Commit 9d0cde31 authored by philippe's avatar philippe
Browse files

CSS... boite !

parent b803cc4c
......@@ -20,57 +20,64 @@ 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="ng6-content-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.
<div class="sub-content sc-top">
<div class="ng6-content-header-left 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.
</div>
<div class="ng6-content-header-right">
&nbsp;
</div>
<div style="clear:both"></div>
</div>
{/block}
<ul id="myTab" class="nav nav-tabs">
<li class="active"><a href="#results" data-toggle="tab">{block name=results_title} Results {/block}</a></li>
{if $analyse.params != ""}
<li><a href="#parameters" data-toggle="tab">{block name=params_title} Parameters {/block}</a></li>
{/if}
<li><a href="#downloads" data-toggle="tab">{block name=downloads_title} Downloads {/block}</a></li>
</ul>
<div id="myTabContent" class="tab-content">
<div class="sub-content sc-bottom">
<ul id="myTab" class="nav nav-tabs">
<li class="active"><a href="#results" data-toggle="tab">{block name=results_title} Results {/block}</a></li>
{if $analyse.params != ""}
<li><a href="#parameters" data-toggle="tab">{block name=params_title} Parameters {/block}</a></li>
{/if}
<li><a href="#downloads" data-toggle="tab">{block name=downloads_title} Downloads {/block}</a></li>
</ul>
<div class="tab-pane fade in active" id="results">
{block name=results}{/block}
</div>
{if $analyse.params != ""}
<div class="tab-pane fade" id="parameters">
{block name=params}
{block name=params_content}
<ul>
<li class="parameter">{$analyse.params}</li>
</ul>
<div id="myTabContent" class="tab-content">
<div class="tab-pane fade in active" id="results">
{block name=results}{/block}
</div>
{if $analyse.params != ""}
<div class="tab-pane fade" id="parameters">
{block name=params}
{block name=params_content}
<ul>
<li class="parameter">{$analyse.params}</li>
</ul>
{/block}
{/block}
{/block}
</div>
{/if}
<div class="tab-pane fade" id="downloads">
{block name=download}
<p><ul>
{$dir=$data_folder|cat:$analyse.directory}
{assign var="nb_files" value=0}
{foreach $dir|scandir as $file}
{if $file != "." and $file != "" and $file != ".." and ($file|substr:-strlen(".png")) != ".png"}
{$link=(('fileadmin'|cat:$analyse.directory)|cat:'/')|cat:$file}
<li class="filelist"><a href="{$link}">{$file}</a> </li>
{$nb_files = $nb_files + 1}
</div>
{/if}
<div class="tab-pane fade" id="downloads">
{block name=download}
{if $nb_files != 0}
<p><ul>
{$dir=$data_folder|cat:$analyse.directory}
{assign var="nb_files" value=0}
{foreach $dir|scandir as $file}
{if $file != "." and $file != "" and $file != ".." and ($file|substr:-strlen(".png")) != ".png"}
{$link=(('fileadmin'|cat:$analyse.directory)|cat:'/')|cat:$file}
<li class="filelist"><a href="{$link}">{$file}</a> </li>
{$nb_files = $nb_files + 1}
{/if}
{/foreach}
</ul></p>
{else}
<div class="alert alert-info">
Results folder not synchronized yet...
</div>
{/if}
{/foreach}
</ul></p>
{if $nb_files == 0}
<div class="alert alert-info">
Results folder not synchronized yet...
</div>
{/if}
{/block}
{/block}
</div>
</div>
</div>
This diff is collapsed.
......@@ -30,8 +30,8 @@ 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="ng6-content-header run">
<div style="float:left">
<div class="sub-content sc-top">
<div class="ng6-content-header-left run">
<h2>Run <small>{$runs[key($runs)].name}</small></h2>
{$runs[key($runs)].description}
</br>
......@@ -44,7 +44,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{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 class="ng6-content-header-right">
<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>
......@@ -57,78 +57,79 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<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 style="clear:both"></div>
</div>
<div style="clear:both"></div>
</div>
<ul id="myTab" class="nav nav-tabs">
<li class="active"><a href="#analyses" data-toggle="tab">Analyses</a></li>
<li><a href="#downloads" data-toggle="tab">Downloads</a></li>
</ul>
<div id="myTabContent" class="tab-content">
<div class="tab-pane fade in active" id="analyses">
{* Find out if an analysis table should be displayed *}
{assign var="display_analysis_result" value=false}
{foreach from=$h_run_analysis key=analysis_id item=analysis_values}
{if $analysis_values.is_admin && $analysis_values.hidden == 1}
{assign var="display_analysis_result" value=true}
{elseif $analysis_values.hidden == 0}
{assign var="display_analysis_result" value=true}
{/if}
{/foreach}
<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}
<th><center><input type="checkbox" id="chk_all_analysis"></center></th>
{/if}
<th nowrap>Name</th>
<th>Description</th>
<th>Software</th>
<th>Version</th>
</tr>
</thead>
<tbody>
{include file="recursive_list_analysis_display.tpl" element=$h_run_analysis prof=0}
</tbody>
{if $runs[key($runs)].is_admin && $login_user && $display_analysis_result}
<tfoot>
<div class="sub-content sc-bottom">
<ul id="myTab" class="nav nav-tabs">
<li class="active"><a href="#analyses" data-toggle="tab">Analyses</a></li>
<li><a href="#downloads" data-toggle="tab">Downloads</a></li>
</ul>
<div id="myTabContent" class="tab-content">
<div class="tab-pane fade in active" id="analyses">
{* Find out if an analysis table should be displayed *}
{assign var="display_analysis_result" value=false}
{foreach from=$h_run_analysis key=analysis_id item=analysis_values}
{if $analysis_values.is_admin && $analysis_values.hidden == 1}
{assign var="display_analysis_result" value=true}
{elseif $analysis_values.hidden == 0}
{assign var="display_analysis_result" value=true}
{/if}
{/foreach}
<table class="table table-striped table-bordered dataTable" id="analysis_data_table">
<thead>
<tr>
<th align="left" colspan="5">
With selection :
<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>
{if $runs[key($runs)].is_admin && $login_user && $display_analysis_result}
<th><center><input type="checkbox" id="chk_all_analysis"></center></th>
{/if}
<th nowrap>Name</th>
<th>Description</th>
<th>Software</th>
<th>Version</th>
</tr>
</tfoot>
</thead>
<tbody>
{include file="recursive_list_analysis_display.tpl" element=$h_run_analysis prof=0}
</tbody>
{if $runs[key($runs)].is_admin && $login_user && $display_analysis_result}
<tfoot>
<tr>
<th align="left" colspan="5">
With selection :
<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>
{/if}
</table>
</div>
<div class="tab-pane fade" id="downloads">
{$dir=$data_folder|cat:$runs[key($runs)].directory}
{assign var="nb_files" value=0}
<ul>
{foreach $dir|scandir as $file}
{if $file != "." and $file !="" and $file != ".." and ($file|substr:-strlen(".png")) != ".png"}
{$link=(('fileadmin'|cat:$runs[key($runs)].directory)|cat:'/')|cat:$file}
<li class="filelist"><a href="{$link}">{$file}</a> <br /></li>
{$nb_files = $nb_files + 1}
{/if}
{/foreach}
</ul>
{if $nb_files == 0}
<div class="alert alert-info">
Results folder not synchronized yet...
</div>
{/if}
</table>
</div>
<div class="tab-pane fade" id="downloads">
{$dir=$data_folder|cat:$runs[key($runs)].directory}
{assign var="nb_files" value=0}
<ul>
{foreach $dir|scandir as $file}
{if $file != "." and $file !="" and $file != ".." and ($file|substr:-strlen(".png")) != ".png"}
{$link=(('fileadmin'|cat:$runs[key($runs)].directory)|cat:'/')|cat:$file}
<li class="filelist"><a href="{$link}">{$file}</a> <br /></li>
{$nb_files = $nb_files + 1}
{/if}
{/foreach}
</ul>
{if $nb_files == 0}
<div class="alert alert-info">
Results folder not synchronized yet...
</div>
{/if}
</div>
</div>
</div>
{* If multiple runs have to be displayed *}
......@@ -143,16 +144,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{/if}
{/foreach}
{* Then display the table *}
<div class="run">
<h2>Runs list you can access :</h2>
<p>
You have access to {$runs|@count} runs.
<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="sub-content sc-top">
<div class="ng6-content-header-left run">
<h2>Runs list <small> you can access </small></h2>
You have access to <strong>{$runs|@count}</strong> runs.
<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 class="ng6-content-header-right">
&nbsp;
</div>
<div style="clear:both"></div>
</div>
<br />
{include file='run_table.tpl'}
<div class="sub-content sc-bottom">
{include file='run_table.tpl'}
</div>
{/if}
\ No newline at end of file
......@@ -95,12 +95,23 @@ div.file-display {
margin: 5px 0 0 0;
}
.ng6-content-header {
.ng6-content-header-left {
box-shadow: -4px 0 5px -5px grey, 5px 0 5px -6px grey;
margin: 15px 0px;
padding-left: 15px;
padding-top: 10px;
padding-bottom: 10px;
margin: 0;
padding: 10px;
width: 300px;
text-align: justify;
float: left;
background-color: #FaFaFa;
}
.ng6-content-header-right {
box-shadow: -4px 0 5px -5px grey, 5px 0 5px -6px grey;
margin: 0;
padding: 10px;
width: 585px;
text-align: justify;
float: right;
background-color: #FaFaFa;
}
.run {
background: url("../img/run-icon.png") no-repeat scroll -15px 15px #FaFaFa;
......
......@@ -23,7 +23,7 @@ h2 a:hover, h2 a:focus, h2 a:active { text-decoration: none; color: #eb5800; }
h2 span.hometype { color:#999; }
/* Header */
#header { background: url(../images/bando2-1.png) 50% 35px no-repeat #222426; }
#header { background: url(../images/bando2-1.png) 50% 35px no-repeat #222426; border-bottom: 1px solid black;}
#header-inside { position: relative; width: 960px; margin: 0 auto; }
#header h1 { margin: 15px 0 0 0; padding: 0; height: 66px; font-size: 15px; line-height: 1; }
......@@ -48,21 +48,35 @@ 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 { }
#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 { position: relative; z-index: 1; }
#header-sep .inside { height:13px; box-shadow: 0 5px 5px -5px grey; margin: 1px auto; width: 990px; }
#header-sep .inside p { margin: 0 0 0 30px; font-size: 0.8em; }
#footer-sep { position: relative; z-index: 1; }
#footer-sep .inside { height:13px; box-shadow: 0 -5px 5px -5px grey; margin: 1px auto; width: 990px; }
#footer-sep .inside p { margin: 0 0 0 30px; font-size: 0.8em; }
/* Bloc Page */
#global { width: 990px; margin: 0 auto; }
#page { }
#content {
margin-left: 15px;
}
.sub-content {
background-color: white;
border: 1px solid lightgray;
float: none;
margin-left: 15px;
margin-right: 15px;
padding: 1px 15px 25px;
width:auto;
float:none;
background-color: white;
box-shadow: -4px 0 5px -5px grey, 5px 0 5px -6px grey;
padding: 10px;
width: auto;
}
.sc-top {
box-shadow: 0 5px 5px -6px grey;
border-top: none;
margin-bottom: 15px;
}
.sc-bottom {
box-shadow: 0 -5px 5px -7px grey;
border-bottom: none;
}
/* Presentation Blocs */
......@@ -254,8 +268,4 @@ table.tx-nG6-pi3-listrow td { border-bottom: 1px solid #ddd; }
.ng6-footer-link:hover {
color: #567f87;
text-decoration: none;
}
.alert {
margin-top:25px;
}
\ No newline at end of file
......@@ -57,6 +57,12 @@
</div> <!-- fin de page -->
</div> <!-- fin de global -->
<!-- Footer-sep, designe la bande graphique entre le bloc central et le footer -->
<div id="footer-sep">
<div class="inside">
</div>
</div>
<div id="ng6-footer">
<ul id="ng6-footer-cols">
<li class="ng6-col">
......
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