Changeset 5958


Ignore:
Timestamp:
Feb 14, 2012, 11:26:51 AM (10 years ago)
Author:
Nicklas Nordborg
Message:

References #1655: GUI improvements

  • Some popup window sizes.
  • Activate project popup.
Location:
trunk/www
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/www/include/scripts/main.js

    r5953 r5958  
    566566    this.controllers['EXPERIMENT'] = { url:'views/experiments/index.jsp', width:750, height:500 };
    567567    this.controllers['EXTRACT'] = { url:'biomaterials/extracts/index.jsp', width:750, height:500 };
    568     this.controllers['EXTRAVALUE'] = { url:'views/experiments/extravalues/index.jsp', width:500, height:340, edit:false };
     568    this.controllers['EXTRAVALUE'] = { url:'views/experiments/extravalues/index.jsp', width:600, height:400, edit:false };
    569569    this.controllers['EXTRAVALUETYPE'] = { url:'admin/extravaluetypes/index.jsp', width:600, height:400 };
    570570    this.controllers['FEATURE'] = { url:'lims/arraydesigns/features/index.jsp', width:750, height:500, popup:true, edit:false };
  • trunk/www/include/scripts/table.js

    r5951 r5958  
    211211    frm.target = window.name;
    212212    frm.cmd.value = oldCmd;
    213   }
    214  
    215   this.configureExport = function(submitPage, ID, tableId, itemType, defaultColumns, extraParameters)
    216   {
    217     var url = submitPage+'?ID='+ID+'&cmd=Export&item_type='+itemType+'&table_id='+tableId
    218     if (defaultColumns) url += '&default='+defaultColumns;
    219     if (extraParameters) url += '&'+extraParameters;
    220     Main.openPopup(url, 'Export'+tableId, 600, 460);
    221213  }
    222214 
  • trunk/www/my_base/index.jsp

    r5946 r5958  
    181181  function setActiveProject(projectId)
    182182  {
    183     Main.openPopup('projects/set_active.jsp?ID=<%=ID%>&project_id='+projectId, 'ActivateProject', 300, 140)
     183    Main.openPopup('projects/set_active.jsp?ID=<%=ID%>&project_id='+projectId, 'ActivateProject', 300, 200)
    184184  }
    185185  function viewDiskUsage()
  • trunk/www/my_base/projects/list_projects.jsp

    r5952 r5958  
    167167    function setActive(projectId)
    168168    {
    169       Main.openPopup('set_active.jsp?ID=<%=ID%>&project_id='+projectId, 'ActivateProject', 300, 140)
     169      Main.openPopup('set_active.jsp?ID=<%=ID%>&project_id='+projectId, 'ActivateProject', 300, 200);
    170170    }
    171171    </script>
  • trunk/www/my_base/projects/set_active.jsp

    r5474 r5958  
    108108{
    109109  window.opener.location.reload();
     110  setTimeout(closeWindow, 500);
     111}
     112function closeWindow()
     113{
    110114  window.close();
    111115}
     
    113117</base:head>
    114118<base:body onload="reloadAndClose()">
    115   <base:note type="info" title="<%=title%>">
    116     <%=message%>
    117   </base:note>
    118   <p>
    119   <table align="center">
    120   <tr>
    121     <td><base:button onclick="window.close();" title="Ok" /></td>
    122   </tr>
    123   </table>
     119  <h1><%=title %></h1>
     120  <div class="content">
     121    <table class="fullcc"><tr><td>
     122    <%=message %>
     123    </td></tr></table>
     124  </div>
     125
     126  <base:buttongroup subclass="dialogbuttons">
     127    <base:button onclick="window.close();" title="Ok" />
     128  </base:buttongroup>
    124129</base:body>
    125130</base:page>
  • trunk/www/my_base/projects/view_project.jsp

    r5946 r5958  
    137137    function setToActive()
    138138    {
    139       Main.openPopup('set_active.jsp?ID=<%=ID%>&project_id=<%=itemId%>', 'ActivateProject', 300, 140);
     139      Main.openPopup('set_active.jsp?ID=<%=ID%>&project_id=<%=itemId%>', 'ActivateProject', 300, 200);
    140140    }
    141141    function viewItems()
  • trunk/www/views/experiments/view_experiment.jsp

    r5946 r5958  
    202202      url += '&annotationtype_id='+annotationTypeId;
    203203      url += '&standalone=1';
    204       Main.openPopup(url, 'EditAnnotation', 700, 460);
     204      Main.openPopup(url, 'EditAnnotation', 750, 500);
    205205    }
    206206    function editInheritedAnnotation(itemType, itemId, annotationTypeId)
     
    211211      url += '&annotationtype_id='+annotationTypeId;
    212212      url += '&standalone=1';
    213       Main.openPopup(url, 'EditAnnotation', 700, 460);
     213      Main.openPopup(url, 'EditAnnotation', 750, 500);
    214214    }
    215215    function setUsedFactorValue(annotationTypeId, values)
Note: See TracChangeset for help on using the changeset viewer.