Changeset 5920


Ignore:
Timestamp:
Jan 10, 2012, 10:41:59 AM (11 years ago)
Author:
Nicklas Nordborg
Message:

References #1655: GUI improvements

Edit dialogs in plates section of Array LIMS.

Location:
trunk/www
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/www/include/scripts/main.js

    r5917 r5920  
    576576    this.controllers['FEATURE'] = { url:'lims/arraydesigns/features/index.jsp', width:750, height:500, popup:true, edit:false };
    577577    this.controllers['ARRAYSLIDE'] = { url:'lims/arrayslides/index.jsp', width:750, height:500 };
    578     this.controllers['PLATEGEOMETRY'] = { url:'lims/geometries/index.jsp', width:500, height:340 };
     578    this.controllers['PLATEGEOMETRY'] = { url:'lims/geometries/index.jsp', width:450, height:300 };
    579579    this.controllers['PLATEMAPPING'] = { url:'lims/platemappings/index.jsp', width:600, height:400 };
    580     this.controllers['PLATE'] = { url:'lims/plates/index.jsp', width:800, height:500 };
    581     this.controllers['WELL'] = { url:'lims/plates/wells/index.jsp', width:800, height:500 };
     580    this.controllers['PLATE'] = { url:'lims/plates/index.jsp', width:750, height:500 };
     581    this.controllers['WELL'] = { url:'lims/plates/wells/index.jsp', width:750, height:500 };
    582582    this.controllers['PLATEEVENT'] = { url:'lims/plates/events/index.jsp', width:600, height:400 };
    583     this.controllers['PLATETYPE'] = { url:'lims/platetypes/index.jsp', width:500, height:340 };
    584     this.controllers['PLATEEVENTTYPE'] = { url:'lims/platetypes/eventtypes/index.jsp', width:500, height:340 };
     583    this.controllers['PLATETYPE'] = { url:'lims/platetypes/index.jsp', width:450, height:300 };
     584    this.controllers['PLATEEVENTTYPE'] = { url:'lims/platetypes/eventtypes/index.jsp', width:450, height:300 };
    585585    this.controllers['ANNOTATIONTYPE'] = { url:'admin/annotationtypes/index.jsp', width:540, height:420 };
    586586    this.controllers['ANNOTATIONTYPECATEGORY'] = { url:'admin/annotationtypecategories/index.jsp', width:540, height:400 };

  • trunk/www/include/styles/popup.css

    r5918 r5920  
    119119{
    120120  position:absolute;
    121   bottom: 1em;
    122   height: 3.5em;
     121  bottom: 1.5em;
     122  height: 4em;
    123123  right: 1em;
    124124  width: 15em;
    125125  text-align: right;
    126126  font-style: italic;
     127  font-size: 87.5%;
    127128}
    128129

  • trunk/www/lims/geometries/edit_geometry.jsp

    r5908 r5920  
    144144  </base:head>
    145145  <base:body onload="init()">
    146     <p>
     146    <h1><%=title%> <base:help tabcontrol="settings" /></h1>
     147
    147148    <form action="index.jsp?ID=<%=ID%>" method="post" name="geometry" onsubmit="return false;">
    148149    <input type="hidden" name="cmd" value="UpdateItem">
    149150
    150     <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    151     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*200)+"px;"%>"
     151    <t:tabcontrol id="settings"
     152      subclass="content dialogtabcontrol"
    152153      position="bottom"  remember="<%=geometry != null%>"
    153154      extensions="<%=invoker%>">
    154155    <t:tab id="info" title="Plate geometry" validate="validatePlateGeometry()" helpid="plategeometry.edit">
    155       <table class="form" cellspacing=0>
     156      <table class="fullform input100 smaller">
    156157      <tr>
    157         <td class="prompt">Name</td>
     158        <th>Name</th>
    158159        <td><input <%=requiredClazz%> type="text" name="name"
    159160          value="<%=HTML.encodeTags(geometry == null ? Values.getString(cc.getPropertyValue("name"), "New plate geometry") : geometry.getName())%>"
    160           size="40" maxlength="<%=PlateGeometry.MAX_NAME_LENGTH%>"></td>
     161          maxlength="<%=PlateGeometry.MAX_NAME_LENGTH%>"></td>
     162        <td></td>
    161163      </tr>
    162164      <tr>
    163         <td class="prompt">Rows</td>
     165        <th>Rows</th>
    164166        <td>
    165167          <%
    … …  
    173175          {
    174176            %>
    175             <input <%=requiredClazz%> type="text" name="rows"
     177            <input class="unchangeable" type="text" name="rows" style="width: 15em;"
    176178              value="<%=cc.getPropertyValue("rows") == null ? "" : Values.getInt(cc.getPropertyValue("rows"))%>"
    177               size="12" maxlength="10" onkeypress="return Numbers.integerOnly(event)">
    178               can't be changed later
     179              maxlength="10" onkeypress="return Numbers.integerOnly(event)">
    179180            <%
    180181          }
    181182          %>
    182183        </td>
     184        <td></td>
    183185      </tr>
    184186      <tr>
    185         <td class="prompt">Columns</td>
     187        <th>Columns</th>
    186188        <td>
    187189          <%
    … …  
    195197          {
    196198            %>
    197             <input <%=requiredClazz%> type="text" name="columns"
     199            <input class="unchangeable" type="text" name="columns" style="width: 15em;"
    198200              value="<%=cc.getPropertyValue("columns") == null ? "" : Values.getInt(cc.getPropertyValue("columns"))%>"
    199               size="12" maxlength="10" onkeypress="return Numbers.integerOnly(event)">
    200               can't be changed later
     201              maxlength="10" onkeypress="return Numbers.integerOnly(event)">
    201202            <%
    202203          }
    203204          %>
    204205        </td>
    205       </tr>
    206       <tr >
    207         <td class="prompt">Description</td>
    208         <td nowrap>
    209           <textarea <%=clazz%> rows="4" cols="40" name="description"
     206        <td></td>
     207      </tr>
     208      <tr class="dynamic">
     209        <th>Description</th>
     210        <td>
     211          <textarea <%=clazz%> rows="4" name="description"
    210212            ><%=HTML.encodeTags(geometry == null ? cc.getPropertyValue("description") : geometry.getDescription())%></textarea>
    211           <a href="javascript:Main.zoom('Description', 'geometry', 'description')"
    212             title="Edit in larger window"><base:icon image="zoom.png" /></a>
     213        </td>
     214        <td style="width: 20px;">
     215          <base:icon image="zoom.png"
     216            onclick="Main.zoom('Description', 'geometry', 'description')"
     217            tooltip="Edit in larger window"
     218          />
    213219        </td>
    214220      </tr>
    215221      </table>
    216       <div align=right>&nbsp;<i><base:icon image="required.gif" /> = required information</i></div>
    217222    </t:tab>
    218223    </t:tabcontrol>
    219 
    220     <table align="center">
    221     <tr>
    222       <td width="50%"><base:button onclick="saveSettings()" title="Save" /></td>
    223       <td width="50%"><base:button onclick="window.close()" title="Cancel" /></td>
    224     </tr>
    225     </table>
    226224    </form>
     225
     226    <div class="legend">
     227      <base:icon image="required.gif" /> = required information
     228      <%if (geometry == null) {%><br>
     229        <base:icon image="unchangeable.gif" /> = can't be changed later
     230      <%}%>
     231    </div>
     232
     233    <base:buttongroup subclass="dialogbuttons">
     234      <base:button onclick="saveSettings()" title="Save" />
     235      <base:button onclick="window.close()" title="Cancel" />
     236    </base:buttongroup>
    227237  </base:body>
    228238  </base:page>

  • trunk/www/lims/platemappings/edit_mapping.jsp

    r5908 r5920  
    178178  </base:head>
    179179  <base:body onload="init()">
    180     <p>
     180    <h1><%=title%> <base:help tabcontrol="settings" /></h1>
    181181    <form action="index.jsp?ID=<%=ID%>" method="post" name="mapping" onsubmit="return false;">
    182182    <input type="hidden" name="cmd" value="UpdateItem">
    183183
    184     <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    185     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*280)+"px;"%>"
     184    <t:tabcontrol id="settings"
     185      subclass="content dialogtabcontrol"
    186186      position="bottom" remember="<%=mapping != null%>"
    187187      extensions="<%=invoker%>">
    188188    <t:tab id="info" title="Plate mapping" validate="validatePlateMapping()" helpid="platemapping.edit">
    189       <table class="form" cellspacing=0>
     189      <table class="fullform input100 smaller">
    190190      <tr>
    191         <td class="prompt">Name</td>
     191        <th>Name</th>
    192192        <td><input <%=requiredClazz%> type="text" name="name"
    193193          value="<%=HTML.encodeTags(mapping == null ? Values.getString(cc.getPropertyValue("name"), "New plate mapping") : mapping.getName())%>"
    194           size="40" maxlength="<%=PlateMapping.MAX_NAME_LENGTH%>"></td>
    195       </tr>
    196       <tr >
    197         <td class="prompt">Source plates</td>
     194          maxlength="<%=PlateMapping.MAX_NAME_LENGTH%>"></td>
     195        <td></td>
     196      </tr>
     197      <tr>
     198        <th>Source plates</th>
    198199        <td>
    199200          <%
    … …  
    201202          {
    202203            %>
    203             <input <%=requiredClazz%> type="text" name="source_count"
     204            <input <%=requiredClazz%> type="text" name="source_count" style="width: 15em;"
    204205              value="<%=Values.getInt(cc.getPropertyValue("sourceCount"), 1)%>"
    205               size="12" maxlength="10" onkeypress="return Numbers.integerOnly(event)">
     206              maxlength="10" onkeypress="return Numbers.integerOnly(event)">
    206207            plate(s) of
    207208            <select name="sourcegeometry_id" class="required">
    … …  
    227228          %>
    228229        </td>
    229       </tr>
    230       <tr >
    231         <td class="prompt">Destination plates</td>
     230        <td></td>
     231      </tr>
     232      <tr>
     233        <th>Destination plates</th>
    232234        <td>
    233235          <%
    … …  
    235237          {
    236238            %>
    237             <input <%=requiredClazz%> type="text" name="destination_count"
     239            <input <%=requiredClazz%> type="text" name="destination_count" style="width: 15em;"
    238240              value="<%=Values.getInt(cc.getPropertyValue("destinationCount"), 1)%>"
    239               size="12" maxlength="10" onkeypress="return Numbers.integerOnly(event)">
     241              maxlength="10" onkeypress="return Numbers.integerOnly(event)">
    240242            plate(s) of
    241243            <select name="destinationgeometry_id" class="required">
    … …  
    261263          %>
    262264        </td>
    263       </tr>
    264       <tr >
    265         <td class="prompt">Image</td>
     265        <td></td>
     266      </tr>
     267      <tr class="big">
     268        <th>Image</th>
    266269        <td>
    267270          <input <%=clazz%> type="text" name="image"
    268271            value="<%=HTML.encodeTags(mapping == null ? "" : mapping.getImage())%>"
    269             size="40" maxlength="<%=PlateMapping.MAX_IMAGE_LENGTH%>"
     272            maxlength="<%=PlateMapping.MAX_IMAGE_LENGTH%>"
    270273            onBlur="updateImage()">
    271274            <br><br>
    … …  
    279282            <img id="mappingImage" src="../../images/platemappings/<%=src%>">
    280283        </td>
    281       </tr>
    282       <tr >
    283         <td class="prompt">Description</td>
    284         <td nowrap>
    285           <textarea <%=clazz%> rows="4" cols="40" name="description"
     284        <td></td>
     285      </tr>
     286      <tr class="dynamic">
     287        <th>Description</th>
     288        <td>
     289          <textarea <%=clazz%> rows="6" name="description"
    286290            ><%=HTML.encodeTags(mapping == null ? cc.getPropertyValue("description") : mapping.getDescription())%></textarea>
    287           <a href="javascript:Main.zoom('Description', 'mapping', 'description')"
    288             title="Edit in larger window"><base:icon image="zoom.png" /></a>
     291        </td>
     292        <td style="width: 20px;">
     293          <base:icon image="zoom.png"
     294            onclick="Main.zoom('Description', 'mapping', 'description')"
     295            tooltip="Edit in larger window"
     296          />
    289297        </td>
    290298      </tr>
    291299      </table>
    292       <div align=right>&nbsp;<i><base:icon image="required.gif" /> = required information</i></div>
    293300    </t:tab>
    294301    </t:tabcontrol>
    295 
    296     <table align="center">
    297     <tr>
    298       <td width="50%"><base:button onclick="saveSettings()" title="Save" /></td>
    299       <td width="50%"><base:button onclick="window.close()" title="Cancel" /></td>
    300     </tr>
    301     </table>
    302302    </form>
     303   
     304    <div class="legend">
     305      <base:icon image="required.gif" /> = required information
     306    </div>
     307
     308    <base:buttongroup subclass="dialogbuttons">
     309      <base:button onclick="saveSettings()" title="Save" />
     310      <base:button onclick="window.close()" title="Cancel" />
     311    </base:buttongroup>
    303312  </base:body>
    304313  </base:page>

  • trunk/www/lims/plates/edit_plate.jsp

    r5908 r5920  
    211211  </base:head>
    212212  <base:body onload="init()">
    213     <p>
     213    <h1><%=title%> <base:help tabcontrol="settings" /></h1>
    214214    <form action="index.jsp?ID=<%=ID%>" method="post" name="plate" onsubmit="return false;">
    215215    <input type="hidden" name="cmd" value="UpdateItem">
    216216
    217     <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    218     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*370)+"px;"%>"
     217    <t:tabcontrol id="settings"
     218      subclass="content dialogtabcontrol"
    219219      position="bottom"  remember="<%=plate != null%>" switch="switchTab"
    220220      extensions="<%=invoker%>">
    221221    <t:tab id="info" title="Plate" validate="validatePlate()" helpid="plate.edit">
    222       <table class="form" cellspacing=0>
     222      <table class="fullform input100 smaller">
    223223      <tr>
    224         <td class="prompt">Name</td>
     224        <th>Name</th>
    225225        <td><input <%=requiredClazz%> type="text" name="name"
    226226          value="<%=HTML.encodeTags(plate == null ? Values.getString(cc.getPropertyValue("name"), "New plate") : plate.getName())%>"
    227           size="40" maxlength="<%=Plate.MAX_NAME_LENGTH%>"></td>
     227          maxlength="<%=Plate.MAX_NAME_LENGTH%>"></td>
     228        <td></td>
    228229      </tr>
    229230      <tr>
    230         <td class="prompt">Barcode</td>
     231        <th>Barcode</th>
    231232        <td><input <%=clazz%> type="text" name="barcode"
    232233          value="<%=HTML.encodeTags(plate == null ? Values.getString(cc.getPropertyValue("barcode"), "") : plate.getBarcode())%>"
    233           size="40" maxlength="<%=Plate.MAX_BARCODE_LENGTH%>"></td>
     234          maxlength="<%=Plate.MAX_BARCODE_LENGTH%>"></td>
     235        <td></td>
    234236      </tr>
    235237      <tr>
    236         <td class="prompt"><label for="destroyed">Destroyed</label></td>
     238        <th><label for="destroyed">Destroyed</label></th>
    237239        <td><input type="checkbox" name="destroyed" id="destroyed" value="1"
    238240          <%=(plate != null && plate.isDestroyed()) || (plate == null && Values.getBoolean(cc.getPropertyValue("destroyed"))) ? "checked" : ""%>>
    239241        </td>
     242        <td></td>
    240243      </tr>
    241244      <tr>
    242         <td class="prompt">Plate type</td>
     245        <th>Plate type</th>
    243246        <td>
    244247          <%
    … …  
    252255          {
    253256            %>
    254             <table border="0" cellspacing="0" cellpadding="0">
     257            <table>
    255258            <tr>
    256259            <td>
    … …  
    276279              %>
    277280              </select>
    278               &nbsp;
    279281            </td>
    280282            <td><base:button onclick="selectPlateTypeOnClick()" title="Select&hellip;" /></td>
    … …  
    285287          %>
    286288        </td>
    287       </tr>
    288       <tr >
    289         <td class="prompt">Description</td>
    290         <td nowrap>
    291           <textarea <%=clazz%> rows="4" cols="40" name="description"
     289        <td></td>
     290      </tr>
     291      <tr class="dynamic">
     292        <th>Description</th>
     293        <td>
     294          <textarea <%=clazz%> rows="6" name="description"
    292295            ><%=HTML.encodeTags(plate == null ? cc.getPropertyValue("description") : plate.getDescription())%></textarea>
    293           <a href="javascript:Main.zoom('Description', 'plate', 'description')"
    294             title="Edit in larger window"><base:icon image="zoom.png" /></a>
    295296        </td>
     297        <td style="width: 20px;">
     298          <base:icon image="zoom.png"
     299            onclick="Main.zoom('Description', 'plate', 'description')"
     300            tooltip="Edit in larger window"
     301          />
     302        </td>
    296303      </tr>
    297304      </table>
    298       <div align=right>&nbsp;<i><base:icon image="required.gif" /> = required information</i></div>
    299305    </t:tab>
    300306   
    301     <t:tab id="annotations" title="Annotations" helpid="annotations.edit">
    302       <iframe name="annotations" id="idAnnotations" src="../../common/annotations/wait.jsp"
    303         width="100%"  height="<%=(int)(scale*370)%>" frameborder=0 vspace=0 hspace=0
    304         marginwidth=0 marginheight=0 scrolling="auto" style="overflow: visible"></iframe>
    305     </t:tab>
    306    
    307     <t:tab id="inheritedAnnotations" title="Inherited annotations" helpid="annotations.edit.inherited">
    308    
    309       <iframe name="inheritedAnnotations" id="idInheritedAnnotations" src="../../common/annotations/wait.jsp"
    310         width="100%"  height="<%=(int)(scale*370)%>" frameborder=0 vspace=0 hspace=0
    311         marginwidth=0 marginheight=0 scrolling="auto" style="overflow: visible"></iframe>
    312     </t:tab>
     307    <t:tab id="annotations" title="Annotations" helpid="annotations.edit"><iframe
     308      name="annotations" id="idAnnotations" src="../../common/annotations/wait.jsp"
     309      style="width: 100%; height: 100%;"></iframe></t:tab>   
     310   
     311    <t:tab id="inheritedAnnotations" title="Inherited annotations"
     312      helpid="annotations.edit.inherited"><iframe
     313        name="inheritedAnnotations" id="idInheritedAnnotations" src="../../common/annotations/wait.jsp"
     314        style="width: 100%; height: 100%;"></iframe></t:tab>
     315
    313316    </t:tabcontrol>
    314 
    315     <table align="center">
    316     <tr>
    317       <td width="50%"><base:button onclick="saveSettings()" title="Save" /></td>
    318       <td width="50%"><base:button onclick="window.close()" title="Cancel" /></td>
    319     </tr>
    320     </table>
    321317    </form>
     318   
     319    <div class="legend">
     320      <base:icon image="required.gif" /> = required information
     321    </div>
     322
     323    <base:buttongroup subclass="dialogbuttons">
     324      <base:button onclick="saveSettings()" title="Save" />
     325      <base:button onclick="window.close()" title="Cancel" />
     326    </base:buttongroup>
    322327  </base:body>
    323328  </base:page>

  • trunk/www/lims/plates/events/edit_event.jsp

    r5908 r5920  
    281281  </base:head>
    282282  <base:body onload="init()">
    283     <p>
     283    <h1><%=title%> <base:help tabcontrol="settings" /></h1>
    284284    <form action="index.jsp?ID=<%=ID%>" method="post" name="event" onsubmit="return false;">
    285285    <input type="hidden" name="cmd" value="UpdateItem">
    286286    <input type="hidden" name="plate_id" value="<%=plateId%>">
    287287
    288     <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    289     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*250)+"px;"%>"
     288    <t:tabcontrol id="settings"
     289      subclass="content dialogtabcontrol"
    290290      position="bottom" remember="<%=event != null%>"
    291291      extensions="<%=invoker%>">
    292292    <t:tab id="info" title="Event" validate="validateEvent()" helpid="plateevent.edit">
    293       <table class="form" cellspacing=0>
     293      <table class="fullform input100 smaller">
    294294      <tr>
    295         <td class="prompt">Event type</td>
     295        <th>Event type</th>
    296296        <td>
    297297          <%
    … …  
    319319          %>
    320320        </td>
     321        <td></td>
    321322      </tr>
    322323      <tr>
    323         <td class="prompt">Event date</td>
     324        <th>Event date</th>
    324325        <td>
    325           <table border="0" cellspacing="0" cellpadding="0">
     326          <table>
    326327          <tr>
    327328          <td>
    … …  
    329330              value="<%=dateFormatter.format(eventDate == null ? new Date() : eventDate)%>"
    330331              size="20" maxlength="20" title="Enter date in format: <%=htmlDateFormat%>">
    331             &nbsp;
    332332          </td>
    333333          <td>
    … …  
    342342          </table>
    343343        </td>
     344        <td></td>
    344345      </tr>
    345346      <tr>
    346         <td class="prompt">Entry date</td>
     347        <th>Entry date</th>
    347348        <td><%=dateFormatter.format(event == null ? new Date() : event.getEntryDate())%></td>
     349        <td></td>
    348350      </tr>
    349351      <tr>
    350         <td class="prompt">Protocol</td>
     352        <th>Protocol</th>
    351353        <td>
    352354          <base:select
    … …  
    361363          />
    362364        </td>
     365        <td></td>
    363366      </tr>
    364367      <tr>
    365         <td class="prompt">Hardware</td>
     368        <th>Hardware</th>
    366369        <td>
    367370          <base:select
    … …  
    376379          />
    377380        </td>
    378       </tr>
    379       <tr >
    380         <td class="prompt">Comment</td>
    381         <td nowrap>
    382           <textarea <%=clazz%> rows="4" cols="40"
     381        <td></td>
     382      </tr>
     383      <tr class="dynamic">
     384        <th>Comment</th>
     385        <td>
     386          <textarea <%=clazz%> rows="6"
    383387            name="comment" ><%=HTML.encodeTags(event == null ? cc.getPropertyValue("comment") : event.getComment())%></textarea>
    384           <a href="javascript:Main.zoom('Comment', 'event', 'comment')" title="Edit in larger window"><base:icon image="zoom.png" /></a>
     388        </td>
     389        <td style="width: 20px;">
     390          <base:icon image="zoom.png"
     391            onclick="Main.zoom('Comment', 'event', 'comment')"
     392            tooltip="Edit in larger window"
     393          />
    385394        </td>
    386395      </tr>
    387396      </table>
    388       <div align=right>&nbsp;<i><base:icon image="required.gif" /> = required information</i></div>
    389397    </t:tab>
    390398    </t:tabcontrol>
    391 
    392     <table align="center">
    393     <tr>
    394       <td width="50%"><base:button onclick="saveSettings()" title="Save" /></td>
    395       <td width="50%"><base:button onclick="window.close()" title="Cancel" /></td>
    396     </tr>
    397     </table>
    398399    </form>
     400   
     401    <div class="legend">
     402      <base:icon image="required.gif" /> = required information
     403    </div>
     404
     405    <base:buttongroup subclass="dialogbuttons">
     406      <base:button onclick="saveSettings()" title="Save" />
     407      <base:button onclick="window.close()" title="Cancel" />
     408    </base:buttongroup>
    399409  </base:body>
    400410  </base:page>

  • trunk/www/lims/plates/merge_plates.jsp

    r5426 r5920  
    136136  </base:head>
    137137  <base:body>
    138     <p>
     138    <h1><%=title%> <base:help helpid="plates.merge.1" /></h1>
    139139    <form action="merge_plates_2.jsp?ID=<%=ID%>" method="post" name="merge" onsubmit="return false;">
    140140
    141     <h3 class="docked"><%=title%> <base:help helpid="plates.merge.1" /></h3>
    142     <div class="boxed" style="<%="height: "+(int)(scale*280)+"px;"%>">
    143       <table class="form" cellspacing=0>
     141    <div class="content bottomborder">
     142      <table class="fullform input100 smaller">
    144143      <tr>
    145         <td class="prompt">Plate mapping</td>
     144        <th>Plate mapping</th>
    146145        <td>
    147146          <base:select
    … …  
    157156      </tr>
    158157      <tr>
    159         <td class="prompt">Name</td>
     158        <th>Name</td>
    160159        <td><input <%=requiredClazz%> type="text" name="name" value="New plate"
    161           size="40" maxlength="<%=Plate.MAX_NAME_LENGTH%>"></td>
     160          maxlength="<%=Plate.MAX_NAME_LENGTH%>"></td>
    162161      </tr>
    163162      <tr>
    164         <td class="prompt">Plate type</td>
     163        <th>Plate type</th>
    165164        <td>
    166165          <base:select
    … …  
    175174        </td>
    176175      </tr>
     176      <tr class="dynamic">
     177        <th></th>
     178        <td></td>
     179      </tr>
    177180      </table>
    178181    </div>
    179 
    180     <table align="center">
    181     <tr>
    182       <td width="50%"><base:button onclick="nextStep()" title="Next" /></td>
    183       <td width="50%"><base:button onclick="window.close()" title="Cancel" /></td>
    184     </tr>
    185     </table>
    186 
    187182    </form>
     183    <div class="legend">
     184      <base:icon image="required.gif" /> = required information
     185    </div>
     186   
     187    <base:buttongroup subclass="dialogbuttons">
     188      <base:button onclick="nextStep()" title="Next" />
     189      <base:button onclick="window.close()" title="Cancel" />
     190    </base:buttongroup>
     191
    188192  </base:body>
    189193  </base:page>

  • trunk/www/lims/plates/merge_plates_2.jsp

    r5906 r5920  
    123123  </base:head>
    124124  <base:body>
    125     <p>
     125    <h1><%=title%> <base:help helpid="plates.merge.2" /></h1>
     126
    126127    <form action="index.jsp?ID=<%=ID%>" method="post" name="merge" onsubmit="return false;">
    127128    <input type="hidden" name="cmd" value="MergePlates">
    … …  
    129130    <input type="hidden" name="platetype_id" value="<%=plateTypeId%>">
    130131
    131     <h3 class="docked"><%=title%> <base:help helpid="plates.merge.2" /></h3>
    132     <div class="boxed" style="<%="height: "+(int)(scale*280)+"px;"%>">
    133       <table class="form" cellspacing=0>
    134       <tr >
    135         <td class="prompt">Plate mapping</td>
    136         <td><%=HTML.encodeTags(plateMapping.getName())%>
     132    <div class="content bottomborder">
     133      <table class="fullform input100 smaller">
     134      <tr>
     135        <th>Plate mapping</th>
     136        <td>
     137          <table><tr>
     138            <td><%=HTML.encodeTags(plateMapping.getName())%></td>
    137139          <%
    138140          if (plateMapping.getImage() !=  null)
    139141          {
    140142            %>
    141             <br>
    142             <img src="../../images/platemappings/<%=plateMapping.getImage()%>">
     143            <td><img src="../../images/platemappings/<%=plateMapping.getImage()%>"></td>
    143144            <%
    144145          }
    145146          %>
     147          </tr></table>
    146148        </td>
    147149      </tr>
    148150      <tr>
    149         <td class="prompt">Name</td>
     151        <th>Name</th>
    150152        <td><input <%=requiredClazz%> type="text" name="name" value="<%=HTML.encodeTags(request.getParameter("name"))%>"
    151           size="40" maxlength="<%=Plate.MAX_NAME_LENGTH%>"></td>
     153          maxlength="<%=Plate.MAX_NAME_LENGTH%>"></td>
    152154      </tr>
    153155      <tr>
    154         <td class="prompt">Plate type</td>
     156        <th>Plate type</th>
    155157        <td><%=HTML.encodeTags(plateType.getName())%></td>
    156158      </tr>
    157       <tr >
    158         <td class="prompt">Plates</td>
     159      <tr class="big">
     160        <th>Plates</th>
    159161        <td>
    160 
    161           <table>
    162           <tr >
    163           <td>
    164             <base:button
    165               onclick="Forms.moveListOptions(document.forms['merge'].plates, false)"
    166               title="<img src='../../images/move_up.png' alt='' style='vertical-align: middle;'>"
    167               tooltip="Move up"
    168             /><p>
    169             <base:button
    170               onclick="Forms.moveListOptions(document.forms['merge'].plates, true)"
    171               title="<img src='../../images/move_down.png' alt='' style='vertical-align: middle;'>"
    172               tooltip="Move down"
    173             />
     162        <table>
     163        <tr>
     164          <td style="padding: 5px;">
     165            <base:buttongroup vertical="true">
     166              <base:button
     167                onclick="Forms.moveListOptions(document.forms['merge'].plates, false)"
     168                image="move_up.png"
     169                tooltip="Move up"
     170                subclass="square"
     171              />
     172              <base:button
     173                onclick="Forms.moveListOptions(document.forms['merge'].plates, true)"
     174                image="move_down.png"
     175                tooltip="Move down"
     176                subclass="square"
     177              />
     178            </base:buttongroup>
    174179          </td>
    175180          <td>
    176181            <select name="plates" size="<%=plateMapping.getSourceCount()%>" multiple
    177               style="width: 15em;">
     182              style="width: 15em;" class="required">
    178183            </select>
    179184            <input type="hidden" name="mergePlates">
    180185          </td>
    181186          <td>
    182             <table width="150">
    183             <tr><td><base:button
    184               onclick="addPlatesOnClick()"
    185               title="Add plates..."
    186               tooltip="Add plates to be used"
    187               /></td></tr>
    188             <tr><td><base:button
    189               onclick="removePlatesOnClick()"
    190               title="Remove"
    191               tooltip="Remove the selected plates"
    192               /></td></tr>
    193             </table>
     187            <base:buttongroup vertical="true">
     188              <base:button
     189                subclass="leftaligned"
     190                style="width: 14em;"
     191                onclick="addPlatesOnClick()"
     192                title="Add&nbsp;plates&hellip;"
     193                tooltip="Add plates to be used"
     194              />
     195              <base:button
     196                subclass="leftaligned"
     197                style="width: 14em;"
     198                onclick="removePlatesOnClick()"
     199                title="Remove"
     200                tooltip="Remove the selected plates"
     201              />
     202            </base:buttongroup>
    194203          </td>
    195204          </tr>
    … …  
    197206        </td>
    198207      </tr>
     208      <tr class="dynamic">
     209        <th></th>
     210        <td></td>
     211      </tr>
    199212      </table>
    200213    </div>
    201 
    202     <table align="center">
    203     <tr>
    204       <td width="50%"><base:button onclick="mergePlates()" title="Merge" /></td>
    205       <td width="50%"><base:button onclick="window.close()" title="Cancel" /></td>
    206     </tr>
    207     </table>
    208 
    209214    </form>
     215   
     216    <div class="legend">
     217      <base:icon image="required.gif" /> = required information
     218    </div>
     219   
     220    <base:buttongroup subclass="dialogbuttons">
     221      <base:button onclick="mergePlates()" title="Merge" image="gonext.png"/>
     222      <base:button onclick="window.close()" title="Cancel" />
     223    </base:buttongroup>
     224
    210225  </base:body>
    211226  </base:page>

  • trunk/www/lims/plates/wells/edit_well.jsp

    r5498 r5920  
    3131  import="net.sf.basedb.core.Plate"
    3232  import="net.sf.basedb.core.PermissionDeniedException"
     33  import="net.sf.basedb.core.Reporter"
    3334  import="net.sf.basedb.core.data.ReporterData"
    3435  import="net.sf.basedb.core.BaseException"
    … …  
    6061  Plate plate = well.getPlate();
    6162  ReporterData reporter = well.getReporter();
     63  if (reporter != null) reporter = Reporter.getById(dc, reporter.getId());
    6264  WellCoordinateFormatter rowFormatter = new WellCoordinateFormatter(true);
    6365  WellCoordinateFormatter columnFormatter = new WellCoordinateFormatter(false);
    6466 
    65   title = "Edit well -- [" + rowFormatter.format(well.getRow()) + ", " + columnFormatter.format(well.getColumn()) + "] on plate " + HTML.encodeTags(plate.getName());
     67  title = "Edit well -- " + HTML.encodeTags(plate.getName()) + " [" + rowFormatter.format(well.getRow()) + columnFormatter.format(well.getColumn()) + "]";
    6668
    6769  final String clazz = "class=\"text\"";
    … …  
    134136  </base:head>
    135137  <base:body>
    136     <p>
     138    <h1><%=title%> <base:help tabcontrol="settings" /></h1>
    137139    <form action="index.jsp?ID=<%=ID%>" method="post" name="well" onsubmit="return false;">
    138140    <input type="hidden" name="cmd" value="UpdateItem">
    139141    <input type="hidden" name="plate_id" value="<%=plateId%>">
    140142
    141     <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    142     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*370)+"px;"%>"
     143    <t:tabcontrol id="settings"
     144      subclass="content dialogtabcontrol"
    143145      position="bottom" switch="switchTab"
    144146      extensions="<%=invoker%>">
    145147    <t:tab id="info" title="Well" validate="validateWell()" helpid="well.edit">
    146       <table class="form" cellspacing=0>
     148      <table class="fullform input100 outlined">
    147149      <tr>
    148         <td class="prompt">Plate</td>
     150        <th>Plate</th>
    149151        <td><%=HTML.encodeTags(plate.getName())%></td>
    150152      </tr>
    151153      <tr>
    152         <td class="prompt">Coordinate</td>
    153         <td>[<%=rowFormatter.format(well.getRow())%>, <%=columnFormatter.format(well.getColumn())%>]</td>
     154        <th>Coordinate</th>
     155        <td><%=rowFormatter.format(well.getRow())%><%=columnFormatter.format(well.getColumn())%></td>
    154156      </tr>
    155157      <tr>
    156         <td class="prompt">Reporter name</td>
     158        <th>Reporter name</th>
    157159        <td><%=reporter == null ? "<i>- none -</i>" : HTML.encodeTags(reporter.getName())%></td>
    158160      </tr>
    159161      <tr>
    160         <td class="prompt">Reporter External ID</td>
     162        <th>Reporter External ID</th>
    161163        <td><%=reporter == null ? "<i>- none -</i>" : HTML.encodeTags(reporter.getExternalId())%></td>
    162164      </tr>
     165      <tr class="dynamic">
     166        <th></th>
     167        <td></td>
     168      </tr>
    163169      </table>
    164       <div align=right>&nbsp;<i><base:icon image="required.gif" /> = required information</i></div>
    165170    </t:tab>
    166171
    167     <t:tab id="annotations" title="Annotations" helpid="annotations.edit">
    168       <iframe name="annotations" id="idAnnotations" src="../../../common/annotations/wait.jsp"
    169         width="100%"  height="<%=(int)(scale*370)%>" frameborder=0 vspace=0 hspace=0
    170         marginwidth=0 marginheight=0 scrolling="auto" style="overflow: visible"></iframe>
    171     </t:tab>
     172    <t:tab id="annotations" title="Annotations" helpid="annotations.edit"><iframe
     173      name="annotations" id="idAnnotations" src="../../../common/annotations/wait.jsp"
     174      style="width: 100%; height: 100%;"></iframe></t:tab>   
    172175   
    173     <t:tab id="inheritedAnnotations" title="Inherited annotations" helpid="annotations.edit.inherited">
    174    
    175       <iframe name="inheritedAnnotations" id="idInheritedAnnotations" src="../../../common/annotations/wait.jsp"
    176         width="100%"  height="<%=(int)(scale*370)%>" frameborder=0 vspace=0 hspace=0
    177         marginwidth=0 marginheight=0 scrolling="auto" style="overflow: visible"></iframe>
    178     </t:tab>
     176    <t:tab id="inheritedAnnotations" title="Inherited annotations"
     177      helpid="annotations.edit.inherited"><iframe
     178        name="inheritedAnnotations" id="idInheritedAnnotations" src="../../../common/annotations/wait.jsp"
     179        style="width: 100%; height: 100%;"></iframe></t:tab>
    179180    </t:tabcontrol>
     181    </form>
    180182
    181     <table align="center">
    182     <tr>
    183       <td width="50%"><base:button onclick="saveSettings()" title="Save" /></td>
    184       <td width="50%"><base:button onclick="window.close()" title="Cancel" /></td>
    185     </tr>
    186     </table>
    187     </form>
     183    <base:buttongroup subclass="dialogbuttons">
     184      <base:button onclick="saveSettings()" title="Save" />
     185      <base:button onclick="window.close()" title="Cancel" />
     186    </base:buttongroup>
    188187  </base:body>
    189188  </base:page>

  • trunk/www/lims/plates/wells/view_well.jsp

    r5910 r5920  
    8585  final Well well = Well.getById(dc, itemId);
    8686  final Plate plate = well.getPlate();
    87   final ReporterData reporter = well.getReporter();
     87  ReporterData reporter = well.getReporter();
    8888  final int plateId = plate.getId();
    8989
    … …  
    113113  }
    114114 
     115  boolean readCurrentReporterType = true;
     116  ReporterType currentReporterType = null;
     117  if (reporter != null)
     118  {
     119    reporter = Reporter.getById(dc, reporter.getId());
     120    try
     121    {
     122      currentReporterType = Reporter.getReporterType(dc, reporter);
     123    }
     124    catch (PermissionDeniedException ex)
     125    {
     126      readCurrentReporterType = false;
     127    }
     128  }
     129 
    115130  final boolean writePermission = well.hasPermission(Permission.WRITE);
    116131  final boolean deletePermission = well.hasPermission(Permission.DELETE);
    … …  
    140155        title="<%=HTML.encodeTags(plate.getName())%>"
    141156        href="<%="index.jsp?ID="+ID+"&plate_id="+plateId%>" />
    142       <p:pathelement title="<%="Well: ["+rowFormatter.format(well.getRow())+", "+columnFormatter.format(well.getColumn())+"]"%>" />
     157      <p:pathelement title="<%="Well: "+rowFormatter.format(well.getRow())+columnFormatter.format(well.getColumn())%>" />
    143158    </p:path>
    144159   
    … …  
    234249      else
    235250      {
    236         boolean readCurrentReporterType = true;
    237         ReporterType currentReporterType = null;
    238         try
    239         {
    240           currentReporterType = Reporter.getReporterType(dc, reporter);
    241         }
    242         catch (PermissionDeniedException ex)
    243         {
    244           readCurrentReporterType = false;
    245         }
    246251        %>
    247252        <table border="0" cellspacing="0" cellpadding="0">

  • trunk/www/lims/platetypes/edit_platetype.jsp

    r5908 r5920  
    157157  </base:head>
    158158  <base:body onload="init()">
    159     <p>
     159    <h1><%=title%> <base:help tabcontrol="settings" /></h1>
    160160    <form action="index.jsp?ID=<%=ID%>" method="post" name="platetype" onsubmit="return false;">
    161161    <input type="hidden" name="cmd" value="UpdateItem">
    162162
    163     <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    164     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*160)+"px;"%>"
     163    <t:tabcontrol id="settings"
     164      subclass="content dialogtabcontrol"
    165165      position="bottom" remember="<%=plateType != null%>"
    166166      extensions="<%=invoker%>">
    167167    <t:tab id="info" title="Plate type" validate="validatePlateType()" helpid="platetype.edit">
    168       <table class="form" cellspacing=0>
     168      <table class="fullform input100 smaller">
    169169      <tr>
    170         <td class="prompt">Name</td>
     170        <th>Name</th>
    171171        <td><input <%=requiredClazz%> type="text" name="name"
    172172          value="<%=HTML.encodeTags(plateType == null ? Values.getString(cc.getPropertyValue("name"), "New plate type") : plateType.getName())%>"
    173           size="40" maxlength="<%=PlateType.MAX_NAME_LENGTH%>"></td>
     173          maxlength="<%=PlateType.MAX_NAME_LENGTH%>"></td>
     174        <td></td>
    174175      </tr>
    175176      <tr>
    176         <td class="prompt">Geometry</td>
     177        <th>Geometry</th>
    177178        <td>
    178179          <%
    … …  
    180181          {
    181182            %>
    182             <select name="plategeometry_id" class="required">
     183            <select name="plategeometry_id" class="unchangeable">
    183184            <%
    184185            for (PlateGeometry pg : plateGeometries)
    … …  
    191192            %>
    192193            </select>
    193             can't be changed later
    194194            <%
    195195          }
    … …  
    202202          %>
    203203        </td>
     204        <td></td>
    204205      </tr>
    205 
    206 
    207 
    208       <tr >
    209         <td class="prompt">Description</td>
    210         <td nowrap>
    211           <textarea <%=clazz%> rows="4" cols="40" name="description"
     206      <tr class="dynamic">
     207        <th>Description</th>
     208        <td>
     209          <textarea <%=clazz%> rows="4" name="description"
    212210            ><%=HTML.encodeTags(plateType == null ? cc.getPropertyValue("description") : plateType.getDescription())%></textarea>
    213           <a href="javascript:Main.zoom('Description', 'platetype', 'description')"
    214             title="Edit in larger window"><base:icon image="zoom.png" /></a>
     211        </td>
     212        <td style="width: 20px;">
     213          <base:icon image="zoom.png"
     214            onclick="Main.zoom('Description', 'platetype', 'description')"
     215            tooltip="Edit in larger window"
     216          />
    215217        </td>
    216218      </tr>
    217219      </table>
    218       <div align=right>&nbsp;<i><base:icon image="required.gif" /> = required information</i></div>
    219220    </t:tab>
    220221    </t:tabcontrol>
    221 
    222     <table align="center">
    223     <tr>
    224       <td width="50%"><base:button onclick="saveSettings()" title="Save" /></td>
    225       <td width="50%"><base:button onclick="window.close()" title="Cancel" /></td>
    226     </tr>
    227     </table>
    228222    </form>
     223   
     224    <div class="legend">
     225      <base:icon image="required.gif" /> = required information
     226      <%if (plateType == null) {%><br>
     227        <base:icon image="unchangeable.gif" /> = can't be changed later
     228      <%}%>
     229    </div>
     230
     231    <base:buttongroup subclass="dialogbuttons">
     232      <base:button onclick="saveSettings()" title="Save" />
     233      <base:button onclick="window.close()" title="Cancel" />
     234    </base:buttongroup>
    229235  </base:body>
    230236  </base:page>

  • trunk/www/lims/platetypes/eventtypes/edit_eventtype.jsp

    r5908 r5920  
    188188  </base:head>
    189189  <base:body onload="init()">
    190     <p>
     190    <h1><%=title%> <base:help tabcontrol="settings" /></h1>
     191   
    191192    <form action="index.jsp?ID=<%=ID%>" method="post" name="eventtype" onsubmit="return false;">
    192193    <input type="hidden" name="cmd" value="UpdateItem">
    193194    <input type="hidden" name="platetype_id" value="<%=plateTypeId%>">
    194195
    195     <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    196     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*200)+"px;"%>"
     196    <t:tabcontrol id="settings"
     197      subclass="content dialogtabcontrol"
    197198      position="bottom" remember="<%=eventType != null%>"
    198199      extensions="<%=invoker%>">
    199200    <t:tab id="info" title="Event type" validate="validateEventType()" helpid="plateeventtype.edit">
    200       <table class="form" cellspacing=0>
     201      <table class="fullform input100 smaller">
    201202      <tr>
    202         <td class="prompt">Name</td>
     203        <th>Name</th>
    203204        <td><input <%=requiredClazz%> type="text" name="name"
    204205          value="<%=HTML.encodeTags(eventType == null ? Values.getString(cc.getPropertyValue("name"), "New event type") : eventType.getName())%>"
    205           size="40" maxlength="<%=PlateEventType.MAX_NAME_LENGTH%>"></td>
     206          maxlength="<%=PlateEventType.MAX_NAME_LENGTH%>"></td>
     207        <td></td>
    206208      </tr>
    207209      <tr>
    208         <td class="prompt">Ordinal</td>
    209         <td><input <%=requiredClazz%> type="text" name="ordinal"
     210        <th>Ordinal</th>
     211        <td><input <%=requiredClazz%> type="text" name="ordinal" style="width: 15em;"
    210212          value="<%=eventType == null ? Values.getInt(cc.getPropertyValue("ordinal"), maxOrdinal+1) : eventType.getOrdinal()%>"
    211           size="12" maxlength="10" onkeypress="return Numbers.integerOnly(event)"></td>
     213          maxlength="10" onkeypress="return Numbers.integerOnly(event)"></td>
     214        <td></td>
    212215      </tr>
    213216      <tr>
    214         <td class="prompt">Protocol type</td>
     217        <th>Protocol type</th>
    215218        <td>
    216219          <base:select
    … …  
    225228          />
    226229        </td>
    227       </tr>
    228 
    229       <tr >
    230         <td class="prompt">Description</td>
    231         <td nowrap>
    232           <textarea <%=clazz%> rows="4" cols="40" name="description"
     230        <td></td>
     231      </tr>
     232      <tr class="dynamic">
     233        <th>Description</th>
     234        <td>
     235          <textarea <%=clazz%> rows="4" name="description"
    233236            ><%=HTML.encodeTags(eventType == null ? cc.getPropertyValue("description") : eventType.getDescription())%></textarea>
    234           <a href="javascript:Main.zoom('Description', 'eventtype', 'description')"
    235             title="Edit in larger window"><base:icon image="zoom.png" /></a>
    236237        </td>
     238        <td style="width: 20px;">
     239          <base:icon image="zoom.png"
     240            onclick="Main.zoom('Description', 'eventtype', 'description')"
     241            tooltip="Edit in larger window"
     242          />
     243        </td>
    237244      </tr>
    238245      </table>
    239       <div align=right>&nbsp;<i><base:icon image="required.gif" /> = required information</i></div>
    240246    </t:tab>
    241247    </t:tabcontrol>
    242 
    243     <table align="center">
    244     <tr>
    245       <td width="50%"><base:button onclick="saveSettings()" title="Save" /></td>
    246       <td width="50%"><base:button onclick="window.close()" title="Cancel" /></td>
    247     </tr>
    248     </table>
    249248    </form>
     249   
     250    <div class="legend">
     251      <base:icon image="required.gif" /> = required information
     252    </div>
     253
     254    <base:buttongroup subclass="dialogbuttons">
     255      <base:button onclick="saveSettings()" title="Save" />
     256      <base:button onclick="window.close()" title="Cancel" />
     257    </base:buttongroup>
    250258  </base:body>
    251259  </base:page>
Note: See TracChangeset for help on using the changeset viewer.