Changeset 5919


Ignore:
Timestamp:
Jan 9, 2012, 2:51:06 PM (10 years ago)
Author:
Nicklas Nordborg
Message:

References #1655: GUI improvements

Fixes image alignment in several places.

Location:
trunk
Files:
53 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/clients/web/net/sf/basedb/clients/web/taglib/Body.java

    r5918 r5919  
    316316        throw new JspTagException(ex);       
    317317      }
    318       //if ((page.getTitle() != null) && !page.getTitle().equals("")) sb.append("\t<h1>").append(page.getTitle()).append("</h1>\n");
    319       //sb.append("<div class=\"content\">\n");
    320318      break;
    321319    }
     
    355353      if (page.getTypeCode() == Page.PAGE_TYPE_DEFAULT)
    356354      {
    357         //sb.append("</div>\n");
    358355      }
    359356      sb.append("</body>\n");
  • trunk/src/clients/web/net/sf/basedb/clients/web/taglib/menu/Menu.java

    r5918 r5919  
    224224    sb.append("<div");
    225225    addIdAndStyles(sb, isVertical() ? "vertical" : "horizontal");
    226     sb.append("\">\n");
     226    sb.append(">\n");
    227227    sb.append("<table>\n");
    228228    if (isVertical())
  • trunk/www/admin/extensions/frameset.jsp

    r5918 r5919  
    6161       
    6262      <div id="d1" class="absolutefull filled leftborder rightborder"
    63         style="left: 294px; width: 4px; cursor: e-resize; z-index: 99;"
     63        style="left: 294px; width: 4px; cursor: col-resize; z-index: 99;"
    6464        onmousedown="DragDrop.beginDrag(event, true, false, repositionX)"
    6565        ></div>
  • trunk/www/admin/extensions/tree.jsp

    r5918 r5919  
    137137    IconStore.init();
    138138   
    139     IconStore.addIcon('ExtensionPoint', path + 'extensionpoint.png', 16, 16);
    140     IconStore.addIcon('ExtensionPointSelected', path + 'extensionpointselected.png', 16, 16);
    141     IconStore.addIcon('ExtensionPointDisabled', path + 'extensionpointdisabled.png', 16, 16);
    142     IconStore.addIcon('ExtensionPointDisabledSelected', path + 'extensionpointdisabledselected.png', 16, 16);
    143     IconStore.addIcon('ExtensionPointError', path + 'extensionpointerror.png', 16, 16);
    144     IconStore.addIcon('ExtensionPointErrorSelected', path + 'extensionpointerrorselected.png', 16, 16);
    145     IconStore.addIcon('Extension', path + 'extension.png', 16, 16);
    146     IconStore.addIcon('ExtensionSelected', path + 'extensionselected.png', 16, 16);
    147     IconStore.addIcon('ExtensionDisabled', path + 'extensiondisabled.png', 16, 16);
    148     IconStore.addIcon('ExtensionDisabledSelected', path + 'extensiondisabledselected.png', 16, 16);
    149     IconStore.addIcon('ExtensionError', path + 'extensionerror.png', 16, 16);
    150     IconStore.addIcon('ExtensionErrorSelected', path + 'extensionerrorselected.png', 16, 16);
    151     IconStore.addIcon('Plugin', path + 'plugin.png', 18, 16);
    152     IconStore.addIcon('PluginSelected', path + 'pluginselected.png', 18, 16);
    153     IconStore.addIcon('PluginDisabled', path + 'plugindisabled.png', 18, 16);
    154     IconStore.addIcon('PluginDisabledSelected', path + 'plugindisabledselected.png', 18, 16);
    155     IconStore.addIcon('PluginError', path + 'pluginerror.png', 18, 16);
    156     IconStore.addIcon('PluginErrorSelected', path + 'pluginerrorselected.png', 18, 16);
    157     IconStore.addIcon('XmlFile', path + 'item.gif', 18, 16);
    158     IconStore.addIcon('XmlFileModified', path + 'itemmodified.gif', 18, 16);
    159     IconStore.addIcon('XmlFileError', path + 'itemerror.gif', 18, 16);
    160     IconStore.addIcon('XmlFileErrorModified', path + 'itemerrormodified.gif', 18, 16);
    161     IconStore.addIcon('XmlFileSelected', path + 'itemselected.gif', 18, 16);
    162     IconStore.addIcon('XmlFileModifiedSelected', path + 'itemmodifiedselected.gif', 18, 16);
    163     IconStore.addIcon('XmlFileErrorSelected', path + 'itemerrorselected.gif', 18, 16);
    164     IconStore.addIcon('XmlFileErrorModifiedSelected', path + 'itemerrormodifiedselected.gif', 18, 16);
    165     IconStore.addIcon('JarFile', path + 'jarfile.png', 18, 16);
    166     IconStore.addIcon('JarFileModified', path + 'jarfilemodified.png', 18, 16);
    167     IconStore.addIcon('JarFileError', path + 'jarfileerror.png', 18, 16);
    168     IconStore.addIcon('JarFileErrorModified', path + 'jarfileerrormodified.png', 18, 16);
    169     IconStore.addIcon('JarFileSelected', path + 'jarfileselected.png', 18, 16);
    170     IconStore.addIcon('JarFileModifiedSelected', path + 'jarfilemodifiedselected.png', 18, 16);
    171     IconStore.addIcon('JarFileErrorSelected', path + 'jarfileerrorselected.png', 18, 16);
    172     IconStore.addIcon('JarFileErrorModifiedSelected', path + 'jarfileerrormodifiedselected.png', 18, 16);
     139    IconStore.addIcon('ExtensionPoint', path + 'extensionpoint.png');
     140    IconStore.addIcon('ExtensionPointSelected', path + 'extensionpointselected.png');
     141    IconStore.addIcon('ExtensionPointDisabled', path + 'extensionpointdisabled.png');
     142    IconStore.addIcon('ExtensionPointDisabledSelected', path + 'extensionpointdisabledselected.png');
     143    IconStore.addIcon('ExtensionPointError', path + 'extensionpointerror.png');
     144    IconStore.addIcon('ExtensionPointErrorSelected', path + 'extensionpointerrorselected.png');
     145    IconStore.addIcon('Extension', path + 'extension.png');
     146    IconStore.addIcon('ExtensionSelected', path + 'extensionselected.png');
     147    IconStore.addIcon('ExtensionDisabled', path + 'extensiondisabled.png');
     148    IconStore.addIcon('ExtensionDisabledSelected', path + 'extensiondisabledselected.png');
     149    IconStore.addIcon('ExtensionError', path + 'extensionerror.png');
     150    IconStore.addIcon('ExtensionErrorSelected', path + 'extensionerrorselected.png');
     151    IconStore.addIcon('Plugin', path + 'plugin.png');
     152    IconStore.addIcon('PluginSelected', path + 'pluginselected.png');
     153    IconStore.addIcon('PluginDisabled', path + 'plugindisabled.png');
     154    IconStore.addIcon('PluginDisabledSelected', path + 'plugindisabledselected.png');
     155    IconStore.addIcon('PluginError', path + 'pluginerror.png');
     156    IconStore.addIcon('PluginErrorSelected', path + 'pluginerrorselected.png');
     157    IconStore.addIcon('XmlFile', path + 'item.gif');
     158    IconStore.addIcon('XmlFileModified', path + 'itemmodified.gif');
     159    IconStore.addIcon('XmlFileError', path + 'itemerror.gif');
     160    IconStore.addIcon('XmlFileErrorModified', path + 'itemerrormodified.gif');
     161    IconStore.addIcon('XmlFileSelected', path + 'itemselected.gif');
     162    IconStore.addIcon('XmlFileModifiedSelected', path + 'itemmodifiedselected.gif');
     163    IconStore.addIcon('XmlFileErrorSelected', path + 'itemerrorselected.gif');
     164    IconStore.addIcon('XmlFileErrorModifiedSelected', path + 'itemerrormodifiedselected.gif');
     165    IconStore.addIcon('JarFile', path + 'jarfile.png');
     166    IconStore.addIcon('JarFileModified', path + 'jarfilemodified.png');
     167    IconStore.addIcon('JarFileError', path + 'jarfileerror.png');
     168    IconStore.addIcon('JarFileErrorModified', path + 'jarfileerrormodified.png');
     169    IconStore.addIcon('JarFileSelected', path + 'jarfileselected.png');
     170    IconStore.addIcon('JarFileModifiedSelected', path + 'jarfilemodifiedselected.png');
     171    IconStore.addIcon('JarFileErrorSelected', path + 'jarfileerrorselected.png');
     172    IconStore.addIcon('JarFileErrorModifiedSelected', path + 'jarfileerrormodifiedselected.png');
    173173
    174174    var byExtPoint = JoustMenu.addMenuItem(-1, 'Root', 'By extension point', 'rootOnClick()', '', '');
  • trunk/www/biomaterials/biosources/list_biosources.jsp

    r5918 r5919  
    207207  </base:head>
    208208 
    209   <base:body>
     209  <base:body >
    210210    <h1><%=title==null ? "Biosources" : title%></h1>
    211211    <div class="content">
  • trunk/www/common/annotations/inherit.jsp

    r5913 r5919  
    399399      <div class="absolutefull topborder" style="top: auto; bottom: 0px; height: 3em;">
    400400        <table style="height: 100%; margin:auto;"><tr><td>
    401         <base:icon image="joust/annotation.gif" /> = annotation
    402         <base:icon image="joust/parameter.gif" /> = protocol parameter<br>
    403         <base:icon image="joust/itemerror.gif" /> = not a parent item
     401        <base:icon image="joust/annotation.gif" style="vertical-align: text-bottom;"/> = annotation
     402        <base:icon image="joust/parameter.gif" style="vertical-align: text-bottom;"/> = protocol parameter<br>
     403        <base:icon image="joust/itemerror.gif" style="vertical-align: text-bottom;" /> = not a parent item
    404404        </td></tr></table>
    405405      </div>
  • trunk/www/common/datafiles/select_files.jsp

    r5916 r5919  
    381381  }
    382382 
     383  .filelist td
     384  {
     385    padding: 1px;
     386  }
     387
    383388  .fileaction
    384389  {
     
    390395    border-radius: 0px 4px 4px 0px;
    391396    -moz-border-radius: 0px 3px 3px 0px;
     397  }
     398 
     399  .filelist img
     400  {
     401    vertical-align: middle;
    392402  }
    393403 
  • trunk/www/common/overview/frameset.jsp

    r5918 r5919  
    7272       
    7373      <div id="d1" class="absolutefull filled leftborder rightborder"
    74         style="left: 394px; width: 4px; cursor: e-resize; z-index: 99;"
     74        style="left: 394px; width: 4px; cursor: col-resize; z-index: 99;"
    7575        onmousedown="DragDrop.beginDrag(event, true, false, repositionX)"
    7676        ></div>
     
    8484         
    8585        <div id="d2" class="absolutefull filled topborder bottomborder"
    86           style="bottom: 244px; height: 4px; top: auto; cursor: n-resize; z-index: 99;"
     86          style="bottom: 244px; height: 4px; top: auto; cursor: row-resize; z-index: 99;"
    8787          onmousedown="DragDrop.beginDrag(event, false, true, repositionY)"
    8888          ></div>
  • trunk/www/include/menu.jsp

    r5918 r5919  
    424424    if (activeProject == null)
    425425    {
    426       fillText.append("<img src=\""+root+"images/no_active_project.gif\" border=\"0\">&nbsp;");
     426      fillText.append("<img src=\""+root+"images/no_active_project.gif\">&nbsp;");
    427427      fillText.append("<a href=\"javascript:void(0)\" style=\"color:#FF0000;\" title=\"" + menu.getString("menu.projects.tooltip.0") + "\"");
    428428    }
    429429    else
    430430    {
    431       fillText.append("<img src=\""+root+"images/project.gif\" border=\"0\">&nbsp;");
     431      fillText.append("<img src=\""+root+"images/project.gif\">&nbsp;");
    432432      fillText.append("<a href=\"javascript:void(0)\" title=\"" + menu.getString("menu.projects.tooltip.1") + "\"");
    433433    }
     
    435435    fillText.append(" onclick=\"Menu.toggleTopMenu(document.getElementById('projects'), event.clientX-50, event.clientY); event.cancelBubble = true;\">");
    436436    fillText.append(activeProject == null ? "<i>- " + menu.getString("noactiveproject.title") + " -</i>" : HTML.encodeTags(activeProject.getName()));
    437     fillText.append(" <img src=\""+root+"images/sort_asc.gif\" border=\"0\"></a><span class=\"menuseparator\"></span>");
     437    fillText.append(" <img src=\""+root+"images/sort_asc.gif\"></a><span class=\"menuseparator\"></span>");
    438438   
    439439    fillText.append("<a href=\"javascript:void(0)\" title=\"" + menu.getString("menu.refresh.tooltip") + "\"");
    440440    fillText.append(" onclick=\"location.reload()\">");
    441     fillText.append("<img src=\""+root+"images/refresh.gif\" border=\"0\"></a><span class=\"menuseparator\"></span>");
     441    fillText.append("<img src=\""+root+"images/refresh.gif\"></a><span class=\"menuseparator\"></span>");
    442442   
    443443    fillText.append("<a href=\"javascript:void(0)\" title=\"" + menu.getString("menu.recentitems.tooltip") + "\"");
    444     fillText.append(" onclick=\"Menu.toggleTopMenu(document.getElementById('mostRecent'), event.clientX-200, event.clientY); event.cancelBubble = true;\">");
    445     fillText.append("<img src=\""+root+"images/recent.png\" border=\"0\"><img src=\""+root+"images/sort_asc.gif\" border=\"0\"></a><span class=\"menuseparator\"></span>");
     444    fillText.append(" onclick=\"Menu.toggleTopMenu(document.getElementById('mostRecent'), event.clientX-100, event.clientY); event.cancelBubble = true;\">");
     445    fillText.append("<img src=\""+root+"images/recent.png\"><img src=\""+root+"images/sort_asc.gif\"></a><span class=\"menuseparator\"></span>");
    446446   
    447447    User user = User.getById(dc, sc.getLoggedInUserId());
    448     fillText.append("<img src=\""+root+"images/take_ownership.png\" border=\"0\"> <a href=\"javascript:void(0)\" title=\"" + menu.getString("menu.user.tooltip") + "\"");
     448    fillText.append("<img src=\""+root+"images/take_ownership.png\"> <a href=\"javascript:void(0)\" title=\"" + menu.getString("menu.user.tooltip") + "\"");
    449449    fillText.append(" onclick=\"javascript:Menu.toggleTopMenu(document.getElementById('switchuser'), event.clientX-100, event.clientY); event.cancelBubble = true;\">");
    450450    fillText.append(HTML.encodeTags(user.getLogin()));
    451     fillText.append(" (").append(user.getName()).append(") <img src=\""+root+"images/sort_asc.gif\" border=\"0\"></a>");
     451    fillText.append(" (").append(user.getName()).append(") <img src=\""+root+"images/sort_asc.gif\"></a>");
    452452    %>
    453453    <%
  • trunk/www/include/scripts/newjoust.js

    r5811 r5919  
    456456    html += ' onclick="JoustMenu.select('+this.index+', event)"';
    457457    html += ' title="' + this.tooltip + '">';
    458     html += '<table border="0" cellspacing="0" cellpadding="0"><tr><td width="10%">';
     458    html += '<table><tr><td class="outline">';
    459459    html += indentString;
    460460    if (this.firstChildIndex != -1 || this.lazyInit)
     
    466466      html += outlineTag+docTag;
    467467    }
    468     html += '</td><td class="text" id="text'+this.index+'" width="90%">';
    469     html += '&nbsp;'+this.text+'&nbsp;';
     468    html += '</td><td class="text" id="text'+this.index+'">';
     469    html += this.text;
    470470    html += '</td></tr></table>';
    471471    html += '</div>\n';
     
    487487    Initialise the IconStore object.
    488488  */
    489   this.init = function(imageDir, width, height)
     489  this.init = function(imageDir)
    490490  {
    491491    var path = imageDir ? imageDir : getRoot()+'images/joust/';
    492     if (!width) width = 18;
    493     if (!height) height = 16;
    494     this.addIcon('iconPlusTop', path + 'plustop.gif', width, height);
    495     this.addIcon('iconPlus', path + 'plus.gif', width, height);
    496     this.addIcon('iconPlusBottom', path + 'plusbottom.gif', width, height);
    497     this.addIcon('iconPlusOnly', path + 'plusonly.gif', width, height);
    498     this.addIcon('iconMinusTop', path + 'minustop.gif', width, height);
    499     this.addIcon('iconMinus', path + 'minus.gif', width, height);
    500     this.addIcon('iconMinusBottom', path + 'minusbottom.gif', width, height);
    501     this.addIcon('iconMinusOnly', path + 'minusonly.gif', width, height);
    502     this.addIcon('iconLazyTop', path + 'lazytop.gif', width, height);
    503     this.addIcon('iconLazy', path + 'lazy.gif', width, height);
    504     this.addIcon('iconLazyBottom', path + 'lazybottom.gif', width, height);
    505     this.addIcon('iconLazyOnly', path + 'lazyonly.gif', width, height);
    506     this.addIcon('iconLine', path + 'line.gif', width, height);
    507     this.addIcon('iconBlank', path + 'blank.gif', width, height);
    508     this.addIcon('iconJoinTop', path + 'jointop.gif', width, height);
    509     this.addIcon('iconJoin', path + 'join.gif', width, height);
    510     this.addIcon('iconJoinBottom', path + 'joinbottom.gif', width, height);
    511     this.addIcon('Folder', path + 'folderclosed.gif', width, height);
    512     this.addIcon('FolderExpanded', path + 'folderopen.gif', width, height);
    513     this.addIcon('FolderSelected', path + 'folderselected.gif', width, height);
    514     this.addIcon('FolderExpandedSelected', path + 'folderselected.gif', width, height);
    515     this.addIcon('FolderDeleted', path + 'folderdeleted.gif', width, height);
    516     this.addIcon('FolderCompressed', path + 'foldercompressed.gif', width, height);
    517     this.addIcon('FolderCompressedExpanded', path + 'foldercompressed.gif', width, height);
    518     this.addIcon('FolderCompressedSelected', path + 'foldercompressedselected.gif', width, height);
    519     this.addIcon('FolderCompressedExpandedSelected', path + 'foldercompressedselected.gif', width, height);
    520     this.addIcon('Root', path + 'root.gif', width, height);
    521     this.addIcon('Home', path + 'home.gif', width, height);
    522     this.addIcon('UserHome', path + 'userhome.gif', width, height);
     492    this.addIcon('iconPlusTop', path + 'plustop.gif');
     493    this.addIcon('iconPlus', path + 'plus.gif');
     494    this.addIcon('iconPlusBottom', path + 'plusbottom.gif');
     495    this.addIcon('iconPlusOnly', path + 'plusonly.gif');
     496    this.addIcon('iconMinusTop', path + 'minustop.gif');
     497    this.addIcon('iconMinus', path + 'minus.gif');
     498    this.addIcon('iconMinusBottom', path + 'minusbottom.gif');
     499    this.addIcon('iconMinusOnly', path + 'minusonly.gif');
     500    this.addIcon('iconLazyTop', path + 'lazytop.gif');
     501    this.addIcon('iconLazy', path + 'lazy.gif');
     502    this.addIcon('iconLazyBottom', path + 'lazybottom.gif');
     503    this.addIcon('iconLazyOnly', path + 'lazyonly.gif');
     504    this.addIcon('iconLine', path + 'line.gif');
     505    this.addIcon('iconBlank', path + 'blank.gif');
     506    this.addIcon('iconJoinTop', path + 'jointop.gif');
     507    this.addIcon('iconJoin', path + 'join.gif');
     508    this.addIcon('iconJoinBottom', path + 'joinbottom.gif');
     509    this.addIcon('Folder', path + 'folderclosed.gif');
     510    this.addIcon('FolderExpanded', path + 'folderopen.gif');
     511    this.addIcon('FolderSelected', path + 'folderselected.gif');
     512    this.addIcon('FolderExpandedSelected', path + 'folderselected.gif');
     513    this.addIcon('FolderDeleted', path + 'folderdeleted.gif');
     514    this.addIcon('FolderCompressed', path + 'foldercompressed.gif');
     515    this.addIcon('FolderCompressedExpanded', path + 'foldercompressed.gif');
     516    this.addIcon('FolderCompressedSelected', path + 'foldercompressedselected.gif');
     517    this.addIcon('FolderCompressedExpandedSelected', path + 'foldercompressedselected.gif');
     518    this.addIcon('Root', path + 'root.gif');
     519    this.addIcon('Home', path + 'home.gif');
     520    this.addIcon('UserHome', path + 'userhome.gif');
    523521    this.isInitialised = true;
    524522  }
     
    531529    @param height The height of the image
    532530  */
    533   this.addIcon = function(name, src, width, height)
     531  this.addIcon = function(name, src)
    534532  {
    535533    var insertIndex = this.icons.length;
    536     var icon = new Icon(name, src, width, height, insertIndex);
     534    var icon = new Icon(name, src, insertIndex);
    537535    this.icons[insertIndex] = icon;
    538536    this.icons[name] = icon;
     
    560558  @param name The name of the icon
    561559  @param src The src URL of the image
    562   @param width The width of the image
    563   @param height The height of the image
    564560  @param index The index of this icon in the IconStore
    565561*/
    566 function Icon(name, src, width, height, index)
     562function Icon(name, src, index)
    567563{
    568564  this.name = name;
    569565  this.src = src;
    570   this.width = width;
    571   this.height = height;
    572566  this.index = index;
    573567  // Preload the image
    574   this.img = new Image(width, height);
     568  this.img = new Image();
    575569  this.img.src = src;
    576570 
     
    578572    Change the attributes of an image.
    579573  */
    580   this.setAttributes = function(src, width, height)
    581   {
    582     if (width) this.width = width;
    583     if (height) this.height = height;
     574  this.setAttributes = function(src)
     575  {
    584576    if (src)
    585577    {
    586578      this.src = src;
    587       this.img = new Image(this.width, this.height);
     579      this.img = new Image();
    588580      this.img.src = src;
    589581    }
     
    597589    var html = '<img';
    598590    if (id) html += ' id="'+id+'"';
    599     html+= ' src="'+this.src+'" width="'+this.width+'" height="'+this.height+'" border="0">';
     591    html+= ' src="'+this.src+'">';
    600592    return html
    601593  }
  • trunk/www/include/styles/headertabcontrol.css

    r5918 r5919  
    2626  @version 2.0
    2727*/
    28 
    29 /* TODO - remove. temporary styles while fixing #1655 */
    30 #main.tabcontrol
    31 {
    32   margin-top: 5em;
    33 }
    34 
    35 #main.mastertabcontrol
    36 {
    37   margin-top: 0px;
    38 }
    3928
    4029/* Main tab control */
  • trunk/www/include/styles/main.css

    r5918 r5919  
    5454{
    5555  border: 0px;
    56   vertical-align: text-bottom;
     56  xvertical-align: text-bottom;
    5757}
    5858
     
    7070}
    7171
     72/*
     73  Add a large padding to make sure that old pages start below
     74  absolutely-positioned menu and page title. Should be removed
     75  when all pages (including extension) have been fixed to use
     76  absolute positioning.
     77*/
     78body.default
     79{
     80  padding-top: 5em;
     81}
     82
    7283body.default h1
    7384{
     
    7586  left: 0px;
    7687  right: 0px;
    77   top:  2em;
     88  top:  1.75em;
    7889  /* NOTE! Total height in base units is 1.4*1.4=1.96em */
    7990  height: 1.4em;
     
    93104}
    94105
    95 
    96106body.default .content
    97107{
     
    99109  left: 0px;
    100110  right: 0px;
    101   top:  5em;
     111  top:  4.5em;
    102112  bottom: 0px;
    103113  overflow: auto;
     
    322332  background: #F8F8F8;
    323333  color: #A0A0A0;
    324   border: 1px solid #A0A0A0 !important;
     334  border: 1px dotted #A0A0A0 !important;
    325335  cursor: default;
    326336  cursor: not-allowed;
  • trunk/www/include/styles/menu.css

    r5918 r5919  
    100100}
    101101
     102.menu img
     103{
     104  vertical-align: text-bottom;
     105}
     106
    102107.menuicon
    103108{
  • trunk/www/include/styles/newjoust.css

    r5913 r5919  
    3838}
    3939
    40 .joust .menuitem
     40.joust .menuitem .outline
    4141{
    42   padding: 0px 2px 0px 2px;
    43   margin: 2px 0px 0px 0px;
    44   border: 0px;
     42 
     43}
     44
     45.joust .menuitem .text
     46{
     47  border: 2px solid transparent;
    4548  border-radius: 4px;
    4649  -moz-border-radius: 3px;
    4750}
    4851
    49 .joust .menuitem:hover
     52.joust .menuitem:hover .text
    5053{
    5154  cursor: pointer;
    5255  border: 2px solid #2288AA;
    53   padding: 0px;
    54   margin: 0px 0px -2px 0px;
    5556}
    5657
  • trunk/www/include/styles/table.css

    r5918 r5919  
    3636  margin-bottom: 0px;
    3737  padding-bottom: 0px;
    38   margin-top: 4em;
    39 }
    40 
    41 /* TODO - remove when #1655 is complete */
    42 .content .itemlist
    43 {
    44   margin-top: 0px;
    4538}
    4639
  • trunk/www/my_base/index.jsp

    r5918 r5919  
    201201
    202202    <div class="absolutefull" style="height: 50%;">
    203       <div class="absolutefull" style="height: 2em; overflow: hidden;"">
     203      <div class="absolutefull" style="height: 1.75em; overflow: hidden;"">
    204204        <h3 style="height: 100%;"><base:icon image="project.gif" />Projects (<%=projects.size()%>)</h3>
    205205      </div>
    206       <div id="projects" class="absolutefull welcomesection" style="top: 2em; bottom: 0.5em;">
     206      <div id="projects" class="absolutefull welcomesection" style="top: 1.75em; bottom: 0.5em;">
    207207      <%
    208208      if (projects.size() == 0)
     
    259259
    260260    <div class="absolutefull" style="height: 50%; top: auto;">
    261       <div class="absolutefull" style="height: 2em; top: 0.5em; overflow: hidden;">
     261      <div class="absolutefull" style="height: 1.75em; top: 0.5em; overflow: hidden;">
    262262        <h3 style="height: 100%;"><base:icon image="message.gif" />New messages (<%=messages.size()%>)</h3>
    263263      </div>
    264       <div id="messages" class="absolutefull news welcomesection" style="top: 2.5em;">
     264      <div id="messages" class="absolutefull news welcomesection" style="top: 2.25em;">
    265265      <%
    266266      String broadcastTitle = (String)application.getAttribute("broadcast.title");
     
    310310    %>
    311311    <div class="absolutefull" style="left: 1em; right: 0.5em; top: auto; height: 13em; bottom: 1em; ">
    312       <div class="absolutefull" style="height: 2em; overflow: hidden;"">
    313       <h3 style="height: 100%;"><base:icon image="help.png" style="float: left; margin-top: 0.2em; margin-right: 0.5em;" />Help</h3>
    314       </div>
    315       <div id="help" class="absolutefull welcomesection" style="top: 2em;">
     312      <div class="absolutefull" style="height: 1.75em; overflow: hidden;"">
     313      <h3 style="height: 100%;"><base:icon image="help.png" />Help</h3>
     314      </div>
     315      <div id="help" class="absolutefull welcomesection" style="top: 1.75em;">
    316316      <%
    317317      if (help != null)
     
    348348 
    349349    <div class="absolutefull" style="left: 0.5em; right: 1em; bottom: 15em;">
    350       <div class="absolutefull" style="height: 2em; overflow: hidden;"">
    351       <h3 style="height: 100%;"><base:icon image="news.gif" style="float: left; margin-top: 0.2em; margin-right: 0.5em;" />News and announcements (<%=news.size()%>)
     350      <div class="absolutefull" style="height: 1.75em; overflow: hidden;"">
     351      <h3 style="height: 100%;"><base:icon image="news.gif" />News and announcements (<%=news.size()%>)
    352352        <%
    353353        if (RssNewsFeed.isEnabled())
     
    357357            onclick="location.href='../info/news.rss'"
    358358            tooltip="Subscribe to news from this BASE server"
    359             style="float: right; margin-top: 0.2em;"
     359            style="float: right; margin-top: 0.15em;"
    360360          />
    361361          <%
     
    364364      </h3>
    365365      </div>
    366       <div id="news" class="absolutefull news welcomesection" style="top: 2em;">
     366      <div id="news" class="absolutefull news welcomesection" style="top: 1.75em;">
    367367        <%
    368368        if (news.size() == 0)
     
    390390 
    391391    <div class="absolutefull" style="left: 0.5em; right: 1em; top: auto; height: 13em; bottom: 1em;">
    392       <div class="absolutefull" style="height: 2em; overflow: hidden;"">
    393       <h3 style="height: 100%;"><base:icon image="diskusage.gif" style="float: left; margin-top: 0.2em; margin-right: 0.5em;" />Disk usage</h3>
    394       </div>
    395       <div id="quota" class="absolutefull welcomesection" style="top: 2em;">
     392      <div class="absolutefull" style="height: 1.75em; overflow: hidden;"">
     393      <h3 style="height: 100%;"><base:icon image="diskusage.gif" />Disk usage</h3>
     394      </div>
     395      <div id="quota" class="absolutefull welcomesection" style="top: 1.75em;">
    396396      <%
    397397      if (quotaGroup != null)
Note: See TracChangeset for help on using the changeset viewer.