Changeset 6612


Ignore:
Timestamp:
Nov 21, 2014, 7:43:00 AM (8 years ago)
Author:
Nicklas Nordborg
Message:

References #1890: Improve skinnability of BASE

Experiment explorer and plotter.

Location:
trunk/www
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/www/include/styles/explorer.css

    r5940 r6612  
    2929.annotationsummary
    3030{
    31   border: 1px solid #A0A0A0;
     31  border-width: 1px;
    3232  margin-top: 5px;
    3333}
     
    4141  font-weight: bold;
    4242  width: 10em;
    43   background: #E8E8E8;
    44   border-bottom: 1px solid #A0A0A0;
     43  border-bottom-width: 1px;
    4544}
    4645.annotationsummary .plotheader
    4746{
    48   background: #E8E8E8;
    49   border-bottom: 1px solid #A0A0A0;
     47  border-bottom-width: 1px;
    5048}
    5149
     
    5553  width: 10em;
    5654  text-align: right;
    57   border-bottom: 1px solid #A0A0A0;
    58   border-left: 1px solid #A0A0A0;
     55  border-bottom-width: 1px;
     56  border-left-width: 1px;
    5957}
    6058
     
    6260{
    6361  text-align: right;
    64   border-left: 1px solid #A0A0A0;
     62  border-left-width: 1px;
    6563}
    6664
  • trunk/www/views/experiments/bioassays/view_bioassay.jsp

    r6605 r6612  
    352352
    353353    <t:tab id="spotdata" title="Spot data" visible="<%=hasDbSpots%>">
    354       <div class="filled absolutefull">
     354      <div class="bg-filled-50 absolutefull">
    355355        <table style="margin: auto; height: 100%;"><tr><td>
    356356        <b>Please wait. The spot data is loading...</b>
  • trunk/www/views/experiments/bioassaysets/analysis_tree.js

    r6388 r6612  
    102102    var url = '../plotter/index.jsp?ID='+App.getSessionId();
    103103    url += '&bioassayset_id='+Data.get(event.currentTarget, 'item-id');
    104     Dialogs.openPopup(url, 'Plotter', 1050, 700);
     104    Dialogs.openPopup(url, 'Plotter', 1250, 700);
    105105  }
    106106 
  • trunk/www/views/experiments/bioassaysets/bioassaysets.js

    r6389 r6612  
    163163    var url = '../plotter/index.jsp?ID='+App.getSessionId();
    164164    url += '&bioassayset_id='+Data.get('page-data', 'item-id');
    165     Dialogs.openPopup(url, 'Plotter', 1050, 700);
     165    Dialogs.openPopup(url, 'Plotter', 1250, 700);
    166166  }
    167167 
  • trunk/www/views/experiments/bioassaysets/view_bioassayset.jsp

    r6605 r6612  
    488488     
    489489      <t:tab id="spotdata" title="Spot data" visible="<%=hasDbSpots%>">
    490         <div class="filled absolutefull">
     490        <div class="bg-filled-50 absolutefull">
    491491          <table style="margin: auto; height: 100%;"><tr><td>
    492492          <b>Please wait. The spot data is loading...</b>
  • trunk/www/views/experiments/explorer/search/list.jsp

    r6605 r6612  
    169169     
    170170      <div class="panelgroup bg-filled-50 bottomborder">
    171         <tbl:toolbar subclass="bottomborder bg-filled-50">
     171        <tbl:toolbar subclass="bottomborder">
    172172          <tbl:button
    173173            id="btnColumns"
  • trunk/www/views/experiments/explorer/view/plotter.jsp

    r6315 r6612  
    280280
    281281    </div>
    282     <div class="absolutefull filled" style="width: 550px; left: auto;">
     282    <div class="absolutefull bg-filled-50" style="width: 550px; left: auto;">
    283283      <img src="../../../../images/plot_empty.png" id="preview"
    284284        style="position: absolute; top: 5px; z-index: 1;" alt="">
  • trunk/www/views/experiments/explorer/view/view.js

    r6389 r6612  
    9191  view.viewSearch = function()
    9292  {
    93     var frm = document.forms['reporterIndex'];   
    9493    var url = '../search/index.jsp?ID='+App.getSessionId();
    95     url += '&bioassayset_id='+frm.bioassayset_id.value;
     94    url += '&bioassayset_id='+Data.get('page-data', 'bioassayset-id');
    9695    location.href = url;
    9796  }
     
    103102    var url = 'plotter.jsp?ID='+App.getSessionId();
    104103    url += '&type=assay';
    105     url += '&bioAssaySetId='+frm.bioassayset_id.value;
     104    url += '&bioAssaySetId='+Data.get('page-data', 'bioassayset-id');
    106105    url += '&reporterIndex='+frm.reporter_index.value;
    107106    url += '&positionIndex='+frm.position_index.value;
    108     Dialogs.openPopup(url, 'AssayPlot', 1050, 700);
     107    Dialogs.openPopup(url, 'AssayPlot', 1250, 700);
    109108  }
    110109 
     
    114113    var url = 'plotter.jsp?ID='+App.getSessionId();
    115114    url += '&type=annotation';
    116     url += '&bioAssaySetId='+frm.bioassayset_id.value;
     115    url += '&bioAssaySetId='+Data.get('page-data', 'bioassayset-id');
    117116    url += '&reporterIndex='+frm.reporter_index.value;
    118117    url += '&positionIndex='+frm.position_index.value;
    119118    url += '&annotationTypeId=' + Data.get(event.currentTarget, 'annotation-type');
    120     Dialogs.openPopup(url, 'AnnotationPlot', 1050, 700);
     119    Dialogs.openPopup(url, 'AnnotationPlot', 1250, 700);
    121120  }
    122121 
  • trunk/www/views/experiments/explorer/view/view.jsp

    r6605 r6612  
    223223      /><p:pathelement title="Explorer" /></p:path>
    224224   
     225    <div id="page-data" class="data-container"
     226      data-bioassayset-id="<%=bioAssaySetId %>"
     227    ></div>
     228   
    225229    <t:tabcontrol
    226230      id="explorer"
     
    261265     
    262266      <tbl:toolbar subclass="bottomborder bg-filled-50">
    263         <tbl:label style="padding: 0px 2px 0px 6px;">
     267        <tbl:label subclass="bg-filled-100" style="padding: 0px 2px 0px 6px;">
    264268          Current reporter
    265269            <input name="newReporterIndex" id="newReporterIndex"
     
    388392          <table>
    389393          <tr>
    390             <td><input type="text" class="text multiselect-display" name="display:annotationTypes" title="Click to select experimental factor"></td>
     394            <td>
     395            <input type="hidden" class="multiselect-hidden" name="annotationtype_id" value="">           
     396            <input type="text" class="text multiselect-display" name="display:annotationTypes" title="Click to select experimental factor" style="width: calc(100% - 7px);"></td>
    391397            <td class="dropdown">
    392398              <base:icon image="mini_scroll_down.png" />
     
    394400            </tr>
    395401          </table>
    396           <input type="hidden" class="multiselect-hidden" name="annotationtype_id" value="">
    397402        </div>
    398403          <%
     
    404409            <table class="annotationsummary">
    405410            <tr>
    406               <td class="summaryheader"><%=Base.getLinkedName(ID, at, false, true)%></td>
    407               <td class="plotheader"><base:icon
     411              <td class="summaryheader bg-filled-100"><%=Base.getLinkedName(ID, at, false, true)%></td>
     412              <td class="plotheader bg-filled-100"><base:icon
    408413                subclass="link auto-init"
    409414                data-auto-init="annotation-plot"
     
    428433                %>
    429434                <tr>
    430                 <td colspan="2">Mean ch <%=ch%> int.</td>
     435                <td colspan="2" class="bg-filled-100">Mean ch <%=ch%> int.</td>
    431436                <%
    432437                for (AnnotationGroup ag : summary.getAnnotationGroups())
     
    445450                %>
    446451                <tr>
    447                 <td colspan="2" title="The geometric mean of the ratios">G. mean ratio</td>
     452                <td colspan="2" class="bg-filled-100" title="The geometric mean of the ratios">G. mean ratio</td>
    448453                <%
    449454                for (AnnotationGroup ag : summary.getAnnotationGroups())
     
    457462                </tr>
    458463                <tr>
    459                 <td colspan="2" title="Standard deviation of log2 ratios">log2ratio SD</td>
     464                <td colspan="2" class="bg-filled-100" title="Standard deviation of log2 ratios">log2ratio SD</td>
    460465                <%
    461466                for (AnnotationGroup ag : summary.getAnnotationGroups())
     
    472477              %>
    473478              <tr>
    474               <td colspan="2" title="The number of spots falling in this group">Count</td>
     479              <td colspan="2" class="bg-filled-100" title="The number of spots falling in this group">Count</td>
    475480              <%
    476481              for (AnnotationGroup ag : summary.getAnnotationGroups())
     
    507512      <input type="hidden" name="bioassayset_id" value="<%=bioAssaySetId%>">
    508513      <input type="hidden" name="cmd" value="SetSpotIndex">
    509       <tbl:toolbar subclass="topborder">
    510         <tbl:label style="padding: 0px 2px 0px 6px;">
     514      <tbl:toolbar subclass="topborder bg-filled-50">
     515        <tbl:label subclass="bg-filled-100" style="padding: 0px 2px 0px 6px;">
    511516        Current spot
    512517        <input name="newSpotIndex" id="newSpotIndex"
  • trunk/www/views/experiments/plotter/index.jsp

    r6315 r6612  
    178178        <tr>
    179179          <th>Plot type</th>
    180           <td colspan="2">
     180          <th colspan="2">
    181181            <input type="radio" name="plotType" value="scatter"
    182182              id="plotTypeScatter" checked><label for="plotTypeScatter">Scatter</label>
    183183            <input type="radio" name="plotType" value="histogram"
    184184              id="plotTypeHistogram"><label for="plotTypeHistogram">Histogram</label>
    185           </td>
     185          </th>
    186186        </tr>
    187187      </tbody>
     
    505505    </div>
    506506   
    507     <div class="absolutefull filled" style="width: 550px; left: auto;">
     507    <div class="absolutefull bg-filled-50" style="width: 550px; left: auto;">
    508508       
    509509          <img src="../../../images/plot_empty.png" id="preview"
Note: See TracChangeset for help on using the changeset viewer.