Skip to content

GitLab

Commit 5a6ef888 authored by philippe's avatar philippe
Browse files

CSS page header and co

parent 4b3ee261
Hide whitespace changes
Inline Side-by-side
ui/nG6/pi1/analyzes/BasicAnalyse.tpl
View file @ 5a6ef888
......@@ -20,11 +20,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<input type="hidden" id="analyse_name" value="{$analyse.name}"/>
{block name=description}
<div class="analysis">
<h2>Analysis {$analyse.name} :</h2>
<p><strong>{$analyse.description}</strong> <br />
<div class="page-header analysis">
<h2>Analysis <small>{$analyse.name}</small></h2>
{$analyse.description}
<br />
All data related to this analysis use <strong> {$analyse_size} </strong> on the hard drive.
</p>
</div>
{/block}
......
ui/nG6/pi1/project_view.tpl
View file @ 5a6ef888
......@@ -35,9 +35,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<input type="hidden" id="is_project_admin" value="{$projects[key($projects)].is_admin}" />
<div class="project">
<h2> {$projects[key($projects)].name}<small> Project </small></h2>
<p><strong>{$projects[key($projects)].description}</strong> <br />
<div class="page-header project">
<h2>Projet <small>{$projects[key($projects)].name}</small></h2>
{$projects[key($projects)].description}
<br />
{$project_runs|@count} run(s) and {$project_analysis|@count} analyse(s) have been done on the run {$projects[key($projects)].name}.
<br />
{assign var="project_size" value="<span id='size' class='tx-nG6-mini-wait'></span>"}
......@@ -250,13 +251,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{/if}
{/foreach}
{* Then display the table *}
<div class="project">
<div class="page-header project">
<h2>Projects list <small> you can access </small></h2>
<blockquote>
<p>You have access to <strong>{$projects|@count}</strong> projects.</p>
{assign var="project_size" value="<span id='size' class='tx-nG6-mini-wait'></span>"}
<p>Raw data and analysis results use <strong>{$project_size}</strong> on the hard drive for all projects.</p>
</blockquote>
You have access to <strong>{$projects|@count}</strong> projects.
<br />
{assign var="project_size" value="<span id='size' class='tx-nG6-mini-wait'></span>"}
Raw data and analysis results use <strong>{$project_size}</strong> on the hard drive for all projects.
</div>
<br />
<table class="table table-striped table-bordered dataTable" id="project_data_table">
......
ui/nG6/pi1/run_view.tpl
View file @ 5a6ef888
......@@ -30,42 +30,36 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{* If a single run has to be displayed *}
{elseif $runs|@count == 1}
<div class="run">
<h2>Run {$runs[key($runs)].name} :</h2>
<p><strong>{$runs[key($runs)].description}</strong> <br />
{if $run_analysis|@count > 0}
{$run_analysis|@count} analysis have been done on the run {$runs[key($runs)].name}.
{else}
{$run_analysis|@count} analysis has been done on the run {$runs[key($runs)].name}.
{/if}
<br />
{assign var="run_size" value="<span id='size' class='tx-nG6-mini-wait'></span>"}
Raw data and analysis results use <strong>{$run_size}</strong> on the hard drive.
</p>
<div class="page-header run">
<div style="float:left">
<h2>Run <small>{$runs[key($runs)].name}</small></h2>
{$runs[key($runs)].description}
</br>
{if $run_analysis|@count > 0}
<strong>{$run_analysis|@count}</strong> analysis have been done on this run.
{else}
<strong>{$run_analysis|@count}</strong> analysis has been done on this run.
{/if}
<br/>
{assign var="run_size" value="<span id='size' class='tx-nG6-mini-wait'></span>"}
Raw data and analysis results use <strong>{$run_size}</strong> on the hard drive.
</div>
<div style="background:white;float:right;margin:15px;padding:15px;border-radius:5px;border:1px solid #F2F2F2">
<div style="float:left;margin-right:25px">
<p class="bullet"><strong>Project name: </strong> {$runs[key($runs)].project_name}</p>
<p class="bullet"><strong>Date: </strong> {$runs[key($runs)].date|date_format:"%d-%m-%y"}</p>
<p class="bullet"><strong>Species: </strong> {$runs[key($runs)].species}</p>
<p class="bullet"><strong>Type: </strong> {$runs[key($runs)].type}</p>
</div>
<div style="float:left">
<p class="bullet"><strong>Data nature: </strong> {$runs[key($runs)].data_nature}</p>
<p class="bullet"><strong>Number of sequences: </strong> {$runs[key($runs)].nb_sequences|number_format:0:' ':' '}</p>
<p class="bullet"><strong>Full sequences length: </strong> {$runs[key($runs)].full_seq_size|number_format:0:' ':' '}</p>
<p class="bullet"><strong>Sequencer: </strong> {$runs[key($runs)].sequencer}</p>
</div>
</div>
<div style="clear:both"></div>
</div>
<table class="tx-nG6-pi1-listrow">
<tr>
<th align="left">Project name</th>
<th align="left">Date</th>
<th align="left">Species</th>
<th align="left">Type</th>
<th align="left">Data nature</th>
<th align="left">Number of sequences</th>
<th align="left">Full sequences length</th>
<th align="left">Sequencer</th>
</tr>
<tr>
<td align="left">{$runs[key($runs)].project_name}</td>
<td align="left">{$runs[key($runs)].date|date_format:"%d-%m-%y"}</td>
<td align="left">{$runs[key($runs)].species}</td>
<td align="left">{$runs[key($runs)].type}</td>
<td align="left">{$runs[key($runs)].data_nature}</td>
<td align="left">{$runs[key($runs)].nb_sequences|number_format:0:' ':' '}</td>
<td align="left">{$runs[key($runs)].full_seq_size|number_format:0:' ':' '}</td>
<td align="left">{$runs[key($runs)].sequencer}</td>
</tr>
</table>
<br />
<ul id="myTab" class="nav nav-tabs">
<li class="active"><a href="#analyses" data-toggle="tab">Analyses</a></li>
......@@ -84,7 +78,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{assign var="display_analysis_result" value=true}
{/if}
{/foreach}
<table class="display" id="analysis_data_table">
<table class="table table-striped table-bordered dataTable" id="analysis_data_table">
<thead>
<tr>
{if $runs[key($runs)].is_admin && $login_user && $display_analysis_result}
......@@ -104,8 +98,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<tr>
<th align="left" colspan="5">
With selection :
<button id="hide_analysis" type="button" class="btn pill-l"><span><span>hide</span></span></button><button id="unhide_analysis" type="button" class="btn pill-r"><span><span>unhide</span></span></button>
&nbsp;<button id="delete_analysis" type="button" class="btn"><span><span>delete</span></span></button>
<div class="btn-group">
<button id="hide_analysis" type="button" class="btn btn-small"><i class=" icon-eye-close"></i> hide</button>
<button id="unhide_analysis" type="button" class="btn btn-small"><i class="icon-eye-open"></i> unhide</button>
</div>
<button id="delete_analysis" type="button" class="btn btn-small"><i class="icon-trash"></i> delete</button>
</th>
</tr>
</tfoot>
......
ui/nG6/res/css/tx_nG6.css
View file @ 5a6ef888
......@@ -29,15 +29,18 @@ body {
h2 {
color: #51565B;
font-size: 28px;
font-size: 20px;
font-weight: normal;
line-height: 1.5em;
text-shadow: 1px 1px #F1F1F1;
text-transform: capitalize;
padding-left: 35px;
padding-top: 5px;
padding-bottom: 10px;
}
h2 small {
font-size: 18px;
font-size: 16px;
font-weight: lighter;
}
......@@ -86,20 +89,33 @@ div.file-display {
.tx-nG6-wait { margin-left: 0px; padding-left: 50px; padding-top: 10px; height: 40px; background: url(../img/light_wait.gif) left no-repeat; }
.tx-nG6-mini-wait { margin-left: 0px; padding-left: 25px; padding-top: 0px; height: 20px; background: url(../img/mini_light_wait.gif) left no-repeat; }
.bullet {
background: url(../img/bullet.png) left no-repeat;
padding-left: 20px;
margin: 5px 0 0 0;
}
.page-header {
box-shadow: -4px 0 5px -5px grey, 5px 0 5px -6px grey;
margin: 15px 0px;
padding-left: 15px;
padding-top: 10px;
padding-bottom: 10px;
}
.run {
margin-left: 0px; padding-left: 120px; margin-top: 2px; padding-top: 10px; height: 130px; background: url(../img/run-icon.png) left no-repeat ;
background: url("../img/run-icon.png") no-repeat scroll -15px 15px #FaFaFa;
}
.analysis {
margin-left: 0px; padding-left: 120px; margin-top: 2px; padding-top: 10px; height: 130px; background: url(../img/analysis-icon.png) left no-repeat ;
background: url(../img/analysis-icon.png) no-repeat scroll -15px 15px #FaFaFa;
}
.project {
margin-left: 0px; padding-left: 120px; margin-top: 2px; padding-top: 10px; height: 130px; background: url(../img/project-icon.png) left no-repeat ;
background: url(../img/project-icon.png) no-repeat scroll -15px 15px #FaFaFa;
}
.download {
margin-left: 0px; padding-left: 120px; margin-top: 2px; padding-top: 10px; height: 130px; background: url(../img/download-icon.png) left no-repeat ;
background: url(../img/download-icon.png) no-repeat scroll -15px 15px #FaFaFa;
}
.administration {
margin-left: 0px; padding-left: 120px; margin-top: 2px; padding-top: 10px; height: 130px; background: url(../img/administration-icon.png) left no-repeat ;
background: url(../img/administration-icon.png) no-repeat scroll -15px 15px #FaFaFa;
}
.underline {
border-bottom: 1px dotted #666; position: relative;
......@@ -109,28 +125,6 @@ p.information { margin-left: 0px; padding-left: 75px; padding-top: 10px; height:
.tx-nG6-pi1-error { font-size:14px; margin-left: 0px; padding-left: 160px; padding-top: 40px; height: 90px; background: url(../img/error.png) 20px no-repeat; background-size: 7em auto; }
.tx-nG6-pi1-login { font-size:14px; margin-left: 0px; padding-left: 140px; padding-top: 10px; height: 130px; background: url(../img/login.png) 20px no-repeat; background-size: 7em auto; }
/*table.tx-nG6-pi1-listrow { width: 100%; margin: 1em 0;font-size:90%;}
table.tx-nG6-pi1-listrow th, table.tx-nG6-pi1-listrow td { text-align: left; padding: 5px 8px; }
table.tx-nG6-pi1-listrow th {
background: #ececec;
-moz-border-radius-topleft:7px;
-moz-border-radius-topright:7px;
-webkit-border-top-right-radius: 7px;
-webkit-border-top-left-radius: 7px;
border-top-right-radius:7px;
border-top-left-radius:7px;
}
table.tx-nG6-pi1-listrow tr.tx-nG6-pi1-listrowlast{
background: #ececec;
-moz-border-radius-bottomleft:7px;
-moz-border-radius-bottomright:7px;
-webkit-border-bottom-right-radius: 7px;
-webkit-border-bottom-left-radius: 7px;
border-bottom-right-radius:7px;
border-bottom-left-radius:7px;
}
table.tx-nG6-pi1-listrow td { border-bottom: 1px solid #ddd; }
*/
ul li.filelist { list-style: none; margin-left: -25px; padding-left: 17px; background: url(../img/ico-fleche.png) left 4px no-repeat; }
ul li.parameter { list-style: none; margin-left: -25px; padding-left: 17px; background: url(../img/ico-fleche.png) left 4px no-repeat; }
.tx-nG6-pi1-hidden { color:#9a9a9a; }
......@@ -155,10 +149,7 @@ ul li.parameter { list-style: none; margin-left: -25px; padding-left: 17px; back
margin:5px 5px 5px 5px;
float:left;
}
/*
table tr.tx-nG6-pi1-line-emphasis {background: #e3e3e3;}
table tr.tx-nG6-pi1-line-emphasis td.sorting_1 {background: #d2d2d2;}
*/
.tx-nG6-pi1-add-new { text-align: justify; margin-left: 20px; font-size:14px; padding-top: 10px; height: 300px; background: url(../img/add_user.png) 10px no-repeat; background-size: 7em auto; }
.ui-autocomplete-loading { background: white url('../img/mini_light_wait.gif') right center no-repeat; }
......
ui/nG6/res/img/analysis-icon.png
View replaced file @ 4b3ee261 View file @ 5a6ef888
ui/nG6/res/img/analysis-icon.png

12.7 KB | W: | H:

ui/nG6/res/img/analysis-icon.png

5.88 KB | W: | H:

ui/nG6/res/img/analysis-icon.png
ui/nG6/res/img/analysis-icon.png
ui/nG6/res/img/analysis-icon.png
ui/nG6/res/img/analysis-icon.png
  • 2-up
  • Swipe
  • Onion skin
ui/nG6/res/img/project-icon.png
View replaced file @ 4b3ee261 View file @ 5a6ef888
ui/nG6/res/img/project-icon.png

11.5 KB | W: | H:

ui/nG6/res/img/project-icon.png

5.68 KB | W: | H:

ui/nG6/res/img/project-icon.png
ui/nG6/res/img/project-icon.png
ui/nG6/res/img/project-icon.png
ui/nG6/res/img/project-icon.png
  • 2-up
  • Swipe
  • Onion skin
ui/nG6/res/img/run-icon.png
View replaced file @ 4b3ee261 View file @ 5a6ef888
ui/nG6/res/img/run-icon.png

15.8 KB | W: | H:

ui/nG6/res/img/run-icon.png

7.39 KB | W: | H:

ui/nG6/res/img/run-icon.png
ui/nG6/res/img/run-icon.png
ui/nG6/res/img/run-icon.png
ui/nG6/res/img/run-icon.png
  • 2-up
  • Swipe
  • Onion skin
ui/nG6template/css/style.css
View file @ 5a6ef888
......@@ -48,13 +48,13 @@ ul#menu li a { text-decoration: none; color: #fff; font-size: 1.5em; font-weight
#sous-menu li.homeitem a { padding-left:5px; padding-right:5px; }
#sous-menu li a:hover, #sous-menu li a:focus, #sous-menu li a:active { border-bottom:8px solid #fff; }
#sous-menu li.act a { border-bottom:8px solid #fff; }
#header-sep { background-color: #D7D4CB; }
#header-sep .inside { background: url(../images/header-sep.png) center top repeat-y; padding: 2px 0 2px 0; margin: 0 auto; width: 990px; }
#header-sep { }
#header-sep .inside { box-shadow: 0 5px 5px -5px grey, 5px 5px 0 -5px grey; /*padding: 2px 0 2px 0;*/ margin: 1px auto; width: 990px; }
#header-sep .inside p { margin: 0 0 0 30px; font-size: 0.8em; }
/* Bloc Page */
#global { width: 990px; margin: 0 auto; }
#page { /*background: #EFECE2 url(../images/center-bg.png) center top repeat-y; */}
#page { }
#content {
margin-left: 15px;
margin-right: 15px;
......@@ -62,7 +62,7 @@ ul#menu li a { text-decoration: none; color: #fff; font-size: 1.5em; font-weight
width:auto;
float:none;
background-color: white;
box-shadow: -5px 0 5px -5px grey, 5px 0 5px -5px grey;
box-shadow: -4px 0 5px -5px grey, 5px 0 5px -6px grey;
}
/* Presentation Blocs */
......@@ -125,10 +125,6 @@ table.tx-nG6-pi3-listrow td { border-bottom: 1px solid #ddd; }
color: #FFFFFF;
position: relative;
border-top: solid 1px #141414;
/* -moz-box-shadow: 0px -4px 5px 0px #3692ba;
-webkit-box-shadow: 0px -4px 5px 0px #3692ba;
-o-box-shadow: 0px -4px 5px 0px #3692ba;
box-shadow: 0px -4px 5px 0px #3692ba; */
}
#ng6-footer-cols {
margin-left: auto;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment