Changeset 5908


Ignore:
Timestamp:
Dec 13, 2011, 2:48:46 PM (10 years ago)
Author:
Nicklas Nordborg
Message:

References #1655: GUI improvements

  • File manager dialogs
  • File server edit dialog
  • Changed zoom.gif to png
Location:
trunk/www
Files:
1 added
1 deleted
89 edited

Legend:

Unmodified
Added
Removed
  • trunk/www/admin/annotationtypecategories/edit_category.jsp

    r5905 r5908  
    208208            ><%=HTML.encodeTags(annotationTypeCategory == null ? cc.getPropertyValue("description") : annotationTypeCategory.getDescription())%></textarea>
    209209          <a href="javascript:Main.zoom('Description', 'annotationTypeCategory', 'description')"
    210             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     210            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    211211        </td>
    212212      </tr>
  • trunk/www/admin/annotationtypes/edit_annotationtype.jsp

    r5906 r5908  
    534534              ><%=HTML.encodeTags(defaultValue)%></textarea>
    535535            <a href="javascript:Main.zoom('Default value', 'annotationType', 'defaultValue')"
    536               title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     536              title="Edit in larger window"><base:icon image="zoom.png" /></a>
    537537            <%
    538538          }
     
    558558            ><%=HTML.encodeTags(annotationType == null ? cc.getPropertyValue("description") : annotationType.getDescription())%></textarea>
    559559          <a href="javascript:Main.zoom('Description', 'annotationType', 'description')"
    560             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     560            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    561561        </td>
    562562      </tr>
     
    628628              onkeypress="return Numbers.integerOnly(event)"><%=HTML.encodeTags(values)%></textarea>
    629629            <a href="javascript:Main.zoom('Values', 'annotationtype', 'values')"
    630               title="Edit in larger window"><base:icon image="zoom.gif" /></a><br>
     630              title="Edit in larger window"><base:icon image="zoom.png" /></a><br>
    631631            One enumeration value per line
    632632          </td>
     
    694694              onkeypress="return Numbers.numberOnly(event)"><%=HTML.encodeTags(values)%></textarea>
    695695            <a href="javascript:Main.zoom('Values', 'annotationtype', 'values')"
    696               title="Edit in larger window"><base:icon image="zoom.gif" /></a><br>
     696              title="Edit in larger window"><base:icon image="zoom.png" /></a><br>
    697697            One enumeration value per line
    698698          </td>
     
    746746            <textarea <%=clazz%> rows="10" cols="40" name="values"
    747747              ><%=HTML.encodeTags(values)%></textarea>
    748             <a href="javascript:Main.zoom('Values', 'annotationtype', 'values')" title="Edit in larger window"><base:icon image="zoom.gif" /></a><br>
     748            <a href="javascript:Main.zoom('Values', 'annotationtype', 'values')" title="Edit in larger window"><base:icon image="zoom.png" /></a><br>
    749749            One date value (<%=htmlDateFormat%>) per line
    750750          </td>
     
    813813            <textarea <%=clazz%> rows="10" cols="40" name="values" ><%=HTML.encodeTags(values)%></textarea>
    814814            <a href="javascript:Main.zoom('Values', 'annotationtype', 'values')"
    815               title="Edit in larger window"><base:icon image="zoom.gif" /></a><br>
     815              title="Edit in larger window"><base:icon image="zoom.png" /></a><br>
    816816            One enumeration value per line
    817817          </td>
  • trunk/www/admin/clients/edit_client.jsp

    r5905 r5908  
    160160            ><%=HTML.encodeTags(client == null ? cc.getPropertyValue("description") : client.getDescription())%></textarea>
    161161          <a href="javascript:Main.zoom('Description', 'client', 'description')"
    162             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     162            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    163163        </td>
    164164      </tr>
  • trunk/www/admin/clients/help/edit_help.jsp

    r5905 r5908  
    382382            ><%=HTML.encodeTags(help == null ? cc.getPropertyValue("description") : help.getDescription())%></textarea>
    383383          <a href="javascript:Main.zoom('Help text', 'help', 'description')"
    384             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     384            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    385385        </td>
    386386      </tr>
  • trunk/www/admin/datafiletypes/edit_filetype.jsp

    r5905 r5908  
    245245            ><%=HTML.encodeTags(fileType == null ? cc.getPropertyValue("description") : fileType.getDescription())%></textarea>
    246246          <a href="javascript:Main.zoom('Description', 'fileType', 'description')"
    247             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     247            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    248248        </td>
    249249      </tr>
  • trunk/www/admin/extravaluetypes/edit_extravaluetype.jsp

    r5905 r5908  
    316316            ><%=HTML.encodeTags(extraValueType == null ? cc.getPropertyValue("description") : extraValueType.getDescription())%></textarea>
    317317          <a href="javascript:Main.zoom('Description', 'extraValueType', 'description')"
    318             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     318            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    319319        </td>
    320320      </tr>
  • trunk/www/admin/groups/edit_group.jsp

    r5905 r5908  
    334334            ><%=HTML.encodeTags(group == null ? cc.getPropertyValue("description") : group.getDescription())%></textarea>
    335335          <a href="javascript:Main.zoom('Description', 'group', 'description')"
    336             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     336            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    337337        </td>
    338338      </tr>
  • trunk/www/admin/hardware/edit_hardware.jsp

    r5905 r5908  
    207207            ><%=HTML.encodeTags(hardware == null ? cc.getPropertyValue("description") : hardware.getDescription())%></textarea>
    208208          <a href="javascript:Main.zoom('Description', 'hardware', 'description')"
    209             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     209            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    210210        </td>
    211211      </tr>
  • trunk/www/admin/itemsubtypes/edit_subtype.jsp

    r5905 r5908  
    371371            ><%=HTML.encodeTags(subtype == null ? cc.getPropertyValue("description") : subtype.getDescription())%></textarea>
    372372          <a href="javascript:Main.zoom('Description', 'subtype', 'description')"
    373             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     373            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    374374        </td>
    375375      </tr>
  • trunk/www/admin/jobagents/edit_agent.jsp

    r5905 r5908  
    405405            ><%=HTML.encodeTags(agent == null ? cc.getPropertyValue("description") : agent.getDescription())%></textarea>
    406406          <a href="javascript:Main.zoom('Description', 'agent', 'description')"
    407             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     407            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    408408        </td>
    409409      </tr>
  • trunk/www/admin/mimetypes/edit_mimetype.jsp

    r5905 r5908  
    235235            ><%=HTML.encodeTags(mimeType == null ? cc.getPropertyValue("description") : mimeType.getDescription())%></textarea>
    236236          <a href="javascript:Main.zoom('Description', 'mimeType', 'description')"
    237             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     237            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    238238        </td>
    239239      </tr>
  • trunk/www/admin/news/edit_news.jsp

    r5905 r5908  
    226226            ><%=HTML.encodeTags(news == null ? cc.getPropertyValue("description") : news.getDescription())%></textarea>
    227227          <a href="javascript:Main.zoom('Description', 'news', 'description')"
    228             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     228            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    229229        </td>
    230230      </tr>
  • trunk/www/admin/platforms/edit_platform.jsp

    r5905 r5908  
    335335            ><%=HTML.encodeTags(platform == null ? cc.getPropertyValue("description") : platform.getDescription())%></textarea>
    336336          <a href="javascript:Main.zoom('Description', 'platform', 'description')"
    337             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     337            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    338338        </td>
    339339      </tr>
  • trunk/www/admin/platforms/variants/edit_variant.jsp

    r5905 r5908  
    344344            ><%=HTML.encodeTags(variant == null ? cc.getPropertyValue("description") : variant.getDescription())%></textarea>
    345345          <a href="javascript:Main.zoom('Description', 'variant', 'description')"
    346             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     346            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    347347        </td>
    348348      </tr>
  • trunk/www/admin/pluginconfigurations/edit_configuration.jsp

    r5905 r5908  
    293293            ><%=HTML.encodeTags(description)%></textarea>
    294294          <a href="javascript:Main.zoom('Description', 'configuration', 'description')"
    295             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     295            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    296296        </td>
    297297      </tr>
  • trunk/www/admin/plugintypes/edit_plugintype.jsp

    r5905 r5908  
    163163            ><%=HTML.encodeTags(pluginType == null ? cc.getPropertyValue("description") : pluginType.getDescription())%></textarea>
    164164          <a href="javascript:Main.zoom('Description', 'pluginType', 'description')"
    165             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     165            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    166166        </td>
    167167      </tr>
  • trunk/www/admin/protocols/edit_protocol.jsp

    r5905 r5908  
    331331            ><%=HTML.encodeTags(protocol == null ? cc.getPropertyValue("description") : protocol.getDescription())%></textarea>
    332332          <a href="javascript:Main.zoom('Description', 'protocol', 'description')"
    333             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     333            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    334334        </td>
    335335      </tr>
  • trunk/www/admin/quantities/edit_quantity.jsp

    r5905 r5908  
    158158            ><%=HTML.encodeTags(quantity == null ? cc.getPropertyValue("description") : quantity.getDescription())%></textarea>
    159159          <a href="javascript:Main.zoom('Description', 'quantity', 'description')"
    160             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     160            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    161161        </td>
    162162      </tr>
  • trunk/www/admin/quantities/units/edit_unit.jsp

    r5905 r5908  
    235235            ><%=HTML.encodeTags(unit == null ? cc.getPropertyValue("description") : unit.getDescription())%></textarea>
    236236          <a href="javascript:Main.zoom('Description', 'unit', 'description')"
    237             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     237            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    238238        </td>
    239239      </tr>
  • trunk/www/admin/quota/edit_quota.jsp

    r5905 r5908  
    233233            ><%=HTML.encodeTags(quota == null ? cc.getPropertyValue("description") : quota.getDescription())%></textarea>
    234234          <a href="javascript:Main.zoom('Description', 'quota', 'description')"
    235             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     235            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    236236        </td>
    237237      </tr>
  • trunk/www/admin/quotatypes/edit_quotatype.jsp

    r5905 r5908  
    143143            ><%=HTML.encodeTags(quotaType == null ? cc.getPropertyValue("description") : quotaType.getDescription())%></textarea>
    144144          <a href="javascript:Main.zoom('Description', 'quotaType', 'description')"
    145             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     145            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    146146        </td>
    147147      </tr>
  • trunk/www/admin/reporterclonetemplates/edit_template.jsp

    r5906 r5908  
    237237            ><%=HTML.encodeTags(template == null ? cc.getPropertyValue("description") : template.getDescription())%></textarea>
    238238          <a href="javascript:Main.zoom('Description', 'template', 'description')"
    239             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     239            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    240240        </td>
    241241      </tr>
  • trunk/www/admin/reportertypes/edit_reportertype.jsp

    r5905 r5908  
    144144            ><%=HTML.encodeTags(reporterType == null ? cc.getPropertyValue("description") : reporterType.getDescription())%></textarea>
    145145          <a href="javascript:Main.zoom('Description', 'reporterType', 'description')"
    146             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     146            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    147147        </td>
    148148      </tr>
  • trunk/www/admin/roles/edit_role.jsp

    r5905 r5908  
    397397            ><%=HTML.encodeTags(role == null ? cc.getPropertyValue("description") : role.getDescription())%></textarea>
    398398          <a href="javascript:Main.zoom('Description', 'role', 'description')"
    399             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     399            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    400400        </td>
    401401      </tr>
  • trunk/www/admin/server/broadcast.jsp

    r5905 r5908  
    115115        </td>
    116116        <td style="width: 20px;">
    117           <a href="javascript:Main.zoom('Message', 'broadcast', 'message')" title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     117          <a href="javascript:Main.zoom('Message', 'broadcast', 'message')" title="Edit in larger window"><base:icon image="zoom.png" /></a>
    118118        </td>
    119119      </tr>
  • trunk/www/admin/server/configure.jsp

    r5905 r5908  
    197197        </td>
    198198        <td style="width: 20px;">
    199           <a href="javascript:Main.zoom('About', 'server', 'about', <%=!writePermission%>)" title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     199          <a href="javascript:Main.zoom('About', 'server', 'about', <%=!writePermission%>)" title="Edit in larger window"><base:icon image="zoom.png" /></a>
    200200        </td>
    201201      </tr>
     
    210210        </td>
    211211        <td style="width: 20px;">
    212           <a href="javascript:Main.zoom('Get account - message', 'server', 'account', <%=!writePermission%>)" title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     212          <a href="javascript:Main.zoom('Get account - message', 'server', 'account', <%=!writePermission%>)" title="Edit in larger window"><base:icon image="zoom.png" /></a>
    213213        </td>
    214214      </tr>
     
    224224        </td>
    225225        <td style="width: 20px;">
    226           <a href="javascript:Main.zoom('Forgotten password - message', 'server', 'password', <%=!writePermission%>)" title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     226          <a href="javascript:Main.zoom('Forgotten password - message', 'server', 'password', <%=!writePermission%>)" title="Edit in larger window"><base:icon image="zoom.png" /></a>
    227227        </td>
    228228      </tr>
  • trunk/www/admin/software/edit_software.jsp

    r5905 r5908  
    208208            ><%=HTML.encodeTags(software == null ? cc.getPropertyValue("description") : software.getDescription())%></textarea>
    209209          <a href="javascript:Main.zoom('Description', 'software', 'description')"
    210             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     210            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    211211        </td>
    212212      </tr>
  • trunk/www/admin/users/edit_user.jsp

    r5905 r5908  
    624624          <textarea <%=clazz%> rows="4" cols="40" name="address"
    625625            wrap="off"><%=HTML.encodeTags(user == null ? cc.getPropertyValue("address") : user.getAddress())%></textarea>
    626           <a href="javascript:Main.zoom('Address', 'user', 'address')" title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     626          <a href="javascript:Main.zoom('Address', 'user', 'address')" title="Edit in larger window"><base:icon image="zoom.png" /></a>
    627627        </td>
    628628      </tr>
     
    650650          <textarea <%=clazz%> rows="4" cols="40" name="description"
    651651            ><%=HTML.encodeTags(user == null ? cc.getPropertyValue("description") : user.getDescription())%></textarea>
    652           <a href="javascript:Main.zoom('Description', 'user', 'description')" title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     652          <a href="javascript:Main.zoom('Description', 'user', 'description')" title="Edit in larger window"><base:icon image="zoom.png" /></a>
    653653        </td>
    654654      </tr>
     
    710710                    '<%=HTML.javaScriptEncode(ep.getTitle())%>',
    711711                    'user', '<%=name%>')"
    712                     title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     712                    title="Edit in larger window"><base:icon image="zoom.png" /></a>
    713713                  <%
    714714                }
  • trunk/www/biomaterials/bioplateeventtypes/edit_eventtype.jsp

    r5905 r5908  
    169169            ><%=HTML.encodeTags(eventType == null ? cc.getPropertyValue("description") : eventType.getDescription())%></textarea>
    170170          <a href="javascript:Main.zoom('Description', 'bioPlateEventType', 'description')"
    171             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     171            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    172172        </td>
    173173      </tr>
  • trunk/www/biomaterials/bioplates/edit_bioplate.jsp

    r5905 r5908  
    408408            ><%=HTML.encodeTags(bioplate == null ? cc.getPropertyValue("description") : bioplate.getDescription())%></textarea>
    409409          <a href="javascript:Main.zoom('Description', 'bioplate', 'description')"
    410             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     410            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    411411        </td>
    412412      </tr>
  • trunk/www/biomaterials/bioplates/events/edit_event.jsp

    r5905 r5908  
    269269            ><%=HTML.encodeTags(event.getDescription())%></textarea>
    270270          <a href="javascript:Main.zoom('Description', 'event', 'description')"
    271             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     271            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    272272        </td>
    273273      </tr>
  • trunk/www/biomaterials/bioplatetypes/edit_platetype.jsp

    r5905 r5908  
    302302            ><%=HTML.encodeTags(bioPlateType == null ? cc.getPropertyValue("description") : bioPlateType.getDescription())%></textarea>
    303303          <a href="javascript:Main.zoom('Description', 'bioPlateType', 'description')"
    304             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     304            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    305305        </td>
    306306      </tr>
  • trunk/www/biomaterials/biosources/edit_biosource.jsp

    r5905 r5908  
    230230            ><%=HTML.encodeTags(bioSource == null ? cc.getPropertyValue("description") : bioSource.getDescription())%></textarea>
    231231          <a href="javascript:Main.zoom('Description', 'biosource', 'description')"
    232             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     232            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    233233        </td>
    234234      </tr>
  • trunk/www/biomaterials/events/edit_event.jsp

    r5905 r5908  
    232232          <textarea <%=clazz%> rows="4" cols="40"
    233233            name="comment" ><%=HTML.encodeTags(event == null ? cc.getPropertyValue("comment") : event.getComment())%></textarea>
    234           <a href="javascript:Main.zoom('Comment', 'event', 'comment')" title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     234          <a href="javascript:Main.zoom('Comment', 'event', 'comment')" title="Edit in larger window"><base:icon image="zoom.png" /></a>
    235235        </td>
    236236      </tr>
  • trunk/www/biomaterials/extracts/edit_extract.jsp

    r5905 r5908  
    865865            ><%=HTML.encodeTags(extract == null ? cc.getPropertyValue("description") : extract.getDescription())%></textarea>
    866866          <a href="javascript:Main.zoom('Description', 'extract', 'description')"
    867             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     867            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    868868        </td>
    869869      </tr>
  • trunk/www/biomaterials/lists/edit_list.jsp

    r5905 r5908  
    286286            ><%=HTML.encodeTags(list == null ? cc.getPropertyValue("description") : list.getDescription())%></textarea>
    287287          <a href="javascript:Main.zoom('Description', 'list', 'description')"
    288             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     288            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    289289        </td>
    290290      </tr>
  • trunk/www/biomaterials/samples/edit_sample.jsp

    r5905 r5908  
    790790            ><%=HTML.encodeTags(sample == null ? cc.getPropertyValue("description") : sample.getDescription())%></textarea>
    791791          <a href="javascript:Main.zoom('Description', 'sample', 'description')"
    792             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     792            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    793793        </td>
    794794      </tr>
  • trunk/www/biomaterials/tags/edit_tag.jsp

    r5905 r5908  
    197197            ><%=HTML.encodeTags(tag == null ? cc.getPropertyValue("description") : tag.getDescription())%></textarea>
    198198          <a href="javascript:Main.zoom('Description', 'tag', 'description')"
    199             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     199            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    200200        </td>
    201201      </tr>
  • trunk/www/biomaterials/wizards/create_child_bioplate_step1.jsp

    r5905 r5908  
    420420          ></textarea>
    421421        <a href="javascript:Main.zoom('Event description', 'main', 'event_description')"
    422           title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     422          title="Edit in larger window"><base:icon image="zoom.png" /></a>
    423423      </td>
    424424    </tr>
     
    581581          ></textarea>
    582582        <a href="javascript:Main.zoom('Biomaterial description', 'main', 'child_description')"
    583           title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     583          title="Edit in larger window"><base:icon image="zoom.png" /></a>
    584584      </td>
    585585    </tr>
     
    661661          ></textarea>
    662662        <a href="javascript:Main.zoom('Plate description', 'main', 'plate_description')"
    663           title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     663          title="Edit in larger window"><base:icon image="zoom.png" /></a>
    664664      </td>
    665665    </tr>
  • trunk/www/biomaterials/wizards/move_biomaterial.jsp

    r5905 r5908  
    807807          ></textarea>
    808808        <a href="javascript:Main.zoom('Description', 'main', 'description')"
    809           title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     809          title="Edit in larger window"><base:icon image="zoom.png" /></a>
    810810      </td>
    811811    </tr>
  • trunk/www/biomaterials/wizards/place_on_plate.jsp

    r5905 r5908  
    719719            ></textarea>
    720720          <a href="javascript:Main.zoom('Description', 'main', 'description')"
    721             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     721            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    722722        </td>
    723723      </tr>
  • trunk/www/common/annotations/annotate.jsp

    r5905 r5908  
    809809              onblur="valueOnBlur(this.value)"></textarea>
    810810            <a href="javascript:Main.zoom('<%=HTML.javaScriptEncode(at.getName())%>', 'annotations', '<%=inputName%>')"
    811               title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     811              title="Edit in larger window"><base:icon image="zoom.png" /></a>
    812812            <%
    813813          }
  • trunk/www/common/anytoany/edit_anytoany.jsp

    r5905 r5908  
    207207            ><%=HTML.encodeTags(anyToAny == null ? cc.getPropertyValue("description") : anyToAny.getDescription())%></textarea>
    208208          <a href="javascript:Main.zoom('Description', 'label', 'description')"
    209             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     209            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    210210        </td>
    211211      </tr>
  • trunk/www/common/plugin/configure.jsp

    r5905 r5908  
    970970                        onblur="valueOnBlur(this.value)"></textarea>
    971971                      <a href="javascript:Main.zoom('<%=HTML.javaScriptEncode(param.getLabel())%>', 'configure', '<%=inputName%>')"
    972                         title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     972                        title="Edit in larger window"><base:icon image="zoom.png" /></a>
    973973                      <%
    974974                    }
  • trunk/www/common/plugin/finish_job.jsp

    r5905 r5908  
    163163            ><%=HTML.encodeTags(job.getDescription())%></textarea>
    164164          <a href="javascript:Main.zoom('Job description', 'plugin', 'description')"
    165             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     165            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    166166        </td>
    167167      </tr>
  • trunk/www/common/progress_reporter.jsp

    r5426 r5908  
    4040 
    4141  SimpleProgressReporter progress = (SimpleProgressReporter)sc.getSessionSetting("progress." + progressName);
    42   String message = "";
     42  String message = null;
    4343  int percentDone = 0;
    4444  if (progress != null)
     
    4747    percentDone = progress.getPercent();
    4848  }
    49   else
     49  if (message == null)
    5050  {
    5151    message = "Please wait...";
     
    6969</base:head>
    7070<base:body onload="<%=onload%>">
    71 
    72   <div id="progress">
    73     <h3 class="docked"><%=title%></h3>
    74     <div class="boxed" style="background: #E0E0E0">
    75       <br>
    76       <table width="90%" border=0 cellspacing=0 cellpadding=0 align="center">
     71  <h1><%=title%></h1>
     72  <div class="content">
     73 
     74    <table class="fullcc"><tr><td>
     75      <table class="progressbar" style="margin: auto;">
    7776      <tr>
    78       <td width="90%" >
    79         <table width="100%" class="progressbar" border=0 cellspacing=0 cellpadding=0>
     77      <td>
     78        <table id="bar" style="width: 200px;">
    8079        <tr>
    81           <%if (percentDone > 0) {%><td width="<%=percentDone%>%" class="done" id="percentDone">&nbsp;</td><%}%>
    82           <%if (percentDone < 100) {%><td width="<%=100-percentDone%>%" class="remain" id="percentRemain">&nbsp;</td><%}%>
     80          <%if (percentDone > 0) {%><td style="width: <%=percentDone%>%;" id="percentDone">&nbsp;</td><%}%>
     81          <%if (percentDone < 100) {%><td style="width: <%=100-percentDone%>%;" id="percentRemain">&nbsp;</td><%}%>
    8382        </tr>
    8483        </table>
    8584      </td>
    86         <td width="10%" id="percent">&nbsp;<%=percentDone%>%</td>
     85        <td id="percentText"><%=percentDone%>%</td>
    8786      </tr>
    88       <tr><td colspan="2"><%=message%></td></tr>
    8987      </table>
    90       <br>
    91     </div>
    92     <br>
    93     <table align="center">
    94     <tr>
    95       <td><base:button onclick="window.close()" title="Close" /></td>
    96     </tr>
    97     </table>
    98     <div align="center">
    99     <i>Closing this window will NOT abort the process</i>
    100     </div>
     88      <%=message %>
     89      <br><br>
     90     
     91      <div align="center">
     92      <i>Closing this window will NOT abort the process</i>
     93      </div>
     94    </td></tr></table>
    10195  </div>
     96
     97  <base:buttongroup subclass="dialogbuttons">
     98    <base:button onclick="window.close()" title="Close" />
     99  </base:buttongroup>
    102100
    103101</base:body>
  • trunk/www/common/zoom.jsp

    r5905 r5908  
    4747<base:head scripts="menu.js" styles="toolbar.css,menu.css,help.css">
    4848  <script language="JavaScript">
    49   var timer = 0;
    50   var inCall = false;
    51   function adjustTextareaSize()
    52   {
    53     if (inCall) return;
    54     inCall = true;
    55     var textareaElement = document.getElementById("zoom");
    56     // Find the top coordinate of the textarea
    57     var offsetTop = 1;
    58     var offsetTrail = textareaElement;
    59     while (offsetTrail)
    60     {
    61       offsetTop += offsetTrail.offsetTop;
    62       offsetTrail = offsetTrail.offsetParent;
    63     }
    64     // Find the browser window height
    65     var windowHeight = Main.getWindowHeight();
    66     textareaElement.style.height = (windowHeight-offsetTop - 50) + 'px';
    67     inCall = false;
    68   }
    69   function setTimer()
    70   {
    71     if (inCall) return;
    72     if (timer) clearTimeout(timer);
    73     //timer = setTimeout('adjustTextareaSize()', 150);
    74   }
    7549  function init()
    7650  {
    7751    getText();
    78     //adjustTextareaSize();
    7952  }
    8053  function getText()
  • trunk/www/filemanager/directories/edit_directory.jsp

    r5905 r5908  
    138138  </base:head>
    139139  <base:body onload="init()">
    140     <p>
     140    <h1><%=title%> <base:help tabcontrol="settings" /></h1>
     141
    141142    <form action="index.jsp?ID=<%=ID%>" method="post" name="directory" onsubmit="return false;">
    142143    <input type="hidden" name="cmd" value="UpdateItem">
    143144    <input type="hidden" name="parent_id" value="<%=parent.getId()%>">
    144 
    145     <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    146     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*240)+"px;"%>"
     145   
     146    <t:tabcontrol id="settings"
     147      subclass="content dialogtabcontrol"
    147148      position="bottom" remember="<%=directory != null%>"
    148149      extensions="<%=invoker%>">
    149150    <t:tab id="info" title="Directory" validate="validateDirectory()" helpid="directory.edit">
    150       <table class="form" cellspacing=0>
    151       <tr>
    152         <td class="prompt">Path</td>
    153         <td><%=HTML.encodeTags(parent.getPath().toString())%></td>
     151      <table class="fullform input100">
     152      <tr>
     153        <th>Path</th>
     154        <td colspan="2"><%=HTML.encodeTags(parent.getPath().toString())%></td>
    154155      </tr>
    155156      <tr>
    156         <td class="prompt">Name</td>
     157        <th>Name</th>
    157158        <td><input <%=requiredClazz%> type="text" name="name"
    158159          value="<%=HTML.encodeTags(directory == null ? Values.getString(cc.getPropertyValue("name"), "New directory") : directory.getName())%>"
    159           size="40" maxlength="<%=Directory.MAX_NAME_LENGTH%>"></td>
     160          maxlength="<%=Directory.MAX_NAME_LENGTH%>"></td>
     161        <td></td>
    160162      </tr>
    161163      <tr>
    162         <td class="prompt">Compress new files</td>
     164        <th>Compress new files</th>
    163165        <td>
    164166          <input type="radio" name="autoCompress" id="autoCompressNo" value="0"
     
    170172            ><label for="autoCompressRecursive">Recursive</label></span>
    171173        </td>
     174        <td></td>
    172175      </tr>
    173176      <tr>
    174         <td class="prompt">
     177        <th>
    175178          Share new files and sub-<br>
    176179          directories automatically
    177         </td>
     180        </th>
    178181        <td>
    179182          <input type="radio" name="autoShare" id="autoShareNo" value="0"
     
    185188            ><label for="autoShareRecursive">Recursive</label></span>
    186189        </td>
     190        <td></td>
    187191      </tr>
    188       <tr >
    189         <td class="prompt">Description</td>
    190         <td nowrap>
    191           <textarea <%=clazz%> rows="4" cols="40" name="description"
     192      <tr class="dynamic">
     193        <th>Description</th>
     194        <td>
     195          <textarea <%=clazz%> rows="4" name="description"
    192196            ><%=HTML.encodeTags(directory == null ? cc.getPropertyValue("description") : directory.getDescription())%></textarea>
    193           <a href="javascript:Main.zoom('Description', 'directory', 'description')"
    194             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     197        </td>
     198        <td style="width: 20px;">
     199          <base:icon image="zoom.png"
     200            onclick="Main.zoom('Description', 'directory', 'description')"
     201            tooltip="Edit in larger window"
     202          />
    195203        </td>
    196204      </tr>
    197205      </table>
    198       <div align=right>&nbsp;<i><base:icon image="required.gif" /> = required information</i></div>
    199206    </t:tab>
    200 
    201207    </t:tabcontrol>
    202 
    203     <table align="center">
    204     <tr>
    205       <td width="50%"><base:button onclick="saveSettings()" title="Save" /></td>
    206       <td width="50%"><base:button onclick="window.close()" title="Cancel" /></td>
    207     </tr>
    208     </table>
    209208    </form>
     209
     210    <div class="legend">
     211      <base:icon image="required.gif" /> = required information
     212    </div>
     213
     214    <base:buttongroup subclass="dialogbuttons">
     215      <base:button onclick="saveSettings()" title="Save" />
     216      <base:button onclick="window.close()" title="Cancel" />
     217    </base:buttongroup>
    210218  </base:body>
    211219  </base:page>
  • trunk/www/filemanager/files/download_file.jsp

    r5630 r5908  
    8484  </base:head>
    8585  <base:body onload="downloadFile()">
    86 
    87     <h3 class="docked"><%=title%></h3>
    88     <div class="boxedbottom">
    89    
    90       <div class="error">
    91       If download doesn't start, click on the filename below.
    92       </div>
    93    
    94       <table class="form" cellspacing=0>
     86    <h1><%=title%></h1>
     87    <div class="content">
     88 
     89      <table class="fullform smaller bottomborder">
    9590      <tr>
    96         <td class="prompt">File</td>
     91        <th>File</th>
    9792        <td><a href="<%=downloadUrl%>"><%=HTML.encodeTags(path)%></a></td>
    9893      </tr>
    9994      <tr>
    100         <td class="prompt">Content type</td>
     95        <th>Size</th>
     96        <td><%=Values.formatBytes(file.getSize())%></td>
     97      </tr>
     98      <tr>
     99        <th>Content type</th>
    101100        <td>
    102101        <%=HTML.encodeTags(file.getMimeType())%><%
     
    110109      </tr>
    111110      <tr>
    112         <td class="prompt">Size</td>
    113         <td><%=Values.formatBytes(file.getSize())%></td>
     111        <th>Description</th>
     112        <td><%=HTML.niceFormat(file.getDescription())%></td>
    114113      </tr>
    115       <tr>
    116         <td class="prompt">Description</td>
    117         <td><%=HTML.niceFormat(file.getDescription())%></td>
     114      <tr class="dynamic">
     115        <th></th>
     116        <td><b>If the download doesn't start, click on the filename above.</b></td>
    118117      </tr>
    119118      </table>
     
    122121   
    123122
    124     <table align="center">
    125     <tr>
    126       <td><base:button onclick="window.close()" title="Close" /></td>
    127     </tr>
    128     </table>
    129 
     123    <base:buttongroup subclass="dialogbuttons">
     124      <base:button onclick="window.close()" title="Close" />
     125    </base:buttongroup>
     126   
    130127  </base:body>
    131128  </base:page>
  • trunk/www/filemanager/files/edit_file.jsp

    r5905 r5908  
    229229  </base:head>
    230230  <base:body onload="init()">
    231     <p>
     231    <h1><%=title%> <base:help tabcontrol="settings" /></h1>
     232   
    232233    <form action="index.jsp?ID=<%=ID%>" method="post" name="file" onsubmit="return false;">
    233234    <input type="hidden" name="cmd" value="UpdateItem">
    234235    <input type="hidden" name="directory_id" value="<%=directory.getId()%>">
    235236
    236     <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    237     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*300)+"px;"%>"
     237   
     238    <t:tabcontrol id="settings"
     239      subclass="content dialogtabcontrol"
    238240      position="bottom" remember="<%=file != null%>"
    239241      extensions="<%=invoker%>">
    240242    <t:tab id="info" title="File" validate="validateFile()" helpid="file.edit">
    241       <table class="form" cellspacing=0>
     243      <table class="fullform input100">
    242244      <tr>
    243         <td class="prompt">Path</td>
    244         <td><%=HTML.encodeTags(directory.getPath().toString())%></td>
     245        <th>Path</th>
     246        <td colspan="2"><%=HTML.encodeTags(directory.getPath().toString())%></td>
    245247      </tr>
    246248      <%
     
    248250      {
    249251        %>
    250         <tr>
    251           <td class="prompt">URL</td>
     252        <tr class="double">
     253          <th>URL</th>
    252254          <td><input <%=requiredClazz%> type="text" name="url"
    253255            value="<%=HTML.encodeTags(file == null ? Values.getString(cc.getPropertyValue("url")) : file.getUrl())%>"
     
    258260              ><label for="loadMetadata">Load metadata</label></span>
    259261          </td>
     262          <td></td>
    260263        </tr>
    261264        <tr>
    262         <td class="prompt">Server</td>
     265        <th>Server</th>
    263266        <td>
    264267          <base:select
     
    273276          />
    274277        </td>
     278        <td></td>
    275279      </tr>
    276280        <%
     
    278282      %>
    279283      <tr>
    280         <td class="prompt">Name</td>
     284        <th>Name</th>
    281285        <td><input <%=requiredClazz%> type="text" name="name"
    282286          value="<%=HTML.encodeTags(file == null ? Values.getString(cc.getPropertyValue("name")) : file.getName())%>"
    283287          size="40" maxlength="<%=File.MAX_NAME_LENGTH%>"></td>
     288        <td></td>
    284289      </tr>
    285290      <tr>
    286         <td class="prompt"><label for="writeProtected">Write protected</label></td>
     291        <th><label for="writeProtected">Write protected</label></th>
    287292        <td><input type="checkbox" name="write_protected" id="writeProtected" value="1"
    288293          <%=(file != null && file.isWriteProtected()) ||
    289294            (file == null && Values.getBoolean(cc.getPropertyValue("writeProtected"))) ? "checked" : ""%>></td>
     295        <td></td>
    290296      </tr>
    291297      <tr >
    292         <td class="prompt">Type</td>
    293         <td colspan="2">
     298        <th>Type</th>
     299        <td>
    294300          <select name="subtype_id"
    295301            <%=!readCurrentSubtype ? "disabled readonly class=\"disabled selectionlist\"" : "class=\"selectionlist\""%>>
     
    321327          </select>
    322328        </td>
     329        <td></td>
    323330      </tr>
    324331      <tr>
    325         <td class="prompt">MIME type</td>
    326         <td><table border="0" cellspacing="0" cellpadding="0">
     332        <th>MIME type</th>
     333        <td><table style="width: 100%;">
    327334          <tr>
    328             <td><input <%=clazz%> type="text" name="mime_type"
     335            <td style="width: 98%;"><input <%=clazz%> type="text" name="mime_type"
    329336              value="<%=HTML.encodeTags(file == null ? Values.getString(cc.getPropertyValue("mimeType")) : file.getMimeType())%>"
    330               size="40" maxlength="<%=File.MAX_MIMETYPE_LENGTH%>">&nbsp;</td>
     337              maxlength="<%=File.MAX_MIMETYPE_LENGTH%>"></td>
    331338            <td><base:button onclick="mimeTypeOnClick()" title="Select&hellip;"/></td>
    332339          </tr>
    333340          </table>
    334341        </td>
     342        <td></td>
    335343      </tr>
    336344      <tr>
    337         <td class="prompt">Character set</td>
     345        <th>Character set</th>
    338346        <td>
    339347          <select name="characterSet">
     
    341349          <%
    342350          String currentCharset = file == null ?
    343             Values.getString(cc.getPropertyValue("characterSet")) : file.getCharacterSet();
     351            Values.getStringOrNull(cc.getPropertyValue("characterSet")) : file.getCharacterSet();
    344352          int numCommon = Config.getCommonCharsets().size();
    345353          int i = 0;
     
    368376          </select>
    369377        </td>
    370       </tr>
    371       <tr >
    372         <td class="prompt">Description</td>
    373         <td nowrap>
    374           <textarea <%=clazz%> rows="4" cols="40" name="description"
     378        <td></td>
     379      </tr>
     380      <tr class="dynamic">
     381        <th>Description</th>
     382        <td>
     383          <textarea <%=clazz%> rows="4" name="description" style="height: 97%;"
    375384            ><%=HTML.encodeTags(file == null ? cc.getPropertyValue("description") : file.getDescription())%></textarea>
    376           <a href="javascript:Main.zoom('Description', 'file', 'description')"
    377             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     385        </td>
     386        <td style="width: 20px;">
     387          <base:icon image="zoom.png"
     388            onclick="Main.zoom('Description', 'file', 'description')"
     389            tooltip="Edit in larger window"
     390          />
    378391        </td>
    379392      </tr>
    380393      </table>
    381       <div align=right>&nbsp;<i><base:icon image="required.gif" /> = required information</i></div>
    382394    </t:tab>
    383 
    384395    </t:tabcontrol>
    385 
    386     <table align="center">
    387     <tr>
    388       <td width="50%"><base:button onclick="saveSettings()" title="Save" /></td>
    389       <td width="50%"><base:button onclick="window.close()" title="Cancel" /></td>
    390     </tr>
    391     </table>
    392396    </form>
     397   
     398    <div class="legend">
     399      <base:icon image="required.gif" /> = required information
     400    </div>
     401
     402    <base:buttongroup subclass="dialogbuttons">
     403      <base:button onclick="saveSettings()" title="Save" />
     404      <base:button onclick="window.close()" title="Cancel" />
     405    </base:buttongroup>
     406   
    393407  </base:body>
    394408  </base:page>
  • trunk/www/filemanager/files/edit_file_data.jsp

    r5563 r5908  
    7171  <base:head scripts="ajax.js,json2.js" styles="toolbar.css">
    7272    <script language="JavaScript">
    73     var timer = 0;
    74     var inCall = false;
    7573    var isModified = false;
    7674    var originalText;
    77     function adjustTextareaSize()
    78     {
    79       if (inCall) return;
    80       inCall = true;
    81       var textareaElement = document.getElementById("filedata");
    82       var lineNumberElement = document.getElementById("linenumbers");
    83       // Find the top coordinate of the textarea
    84       var offsetTop = 1;
    85       var offsetTrail = textareaElement;
    86       while (offsetTrail)
    87       {
    88         offsetTop += offsetTrail.offsetTop;
    89         offsetTrail = offsetTrail.offsetParent;
    90       }
    91       // Find the browser window height
    92       var windowHeight = Main.getWindowHeight();
    93       textareaElement.style.height = (windowHeight-offsetTop - 50) + 'px';
    94       lineNumberElement.style.height = (windowHeight-offsetTop - 50) + 'px';
    95       inCall = false;
    96     }
    97     function setTimer()
    98     {
    99       if (inCall) return;
    100       if (timer) clearTimeout(timer);
    101       timer = setTimeout('adjustTextareaSize()', 150);
    102     }
    10375    function init()
    10476    {
    10577      downloadFile();
    106       adjustTextareaSize();
    10778    }
    10879    function downloadFile()
     
    203174      var textHeight = frm.filedata.offsetHeight;
    204175      var topLine = 1;
     176      var scrollRemain = 0;
    205177      if (totalScroll > textHeight || topScroll > 0)
    206178      {
    207179        var numLines = frm.filedata.value.split('\n').length;
    208         var scrollPerLine = Math.round(totalScroll / numLines);
    209         var visibleLines = Math.ceil(frm.filedata.offsetHeight / scrollPerLine)
    210         topLine = 1 + Math.round(topScroll / scrollPerLine);
    211         frm.filedata.scrollTop = scrollPerLine * (topLine - 1);
     180        var scrollPerLine = totalScroll / numLines;
     181        topLine = 1 + Math.floor(topScroll / scrollPerLine);
     182        scrollRemain = topScroll - scrollPerLine * (topLine - 1);
    212183      }
    213184      var lineNumberHTML = '';
     
    218189      var lineNumberElem = document.getElementById('linenumbers');
    219190      lineNumberElem.innerHTML = lineNumberHTML;
     191      lineNumberElem.scrollTop = scrollRemain;
    220192    }
    221193   
     
    258230    </script>
    259231    <style>
    260     .linenumbers {
    261       width: 36px;
     232    #linenumbers
     233    {
     234      position: absolute;
     235      top: 0em;
     236      left: 0em;
     237      bottom: 0em;
     238      width: 3.6em;
     239      padding-right: 0.4em;
    262240      text-align: right;
    263241      overflow: hidden;
    264       color: #333399;
    265       background: #e0e0e0;
    266       xborder: 1px solid #999999;
    267       border-top: 2px groove #999999;
    268       border-left: 2px groove #999999;
    269       border-bottom: 2px ridge #FFFFFF;
    270       border-right: 0px;
    271       padding-right: 4px;
     242      color: #224488;
     243      background: #E8E8E8;
    272244      font-family: monospace;
     245      border-right: 2px solid #224488;
     246    }
     247   
     248    #filecontainer
     249    {
     250      position: absolute;
     251      top: 0em;
     252      left: 4em;
     253      bottom: 0em;
     254      right: 0em;
     255      margin-left: 2px;
     256    }
     257   
     258    #filedata
     259    {
     260      width: 100%;
     261      height: 100%;
     262      border: 0px;
     263      margin: 0px;
     264      padding: 0px;
    273265    }
    274266    </style>
    275267  </base:head>
    276   <base:body onload="init()" attributes="onresize='setTimer();'">
    277     <p>
     268  <base:body onload="init()">
     269    <h1><%=title%> <base:help helpid="file.edit.data" /></h1>
     270   
    278271    <form action="index.jsp?ID=<%=ID%>" method="post" name="file" onsubmit="return false;">
    279272    <input type="hidden" name="cmd" value="UpdateItem">
    280 
    281     <h3 class="docked"><%=title%> <base:help helpid="file.edit.data" /></h3>
    282     <table width="100%" border="0" cellspacing="0" cellpadding="0">
    283     <tr>
    284     <td><div id="linenumbers" class="linenumbers"></div></td>
    285     <td width="100%" style="padding-right: 4px;">
    286       <textarea id="filedata" name="filedata" style="width: 100%;"
     273   
     274    <div class="content bottomborder" style="overflow: hidden;">
     275      <div id="linenumbers"></div>
     276      <div id="filecontainer">
     277      <textarea id="filedata" name="filedata"
    287278        wrap="off"
    288279        onkeydown="return detectTab(event);"
     
    290281        onscroll="updateLineNumbers()"
    291282        >Loading file; please wait...</textarea>
    292     </td>
    293     </tr>
    294     </table>
    295     <table align="center">
    296     <tr>
    297       <td width="50%"><base:button onclick="closeFile(true)" title="Save" /></td>
    298       <td width="50%"><base:button onclick="closeFile(false)" title="Close" /></td>
    299     </tr>
    300     </table>
     283      </div>
     284    </div>
    301285    </form>
     286   
     287    <base:buttongroup subclass="dialogbuttons">
     288      <base:button onclick="closeFile(true)" title="Save" />
     289      <base:button onclick="closeFile(false)" title="Close" />
     290    </base:buttongroup>
    302291  </base:body>
    303292  </base:page>
  • trunk/www/filemanager/files/edit_multiple_file.jsp

    r5905 r5908  
    123123  </base:head>
    124124  <base:body>
    125     <p>
     125    <h1><%=title%> <base:help tabcontrol="settings" /></h1>
     126   
    126127    <form action="index.jsp?ID=<%=ID%>" method="post" name="file" onsubmit="return false;">
    127128    <input type="hidden" name="cmd" value="UpdateMultipleItems">
    128 
    129     <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    130     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*300)+"px;"%>"
     129   
     130    <t:tabcontrol id="settings"
     131      subclass="content dialogtabcontrol"
    131132      position="bottom">
    132133    <t:tab id="info" title="Properties" validate="validateFile()" helpid="file.edit">
    133       <table class="form" cellspacing=0>
    134 
    135       <tr>
    136         <td class="prompt">Write protected</td>
     134      <table class="fullform input100">
     135      <tr>
     136        <th>Write protected</th>
    137137        <td>
    138138          <input type="radio" name="write_protected" id="writeProtectedKeep" value="keep" checked><label for="writeProtectedKeep">No change</label>
     
    140140          <input type="radio" name="write_protected" id="writeProtectedYes" value="1"><label for="writeProtectedYes">Yes</label></td>
    141141      </tr>
    142       <tr >
    143         <td class="prompt">Type</td>
    144         <td colspan="2">
     142      <tr>
     143        <th>Type</th>
     144        <td>
    145145          <select name="filetype_id">
    146146          <option value="keep" selected>- no change -
     
    160160      </tr>
    161161      <tr>
    162         <td class="prompt">MIME type</td>
     162        <th>MIME type</th>
    163163        <td>
    164164          <input type="checkbox" name="keepMimeType" id="keepMimeType" value="1" checked
    165165            onclick="keepMimeTypeOnClick()"><label for="keepMimeType">No change</label><br>
    166           <table border="0" cellspacing="0" cellpadding="0">
     166          <table style="width: 100%;">
    167167          <tr>
    168             <td><input <%=clazz%> type="text" name="mimeType" disabled
    169               value="" size="40" maxlength="<%=File.MAX_MIMETYPE_LENGTH%>">&nbsp;</td>
     168            <td style="width: 98%;"><input <%=clazz%> type="text" name="mimeType" disabled
     169              value="" maxlength="<%=File.MAX_MIMETYPE_LENGTH%>"></td>
    170170            <td><base:button onclick="mimeTypeOnClick()" title="Select&hellip;"/></td>
    171171          </tr>
     
    174174      </tr>
    175175      <tr>
    176         <td class="prompt">Character set</td>
     176        <th>Character set</th>
    177177        <td>
    178178          <select name="characterSet">
     
    193193        </td>
    194194      </tr>
     195      <tr class="dynamic">
     196        <th></th>
     197        <td></td>
     198      </tr>
    195199      </table>
    196200    </t:tab>
    197 
    198201    </t:tabcontrol>
    199 
    200     <table align="center">
    201     <tr>
    202       <td width="50%"><base:button onclick="saveSettings()" title="Save" /></td>
    203       <td width="50%"><base:button onclick="window.close()" title="Cancel" /></td>
    204     </tr>
    205     </table>
    206202    </form>
     203
     204    <base:buttongroup subclass="dialogbuttons">
     205      <base:button onclick="saveSettings()" title="Save" />
     206      <base:button onclick="window.close()" title="Cancel" />
     207    </base:buttongroup>
    207208  </base:body>
    208209  </base:page>
  • trunk/www/filemanager/files/list_files.jsp

    r5793 r5908  
    253253    {
    254254      var cmd = fileId ? 'UploadFile' : 'UploadNewFile';
    255       Main.openPopup('index.jsp?ID=<%=ID%>&cmd='+cmd+'&directory_id=<%=directoryId%>&item_id='+fileId, 'UploadFile', 680, 520);
     255      Main.openPopup('index.jsp?ID=<%=ID%>&cmd='+cmd+'&directory_id=<%=directoryId%>&item_id='+fileId, 'UploadFile', 600, 400);
    256256    }
    257257    function viewFile(fileId)
     
    284284        return;
    285285      }
    286       Table.submitToPopup(formId, 'EditMultiple', 560, 420);
     286      Table.submitToPopup(formId, 'EditMultiple', 600, 400);
    287287    }
    288288    function deleteItems()
  • trunk/www/filemanager/files/view_file.jsp

    r5905 r5908  
    138138    function setOwner()
    139139    {
    140       Main.openPopup('index.jsp?ID=<%=ID%>&cmd=SetOwnerOfItem&item_id=<%=itemId%>', 'SetOwnerOfItem', 450, 150);
     140      Main.openPopup('index.jsp?ID=<%=ID%>&cmd=SetOwnerOfItem&item_id=<%=itemId%>', 'SetOwnerOfItem', 440, 280);
    141141    }
    142142    function runPlugin(cmd)
     
    146146    function uploadFile()
    147147    {
    148       Main.openPopup('index.jsp?ID=<%=ID%>&cmd=UploadFile&item_id=<%=itemId%>', 'UploadFile', 680, 520);
     148      Main.openPopup('index.jsp?ID=<%=ID%>&cmd=UploadFile&item_id=<%=itemId%>', 'UploadFile', 600, 400);
    149149    }
    150150    function moveOffline()
     
    158158    function compress()
    159159    {
    160       Main.openPopup('../../common/progress_reporter.jsp?ID=<%=ID%>&progress=compress&title=Compressing file', 'CompressFile', 400, 200);
     160      Main.openPopup('../../common/progress_reporter.jsp?ID=<%=ID%>&progress=compress&title=Compressing file', 'CompressFile', 300, 200);
    161161      location.replace('index.jsp?ID=<%=ID%>&cmd=CompressItem&item_id=<%=itemId%>');
    162162    }
    163163    function decompress()
    164164    {
    165       Main.openPopup('../../common/progress_reporter.jsp?ID=<%=ID%>&progress=decompress&title=Decompressing file', 'UncompressFile', 400, 200);
     165      Main.openPopup('../../common/progress_reporter.jsp?ID=<%=ID%>&progress=decompress&title=Decompressing file', 'UncompressFile', 300, 200);
    166166      location.replace('index.jsp?ID=<%=ID%>&cmd=DecompressItem&item_id=<%=itemId%>');
    167167    }
    168168    function editFileData()
    169169    {
    170       Main.openPopup('index.jsp?ID=<%=ID%>&cmd=EditFileData&item_id=<%=itemId%>', 'EditFileData', 900, 700);
     170      Main.openPopup('index.jsp?ID=<%=ID%>&cmd=EditFileData&item_id=<%=itemId%>', 'EditFileData', 800, 600);
    171171    }
    172172    function switchTab(tabControlId, tabId)
  • trunk/www/filemanager/fileservers/edit_fileserver.jsp

    r5905 r5908  
    167167  </base:head>
    168168  <base:body onload="init()">
    169     <p>
     169    <h1><%=title%> <base:help tabcontrol="settings"/></h1>
     170   
    170171    <form action="index.jsp?ID=<%=ID%>&cmd=UpdateItem" method="post" name="server" enctype="multipart/form-data" onsubmit="return false;">
    171172
    172     <h3 class="docked"><%=title%> <base:help tabcontrol="settings"/></h3>
    173     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*320)+"px;"%>"
     173    <t:tabcontrol id="settings"
     174      subclass="content dialogtabcontrol"
    174175      position="bottom"  remember="<%=server != null%>"
    175176      extensions="<%=invoker%>">
    176177    <t:tab id="info" title="File server" validate="validateFileServer()" helpid="fileserver.edit">
    177       <table class="form" cellspacing=0>
    178       <tr>
    179         <td class="prompt">Name</td>
     178      <table class="fullform input100 smaller">
     179      <tr>
     180        <th>Name</th>
    180181        <td><input <%=requiredClazz%> type="text" name="name"
    181182          value="<%=HTML.encodeTags(server == null ? Values.getString(cc.getPropertyValue("name"), "New file server") : server.getName())%>"
    182           size="40" maxlength="<%=FileServer.MAX_NAME_LENGTH%>"></td>
    183       </tr>
    184       <tr>
    185         <td class="prompt">Connection manager</td>
     183          maxlength="<%=FileServer.MAX_NAME_LENGTH%>"></td>
     184        <td></td>
     185      </tr>
     186      <tr>
     187        <th>Connection manager</th>
    186188        <td>
    187189          <select name="connectionManager" onchange="connectionManagerOnChange()">
     
    199201          %>
    200202          </select>
    201           • = Supports auto-detection
    202         </td>
    203       </tr>
    204       <tr>
    205         <td></td>
    206         <td>
    207           <div class="helpmessage" style="margin: 0px 10px 8px 0px; height: <%=(int)(scale*70)%>px; overflow: auto;">
     203         
     204        </td>
     205        <td></td>
     206      </tr>
     207      <tr>
     208        <th class="subprompt"></th>
     209        <td>
     210          <div class="helpmessage" style="margin-top: 0.5em; height: <%=(int)(scale*70)%>px; overflow: auto;">
    208211          <div id="cmf.auto.description" style="display: none;">
    209212            Automatically select a connection manager among those
     
    223226          </div>
    224227        </td>
    225       </tr>
    226       <tr>
    227         <td class="prompt">Host</td>
     228        <td></td>
     229      </tr>
     230      <tr>
     231        <th>Host</th>
    228232        <td><input <%=clazz%> type="text" name="host"
    229233          value="<%=HTML.encodeTags(server == null ? Values.getString(cc.getPropertyValue("host")) : server.getHost())%>"
    230           size="40" maxlength="<%=FileServer.MAX_HOST_LENGTH%>"></td>
    231       </tr>
    232       <tr>
    233         <td class="prompt">Username</td>
     234          maxlength="<%=FileServer.MAX_HOST_LENGTH%>"></td>
     235        <td></td>
     236      </tr>
     237      <tr>
     238        <th>Username</th>
    234239        <td><input <%=clazz%> type="text" name="username"
    235240          value="<%=HTML.encodeTags(server == null ? Values.getString(cc.getPropertyValue("username")) : server.getUsername())%>"
    236           size="40" maxlength="<%=FileServer.MAX_USERNAME_LENGTH%>"></td>
    237       </tr>
    238       <tr>
    239         <td class="prompt">Password</td>
     241          maxlength="<%=FileServer.MAX_USERNAME_LENGTH%>"></td>
     242        <td></td>
     243      </tr>
     244      <tr>
     245        <th>Password</th>
    240246        <td><input <%=clazz%> type="password" name="password"
    241           value="" size="40" maxlength="<%=FileServer.MAX_PASSWORD_LENGTH%>"><br>
    242           (leave empty to keep the password)</td>
    243       </tr>
    244       <tr >
    245         <td class="prompt">Description</td>
    246         <td nowrap>
     247          value="" maxlength="<%=FileServer.MAX_PASSWORD_LENGTH%>" placeholder="leave empty to keep the password"></td>
     248        <td></td>
     249      </tr>
     250      <tr class="dynamic">
     251        <th>Description</th>
     252        <td>
    247253          <textarea <%=clazz%> rows="4" cols="40" name="description"
    248254            ><%=HTML.encodeTags(server == null ? cc.getPropertyValue("description") : server.getDescription())%></textarea>
    249           <a href="javascript:Main.zoom('Description', 'server', 'description')"
    250             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     255        </td>
     256        <td>
     257          <base:icon image="zoom.png"
     258            onclick="Main.zoom('Description', 'server', 'description')"
     259            tooltip="Edit in larger window"
     260          />
    251261        </td>
    252262      </tr>
    253263      </table>
    254       <div align=right>&nbsp;<i><base:icon image="required.gif" /> = required information</i></div>
    255264    </t:tab>
    256265    <t:tab id="serverCertificate" title="Certificates" validate="validateCertificates()"
    257266      helpid="fileserver.edit">
    258267     
    259       <table class="form" cellspacing=0>
    260       <tr >
    261         <td class="prompt">Server X.509 certificate</td>
    262       </tr>
    263       <tr>
    264         <td>
    265           <input <%=clazz%> type="file" name="server_certificate" size="50"><br>
     268      <table class="fullform smaller input100">
     269      <tr class="big">
     270        <th>Server certificate</th>
     271        <td>
     272          <input <%=clazz%> type="file" name="server_certificate" size="40"><br>
    266273          <input type="checkbox" name="remove_server_certificate" id="removeServerCertificate" value="1"
    267274            onclick="removeServerCertificateOnClick()"><label for="removeServerCertificate">Remove existing server certificate</label><br><br>
    268275        </td>
    269276      </tr>
    270       <tr >
    271         <td class="prompt">Client PKCS #12 certificate</td>
    272       </tr>
    273       <tr>
    274         <td>
    275           <input <%=clazz%> type="file" name="client_certificate" size="50"><br>
    276           Password <input <%=clazz%> type="password" name="client_certificate_password"><br>
     277      <tr>
     278        <th>Client certificate</th>
     279        <td>
     280          <input <%=clazz%> type="file" name="client_certificate" size="40">
     281        </td>
     282      </tr>
     283      <tr>
     284        <th class="subprompt">Password</th>
     285        <td>
     286          <input <%=clazz%> type="password" name="client_certificate_password">
     287        </td>
     288      </tr>
     289      <tr>
     290        <th class="subprompt"></th>
     291        <td>
    277292          <input type="checkbox" name="remove_client_certificate" id="removeClientCertificate" value="1"
    278             onclick="removeClientCertificateOnClick()"><label for="removeClientCertificate">Remove existing client certificate</label><br>
     293            onclick="removeClientCertificateOnClick()"><label for="removeClientCertificate">Remove existing client certificate</label>
     294        </td>
     295      </tr>
     296     
     297      <tr class="dynamic">
     298        <th></th>
     299        <td>
    279300            <div class="helpmessage">
    280301              A <b>server certificate</b> may be needed to access files with https on servers that
     
    293314    </t:tab>
    294315    </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>
    302316    </form>
     317
     318    <div class="legend">
     319      • = supports auto-detection<br>
     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>
    303327  </base:body>
    304328  </base:page>
  • trunk/www/filemanager/upload/select.jsp

    r5905 r5908  
    294294      // Percent done
    295295      var percentDone = totalBytes == 0 ? 0 : Math.round(100 * transferredBytes / totalBytes);
    296       document.getElementById('percent').innerHTML = '&nbsp;' + percentDone+'%';
     296      document.getElementById('percentText').innerHTML = percentDone+'%';
    297297      var doneElement = document.getElementById('percentDone');
    298298      doneElement.style.width = percentDone+'%';
     
    362362  </base:head>
    363363  <base:body onload="initZipFormats()">
    364   <p>
    365364  <div id="selectForm">
     365    <h1><%=title%> <base:help tabcontrol="settings" /></h1>
     366   
    366367    <form action="Upload?ID=<%=ID%>&directory_id=<%=directory.getId()%>"
    367368      method="post" name="file" enctype="multipart/form-data" onsubmit="return false;" target="upload">
     
    379380    <input type="hidden" name="characterSet" value="">
    380381
    381     <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
    382     <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*380)+"px;"%>"
     382    <t:tabcontrol id="settings"
     383      subclass="content dialogtabcontrol"
    383384      position="bottom" remember="false">
    384385    <t:tab id="info" title="File" validate="validateFile()" helpid="file.upload">
    385       <table class="form" cellspacing=0>
     386      <table class="fullform input100 smaller">
    386387      <tr>
    387         <td class="prompt">Directory</td>
    388         <td><%=HTML.encodeTags(directory.getPath().toString())%></td>
     388        <th>Directory</th>
     389        <td colspan="2"><%=HTML.encodeTags(directory.getPath().toString())%></td>
    389390      </tr>
    390391      <tr>
    391         <td class="prompt">File</td>
     392        <th>File</th>
    392393        <td>
    393           <input <%=requiredClazz%> type="file" name="the_file" size="50"
     394          <input <%=requiredClazz%> type="file" name="the_file"  size="40"
    394395            onchange="fileOnChange()">
    395396        </td>
     397        <td></td>
    396398      </tr>
    397       <%
    398       if (file == null)
    399       {
    400         %>
    401         <tr>
    402           <td class="prompt"><label for="tempReplaceExisting">Replace existing</label></td>
    403           <td>
    404             <input type="checkbox" name="temp_replace_existing" id="tempReplaceExisting" value="1" >
    405           </td>
    406         </tr>
    407         <%
    408       }
    409        %>
    410399      <tr>
    411         <td class="prompt"><label for="tempWriteProtected">Write protected</label></td>
     400        <th></th>
    412401        <td>
    413402          <input type="checkbox" name="temp_write_protected" id="tempWriteProtected" value="1"
    414403          <%=(file != null && file.isWriteProtected()) ||
    415404            (file == null && Values.getBoolean(cc.getPropertyValue("writeProtected"))) ? "checked" : ""%>>
     405          <label for="tempWriteProtected">Write protected</label>
     406          <%
     407          if (file == null)
     408          {
     409            %>
     410            <input type="checkbox" name="temp_replace_existing" id="tempReplaceExisting" value="1">
     411            <label for="tempReplaceExisting">Replace existing</label>
     412            <%
     413          }
     414          else
     415          {
     416            %>
     417            <input type="checkbox" name="temp_check_md5" id="tempCheckMd5">
     418            <label for="tempCheckMd5">Validate MD5</label>
     419            <%
     420          }
     421          %>
    416422        </td>
     423        <td></td>
    417424      </tr>
    418425      <tr>
    419         <td class="prompt">Store compressed</td>
     426        <th>Store compressed</th>
    420427        <td>
    421428          <select name="temp_compressed">
     
    432439          </select>
    433440        </td>
     441        <td></td>
    434442      </tr>
    435       <%
    436       if (file != null)
    437       {
    438         %>
    439         <tr>
    440           <td class="prompt"><label for="tempCheckMd5">Validate MD5</label></td>
    441           <td><input type="checkbox" name="temp_check_md5" id="tempCheckMd5"></td>
    442         </tr>
    443         <%
    444       }
    445       %>
    446443      <tr >
    447         <td class="prompt">Type</td>
    448         <td colspan="2">
     444        <th>Type</tdh>
     445        <td>
    449446          <select name="temp_subtype_id"
    450447            <%=!readCurrentSubtype ? "disabled readonly class=\"disabled selectionlist\"" : "class=\"selectionlist\""%>>
     
    477474          </select>
    478475        </td>
     476        <td></td>
    479477      </tr>
    480478      <tr>
    481         <td class="prompt">Character set</td>
     479        <th>Character set</th>
    482480        <td>
    483481          <select name="temp_charset">
     
    511509          </select>
    512510        </td>
     511        <td></td>
    513512      </tr>
    514       <tr >
    515         <td class="prompt">Description</td>
    516         <td nowrap>
    517           <textarea <%=clazz%> rows="4" cols="50" name="temp_description"
    518             ><%=HTML.encodeTags(file == null ? cc.getPropertyValue("description") : file.getDescription())%></textarea>
    519           <a href="javascript:Main.zoom('Description', 'file', 'temp_description')"
    520             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
    521         </td>
    522       </tr>
    523      
    524       <tr >
    525         <td class="prompt">Max trans-<br>fer rate</td>
    526         <td nowrap>
    527           <%
    528           long maxTransferRate = Values.getInt(sc.getClientDefaultSetting("server.transferRate"), 0);
    529           %>
    530           <%=maxTransferRate == 0 ? "unlimited" : Values.formatBytes(maxTransferRate)+"/s (approx.)"%>
    531         </td>
    532       </tr>
    533      
    534513      <%
    535514      if (file == null)
    536515      {
    537516        %>
    538         <tr >
    539           <td class="prompt">Compressed file</td>
     517        <tr class="big">
     518          <th>Compressed file</th>
    540519          <td>
    541520            <select name="temp_zip_format" disabled>
     
    550529              ><label for="tempZipKeep">Keep the compressed file</label><br>
    551530          </td>
     531          <td></td>
    552532        </tr>
    553533        <%
    554534      }
    555535      %>
    556      
     536      <tr class="dynamic">
     537        <th>Description</th>
     538        <td>
     539          <textarea <%=clazz%> rows="4" name="temp_description" style="height: 97%;"
     540            ><%=HTML.encodeTags(file == null ? cc.getPropertyValue("description") : file.getDescription())%></textarea>
     541        </td>
     542        <td style="width: 20px;">
     543          <base:icon image="zoom.png"
     544            onclick="Main.zoom('Description', 'file', 'temp_description')"
     545            tooltip="Edit in larger window"
     546          />
     547        </td>
     548      </tr>
    557549      </table>
    558       <div align=right>&nbsp;<i><base:icon image="required.gif" /> = required information</i></div>
    559550    </t:tab>
    560 
    561551    </t:tabcontrol>
    562 
    563     <table align="center">
    564     <tr>
    565       <td width="50%"><base:button image="upload.gif" onclick="doUpload()" title="Upload" /></td>
    566       <td width="50%"><base:button onclick="top.window.close()" title="Cancel" /></td>
    567     </tr>
    568     </table>
    569552    </form>
     553
     554    <div class="legend">
     555      <base:icon image="required.gif" /> = required information
     556    </div>
     557
     558    <base:buttongroup subclass="dialogbuttons">
     559      <base:button image="upload.gif" onclick="doUpload()" title="Upload" />
     560      <base:button onclick="top.window.close()" title="Cancel" />
     561    </base:buttongroup>
    570562  </div>
    571563 
    572564  <div id="progressForm" style="display:none;">
    573     <h3 class="docked" id="fileName">Preparing file upload...</h3>
    574     <div class="boxed" style="background: #E0E0E0">
    575       <br>
    576       <table width="90%" border=0 cellspacing=0 cellpadding=0 align="center">
    577       <tr>
    578       <td width="90%" >
    579         <table width="100%" class="progressbar" border=0 cellspacing=0 cellpadding=0>
     565    <h1 class="docked" id="fileName">Preparing file upload...</h1>
     566    <div class="content">
     567      <table class="fullcc"><tr><td>
     568        <table class="progressbar" style="width: 100%;">
    580569        <tr>
    581           <td width="0%" class="done" id="percentDone">&nbsp;</td>
    582           <td width="100%" class="remain" id="percentRemain">&nbsp;</td>
     570          <td style="width: 2em;"></td>
     571          <td style="">
     572            <table id="bar" style="width: 100%;">
     573            <tr>
     574              <td style="width: 0%;" id="percentDone">&nbsp;</td>
     575              <td style="width: 100%;" id="percentRemain">&nbsp;</td>
     576            </tr>
     577            </table>
     578          </td>
     579          <td style="width: 3em;" id="percentText">0%</td>
     580          <td style="width: 2em;"></td>
     581        </tr>
     582        <tr>
     583          <td></td>
     584          <td colspan="2" style="text-align: left;">
     585            <b>Transferred:</b> <span id="transferredBytes">0 bytes</span> of <span id="totalBytes">unknown</span><br>
     586            <b>Time:</b> <span id="transferTime">0s</span> <span id="transferRate"></span><br>
     587            <b>Remain:</b> <span id="remainTime">unknown</span><br>
     588            <span id="message"></span>
     589          </td>
     590          <td></td>
    583591        </tr>
    584592        </table>
    585       </td>
    586         <td width="10%" id="percent">&nbsp;0%</td>
    587       </tr>
    588       <tr>
    589         <td colspan="2">
    590           <b>Transferred:</b> <span id="transferredBytes">0 bytes</span> of <span id="totalBytes">unknown</span><br>
    591           <b>Time:</b> <span id="transferTime">0s</span> <span id="transferRate"></span><br>
    592           <b>Remain:</b> <span id="remainTime">unknown</span><br>
    593           <span id="message"></span>
    594         </td>
    595       </tr>
    596       </table>
    597       <br>
     593      </td></tr></table>
    598594    </div>
    599     <br>
    600     <table align="center">
    601     <tr>
    602       <td><base:button image="cancel.png" onclick="abortUpload()" title="Abort..." /></td>
    603     </tr>
    604     </table>
     595   
     596    <base:buttongroup subclass="dialogbuttons">
     597      <base:button image="cancel.png" onclick="abortUpload()" title="Abort..." />
     598    </base:buttongroup>
    605599 
    606600  </div>
  • trunk/www/impersonate.jsp

    r5907 r5908  
    141141        <td>
    142142          <a href="javascript:Main.zoom('Comment', 'login', 'comment')"
    143             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     143            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    144144        </td>
    145145      </tr>
  • trunk/www/include/scripts/main.js

    r5907 r5908  
    104104  this.openPopup = function(url, name, width, height, options)
    105105  {
     106    if (height * 1.5 != width) Main.debug('window.size: name=' + name + '; height='+height + '; width='+width);
     107   
    106108    // Rescale the width and height
    107109    var scale = getScale();
     
    531533    var controller = this.getController('FILE');
    532534    var url = getRoot() + controller.url + '?ID='+ID+'&cmd=DownloadFile&item_id='+fileId;
    533     Main.openPopup(url, 'DownloadFile', 400, 300);
     535    Main.openPopup(url, 'DownloadFile', 440, 280);
    534536  }
    535537 
     
    568570    this.controllers['PROJECT'] = { url:'my_base/projects/index.jsp', width:640, height:480 };
    569571    this.controllers['PERMISSIONTEMPLATE'] = { url:'views/permissiontemplates/index.jsp', width:450, height:280 };
    570     this.controllers['FILE'] = { url:'filemanager/index.jsp', width:560, height:420 };
    571     this.controllers['FILESERVER'] = { url:'filemanager/fileservers/index.jsp', width:600, height:460 };
    572     this.controllers['DIRECTORY'] = { url:'filemanager/directories/index.jsp', width:600, height:400, xpopup:true };
     572    this.controllers['FILE'] = { url:'filemanager/index.jsp', width:600, height:400 };
     573    this.controllers['FILESERVER'] = { url:'filemanager/fileservers/index.jsp', width:600, height:400 };
     574    this.controllers['DIRECTORY'] = { url:'filemanager/directories/index.jsp', width:600, height:400, popup:true };
    573575    this.controllers['ARRAYBATCH'] = { url:'lims/arraybatches/index.jsp', width:800, height:500 };
    574576    this.controllers['ARRAYDESIGN'] = { url:'lims/arraydesigns/index.jsp', width:800, height:500 };
  • trunk/www/include/styles/calendar.css

    r5907 r5908  
    7171  font-weight: bold;
    7272  background: #FFFFFF !important;
    73   border: 1px solid #224488;
     73  border: 1px solid #2288AA;
    7474  border-radius: 3px;
    7575  padding: 1px;
     
    7979{
    8080  cursor: pointer;
    81   border: 2px solid #224488;
     81  border: 2px solid #2288AA;
    8282  border-radius: 3px;
    8383  padding: 0px;
  • trunk/www/include/styles/main.css

    r5907 r5908  
    184184
    185185/* Regular text-field controls + selection list */
    186 input[type="text"], input[type="password"], textarea, select
    187 {
    188   font-size:  1em;
     186input[type="text"], input[type="password"], input[type="file"], textarea, select
     187{
     188  font-size: 1em;
    189189  margin: 1px;
    190190  border: 1px solid #A0A0A0;
     
    194194
    195195/* Make a blue-ish border when mouse is over the field */
    196 input[type="text"]:hover, input[type="password"]:hover, textarea:hover, select
     196input[type="text"]:hover, input[type="password"]:hover, input[type="file"]:hover, textarea:hover, select
    197197{
    198198  border: 1px solid #2288AA;
     
    200200
    201201/* Make a bigger blue-ish border when the field is active */
    202 input[type="text"]:focus, input[type="password"]:focus, textarea:focus, select:focus
     202input[type="text"]:focus, input[type="password"]:focus, input[type="file"]:focus, textarea:focus, select:focus
    203203{
    204204  margin: 0px;
     
    214214
    215215/* Input fields should be "close to" 100% wide,  need to use lower value due to padding */
    216 .input100 input[type="text"], .input100 input[type="password"], .input100 textarea
     216.input100 input[type="text"], .input100 input[type="password"], .input100 input[type="file"], .input100 textarea
    217217{
    218218  width: 98%;
     
    222222textarea.autohight
    223223{
    224   height: 98%;
     224  height: 97%;
    225225}
    226226
     
    475475}
    476476
    477 .helpmessage {
    478   background: #E0E0E0;
    479   border: 1px solid #999999;
    480   padding: 2px;
    481   margin: 8px;
    482 }
    483 
    484 .tabcontents .helpmessage {
    485   background: #ffffd8;
     477.helpmessage
     478{
     479  margin: 1em;
     480  padding: 0.5em;
     481  border: 1px solid #A0A0A0;
     482  background-color: #F8F8E0;
     483  border-radius: 8px;
     484   -moz-border-radius: 8px;
    486485}
    487486
  • trunk/www/include/styles/popup.css

    r5907 r5908  
    112112}
    113113
     114/* Places a short legend in the bottom right corner */
     115.popup .legend
     116{
     117  position:absolute;
     118  bottom: 1em;
     119  height: 3.5em;
     120  right: 1em;
     121  width: 15em;
     122  text-align: right;
     123  font-style: italic;
     124}
     125
    114126/*
    115127  Buttons and related
     
    226238table.fullform > tbody > tr.dynamic textarea
    227239{
    228   height: 98%;
    229 }
    230 
     240  height: 97%;
     241}
     242
  • trunk/www/include/styles/progressbar.css

    r5707 r5908  
    2828*/
    2929
    30 .progressbar {
    31   border-top: 1px solid #999999;
    32   border-left: 1px solid #999999;
     30.progressbar
     31{
    3332  margin: 0px;
    3433  padding: 0px;
    3534}
    3635
    37 .progressbar .done {
    38   border-bottom: 1px solid #999999;
    39   border-right: 1px solid #999999;
    40   background: #445577;
     36.progressbar #bar
     37{
     38  border: 1px solid #A0A0A0;
    4139}
    4240
    43 .progressbar.error .done {
     41.progressbar #percentDone
     42{
     43  background: #2288AA;
     44}
     45
     46.progressbar #percentRemain
     47{
     48  background: #FFFFFF;
     49}
     50
     51.progressbar #percentText
     52{
     53  padding-left: 4px;
     54  text-align: left;
     55}
     56
     57.progressbar.error .done
     58{
    4459  background: #CC0000;
    4560}
    46 .progressbar .remain {
    47   border-bottom: 1px solid #999999;
    48   border-right: 1px solid #999999;
    49   background: #FFFFFF;
    50 }
    51 .progressbar.error .remain {
     61.progressbar.error .remain
     62{
    5263  background: #D0D0D0;
    5364}
    5465
    55 .progressbar .unknown {
    56   border-bottom: 1px solid #999999;
    57   border-right: 1px solid #999999;
     66.progressbar .unknown
     67{
    5868  background: #cccccc;
    5969  text-align: center;
  • trunk/www/lims/arraybatches/edit_batch.jsp

    r5905 r5908  
    447447            ><%=HTML.encodeTags(batch == null ? cc.getPropertyValue("description") : batch.getDescription())%></textarea>
    448448          <a href="javascript:Main.zoom('Description', 'batch', 'description')"
    449             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     449            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    450450        </td>
    451451      </tr>
  • trunk/www/lims/arraydesigns/edit_design.jsp

    r5905 r5908  
    338338            ><%=HTML.encodeTags(design == null ? cc.getPropertyValue("description") : design.getDescription())%></textarea>
    339339          <a href="javascript:Main.zoom('Description', 'design', 'description')"
    340             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     340            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    341341        </td>
    342342      </tr>
  • trunk/www/lims/arrayslides/create_wizard.jsp

    r5905 r5908  
    290290              ><%=HTML.encodeTags(cc.getPropertyValue("description"))%></textarea>
    291291            <a href="javascript:Main.zoom('Description', 'WizardStep1', 'description')"
    292               title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     292              title="Edit in larger window"><base:icon image="zoom.png" /></a>
    293293          </td>
    294294        </tr>
  • trunk/www/lims/arrayslides/edit_slide.jsp

    r5905 r5908  
    301301            ><%=HTML.encodeTags(slide == null ? cc.getPropertyValue("description") : slide.getDescription())%></textarea>
    302302          <a href="javascript:Main.zoom('Description', 'slide', 'description')"
    303             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     303            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    304304        </td>
    305305      </tr>
  • trunk/www/lims/geometries/edit_geometry.jsp

    r5905 r5908  
    210210            ><%=HTML.encodeTags(geometry == null ? cc.getPropertyValue("description") : geometry.getDescription())%></textarea>
    211211          <a href="javascript:Main.zoom('Description', 'geometry', 'description')"
    212             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     212            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    213213        </td>
    214214      </tr>
  • trunk/www/lims/platemappings/edit_mapping.jsp

    r5905 r5908  
    286286            ><%=HTML.encodeTags(mapping == null ? cc.getPropertyValue("description") : mapping.getDescription())%></textarea>
    287287          <a href="javascript:Main.zoom('Description', 'mapping', 'description')"
    288             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     288            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    289289        </td>
    290290      </tr>
  • trunk/www/lims/plates/edit_plate.jsp

    r5905 r5908  
    292292            ><%=HTML.encodeTags(plate == null ? cc.getPropertyValue("description") : plate.getDescription())%></textarea>
    293293          <a href="javascript:Main.zoom('Description', 'plate', 'description')"
    294             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     294            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    295295        </td>
    296296      </tr>
  • trunk/www/lims/plates/events/edit_event.jsp

    r5905 r5908  
    382382          <textarea <%=clazz%> rows="4" cols="40"
    383383            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.gif" /></a>
     384          <a href="javascript:Main.zoom('Comment', 'event', 'comment')" title="Edit in larger window"><base:icon image="zoom.png" /></a>
    385385        </td>
    386386      </tr>
  • trunk/www/lims/platetypes/edit_platetype.jsp

    r5905 r5908  
    212212            ><%=HTML.encodeTags(plateType == null ? cc.getPropertyValue("description") : plateType.getDescription())%></textarea>
    213213          <a href="javascript:Main.zoom('Description', 'platetype', 'description')"
    214             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     214            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    215215        </td>
    216216      </tr>
  • trunk/www/lims/platetypes/eventtypes/edit_eventtype.jsp

    r5905 r5908  
    233233            ><%=HTML.encodeTags(eventType == null ? cc.getPropertyValue("description") : eventType.getDescription())%></textarea>
    234234          <a href="javascript:Main.zoom('Description', 'eventtype', 'description')"
    235             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     235            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    236236        </td>
    237237      </tr>
  • trunk/www/my_base/projects/edit_project.jsp

    r5905 r5908  
    622622            ><%=HTML.encodeTags(project == null ? cc.getPropertyValue("description") : project.getDescription())%></textarea>
    623623          <a href="javascript:Main.zoom('Description', 'project', 'description')"
    624             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     624            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    625625        </td>
    626626      </tr>
  • trunk/www/my_base/user/preferences.jsp

    r5906 r5908  
    425425        <tr class="dynamic">
    426426          <th></th>
    427           <td style="vertical-align: bottom;"><base:icon image="required.gif" /> = required information</i></td>
     427          <td></td>
    428428        </tr>
    429429        </table>
     
    571571    </t:tabcontrol>
    572572    </form>
    573  
     573
     574    <div class="legend">
     575      <base:icon image="required.gif" /> = required information
     576    </div>
     577
    574578    <base:buttongroup subclass="dialogbuttons">
    575579      <base:button onclick="savePreferences();" title="Save" />
  • trunk/www/my_base/user/settings.jsp

    r5905 r5908  
    230230          </td>
    231231          <td style="width: 20px;">
    232             <a href="javascript:Main.zoom('Address', 'user', 'address', <%=!writePermission%>)" title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     232            <base:icon image="zoom.png"
     233              onclick="Main.zoom('Address', 'user', 'address')"
     234              visible="<%=writePermission%>"
     235              tooltip="Edit in larger window" />
    233236          </td>
    234237        </tr>
     
    297300            Object value = user == null ? cc.getPropertyValue(name) : user.getExtended(name);
    298301            String isRequired = required ? "class=\"required\"" : "";
     302            boolean addZoom = false;
    299303            %>
    300304            <tr>
     
    331335              else if (type == Type.TEXT)
    332336              {
     337                addZoom = true;
    333338                %>
    334339                <textarea <%=isRequired%> <%=ifDisabled%> name="<%=name%>" rows="6" 
    335340                  ><%=HTML.encodeTags((String)value)%></textarea>
    336                 <a href="javascript:Main.zoom(
    337                   '<%=HTML.javaScriptEncode(ep.getTitle())%>',
    338                   'reporter', '<%=name%>')"
    339                   title="Edit in larger window"><base:icon image="zoom.gif" /></a>
    340341                <%
    341342              }
     
    412413              %>
    413414              </td>
    414               <td></td>
     415              <td style="width: 20px;">
     416                <%if (addZoom)
     417                {
     418                  %>
     419                  <base:icon image="zoom.png"
     420                  onclick="<%="Main.zoom('" + HTML.javaScriptEncode(ep.getTitle()) + "', 'user', '" + name + "')"%>"
     421                    tooltip="Edit in larger window"
     422                    visible="<%=writePermission%>"
     423                  />
     424                  <%
     425                }
     426                %>
     427              </td>
    415428            </tr>
    416429            <%
     
    424437          </td>
    425438          <td style="width: 20px;">
    426             <a href="javascript:Main.zoom('Description', 'user', 'description', <%=!writePermission%>)" title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     439            <base:icon image="zoom.png"
     440              onclick="Main.zoom('Description', 'user', 'description')"
     441              tooltip="Edit in larger window"
     442              visible="<%=writePermission%>"
     443            />
    427444          </td>
    428445        </tr>
  • trunk/www/plugins/net/sf/basedb/plugins/jep_filter.jsp

    r5905 r5908  
    389389          ><%=HTML.encodeTags(childDescription) %></textarea>
    390390        <a href="javascript:Main.zoom('Description', 'transformation', 'parameter:childDescription')"
    391           title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     391          title="Edit in larger window"><base:icon image="zoom.png" /></a>
    392392      </td>
    393393    </tr>
  • trunk/www/plugins/net/sf/basedb/plugins/jep_intensity_transformer.jsp

    r5905 r5908  
    236236            ><%=HTML.encodeTags(childDescription)%></textarea>
    237237          <a href="javascript:Main.zoom('Description', 'transformation', 'parameter:childDescription')"
    238             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     238            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    239239        </td>
    240240      </tr>
  • trunk/www/views/derivedbioassays/edit_bioassay.jsp

    r5905 r5908  
    850850            ><%=HTML.encodeTags(bioAssay == null ? cc.getPropertyValue("description") : bioAssay.getDescription())%></textarea>
    851851          <a href="javascript:Main.zoom('Description', 'bioAssay', 'description')"
    852             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     852            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    853853        </td>
    854854      </tr>
  • trunk/www/views/experiments/bioassays/edit_bioassay.jsp

    r5905 r5908  
    176176            ><%=HTML.encodeTags(bioAssay == null ? cc.getPropertyValue("description") : bioAssay.getDescription())%></textarea>
    177177          <a href="javascript:Main.zoom('Description', 'bioAssaySet', 'description')"
    178             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     178            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    179179        </td>
    180180      </tr>
  • trunk/www/views/experiments/bioassaysets/edit_bioassayset.jsp

    r5905 r5908  
    205205            ><%=HTML.encodeTags(bioAssaySet == null ? cc.getPropertyValue("description") : bioAssaySet.getDescription())%></textarea>
    206206          <a href="javascript:Main.zoom('Description', 'bioAssaySet', 'description')"
    207             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     207            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    208208        </td>
    209209      </tr>
  • trunk/www/views/experiments/clone_reporters.jsp

    r5905 r5908  
    201201            ><%=HTML.encodeTags(experiment == null ? cc.getPropertyValue("description") : experiment.getDescription())%></textarea>
    202202          <a href="javascript:Main.zoom('Description', 'clone', 'description')"
    203             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     203            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    204204        </td>
    205205      </tr>
  • trunk/www/views/experiments/edit_experiment.jsp

    r5905 r5908  
    442442            ><%=HTML.encodeTags(experiment == null ? cc.getPropertyValue("description") : experiment.getDescription())%></textarea>
    443443          <a href="javascript:Main.zoom('Description', 'rawbioassay', 'description')"
    444             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     444            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    445445        </td>
    446446      </tr>
     
    467467            ><%=HTML.encodeTags(experiment == null ? cc.getPropertyValue("title") : experiment.getTitle())%></textarea>
    468468          <a href="javascript:Main.zoom('Title', 'experiment', 'title')"
    469             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     469            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    470470        </td>
    471471      </tr>
     
    500500            ><%=HTML.encodeTags(experiment == null ? cc.getPropertyValue("abstract") : experiment.getAbstract())%></textarea>
    501501          <a href="javascript:Main.zoom('Abstract', 'experiment', 'abstract')"
    502             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     502            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    503503        </td>
    504504      </tr>
     
    509509            ><%=HTML.encodeTags(experiment == null ? cc.getPropertyValue("experimentDesign") : experiment.getExperimentDesign())%></textarea>
    510510          <a href="javascript:Main.zoom('Experiment design', 'experiment', 'experimentDesign')"
    511             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     511            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    512512        </td>
    513513      </tr>
     
    518518            ><%=HTML.encodeTags(experiment == null ? cc.getPropertyValue("experimentType") : experiment.getExperimentType())%></textarea>
    519519          <a href="javascript:Main.zoom('Experiment type', 'experiment', 'experimentType')"
    520             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     520            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    521521        </td>
    522522      </tr>
     
    527527            ><%=HTML.encodeTags(experiment == null ? cc.getPropertyValue("affiliations") : experiment.getAffiliations())%></textarea>
    528528          <a href="javascript:Main.zoom('Affiliations', 'experiment', 'affiliations')"
    529             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     529            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    530530        </td>
    531531      </tr>
     
    536536            ><%=HTML.encodeTags(experiment == null ? cc.getPropertyValue("authors") : experiment.getAuthors())%></textarea>
    537537          <a href="javascript:Main.zoom('Authors', 'experiment', 'authors')"
    538             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     538            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    539539        </td>
    540540      </tr>
     
    545545            ><%=HTML.encodeTags(experiment == null ? cc.getPropertyValue("publication") : experiment.getPublication())%></textarea>
    546546          <a href="javascript:Main.zoom('Publication', 'experiment', 'publication')"
    547             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     547            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    548548        </td>
    549549      </tr>
  • trunk/www/views/experiments/transformations/edit_transformation.jsp

    r5905 r5908  
    140140            ><%=HTML.encodeTags(transformation == null ? cc.getPropertyValue("description") : transformation.getDescription())%></textarea>
    141141          <a href="javascript:Main.zoom('Description', 'transformation', 'description')"
    142             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     142            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    143143        </td>
    144144      </tr>
  • trunk/www/views/formulas/edit_formula.jsp

    r5905 r5908  
    620620            ><%=HTML.encodeTags(formula == null ? cc.getPropertyValue("description") : formula.getDescription())%></textarea>
    621621          <a href="javascript:Main.zoom('Description', 'formula', 'description')"
    622             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     622            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    623623        </td>
    624624      </tr>
  • trunk/www/views/permissiontemplates/edit_template.jsp

    r5905 r5908  
    138138            ><%=HTML.encodeTags(template == null ? cc.getPropertyValue("description") : template.getDescription())%></textarea>
    139139          <a href="javascript:Main.zoom('Description', 'template', 'description')"
    140             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     140            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    141141        </td>
    142142      </tr>
  • trunk/www/views/physicalbioassays/edit_bioassay.jsp

    r5905 r5908  
    729729            ><%=HTML.encodeTags(pba == null ? cc.getPropertyValue("description") : pba.getDescription())%></textarea>
    730730          <a href="javascript:Main.zoom('Description', 'bioassay', 'description')"
    731             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     731            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    732732        </td>
    733733      </tr>
  • trunk/www/views/rawbioassays/edit_rawbioassay.jsp

    r5905 r5908  
    937937            ><%=HTML.encodeTags(rawBioAssay == null ? cc.getPropertyValue("description") : rawBioAssay.getDescription())%></textarea>
    938938          <a href="javascript:Main.zoom('Description', 'rawbioassay', 'description')"
    939             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     939            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    940940        </td>
    941941      </tr>
  • trunk/www/views/reporterlists/edit_reporterlist.jsp

    r5905 r5908  
    273273            ><%=HTML.encodeTags(reporterList == null ? cc.getPropertyValue("description") : reporterList.getDescription())%></textarea>
    274274          <a href="javascript:Main.zoom('Description', 'reporterList', 'description')"
    275             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     275            title="Edit in larger window"><base:icon image="zoom.png" /></a>
    276276        </td>
    277277      </tr>
  • trunk/www/views/reporters/edit_reporter.jsp

    r5905 r5908  
    292292          <textarea <%=clazz%> rows="4" cols="40" name="description"
    293293            ><%=HTML.encodeTags(reporter == null ? cc.getPropertyValue("description") : reporter.getDescription())%></textarea>
    294           <a href="javascript:Main.zoom('Description', 'reporter', 'description')" title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     294          <a href="javascript:Main.zoom('Description', 'reporter', 'description')" title="Edit in larger window"><base:icon image="zoom.png" /></a>
    295295        </td>
    296296      </tr>
     
    352352                  '<%=HTML.javaScriptEncode(ep.getTitle())%>',
    353353                  'reporter', '<%=name%>')"
    354                   title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     354                  title="Edit in larger window"><base:icon image="zoom.png" /></a>
    355355                <%
    356356              }
Note: See TracChangeset for help on using the changeset viewer.