Changeset 6621


Ignore:
Timestamp:
Nov 24, 2014, 2:15:23 PM (8 years ago)
Author:
Nicklas Nordborg
Message:

References #1890: Improve skinnability of BASE

Getting rid of some more hardcoded color values.

Location:
trunk
Files:
20 edited

Legend:

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

    r6605 r6621  
    611611      if (recent != null && recent.size() > 0)
    612612      {
    613         sb.append("<option value=\"0\" disabled class=\"recentheader\">- recently used -\n");
     613        sb.append("<option value=\"0\" disabled class=\"recentheader\">› recently used\n");
    614614        int i = 1;
    615615        for (BasicItem item : recent)
    616616        {
    617617          String name = getName(item);
    618           String clazz = "recent";
     618          String clazz = "selectoptionindent recent";
    619619          if (item instanceof Removable && ((Removable)item).isRemoved())
    620620          {
     
    635635      if (defaultItems != null && defaultItems.size() > 0)
    636636      {
    637         sb.append("<option value=\"0\" disabled class=\"defaultheader\">- project default -\n");
     637        sb.append("<option value=\"0\" disabled class=\"defaultheader\">› project default\n");
    638638        for (BasicItem defaultitem : defaultItems)
    639639        {
     
    641641         
    642642          sb.append("<option value=\"").append(defaultitem.getId()).append("\"");
    643           sb.append(" class=\"default\"");       
     643          sb.append(" class=\"default selectoptionindent\"");       
    644644          if (!hasSelected && isNewitem() && getSelectdefault())
    645645          {         
     
    655655   
    656656    sb.append("<td>");
    657     sb.append("<div class=\"").append(getButtonclass()).append(disabled ? " disabled": "").append("\"");
     657    sb.append("<div class=\"interactable ").append(getButtonclass()).append(disabled ? " disabled": "").append("\"");
    658658    sb.append(" id=\"").append(getId()).append(".select\"");
    659659    sb.append(" data-list-name=\"").append(getId()).append("\"");
  • trunk/www/admin/diskusage/details/view_details.jsp

    r6605 r6621  
    159159    table.special
    160160    {
    161       border-collapse: collapse;
    162161      width: auto;
    163162    }
     
    165164    {
    166165      text-align: right;
    167       border-right: 1px dotted #A0A0A0;
     166      border-right-width: 1px;
     167      border-right-style: dotted;
    168168    }
    169169    </style>
     
    267267            <th style="width: 12em;">External</td>
    268268          </tr>
    269           <tr style="border-top: 1px solid #A0A0A0;" class="highlight">
     269          <tr style="border-top-width: 1px;" class="highlight">
    270270            <th>Total</th>
    271271            <td><%=Values.formatBytes(summary.getTotal())%></td>
     
    369369          title="Description"
    370370        />
    371         <div class="panelgroup topborder leftborder rightborder">
    372           <tbl:toolbar subclass="bottomborder bg-filled-50">
     371        <div class="panelgroup topborder leftborder rightborder bg-filled-50">
     372          <tbl:toolbar subclass="bottomborder">
    373373            <tbl:button
    374374              id="btnDeleteItems"
  • trunk/www/admin/diskusage/overview.jsp

    r6305 r6621  
    8282    {
    8383      text-align: right;
    84       border-right: 1px dotted #A0A0A0;
     84      border-right-width: 1px;
     85      border-right-style: dotted;
    8586    }
    8687    </style>
     
    104105        <th style="width: 12em;">External</th>
    105106      </tr>
    106       <tr style="border-top: 1px solid #A0A0A0;" class="highlight">
     107      <tr style="border-top-width: 1px;" class="highlight">
    107108        <th>Total</th>
    108109        <td><%=Values.formatBytes(summary.getTotal())%></td>
  • trunk/www/admin/jobagents/edit_agent.jsp

    r6305 r6621  
    254254        </td>
    255255      </tr>
     256      <tbody class="sectionheader">
     257        <tr>
     258          <th colspan="2">Settings for the selected plug-in</th>
     259        </tr>
     260      </tbody>
    256261      <tbody id="pluginsettings" style="display: none;">
    257         <tr>
    258           <th colspan="2" class="bottomborder" style="border-top: 1px solid #A0A0A0;">Settings for the selected plug-in</th>
    259         </tr>
    260262        <tr>
    261263          <th class="subprompt">Max memory</th>
  • trunk/www/admin/plugindefinitions/edit_plugin.jsp

    r6305 r6621  
    505505                  class="auto-init" data-auto-init="link-container"
    506506                  data-initial-items="[<%=HTML.encodeTags(jsonAgents.toJSONString()) %>]"
    507                   size="15" multiple>
     507                  size="12" multiple>
    508508                </select>
    509509              </td>
     
    535535        </td>
    536536      </tr>
     537      <tbody class="sectionheader">
     538        <tr class="sectionheader">
     539          <th colspan="2">Settings for the selected job agent</th>
     540        </tr>
     541      </tbody>
    537542      <tbody id="agentsettings" style="display: none;">
    538         <tr>
    539           <th colspan="2" class="bottomborder" style="border-top: 1px solid #A0A0A0;">Settings for the selected job agent</th>
    540         </tr>
    541543        <tr>
    542544          <th class="subprompt">Max memory</th>
  • trunk/www/admin/quota/edit_quota.jsp

    r6305 r6621  
    163163      </tr>
    164164      <tr>
    165         <th style="border-top: 0px; border-bottom: 1px dotted #A0A0A0;">Total quota</th>
     165        <th>Total quota</th>
    166166        <td><%=getQuotaInput(quota, total, Location.PRIMARY)%></td>
    167167        <td><%=getQuotaInput(quota, total, Location.SECONDARY)%></td>
  • trunk/www/admin/quota/view_quota.jsp

    r6605 r6621  
    126126    table.special th, table.special td
    127127    {
    128       border-right: 1px dotted #A0A0A0;
     128      border-right-width: 1px;
     129      border-right-style: dotted;
    129130    }
    130131    </style>
     
    240241        <th></th>
    241242        <td>
    242           <table class="fullborder special" style="margin: 5px; border-collapse: collapse;">
    243           <tr style="border-bottom: 1px solid #A0A0A0; background: #E8E8E8;">
     243          <table class="fullborder special" style="margin: 5px;">
     244          <tr class="bottomborder bg-filled-100">
    244245            <th style="width: 10em;"></th>
    245246            <th style="width: 12em;">Primary location</th>
    246247            <th style="width: 12em;">Secondary location</th>
    247248          </tr>
    248           <tr style="border-bottom: 1px dotted #A0A0A0;">
     249          <tr class="bottomborder">
    249250            <th><%=Base.getLinkedName(ID, total, false, true)%></th>
    250251            <td><%=displayQuota(quota, total, Location.PRIMARY)%></td>
  • trunk/www/common/overview/failures.jsp

    r6607 r6621  
    8989  tr.failure
    9090  {
    91     border-top: 1px dotted #A0A0A0;
     91    border-top-width: 1px;
     92    border-top-style: dotted;
     93    border-bottom-width: 1px;
     94    border-bottom-style: dotted;
    9295    cursor: pointer;
    9396  }
    9497  tr.failure:first-child
    9598  {
    96     border-top: 1px dotted transparent;
     99    border-top-color: transparent;
    97100  }
    98101  tr.failure td
  • trunk/www/common/plugin/parse_file.jsp

    r6607 r6621  
    173173  %>
    174174  <base:page type="iframe" title="Test with file">
    175   <base:head scripts="tabcontrol-2.js,~parse_file.js" styles="table.css,tabcontrol.css">
    176     <style>
    177     table.special
    178     {
    179       border-collapse: collapse;
    180     }
    181     table.special > tbody > tr.highlight > td
    182     {
    183       border-top: 1px solid transparent;
    184     }
    185     table.special > tbody > tr.highlight:hover > td
    186     {
    187       background-color: #F8F8E8 !important;
    188       border-top: 1px solid #2288AA !important;
    189       border-bottom: 1px solid #2288AA !important;
    190     }
    191     </style>
    192   </base:head>
     175  <base:head scripts="tabcontrol-2.js,~parse_file.js" styles="table.css,tabcontrol.css" />
    193176  <base:body>
    194177  <div class="absolutefull bottomborder">
     
    435418      %>
    436419      <form name="mappings">
    437       <div class="absolutefull" style="height: 2em;">
     420      <div class="absolutefull bg-filled-100" style="height: 2em;">
    438421        <table>
    439422        <tr>
    440           <td style="padding-left: 2px;">
     423          <td style="padding-left: 4px;">
    441424            <b>Mapping style:</b>
    442425            <input type="radio" name="expressionStyle" id="expressionStyleSimple" value="1" checked><label for="expressionStyleSimple">Simple</label>
  • trunk/www/include/scripts/main-2.js

    r6617 r6621  
    19581958    controllers['ITEMSUBTYPE'] = { url:'admin/itemsubtypes/index.jsp', width:690, height:460 };
    19591959    controllers['JOB'] = { url:'views/jobs/index.jsp', width:750, height:500, popup:true, edit:false };
    1960     controllers['JOBAGENT'] = { url:'admin/jobagents/index.jsp', width:600, height:400 };
     1960    controllers['JOBAGENT'] = { url:'admin/jobagents/index.jsp', width:750, height:500 };
    19611961    controllers['MESSAGE'] = { url:'my_base/messages/index.jsp', width:600, height:400, popup:true, edit:false };
    19621962    controllers['MIMETYPE'] = { url:'admin/mimetypes/index.jsp', width:600, height:400 };
  • trunk/www/include/scripts/subtypes.js

    r6297 r6621  
    254254    {
    255255      // Add recently used items
    256       var recentlyUsedHeader = new Option('- recently used -', 0);
     256      var recentlyUsedHeader = new Option('› recently used', 0);
    257257      recentlyUsedHeader.className = 'recentheader';
    258258      recentlyUsedHeader.disabled = true;
     
    262262      {
    263263        var selected = reselectValue == recentItems[i].id;
    264         list[list.length] = new Option((i+1) + '. ' + recentItems[i].name, recentItems[i].id, false, selected);
     264        var opt = new Option((i+1) + '. ' + recentItems[i].name, recentItems[i].id, false, selected);
     265        opt.className = 'selectoptionindent';
     266        list[list.length] = opt;
    265267      }
    266268    }
     
    269271    {
    270272      // Add project default items
    271       var projectDefaultHeader = new Option('- project default -', 0);
     273      var projectDefaultHeader = new Option('› project default', 0);
    272274      projectDefaultHeader.className = 'defaultheader';
    273275      projectDefaultHeader.disabled = true;
     
    277279      {
    278280        var selected = reselectValue == projectDefaults[i].id;
    279         list[list.length] = new Option( projectDefaults[i].name, projectDefaults[i].id, false, selected);
     281        var opt = new Option( projectDefaults[i].name, projectDefaults[i].id, false, selected);
     282        opt.className = 'selectoptionindent';
     283        list[list.length] = opt;
    280284      }
    281285    }
  • trunk/www/include/styles/calendar.css

    r6608 r6621  
    3636
    3737.calendar > tbody > tr
    38 {
    39   xheight: 20%;
    40 }
     38{}
    4139
    4240.calendar > tbody > tr > td
  • trunk/www/include/styles/main.css

    r6618 r6621  
    287287
    288288
    289 .filled .basicbutton
    290 {
    291   background: #F8F8F8;
    292 }
    293 
    294289img.helpicon, img.zoomicon
    295290{
     
    319314  font-weight: normal !important;
    320315  border-color: #A00000 !important;
    321   filter: none !important;
    322316}
    323317
     
    596590{
    597591  font-weight: bold;
    598   background-color: #E8E8E8;
    599   border-top: 1px dotted #A0A0A0;
    600   border-bottom: 1px dotted #A0A0A0;
    601   margin-top: 2px;
     592  color: #000000;
    602593}
    603594
     
    609600.selectoptionindent
    610601{
    611   padding-left: 1em;
     602  padding-left: 0.5em;
    612603}
    613604
  • trunk/www/include/styles/popup.css

    r6610 r6621  
    7777}
    7878
    79 /* Fill the content area with a background color and a bottom border */
    80 .popup .content.filled
    81 {
    82   background: #E8E8E8;
    83   border-bottom: 1px solid #A0A0A0;
    84 }
    85 
    8679/* fullcc is used for 100% width+height content that is centered vertically+horizontally */
    8780table.fullcc
  • trunk/www/include/styles/progressbar.css

    r6607 r6621  
    3333}
    3434
     35.progressbar.failed .bar
     36{
     37  border-color: #A00000;
     38}
     39
    3540.progressbar .percentDone
    3641{
     
    4550.progressbar .percentUnknown
    4651{
    47   background-color: #cccccc;
    4852  text-align: center;
    4953  font-style: italic;
     
    5862.progressbar.failed .percentDone, .progressbar.failed .percentUnknown
    5963{
    60   background-color: #CC0000;
     64  background-color: #C80000;
    6165}
    6266.progressbar.failed .percentRemain
  • trunk/www/my_base/index.jsp

    r6613 r6621  
    431431      </tr>
    432432      <tr>
    433         <td colspan="6" style="border-top: 1px dotted #A0A0A0;"></td>
     433        <td colspan="6" style="border-top-width: 1px; border-top-style: dotted;"></td>
    434434      </tr>
    435435      <%
     
    456456      %>
    457457      <tr>
    458         <td colspan="6" style="border-top: 1px dotted #A0A0A0;"></td>
     458        <td colspan="6" style="border-top-width: 1px; border-top-style: dotted;"></td>
    459459      </tr>
    460460      </table>
  • trunk/www/my_base/messages/view_message.jsp

    r6520 r6621  
    105105  final boolean deletePermission = message.hasPermission(Permission.DELETE);
    106106  final boolean isRemoved = message.isRemoved();
    107   final boolean isUsed = isRemoved && message.isUsed();
     107  final boolean isUsed = true || isRemoved && message.isUsed();
    108108  final boolean deletePermanentlyPermission = deletePermission && !isUsed;
    109109  %>
     
    121121        %>
    122122        <tr>
    123           <td colspan="2" style="background: #E8E8E8; border-bottom: 1px solid #A0A0A0;">
     123          <th></th>
     124          <td>
    124125          <div class="itemstatus">
    125126            <base:icon
     
    134135              image="used.png"
    135136              tooltip="Show the items that are using this one"
    136               visible="<%=isUsed%>"> This item is used by other items and can't be permanently deleted<br></base:icon>
     137              visible="<%=isUsed%>"> This item is used by other items</base:icon>
    137138          </div>
    138139          </td>
  • trunk/www/plugins/net/sf/basedb/plugins/executor/external_plugin_parameters.jsp

    r6605 r6621  
    131131    <div class="content">
    132132   
    133       <div class="absolutefull filled" style="height: 4.5em;">
     133      <div class="absolutefull bg-filled-100" style="height: 4.5em;">
    134134        <table style="height: 100%; margin:auto;"><tr><td style="padding: 3px;">
    135135        <b>
     
    142142   
    143143      <div class="absolutefull topborder bottomborder" style="top: 4.5em;">
    144       <div class="absolutefull filled" style="width: 18em;">
     144      <div class="absolutefull" style="width: 18em;">
    145145
    146146          <tbl:toolbar subclass="bottomborder bg-filled-50">
  • trunk/www/views/experiments/explorer/view/view.jsp

    r6612 r6621  
    211211    .special td.cell:first-of-type
    212212    {
    213       border-right: 1px solid #A0A0A0;
     213      border-right-width: 1px;
    214214    }
    215215  </style>
  • trunk/www/views/jobs/view_job.jsp

    r6604 r6621  
    212212        %>
    213213        <tr>
    214           <td colspan="2" style="background: #E8E8E8; border-bottom: 1px solid #A0A0A0;">
     214          <th></th>
     215          <td colspan="2">
    215216          <div class="itemstatus">
    216217            <base:icon
     
    233234      %>
    234235      <tr>
    235         <th style="border-top: 0px;">Name</th>
     236        <th>Name</th>
    236237        <td><%=HTML.encodeTags(job.getName())%></td>
    237238      </tr>
     
    281282        <th class="subprompt">- percent complete</th>
    282283        <td>
    283           <table class="progressbar">
     284          <table class="progressbar" style="margin-bottom: 2px;">
    284285          <tr>
    285286          <td>
Note: See TracChangeset for help on using the changeset viewer.