Changeset 5907


Ignore:
Timestamp:
Dec 13, 2011, 9:36:28 AM (10 years ago)
Author:
Nicklas Nordborg
Message:

References #1655: GUI improvements

New design on some more pages:

  • Impersonate
  • Switch user
  • Calendar
  • Close popup message
  • Configure columns
  • Manage lists contexts
  • View help
  • Set owner
  • Share items
  • About
Location:
trunk
Files:
1 deleted
20 edited

Legend:

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

    r5689 r5907  
    284284  private String style = null;
    285285
    286   private String buttonclass = "buttonclass";
     286  private String buttonclass = "basicbutton";
    287287  private String buttonstyle = null;
    288288  private String buttontitle = "Select…";
     
    569569    if (getStyle() != null) sb.append(" style=\"").append(getStyle()).append("\"");
    570570    sb.append(">\n");
    571     sb.append("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n");
     571    sb.append("<table>\n");
    572572    sb.append("<tr><td>");
    573573    boolean disabled = isDenied() || isDisabled();
    574574    sb.append("<select name=\"").append(getId()).append("\"");
    575     sb.append(disabled ? " disabled readonly class=\"disabled\"" : isRequired() ? " class=\"required\"" : "");
     575    sb.append(disabled ? " disabled" : isRequired() ? " class=\"required\"" : "");
    576576    if (getOnchange() != null) sb.append(" onchange=\"").append(getOnchange()).append("\"");
    577577    sb.append(">\n");
     
    638638      }
    639639    }
    640     sb.append("</select>&nbsp;\n");
     640    sb.append("</select>\n");
    641641    sb.append("</td>");
    642642    if (getOnselect() != null)
    643643    {
    644644      sb.append("<td>");
    645       sb.append("<div class=\"").append(getButtonclass()).append(disabled ? "_disabled": "").append("\"");
     645      sb.append("<div class=\"").append(getButtonclass()).append(disabled ? " disabled": "").append("\"");
    646646      if (!disabled)
    647647      {
     
    652652        sb.append("style=\"").append(getButtonstyle()).append("\"");
    653653      }
    654       sb.append("><div class=\"").append(getButtonclass()).append("_inner\">");
     654      sb.append("><div>");
     655      sb.append("<table><tr>");
    655656      String buttonImg = getButtonicon();
    656657      if (buttonImg != null)
     
    660661          buttonImg = page.getRoot() + "images/" + buttonImg;
    661662        }
    662         sb.append("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td style=\"width: 20px;\">");
    663         sb.append("<img src=\"").append(buttonImg).append("\" border=\"0\"></td><td style=\"text-align: left;\">");
     663        sb.append("<td class=\"icon\">");
     664        sb.append("<img src=\"").append(buttonImg).append("\"></td>");
    664665      }
     666      sb.append("<td class=\"title\">");
    665667      sb.append(getButtontitle());
    666       if (buttonImg != null)
    667       {
    668         sb.append("</td></tr></table>");
    669       }
     668      sb.append("</td>");
     669      sb.append("</tr></table>");
    670670      sb.append("</div></div>");
    671671      sb.append("</td>\n");
  • trunk/www/common/calendar.jsp

    r5900 r5907  
    5656  var datetime = <%=datetime ? "1" : "0"%>;
    5757  var dateFormat = '<%=HTML.javaScriptEncode(format)%>';
     58  var MONTHS = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
    5859  var currentDate;
     60 
     61  var calendarYear;
     62  var calendarMonth;
     63 
    5964  function init()
    6065  {
     
    7277  }
    7378
    74   function saveCurrentDate()
     79  function saveCurrentDate(notime)
    7580  {
    7681    var frm = document.forms['calendar'];
    7782    if (!validate())
    7883    {
    79       alert(document.getElementById('error').innerHTML);
    8084      return;
     85    }
     86    if (datetime && !notime)
     87    {
     88      currentDate.setHours(frm.hours.value);
     89      currentDate.setMinutes(frm.minutes.value);
     90      currentDate.setSeconds(frm.seconds.value);
    8191    }
    8292    var formattedDate = Dates.formatDate(currentDate, dateFormat);
     
    99109  }
    100110 
    101   function showFullDate(date)
    102   {
    103     var frm = document.forms['calendar'];
    104     // Year is a regular input field
    105     frm.year.value = Dates.getFourDigitYear(date.getFullYear());
    106     // Month is a selection list
    107     Forms.selectListOption(frm.month, date.getMonth());
     111  function showFullDate(date, notime)
     112  {
     113    calendarYear = date.getFullYear();
     114    calendarMonth = date.getMonth();
     115   
     116    var frm = document.forms['calendar'];
     117    // Update month and year
     118    document.getElementById('year').innerHTML = Dates.getFourDigitYear(date.getFullYear());
     119    document.getElementById('month').innerHTML = MONTHS[date.getMonth()];
    108120    // Days in the month are displayed as a table
    109     displayMonth(date.getFullYear(), date.getMonth(), date);
     121    displayMonth(date.getFullYear(), date.getMonth(), currentDate);
    110122    // Time (if present) are regular input fields
    111     if (datetime)
     123    if (datetime && !notime)
    112124    {
    113125      frm.hours.value = zeroPad(date.getHours());
     
    115127      frm.seconds.value = zeroPad(date.getSeconds());
    116128    }
    117     // Finally, a complete formatted date is created
    118     document.getElementById('current').innerHTML = Dates.formatDate(date, dateFormat);
    119129  }
    120130 
     
    126136  function setDate(date)
    127137  {
    128     if (!validate()) return;
    129138    currentDate.setFullYear(date.getFullYear());
    130139    currentDate.setMonth(date.getMonth());
     
    132141    if (datetime)
    133142    {
    134       showFullDate(currentDate);
     143      showFullDate(currentDate, true);
    135144    }
    136145    else
     
    140149  }
    141150
    142   function setTime()
    143   {
    144     if (!validate()) return;
    145     var frm = document.forms['calendar'];
    146     currentDate.setHours(frm.hours.value);
    147     currentDate.setMinutes(frm.minutes.value);
    148     currentDate.setSeconds(frm.seconds.value);
    149     document.getElementById('current').innerHTML = Dates.formatDate(currentDate, dateFormat);
    150   }
    151151 
    152152  function setToday()
    153153  {
    154154    currentDate = new Date();
    155     saveCurrentDate();
     155    saveCurrentDate(true);
    156156  }
    157157 
     
    204204  }
    205205 
    206   function changeMonth()
    207   {
    208     if (!validate()) return;
    209     var frm = document.forms['calendar'];
    210     var month = Number(frm.month[frm.month.selectedIndex].value);
    211     var year = Number(frm.year.value);
    212     displayMonth(year, month, currentDate);
    213   }
    214 
    215   function addToYear(delta)
    216   {
    217     var frm = document.forms['calendar'];
    218     var nextYear = parseInt(frm.year.value, 10) + delta;
    219     frm.year.value = nextYear;
    220     changeMonth();
     206  function addToMonth(delta)
     207  {
     208    calendarMonth += delta;
     209    if (calendarMonth < 0)
     210    {
     211      calendarMonth = 11;
     212      calendarYear--;
     213    }
     214    if (calendarMonth > 11)
     215    {
     216      calendarMonth = 0;
     217      calendarYear++;
     218    }
     219    showFullDate(new Date(calendarYear, calendarMonth, 1));
    221220  }
    222221 
     
    228227    if (nextHour > 23) nextHour = 23;
    229228    frm.hours.value = zeroPad(nextHour);
    230     setTime();
    231229  }
    232230
     
    238236    if (nextMinute > 59) nextMinute = 59;
    239237    frm.minutes.value = zeroPad(nextMinute);
    240     setTime();
    241238  }
    242239
     
    248245    if (nextSecond > 59) nextSecond = 59;
    249246    frm.seconds.value = zeroPad(nextSecond);
    250     setTime();
    251247  }
    252248
    253249  function showError(message)
    254250  {
    255     document.getElementById('error').innerHTML = message;
    256     Main.show('error');
    257     Main.hide('current');
     251    alert(message);
    258252  }
    259253
     
    261255  {
    262256    var frm = document.forms['calendar'];
    263     if (frm.year.value.length != 4)
    264     {
    265       showError('Year must have four digits');
    266       return false;
    267     }
    268257    if (datetime)
    269258    {
     
    271260      if (hours < 0 || hours > 23)
    272261      {
     262        frm.hours.focus();
    273263        showError('Hours must be a value between 0 and 23');
    274264        return false;
     
    277267      if (minutes < 0 || minutes > 59)
    278268      {
     269        frm.minutes.focus();
    279270        showError('Minutes must be a value between 0 and 59');
    280271        return false;
     
    283274      if (seconds < 0 || seconds > 59)
    284275      {
     276        frm.seconds.focus();
    285277        showError('Seconds must be a value between 0 and 59');
    286278        return false;
    287279      }
    288280    }
    289     Main.hide('error');
    290     Main.show('current');
    291281    return true;
    292282  }
     
    294284</base:head>
    295285<base:body onload="init()">
     286  <h1><%=title%><base:help helpid="calendar.selectday" /></h1>
    296287  <form name="calendar" onsubmit="return false;">
    297   <h3 class="docked"><%=title%><base:help helpid="calendar.selectday" /></h3>
    298   <div class="boxed">
    299 
    300     <table width="100%" border="0" cellspacing=0 cellpadding=0 style="margin-bottom: 4px;" >
     288  <div class="content filled">
     289
     290    <div style="position: absolute; top: 0px; left: 0px; right: 0px; height: 2em; text-align: center;">
     291      <table style="height: 100%; margin:auto;"><tr><td>
     292      <base:icon image="goback.png" onclick="addToMonth(-1)" />
     293      </td>
     294      <td style="width: 15em;">
     295      <b>
     296      <span id="month"></span>
     297      <span id="year"></span>
     298      </b>
     299      </td>
     300      <td>
     301      <base:icon image="gonext.png" onclick="addToMonth(1)"/>
     302      </td></tr></table>
     303    </div>
     304
     305   
     306    <div style="position: absolute; top: 2em; bottom: 2em; width: 100%;">
     307    <table class="calendar">
    301308    <tr>
    302     <td>
    303     <select name="month" onchange="changeMonth();">
    304       <option value="0">January
    305       <option value="1">February
    306       <option value="2">March
    307       <option value="3">April
    308       <option value="4">May
    309       <option value="5">June
    310       <option value="6">July
    311       <option value="7">August
    312       <option value="8">September
    313       <option value="9">October
    314       <option value="10">November
    315       <option value="11">December
    316     </select>
    317     </td>
    318     <td style="text-align: right;">
    319       <input type="text" class="text" name="year" size="4" maxlength="4"
    320         onkeypress="return Numbers.integerOnly(event);"
    321         onkeyup="changeMonth()">
    322     </td>
    323     <td width="12px">
    324       <table border="0" cellspacing="2" cellpadding="0">
    325       <tr><td><base:icon image="mini_scroll_up.png" onclick="addToYear(1)" tooltip="Next year"/></td></tr>
    326       <tr><td><base:icon image="mini_scroll_down.png" onclick="addToYear(-1)" tooltip="Previous year"/></td></tr>
    327       </table>
    328     </td>
    329     </tr>
    330     </table>
    331     <div style="min-height: <%=(int)(scale*130)%>px;">
    332     <table width="100%" border=0 cellspacing=0 cellpadding=0 class="calendar">
    333     <tr>
    334      
    335309      <td class="day">Mon</td>
    336310      <td class="day">Tue</td>
     
    345319    {
    346320      %>
    347       <tr id="w<%=week%>">
     321      <tr id="w<%=week%>" style="max-height: 1.5em;">
    348322      <%
    349323      for (int day = 0; day < 7; ++day)
     
    366340    {
    367341      %>
    368       <table border="0" cellspacing=2 cellpadding=0 align="center" style="padding-top: 4px;">
     342      <div style="position: absolute; height: 2em; left: 0px; right: 0px; bottom: 0em; text-align: center;">
     343      <table style="height: 100%; margin:auto;">
    369344      <tr>
    370345        <td class="time">Time</td>
    371346        <td><input class="text" type="text" name="hours" title="Hours" size="2" maxlength="2"
    372           onkeypress="return Numbers.integerOnly(event)" onblur="setTime()"></td>
    373         <td width="12px">
    374           <table border="0" cellspacing="1" cellpadding="0">
     347          onkeypress="return Numbers.integerOnly(event)"></td>
     348        <td style="width: 1.5em;">
     349          <table>
    375350          <tr><td><base:icon image="mini_scroll_up.png" onclick="addToHour(1)" tooltip="Add one hour"/></td></tr>
    376351          <tr><td><base:icon image="mini_scroll_down.png" onclick="addToHour(-1)" tooltip="Subtract one hour"/></td></tr>
     
    378353        </td>
    379354        <td><input class="text" type="text" name="minutes" title="Minutes" size="2" maxlength="2"
    380           onkeypress="return Numbers.integerOnly(event)" onblur="setTime()"></td>
    381         <td width="12px">
    382           <table border="0" cellspacing="1" cellpadding="0">
     355          onkeypress="return Numbers.integerOnly(event)"></td>
     356        <td style="width: 1.5em;">
     357          <table>
    383358          <tr><td><base:icon image="mini_scroll_up.png" onclick="addToMinute(1)" tooltip="Add one minute"/></td></tr>
    384359          <tr><td><base:icon image="mini_scroll_down.png" onclick="addToMinute(-1)" tooltip="Subtract one minute"/></td></tr>
     
    386361        </td>
    387362        <td><input class="text" type="text" name="seconds" title="Seconds" size="2" maxlength="2"
    388           onkeypress="return Numbers.integerOnly(event)" onblur="setTime()"></td>
    389         <td width="12px">
    390           <table border="0" cellspacing="1" cellpadding="0">
     363          onkeypress="return Numbers.integerOnly(event)"></td>
     364        <td style="width: 1.5em;">
     365          <table>
    391366          <tr><td><base:icon image="mini_scroll_up.png" onclick="addToSecond(1)" tooltip="Add one second"/></td></tr>
    392367          <tr><td><base:icon image="mini_scroll_down.png" onclick="addToSecond(-1)" tooltip="Subtract one second"/></td></tr>
     
    395370      </tr>
    396371      </table>
     372      </div>
    397373      <%
    398374    }
     
    400376  </div>
    401377  </form>
    402   <p></p>
    403   <div id="error" class="error" style="display: none;"></div>
    404   <div id="current" style="text-align: center; font-weight: bold;"></div>
    405   <base:buttongroup>
     378 
     379 
     380  <base:buttongroup subclass="dialogbuttons">
    406381    <base:button image="today.png" onclick="setToday()" title="<%=datetime ? "Now" : "Today"%>" />
    407382    <base:button onclick="saveCurrentDate()" title="Ok" visible="<%=datetime%>"/>
  • trunk/www/common/close_popup.jsp

    r5426 r5907  
    123123</base:head>
    124124<base:body onload="<%="setClose("+millisecondsToWait+")"%>" attributes="onclick='closeIt()';" >
    125     <base:note type="info" title="<%=title%>">
    126     <%=message%>
    127     </base:note>
     125  <h1><%=title%></h1>
     126  <div class="content">
     127    <table class="fullcc"><tr><td>
     128    <b><%=message%></b>
     129    </td></tr></table>
     130  </div>
    128131</base:body>
    129132</base:page>
  • trunk/www/common/columns/configure.jsp

    r5906 r5907  
    195195    {
    196196      var selected = getVisibleColumns();
    197       Main.openPopup('save_preset.jsp?ID=<%=ID%>&item_type=<%=itemType.name()%>&subcontext=<%=subContext%>&settingName=<%=settingName%>&columns='+selected, 'SavePreset', 360, 200);
     197      Main.openPopup('save_preset.jsp?ID=<%=ID%>&item_type=<%=itemType.name()%>&subcontext=<%=subContext%>&settingName=<%=settingName%>&columns='+selected, 'SavePreset', 440, 280);
    198198    }
    199199   
     
    221221  </base:head>
    222222  <base:body onload="<%="initColumns(window.opener.Table.getColumns('"+tableId+"'))"%>">
     223    <h1>Set column order and visiblity <base:help helpid="columns.configure" /></h1>
    223224    <form name="columns" onsubmit="return false;">
    224225 
    225     <h3 class="docked">Set column order and visiblity <base:help helpid="columns.configure" /></h3>
    226     <div class="boxed" align="center">
    227     <table border=0 cellspacing=0 cellpadding=2 width="100%">
     226    <div class="content filled">
     227    <table style="width: 100%; height: 100%;">
    228228    <tr>
    229       <td style="vertical-align: middle">
    230         <br>
    231         <base:button
    232           onclick="moveSelected(document.forms['columns'].visible, false)"
    233           title="<img src='../../images/move_up.png' alt='' style='vertical-align: middle;'>"
    234           tooltip="Move up"
    235         /><p>
    236         <base:button
    237           onclick="moveSelected(document.forms['columns'].visible, true)"
    238           title="<img src='../../images/move_down.png' alt='' style='vertical-align: middle;'>"
    239           tooltip="Move down"
    240         />
    241         <br>
     229      <td style="padding: 5px;">
     230        <base:buttongroup vertical="true">
     231          <base:button
     232            onclick="moveSelected(document.forms['columns'].visible, false)"
     233            image="move_up.png"
     234            tooltip="Move up"
     235            subclass="square"
     236          />
     237          <base:button
     238            onclick="moveSelected(document.forms['columns'].visible, true)"
     239            image="move_down.png"
     240            tooltip="Move down"
     241            subclass="square"
     242          />
     243        </base:buttongroup>
    242244      </td>
    243245 
    244       <td width="50%">
     246      <td style="width: 45%;">
    245247        <b>Visible columns</b><br>
    246         <select name="visible" multiple size="14" style="width: 100%;"
     248        <select name="visible" multiple size="16" style="width: 100%;"
    247249          ondblclick="moveBetween(document.forms['columns'].visible, document.forms['columns'].hidden)">
    248250        </select>
    249251      </td>
     252      <td style="padding: 5px;">
     253        <base:buttongroup vertical="true">
     254          <base:button
     255            onclick="moveBetween(document.forms['columns'].hidden, document.forms['columns'].visible)"
     256            image="move_left.png"
     257            tooltip="Make the selected hidden column(s) visible"
     258            subclass="square"
     259          />
     260          <base:button
     261            onclick="moveBetween(document.forms['columns'].visible, document.forms['columns'].hidden)"
     262            image="move_right.png"
     263            tooltip="Make the selected visible column(s) hidden"
     264            subclass="square"
     265          />
     266        </base:buttongroup>
     267      </td>
    250268 
    251       <td style="vertical-align: middle">
    252          <br>
    253         <base:button
    254           onclick="moveBetween(document.forms['columns'].hidden, document.forms['columns'].visible)"
    255           title="<img src='../../images/move_left.png' alt='' style='vertical-align: middle;'>"
    256           tooltip="Make the selected hidden column(s) visible"
    257         /><p>
    258         <base:button
    259           onclick="moveBetween(document.forms['columns'].visible, document.forms['columns'].hidden)"
    260           title="<img src='../../images/move_right.png' alt='' style='vertical-align: middle;'>"
    261           tooltip="Make the selected visible column(s) hidden"
    262         />
    263         <br>
    264       </td>
    265  
    266       <td width="50%">
     269      <td style="width: 45%; padding-right: 5px;">
    267270        <b>Hidden columns</b><br>
    268         <select name="hidden" multiple size="14" style="width: 100%;"
     271        <select name="hidden" multiple size="16" style="width: 100%;"
    269272          ondblclick="moveBetween(document.forms['columns'].hidden, document.forms['columns'].visible)">
    270273        </select>
    271274      </td>
    272     </tr>
     275    </tr>   
    273276    <tr>
    274       <td>&nbsp;</td>
    275       <td colspan="3">
    276         <div align="right">
    277           <b>×</b> = This column cannot be hidden
    278         </div>
    279         <center>
    280         <table>
     277      <td colspan="4" >
     278        <table style="margin-left: auto; margin-right: auto;">
    281279        <tr>
    282280        <td>
    283           <b>Presets</b><br>
     281          <b>Presets</b>
    284282          <select name="presets" onChange="updateColumns()">
    285283            <option value="">-- predefined --
     
    319317          {
    320318            %>
    321             <td><br><base:button onclick="savePresetAs();" title="Save as&hellip;" /></td>
     319            <td><base:button onclick="savePresetAs();" title="Save as&hellip;" /></td>
    322320            <%
    323321          }
     
    325323        </tr>
    326324        </table>
    327         </center>
     325
     326        <div class="padded" style="text-align: right;">
     327          <b>×</b> = This column cannot be hidden
     328        </div>
     329
    328330      </td>
    329331    </tr>
     
    331333    </div>
    332334    </form>
    333     <table align="center">
    334     <tr>
    335       <td width="50%"><base:button onclick="saveColumns();" title="Ok" /></td>
    336       <td width="50%"><base:button onclick="window.close();" title="Cancel" /></td>
    337     </tr>
    338     </table>
     335    <base:buttongroup subclass="dialogbuttons">
     336      <base:button onclick="saveColumns();" title="Ok" />
     337      <base:button onclick="window.close();" title="Cancel" />
     338    </base:buttongroup>
    339339  </base:body>
    340340  </base:page>
    341 
  • trunk/www/common/columns/save_preset.jsp

    r5426 r5907  
    8686</base:head>
    8787<base:body onload="init()">
    88   <p>
     88  <h1>Save preset <base:help helpid="columns.configure.saveas" /></h1>
     89
    8990  <form name="preset" action="submit_preset.jsp" method="post" onsubmit="return validateForm();">
    9091  <input type="hidden" name="ID" value="<%=ID%>">
     
    9596  <input type="hidden" name="settingName" value="<%=settingName%>">
    9697
    97   <h3 class="docked">Save preset <base:help helpid="columns.configure.saveas" /></h3>
    98   <div class="boxed" align="center">
    99     <br>
    100     <table class="form" cellspacing=0>
     98 
     99  <div class="content filled">
     100    <table class="fullform input100 smaller">
    101101    <tr>
    102       <td class="prompt">Name</td>
    103       <td><input class="text required" type="text" name="name" value="" size="40" maxlength="40"></td>
     102      <th>Name</th>
     103      <td><input class="text required" type="text" name="name" value="" maxlength="40"></td>
    104104    </tr>
    105     <tr>
    106       <td colspan="2">
    107       <div align=right>&nbsp;<i><base:icon image="required.gif" /> = required information</i></div>
     105    <tr class="dynamic">
     106      <th></th>
     107      <td>
     108        <div align=right>&nbsp;<i><base:icon image="required.gif" /> = required information</i></div>
    108109      </td>
    109110    </tr>
    110111    </table>
    111     <p>
    112112  </div>
     113 
     114 
    113115  </form>
    114116
    115   <table align="center">
    116   <tr>
    117     <td width="50%"><base:button onclick="savePreset();" title="Ok" /></td>
    118     <td width="50%"><base:button onclick="window.close();" title="Cancel" /></td>
    119   </tr>
    120   </table>
     117  <base:buttongroup subclass="dialogbuttons">
     118    <base:button onclick="savePreset();" title="Ok" />
     119    <base:button onclick="window.close();" title="Cancel" />
     120  </base:buttongroup>
    121121
    122122</base:body>
  • trunk/www/common/context/manage.jsp

    r5426 r5907  
    8383</base:head>
    8484<base:body>
    85   <p>
    86 
     85  <h1>Manage presets for <%=itemType%> <%="".equals(subContext) ? "" : "(" + subContext + ")" %>
     86      <base:help helpid="contexts.manage" /></h1>
     87 
     88  <div class="content">
    8789  <%
    8890  if (contextNames.size() == 0)
    8991  {
    9092    %>
    91     <base:note type="info" title="No presets found" >
    92     You have not saved any presets for
    93     <%=itemType%> <%="".equals(subContext) ? "" : "(" + subContext + ")" %>
    94     </base:note>
     93    <table class="fullcc"><tr><td>
     94      <b>You have not saved any presets for
     95      <%=itemType%> <%="".equals(subContext) ? "" : "(" + subContext + ")" %>
     96      </b>
     97    </td></tr></table>
    9598    <%
    9699  }
     
    98101  {
    99102    %>
    100     <h3 class="docked">Manage presets for <%=itemType%> <%="".equals(subContext) ? "" : "(" + subContext + ")" %>
    101       <base:help helpid="contexts.manage" /></h3>
    102103      <tbl:table
    103104        id="contexts"
     
    196197    }
    197198    %>
    198 
    199   <table align="center">
    200   <tr>
    201     <td><base:button onclick="window.close();" title="Close" /></td>
    202   </tr>
    203   </table>
     199    </div>
     200  <base:buttongroup subclass="dialogbuttons">
     201    <base:button onclick="window.close();" title="Close" />
     202  </base:buttongroup>
    204203
    205204</base:body>
  • trunk/www/common/context/saveas.jsp

    r5812 r5907  
    7676</base:head>
    7777<base:body onload="init()">
    78   <p>
     78  <h1>Save preset as... <base:help helpid="contexts.saveas" /></h1>
    7979  <form name="preset" action="index.jsp" method="post" onsubmit="return validateForm();">
    8080  <input type=hidden name="ID" value="<%=ID%>">
     
    8383  <input type=hidden name="subcontext" value="<%=subContext%>">
    8484
    85   <h3 class="docked">Save preset as... <base:help helpid="contexts.saveas" /></h3>
    86   <div class="boxed" align="center">
    87     <br>
    88     <table class="form" cellspacing=0>
     85  <div class="content bottomborder">
     86    <table class="fullform input100 smaller">
    8987    <tr>
    90       <td class="prompt">For item</td>
     88      <th>For item</th>
    9189      <td><%=itemType%><%="".equals(subContext) ? "" : " ("+subContext+")"%></td>
    9290    </tr>
    9391    <tr>
    94       <td class="prompt">Name</td>
     92      <th>Name</th>
    9593      <td><input class="text required" type="text" name="name" value="<%=HTML.encodeTags(name)%>" size="40" maxlength="40"></td>
    9694    </tr>
    9795    <tr>
    98       <td class="prompt"><label for="overwrite">Overwrite existing</label></td>
     96      <th><label for="overwrite">Overwrite existing</label></th>
    9997      <td><input type="checkbox" name="overwrite" id="overwrite" value="1" <%=name == null ? "" : "checked"%>></td>
    10098    </tr>
     
    104102      %>
    105103      <tr>
    106         <td class="prompt"><label for="public">Public</label></td>
     104        <th><label for="public">Public</label></th>
    107105        <td><input type="checkbox" name="public" id="public" value="1"></td>
    108106      </tr>
     
    110108    }
    111109    %>
    112     <tr>
    113       <td colspan="2">
    114       <div align=right>&nbsp;<i><base:icon image="required.gif" /> = required information</i></div>
    115       </td>
     110    <tr class="dynamic">
     111      <th></th>
     112      <td><div align=right>&nbsp;<i><base:icon image="required.gif" /> = required information</i></div></td>
    116113    </tr>
    117114    </table>
    118     <p>
     115   
    119116  </div>
    120117  </form>
    121118
    122   <table align="center">
    123   <tr>
    124     <td width="50%"><base:button onclick="savePreset();" title="Ok" /></td>
    125     <td width="50%"><base:button onclick="window.close();" title="Cancel" /></td>
    126   </tr>
    127   </table>
     119  <base:buttongroup subclass="dialogbuttons">
     120    <base:button onclick="savePreset();" title="Ok" />
     121    <base:button onclick="window.close();" title="Cancel" />
     122  </base:buttongroup>
    128123
    129124</base:body>
  • trunk/www/common/help/view_help.jsp

    r5906 r5907  
    127127  </base:head>
    128128  <base:body>
    129    
    130     <div style="position: absolute; top: 10px; left: 10px; right: 10px; bottom: 80px;">
    131     <h3 class="docked"><%=title%></h3>
    132     <div class="boxed" style="height: 100%; xx: <%=(int)(scale*440)%>px; overflow: auto;">
     129    <h1><%=title%></h1>
     130    <div class="content bottomborder">
    133131    <%
    134132    if (help == null || description == null)
    135133    {
    136134      %>
    137       <div class="error">
    138       <br>
    139       The help text for the section <b><%=externalId%></b> is not
    140       written yet.
    141       <br><br>
    142       </div>
     135      <table class="fullcc" style="border-bottom: 0px;"><tr><td>
     136      <b>The help text for the section <b><%=externalId%></b> is not
     137      written yet.</b>
     138      </td></tr></table>
    143139      <%
    144140    }
     
    153149    %>
    154150    </div>
    155     </div>
    156151
    157     <base:buttongroup clazz="fixedatbottom" style="border-top: 0px;">
     152    <base:buttongroup subclass="dialogbuttons" >
    158153      <base:button image="edit.gif" title="Edit&hellip;"
    159154        onclick="editHelpText()" visible="<%=writePermission && description != null%>"
  • trunk/www/common/ownership/ownership.jsp

    r5426 r5907  
    115115  </base:head>
    116116  <base:body onload="">
     117    <h1><%=headLine%> <base:help helpid="ownership.configure" /></h1>
    117118    <form name="ownership" action="submit_ownership.jsp" onsubmit="return false;">
    118119      <input type="hidden" name="ID" value="<%=ID%>">
     
    120121      <input type="hidden" name="item_type" value="<%=itemType.name()%>">
    121122      <input type="hidden" name="subcontext" value="<%=subContext%>">
    122       <h3 class="docked"><%=headLine%> <base:help helpid="ownership.configure" /></h3>
    123       <div class="boxed" >
    124         <table class="form" cellspacing=0>
     123     
     124      <div class="content" >
     125        <table class="fullform input100 bottomborder smaller">
    125126          <tr>
    126             <td class="prompt">New owner</td>
     127            <th>New owner</th>
    127128            <td>
    128129              <base:select
     
    137138            </td>
    138139          </tr>
     140          <tr class="dynamic">
     141            <th></th>
     142            <td></td>
     143          </tr>
    139144        </table>
    140145      </div>     
    141146    </form>
    142     <table align="center">
    143     <tr>
    144       <td width="50%"><base:button onclick="saveSettings();" title="Ok" /></td>
    145       <td width="50%"><base:button onclick="window.close();" title="Cancel" /></td>
    146     </tr>
    147     </table>
     147   
     148    <base:buttongroup subclass="dialogbuttons">
     149      <base:button onclick="saveSettings();" title="Ok" />
     150      <base:button onclick="window.close();" title="Cancel" />
     151    </base:buttongroup>
    148152  </base:body>
    149153  </base:page>
  • trunk/www/common/share/share.jsp

    r5905 r5907  
    399399  </base:head>
    400400  <base:body onload="<%="initList()"%>">
     401    <h1><%=headLine%> <base:help helpid="share.setpermissions" /></h1>
    401402    <form name="share" action="submit_share.jsp" onsubmit="return false;">
    402403    <input type="hidden" name="ID" value="<%=ID%>">
     
    405406    <input type="hidden" name="subcontext" value="<%=subContext%>">
    406407 
    407     <h3 class="docked"><%=headLine%> <base:help helpid="share.setpermissions" /></h3>
    408     <div class="boxed" >
    409     <table border=0 cellspacing=0 cellpadding=2 width="100%">
    410     <tr >
    411       <td rowspan="2">
    412         <b>Members</b><br>
    413         <select name="members" size="15" multiple onChange="membersOnChange()" style="width: 22em;" <%=!writePermission ? "disabled readonly class=\"disabled\"" : ""%>>
     408    <div class="content filled">
     409    <table style="width: 100%;">
     410    <tr>
     411      <td class="padded"><b>Members</b></td>
     412      <td class="padded"><b>Permissions</b></td>
     413      <td></td>
     414    </tr>
     415    <tr style="vertical-align: top;">
     416      <td rowspan="2" style="padding-left: 5px; padding-right: 5px;">
     417        <select name="members" size="16" multiple onChange="membersOnChange()" style="width: 100%;"
     418          <%=!writePermission ? "disabled" : ""%>>
    414419        </select>
    415420        <input type="hidden" name="modifiedUsers" value="">
     
    418423        <input type="hidden" name="permissionTemplates" value="">
    419424      </td>
    420  
    421       <td><br>
    422         <b>Permissions</b><br>
     425      <td>
    423426        <input type="checkbox" id="read" checked name="read" onClick="permissionsOnClick('read')"><label for="read">Read</label><br>
    424427        <input type="checkbox" id="use" checked name="use" onClick="permissionsOnClick('use')"><label for="use">Use</label><br>
     
    428431        <input type="checkbox" id="setPermission" name="set_permission" onClick="permissionsOnClick('set_permission')"><label for="setPermission">Set permission</label><br>
    429432      </td>
    430      
    431433      <td>
    432         <br>
    433         <table width="150">
    434         <tr><td><base:button
    435           clazz="leftaligned buttonclass"
    436           onclick="addUsersOnClick()"
    437           title="Add&nbsp;users&hellip;"
    438           tooltip="Add users"
    439           disabled="<%=!writePermission %>"
    440           /></td></tr>
    441         <tr><td><base:button
    442           clazz="leftaligned buttonclass"
    443           onclick="addGroupsOnClick()"
    444           title="Add&nbsp;groups&hellip;" 
    445           tooltip="Add groups"
    446           disabled="<%=!writePermission %>"
    447         /></td></tr>
    448         <tr><td><base:button
    449           clazz="leftaligned buttonclass"
    450           onclick="addProjectsOnClick()"
    451           title="Add&nbsp;projects&hellip;"
    452           tooltip="Add projects"
    453           disabled="<%=!writePermission %>"
    454           /></td></tr>
    455         <tr><td><base:button
    456           clazz="leftaligned buttonclass"
    457           onclick="addPermissionTemplateOnClick()"
    458           title="Templates&hellip;"
    459           tooltip="Add permission templates"
    460           image="add.png"
    461           disabled="<%=!writePermission %>"
    462           /></td></tr>
    463         <tr><td><base:button
    464           clazz="leftaligned buttonclass"
    465           onclick="removeOnClick()"
    466           title="Remove"
    467           tooltip="Remove the selected items from this group"
    468           disabled="<%=!writePermission%>"
    469         /></td></tr>
    470         </table>
     434        <base:buttongroup vertical="true" style="width: 12em;">
     435          <base:button
     436            subclass="leftaligned"
     437            onclick="addUsersOnClick()"
     438            title="Add&nbsp;users&hellip;"
     439            tooltip="Add users"
     440            disabled="<%=!writePermission %>"
     441            />
     442          <base:button
     443            subclass="leftaligned"
     444            onclick="addGroupsOnClick()"
     445            title="Add&nbsp;groups&hellip;" 
     446            tooltip="Add groups"
     447            disabled="<%=!writePermission %>"
     448          />
     449          <base:button
     450            subclass="leftaligned"
     451            onclick="addProjectsOnClick()"
     452            title="Add&nbsp;projects&hellip;"
     453            tooltip="Add projects"
     454            disabled="<%=!writePermission %>"
     455            />
     456          <base:button
     457            subclass="leftaligned"
     458            onclick="addPermissionTemplateOnClick()"
     459            title="Templates&hellip;"
     460            tooltip="Add permission templates"
     461            image="add.png"
     462            disabled="<%=!writePermission %>"
     463            />
     464          <base:button
     465            subclass="leftaligned"
     466            onclick="removeOnClick()"
     467            title="Remove"
     468            tooltip="Remove the selected items from this group"
     469            disabled="<%=!writePermission%>"
     470          />
     471        </base:buttongroup>
    471472      </td>
    472473    </tr>
     
    477478      {
    478479        %>
    479         <input type="checkbox" name="recursive" value="1">
    480         Apply permissions to all subdirectories and their files
     480        <input type="checkbox" name="recursive" value="1" id="recursive">
     481        <label for="recursive">
     482        Apply permissions to all subdirectories and their files</label>
    481483        <%
    482484      }
     
    485487    </tr>
    486488    </table>
     489
     490      <div class="error" id="share_disabled" style="display:none;">
     491        You don't have permission to change permissions for the
     492        Everyone group. Please contact the server administrator
     493        if you think you should have that permission.
     494      </div>
     495   
    487496    </div>
    488497    </form>
    489     <table align="center">
    490     <tr>
    491       <td width="50%"><base:button onclick="saveSettings();" title="Ok" /></td>
    492       <td width="50%"><base:button onclick="window.close();" title="Cancel" /></td>
    493     </tr>
    494     </table>
    495 
    496       <div class="error" id="share_disabled" style="display:none;">
    497         You don't have permission to change permissions for the
    498         Everyone group. Please contact you server administrator
    499         if you think you should have that permission.
    500       </div>
     498   
     499    <base:buttongroup subclass="dialogbuttons">
     500      <base:button onclick="saveSettings();" title="Ok" />
     501      <base:button onclick="window.close();" title="Cancel" />
     502    </base:buttongroup>
     503
    501504
    502505  </base:body>
  • trunk/www/impersonate.jsp

    r5905 r5907  
    9595 
    9696  <base:body onload="init();">
     97    <h1>Impersonate user <base:help helpid="impersonateuser" /></h1>
    9798    <form name="login" action="login.jsp" method="post" onsubmit="doLogin();">
    9899    <input type="hidden" name="cmd" value="Impersonate">
     
    101102    <input type="hidden" name="redirect" value="">
    102103 
    103     <h3 class="docked">Impersonate user <base:help helpid="impersonateuser" /></h3>
    104     <div class="boxedbottom">
     104    <div class="content">
    105105      <%
    106106      if (error != null)
     
    111111      }
    112112      %>
    113       <table class="form" border="0" cellspacing="1" cellpadding="2">
     113      <table class="fullform input100 bottomborder smaller">
    114114      <tr>
    115         <td class="prompt">User</td>
    116         <td>
     115        <th>User</th>
     116        <td colspan="2">
    117117          <base:select
    118118            id="user_id"
     
    124124            onselect="selectUserOnClick()"
    125125          />
     126        </td>
    126127       
    127         </td>
    128128      </tr>
    129129      <tr>
    130         <td class="prompt"><label for="remainOnPage">Remain on page</label></td>
     130        <th><label for="remainOnPage">Remain on page</label></th>
    131131        <td>
    132132          <input type="checkbox" name="remainOnPage" id="remainOnPage" checked value="1">
    133133        </td>
     134        <td></td>
    134135      </tr>
    135       <tr >
    136         <td class="prompt">Comment</td>
    137         <td nowrap>
    138           <textarea class="text" rows="4" cols="40" name="comment"
    139             ></textarea>
     136      <tr class="dynamic">
     137        <th>Comment</th>
     138        <td>
     139          <textarea class="text" rows="6" name="comment"></textarea>
     140        </td>
     141        <td>
    140142          <a href="javascript:Main.zoom('Comment', 'login', 'comment')"
    141143            title="Edit in larger window"><base:icon image="zoom.gif" /></a>
    142144        </td>
    143145      </tr>
    144      
    145146      </table>
    146147    </div>
    147    
    148     <br>
    149     <table align="center">
    150     <tr>
    151       <td width="50%"><base:button image="login.png" onclick="doLogin();" title="Impersonate" /></td>
    152       <td width="50%"><base:button onclick="window.close()" title="Cancel" /></td>
    153     </tr>
    154     </table>
    155148    </form>
    156149   
     150    <base:buttongroup subclass="dialogbuttons">
     151      <base:button image="login.png" onclick="doLogin();" title="Impersonate" />
     152      <base:button onclick="window.close()" title="Cancel" />
     153    </base:buttongroup>
    157154
    158155  </base:body>
  • trunk/www/include/menu.jsp

    r5905 r5907  
    627627      <m:menuitem
    628628        title="<%=menu.getString("resetlistsettings.title") + "…"%>"
    629         onclick="<%="Main.openPopup('"+root+"my_base/user/reset_filters.jsp?ID="+ID+"', 'ResetFilter', 400, 270);"%>"
     629        onclick="<%="Main.openPopup('"+root+"my_base/user/reset_filters.jsp?ID="+ID+"', 'ResetFilter', 440, 280);"%>"
    630630        tooltip="<%=menu.getString("resetlistsettings.tooltip")%>"
    631631      />
     
    11031103      <m:menuitem
    11041104        title="<%=menu.getString("about.title") + "…"%>"
    1105         onclick="<%="Main.openPopup('"+root+"info/about.jsp?ID="+ID+"&page=about', 'About', 500, 350)"%>"
     1105        onclick="<%="Main.openPopup('"+root+"info/about.jsp?ID="+ID+"&page=about', 'About', 600, 400)"%>"
    11061106      />
    11071107
    11081108      <m:menuitem
    11091109        title="<%=menu.getString("license.title") + "…"%>"
    1110         onclick="<%="Main.openPopup('"+root+"info/about.jsp?ID="+ID+"&page=license', 'About', 500, 350)"%>"
     1110        onclick="<%="Main.openPopup('"+root+"info/about.jsp?ID="+ID+"&page=license', 'About', 600, 400)"%>"
    11111111      />
    11121112      <m:menuitem
  • trunk/www/include/scripts/main.js

    r5905 r5907  
    14361436    url += '&ID='+getSessionId();
    14371437    if (callback) url += '&callback='+callback;
    1438     Main.openPopup(url, title.replace(/[^\w]/, ''), 440, 340);
     1438    Main.openPopup(url, title.replace(/[^\w]/, ''), 440, 280);
    14391439  }
    14401440
     
    14551455    url += '&ID='+getSessionId();
    14561456    if (callback) url += '&callback='+callback;
    1457     Main.openPopup(url, title.replace(/[^\w]/, ''), 440, 340);
     1457    Main.openPopup(url, title.replace(/[^\w]/, ''), 440, 280);
    14581458  }
    14591459
  • trunk/www/include/scripts/table.js

    r5714 r5907  
    186186    if (subContext) url += '&subcontext='+subContext;
    187187    if (settingName) url += '&settingName='+settingName;
    188     Main.openPopup(url, 'ConfigureColumns', 800, 400);
     188    Main.openPopup(url, 'ConfigureColumns', 600, 400);
    189189  }
    190190
     
    254254    frm.cmd.value = cmd ? cmd : "SetOwner";
    255255    frm.target = 'SetOwner'+tableId;
    256     Main.openPopup('', 'SetOwner'+tableId, 450, 150);
     256    Main.openPopup('', 'SetOwner'+tableId, 440, 280);
    257257    frm.submit();
    258258    frm.target = window.name;
     
    299299  {
    300300    var url = getRoot()+'common/context/saveas.jsp?ID='+ID+'&item_type='+itemType+'&subcontext='+subContext;
    301     Main.openPopup(url, 'SaveCurrentContext', 450, 280);
     301    Main.openPopup(url, 'SaveCurrentContext', 400, 270);
    302302  }
    303303
     
    305305  {
    306306    var url = getRoot()+'common/context/manage.jsp?ID='+ID+'&item_type='+itemType+'&subcontext='+subContext;
    307     Main.openPopup(url, 'ManageContexts', 450, 320);
     307    Main.openPopup(url, 'ManageContexts', 400, 270);
    308308  }
    309309
  • trunk/www/include/styles/calendar.css

    r5811 r5907  
    2828*/
    2929
    30 .calendar {
    31   border-top: 1px solid #999999;
    32   border-left: 1px solid #999999;
     30.calendar
     31{
    3332  width: 100%;
    34   background: #E0E0E0;
     33  height: 100%;
    3534}
    3635
    37 .day, .week {
    38   border-top: 1px solid #FFFFFF;
    39   border-left: 1px solid #FFFFFF;
    40   border-bottom: 1px solid #999999;
    41   border-right: 1px solid #999999;
     36.calendar > tr
     37{
     38  height: 20%;
     39}
     40
     41.day
     42{
     43  border-top: 1px solid #A0A0A0;
     44  xborder-left: 1px solid #E8E8E8;
     45  border-bottom: 1px solid #A0A0A0;
     46  xborder-right: 1px solid #A0A0A0;
     47  xborder: 1px solid #A0A0A0;
    4248  font-weight: bold;
    4349  text-align: center;
    4450}
    4551
    46 .date {
    47   border-top: 1px solid #FFFFFF;
    48   border-left: 1px solid #FFFFFF;
    49   border-bottom: 1px solid #999999;
    50   border-right: 1px solid #999999;
     52.date
     53{
     54  xborder-top: 1px solid #E8E8E8;
     55  xborder-left: 1px solid #E8E8E8;
     56  border-bottom: 1px dotted #A0A0A0;
     57  xborder-right: 1px solid #A0A0A0;
     58  xborder: 1px solid #A0A0A0;
    5159  text-align: center;
     60  padding: 2px 2px 1px 2px;
    5261}
     62
    5363
    5464.time {
     
    5767}
    5868
    59 .today, .current {
     69.today, .current
     70{
    6071  font-weight: bold;
    61   background: #F0F0F0;
     72  background: #FFFFFF !important;
     73  border: 1px solid #224488;
     74  border-radius: 3px;
     75  padding: 1px;
    6276}
    6377
    64 .validdate:hover {
    65   background: #F0F0F0;
     78.validdate:hover
     79{
    6680  cursor: pointer;
     81  border: 2px solid #224488;
     82  border-radius: 3px;
     83  padding: 0px;
    6784}
    6885
    69 .sunday {
     86.sunday
     87{
    7088  color: #CC0000;
    7189}
  • trunk/www/include/styles/help.css

    r5799 r5907  
    2626  @author Martin
    2727  @version 2.2
    28 */
     28*/
     29
     30.helptext
     31{
     32  padding: 5px;
     33}
     34
    2935/*Button symbol*/
    30 btn {
    31       font-weight: bold;
     36btn
     37{
     38  font-weight: bold;
     39  border: 1px solid #A8A8A8;
     40  border-radius: 4px;
     41  padding: 2px;
     42  background: #E8E8E8;
     43  line-height: 1.75em;
     44  white-space: nowrap;
    3245}
    3346
    3447/*User inputs*/
    35 lbl {
    36       font-weight: bold;
    37 }
    38 
    39 /*Required value*/
    40 req {
    41       font-weight: bold;
    42       background: #D0F0FF;
    43 }
    44 
    45 /*Important information*/
    46 imp {
    47       text-decoration: underline;
    48       color: red;
     48lbl
     49{
     50  font-weight: bold;
    4951}
    5052
    5153/*Ordered list*/
    52 .helptext ol {
    53       list-style: decimal;
     54.helptext ol
     55{
     56  list-style: decimal;
    5457}
    5558
    5659/*Unordered list*/
    57 .helptext ul {
    58       list-style: disc;
     60.helptext ul
     61{
     62  list-style: disc;
    5963}
    6064
    61 /*Menu*/
    62 mnu {
    63       font-weight: bold;
     65.helptext ul, .helptext ol
     66{
     67  margin-left: 1em;
     68  padding-left: 1em;     
    6469}
    6570
     71.helptext li
     72{
     73  margin-left: 0px;
     74  padding-left: 0px;
     75}
     76
     77/* Definition list */
     78.variablelist
     79{}
     80
     81.variablelist p, .orderedlist p, .itemizedlist p
     82{
     83  margin-top: 0px;
     84}
     85
     86.variablelist dd
     87{
     88  margin-left: 2em;
     89}
     90
     91
     92/*Menu gui elements */
     93mnu, .guimenu, .guisubmenu, .guimenuitem
     94{
     95  font-weight: bold;
     96}
     97
     98/* Notes, warnings, etc. */
     99.helptext .note, .helptext .tip, .helptext .important, .helptext .warning, .helptext .caution
     100{
     101  margin: 1em;
     102  padding: 0.5em;
     103  border: 1px solid #A0A0A0;
     104  background-color: #F8F8E0;
     105  border-radius: 8px;
     106   -moz-border-radius: 8px;
     107   box-shadow: 2px 2px 4px #A0A0A0;
     108   -moz-box-shadow: 2px 2px 4px #A0A0A0;
     109}
     110.helptext .title
     111{
     112  color: #000000;
     113  background: transparent;
     114  font-weight: bold;
     115  margin: 0em;
     116  padding: 0px;
     117  border: 0px;   
     118}
     119
     120
     121/* Warning message have a red title */
     122.helptext .warning .title
     123{
     124  color: #cc0000;
     125}
     126
     127
    66128/*Toolbar for editing the helptext*/
    67 .editbar {
     129.editbar
     130{
    68131      border-top: thin solid #999999;
    69132      border-left: thin solid #999999;
     
    74137}
    75138
    76 .helptext ul, .helptext ol {
    77   margin-left: 1em;
    78   padding-left: 1em;     
    79 }
    80139
    81 .helptext li {
    82   margin-left: 0px;
    83   padding-left: 0px;
    84 }
    85 
    86 /*Columnheader*/
    87 .helptext th {
    88       background: #E0E0E0;
    89 }
    90 
    91 .guimenu,.guisubmenu,.guimenuitem,.guibutton,.guilabel,.interface {
    92       font-weight: bold;
    93 }
    94 
    95 .helptext .note, .helptext .tip, .helptext .important, .helptext .warning, .helptext .caution {
    96   margin: 1em;
    97   padding: 0.5em;
    98   border: 1px solid gray;
    99   background-color: #f8f8e0;
    100   border-radius: 8px;
    101    -moz-border-radius: 8px;
    102    box-shadow: 2px 2px 4px #cccccc;
    103    -moz-box-shadow: 2px 2px 4px #999999;
    104  
    105  
    106 }
    107 
    108 .helptext .warning .title {
    109   color: #cc0000;
    110 }
    111 
    112 .helptext h3 {
    113   color: #000000;
    114   background: transparent;
    115   font-weight: bold;
    116   margin: 0em;
    117   padding: 0px;
    118   border: 0px;   
    119 }
    120 
    121 .variablelist {
    122 }
    123 
    124 .variablelist p, .orderedlist p, .itemizedlist p {
    125   margin-top: 0px;
    126 }
    127 
    128 .variablelist dd {
    129   margin-left: 2em;
    130 }
    131 
  • trunk/www/include/styles/main.css

    r5906 r5907  
    140140}
    141141
     142.basicbutton.leftaligned > div > table
     143{
     144  margin-left: 0px;
     145}
    142146
    143147/* A disabled button should be more gray */
     
    156160}
    157161
     162.filled .basicbutton
     163{
     164  background: #F8F8F8;
     165}
     166
    158167img.help
    159168{
     
    174183}
    175184
    176 /* Regular text-field controls */
    177 input[type="text"], input[type="password"], textarea
     185/* Regular text-field controls + selection list */
     186input[type="text"], input[type="password"], textarea, select
    178187{
    179188  font-size:  1em;
     
    181190  border: 1px solid #A0A0A0;
    182191  border-radius: 3px;
    183   x-moz-border-radius: 2px;
    184192  background: #FFFFFF;
    185193}
    186194
    187195/* Make a blue-ish border when mouse is over the field */
    188 input[type="text"]:hover, input[type="password"]:hover, textarea:hover
     196input[type="text"]:hover, input[type="password"]:hover, textarea:hover, select
    189197{
    190198  border: 1px solid #2288AA;
     
    192200
    193201/* Make a bigger blue-ish border when the field is active */
    194 input[type="text"]:focus, input[type="password"]:focus, textarea:focus
     202input[type="text"]:focus, input[type="password"]:focus, textarea:focus, select:focus
    195203{
    196204  margin: 0px;
     
    199207}
    200208
     209select:focus
     210{
     211  /* Need to keep the margin for select fields to avoid movement */
     212  margin-left: 1px;
     213}
     214
    201215/* Input fields should be "close to" 100% wide,  need to use lower value due to padding */
    202216.input100 input[type="text"], .input100 input[type="password"], .input100 textarea
     
    212226
    213227/* Disabled input fields are grayed out and inactive */
    214 input:disabled, textarea:disabled
     228input:disabled, textarea:disabled, select:disabled
    215229{
    216230  background: #F8F8F8;
     
    221235}
    222236
     237/* Fixed size selection list */
     238.selectionlist select, select.selectionlist
     239{
     240  width: 18em;
     241  margin-right: 5px;
     242}
     243
     244.input100 .selectionlist > table
     245{
     246  width: 98%;
     247}
     248
     249.input100 .selectionlist > table > tbody > tr > td:first-child
     250{
     251  width: 98%;
     252  padding-right: 5px;
     253}
     254
     255.input100 select
     256{
     257  width:  100%;
     258}
     259
    223260/*
    224261  Generic commonly used styles
     
    383420}
    384421
    385 .selectionlist select, select.selectionlist {
    386   width: 20em;
    387 }
    388422
    389423.selectoptionheader, .recentheader {
  • trunk/www/include/styles/popup.css

    r5906 r5907  
    8282}
    8383
     84
    8485/* fullcc is used for 100% width+height content that is centered vertically+horizontally */
    8586.popup .content table.fullcc
     
    9596}
    9697
    97 table.fullcc > tr
    98 {
    99   height: 100%;
    100 }
    101 
    102 table.fullcc > tr > td
     98table.fullcc > tbody > tr
     99{
     100  height: 100%;
     101}
     102
     103table.fullcc > tbody > tr > td
    103104{
    104105  height: 100%;
  • trunk/www/info/about.jsp

    r5441 r5907  
    6868<base:head scripts="tabcontrol.js" styles="tabcontrol.css" />
    6969<base:body>
    70 
    71   <h3 class="docked">BASE - BioArray Software Environment</h3>
    72   <t:tabcontrol active="<%=activePage%>" id="about" contentstyle="<%="height: "+(int)(scale*240)+"px;"%>" position="bottom">
     70  <h1>BASE - BioArray Software Environment</h1>
     71 
     72  <t:tabcontrol subclass="content dialogtabcontrol"
     73    active="<%=activePage%>" id="about" position="bottom">
    7374  <t:tab id="about" title="About">
     75    <div class="padded">
    7476    <%=Values.getString(aboutServer, "")%>
    7577    <p>
     
    7880    <b>Version:</b> <%=Application.getVersionString()%><br>
    7981    <br>
    80     <font size="-1">
     82    <div style="font-size: 85%;">
    8183      &copy; 2005, 2006, 2007, 2008, 2009, 2010 The BASE team <br/> See
    8284      <a href=http://base.thep.lu.se/browser/trunk/credits.txt>BASE
     
    9395      <a target="_new" href="http://www.cancerfonden.se/">Swedish Cancer
    9496      Society</a>. </p>
    95     </font>
     97    </div>
     98    </div>
    9699  </t:tab>
    97100 
    98101  <t:tab id="config" title="Configuration">
    99102 
    100   <table border="0" cellpadding="0" cellspacing="0" class="form">
    101   <tr>
    102     <td class="prompt">Version</td>
     103  <table class="fullform">
     104  <tr>
     105    <th>Version</th>
    103106    <td class="info"><%=Application.getVersionString()%></td>
    104107  </tr>
    105108  <tr>
    106     <td class="prompt">Web server</td>
     109    <th>Web server</th>
    107110    <td class="info"><%=application.getServerInfo()%></td>
    108111  </tr>
    109112  <tr>
    110     <td class="prompt">Database Server</td>
     113    <th>Database Server</th>
    111114    <td class="info"><%=Application.getDatabaseVersionString()%></td>
    112115  </tr>
    113116  <tr>
    114     <td class="prompt">Database Dialect</td>
     117    <th>Database Dialect</th>
    115118    <td class="info"><%=Config.getString("db.dialect")%></td>
    116119  </tr>
    117120  <tr>
    118     <td class="prompt">JDBC Driver</td>
     121    <th>JDBC Driver</th>
    119122    <td class="info"><%=jdbcDriver%> <%=driverVersion%></td>
    120123  </tr>
    121124  <tr>
    122     <td class="prompt">Java runtime</td>
     125    <th>Java runtime</th>
    123126    <td class="info"><%=properties.getProperty("java.runtime.name")%>
    124127      (<%=properties.getProperty("java.runtime.version")%>),
     
    126129  </tr>
    127130  <tr>
    128     <td class="prompt">Operating system</td>
     131    <th>Operating system</th>
    129132    <td class="info"><%=properties.getProperty("os.name")%>
    130133      <%=properties.getProperty("os.arch")%>
     
    133136  </tr>
    134137  <tr>
    135     <td class="prompt">Memory</td>
     138    <th>Memory</th>
    136139    <td class="info">Total: <%=Values.formatBytes(runtime.totalMemory())%><br>
    137140      Free: <%=Values.formatBytes(runtime.freeMemory()) %><br>
    138141      Max: <%=Values.formatBytes(runtime.maxMemory()) %></td>
     142  </tr>
     143  <tr class="dynamic">
     144    <th></th>
     145    <td></td>
    139146  </tr>
    140147  </table>
     
    142149 
    143150  <t:tab id="license" title="License">
    144 
     151    <div style="background: #FFFFFF; padding: 5px;">
    145152<h3 style="text-align: center;">GNU GENERAL PUBLIC LICENSE</h3>
    146153
     
    816823
    817824<p>END OF TERMS AND CONDITIONS</p>
    818 
     825  </div>
    819826  </t:tab>
    820827  <t:tab id="3rdparty" title="3rd-party software">
     828  <div class="padded">
    821829  BASE is using other software/material developed by:
    822   <p>
    823   <table border="0" cellpadding="0" cellspacing="0">
    824   <tr>
    825     <td><b>The Hibernate team</b>&nbsp;</td>
     830  </div>
     831  <div style="position: absolute; top: 2em; bottom: 0em; left: 0em; right: 0em;">
     832  <table class="fullform" style="border-top: 1px solid #A0A0A0;">
     833  <tr>
     834    <th>The Hibernate team</th>
    826835    <td><a href="http://www.hibernate.org/" target="_new">http://www.hibernate.org/</a></td>
    827836  </tr>
    828837  <tr>
    829     <td><b>Apache Software Foundation</b>&nbsp;</td>
     838    <th>Apache Software Foundation</th>
    830839    <td><a href="http://www.apache.org/" target="_new">http://www.apache.org/</a></td>
    831840  </tr>
    832841  <tr>
    833     <td><b>Sun Microsystems</b>&nbsp;</td>
     842    <th>Sun Microsystems</th>
    834843    <td><a href="http://www.sun.com/" target="_new">http://www.sun.com/</a></td>
    835844  </tr>
    836845  <tr>
    837     <td><b>XDoclet team</b>&nbsp;</td>
     846    <th>XDoclet team</th>
    838847    <td><a href="http://xdoclet.sourceforge.net/xdoclet/" target="_new">http://xdoclet.sourceforge.net/xdoclet/</a></td>
    839848  </tr>
    840849  <tr>
    841     <td><b>MySQL</b>&nbsp;</td>
     850    <th>MySQL</th>
    842851    <td><a href="http://www.mysql.com/" target="_new">http://www.mysql.com/</a></td>
    843852  </tr>
    844853  <tr>
    845     <td><b>The JDOM(TM) Project</b>&nbsp;</td>
     854    <th>The JDOM(TM) Project</th>
    846855    <td><a href="http://www.jdom.org" target="_new">http://www.jdom.org</a></td>
    847856  </tr>
    848857  <tr>
    849     <td><b>Singular systems</b>&nbsp;</td>
     858    <th>Singular systems</th>
    850859    <td><a href="http://www.singularsys.com/jep/" target="_new">http://www.singularsys.com/jep/</a></td>
    851860  </tr>
    852861  <tr>
    853     <td><b>JFree software projects</b>&nbsp;</td>
     862    <th>JFree software projects</th>
    854863    <td><a href="http://www.jfree.org/" target="_new">http://www.jfree.org/</a></td>
    855864  </tr>
    856865  <tr>
    857     <td><b>Mark James</b>&nbsp;</td>
     866    <th>Mark James</th>
    858867    <td><a href="http://www.famfamfam.com/lab/icons/silk/" target="_new">http://www.famfamfam.com/lab/icons/silk/</a></td>
    859868  </tr>
    860869  <tr>
    861     <td><b>Affymetrix</b>&nbsp;</td>
     870    <th>Affymetrix</th>
    862871    <td><a href="http://www.affymetrix.com" target="_new">http://www.affymetrix.com</a></td>
    863872  </tr>
     873  <tr class="dynamic">
     874    <th></th>
     875    <td></td>
     876  </tr>
    864877  </table>
    865  
     878  </div>
    866879  </t:tab>
    867880  </t:tabcontrol>
    868881
    869   <p>
    870   <table align="center">
    871     <tr><td><base:button onclick="window.close();" title="Close" /></td></tr>
    872   </table>
     882  <base:buttongroup subclass="dialogbuttons">
     883    <base:button onclick="window.close();" title="Close" />
     884  </base:buttongroup>
    873885</base:body>
    874886</base:page>
  • trunk/www/switch.jsp

    r5827 r5907  
    3939<%
    4040final String login = Values.getString(request.getParameter("login"), "");
    41 final String error = Values.getString(request.getParameter("error"), null);
    4241final String root = request.getContextPath()+"/";
    4342
     
    9796 
    9897  <base:body onload="init();">
     98    <h1>Switch user <base:help helpid="switchuser" /></h1>
    9999    <form name="login" action="login.jsp" method="post" onsubmit="doLogin();">
    100100    <input type="hidden" name="ID" value="<%=ID%>">
     
    102102    <input type="hidden" name="redirect" value="">
    103103 
    104     <h3 class="docked">Switch user <base:help helpid="switchuser" /></h3>
    105     <div class="boxedbottom">
    106       <%
    107       if (error != null)
    108       {
    109         %>
    110         <div class="error"><%=error%></div>
    111         <%
    112       }
    113       %>
    114 
    115       <table class="form" border="0" cellspacing="1" cellpadding="2">
     104    <div class="content">
     105      <table class="fullform input100 bottomborder smaller">
    116106      <tr>
    117         <td class="prompt">Login</td>
    118         <td><input class="text" type="text" name="login" value="<%=HTML.encodeTags(login)%>"
    119           size="15" maxlength="100"
    120           style="width: 120px"></td>
     107        <th>Login</th>
     108        <td><input  type="text" name="login" value="<%=HTML.encodeTags(login)%>"
     109           maxlength="100"></td>
    121110      </tr>
    122111      <tr>
    123         <td class="prompt">Password</td>
     112        <th>Password</th>
    124113        <td>
    125           <input class="text" type="password" name="password" size="15" maxlength="80"
    126             onkeypress="return Forms.submitOnEnter(event, saveLogin)"
    127             style="width: 120px">
     114          <input type="password" name="password" maxlength="80"
     115            onkeypress="return Forms.submitOnEnter(event, saveLogin)">
    128116        </td>
    129117      </tr>
    130118      <tr>
    131         <td class="prompt"><label for="remainOnPage">Remain on this page</label></td>
     119        <th><label for="remainOnPage">Remain on this page</label></th>
    132120        <td>
    133121          <input type="checkbox" name="remainOnPage" id="remainOnPage" checked value="1">
    134122        </td>
    135123      </tr>
     124      <tr class="dynamic">
     125        <th></th>
     126        <td></td>
     127      </tr>
    136128      </table>
    137129    </div>
     130    </form>
    138131   
    139     <br>
    140     <table align="center">
    141     <tr>
    142       <td width="50%"><base:button image="login.png" onclick="doLogin();" title="Login" /></td>
    143       <td width="50%"><base:button onclick="window.close()" title="Cancel" /></td>
    144     </tr>
    145     </table>
    146     </form>
     132    <base:buttongroup subclass="dialogbuttons">
     133      <base:button image="login.png" onclick="doLogin();" title="Login" />
     134      <base:button onclick="window.close()" title="Cancel" />
     135    </base:buttongroup>
    147136   
    148137
Note: See TracChangeset for help on using the changeset viewer.