Commit 3ac22ae5 authored by Jerome Mariette's avatar Jerome Mariette
Browse files

update some code

parent 27b86c41
......@@ -96,20 +96,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<div id="modal-foot-tmpl" class="modal-footer"></div>
</div>
{* Error No raw selected modal *}
<div id="ng6modal-DTnoraw" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="modalLabel-DTnoraw" aria-hidden="true">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3>Error</h3>
</div>
<div class="modal-body">
<div class='tx-nG6-pi1-error'>No raw selected, please select a raw to access this fonctionality.</div>
</div>
<div class="modal-footer">
<button class="btn" data-dismiss="modal" aria-hidden="true"><i class="icon-remove"></i> Close</button>
</div>
</div>
{* Error only 1 raw modal *}
<div id="ng6modal-1raw" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="modalLabel-1raw" aria-hidden="true">
<div class="modal-header">
......
......@@ -47,9 +47,7 @@ $(function () {
columns.push( parseInt($(this).attr("id").split('_')[2]) ) ;
}) ;
if( samples.length == 0 || samples.length == 0 ) {
$("#ng6modal-DTnoraw").modal();
} else {
if( samples.length != 0 ) {
if( $('#sample_1_col_1') !== 'undefined' ) {
columns.push( 1 ) ;
}
......
......@@ -101,7 +101,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</tr>
<tr>
{if $analyse_results|@count > 1 }<th colspan="13">{else}<th colspan="12">{/if}
With selection : <button id="columns_extract" type="button" class="btn"><i class="icon-picture"></i> Table</button>
With selection : <button id="columns_extract" type="button" class="btn multiple-selection-btn"><i class="icon-picture"></i> Table</button>
</th>
</tr>
</tfoot>
......
......@@ -35,9 +35,7 @@ $(function () {
var max_xvalues = 30;
if ($(":checked[id^=chk_sample_]").size() == 0) {
$("#ng6modal-DTnoraw").modal();
} else {
if ($(":checked[id^=chk_sample_]").size() > 0) {
//Set dialog window
$("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>");
$("#modal-body-tmpl").html('<div id="highcharts_container"></div>');
......
......@@ -121,7 +121,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<tr>
<th align="left" colspan="{if $analyse_results|@count > 1 }5{else}4{/if}">
With selection :
<button type="button" class="btn length-view-btn"><span><span>Length distribution</span></span></button>
<button type="button" class="btn multiple-selection-btn length-view-btn"><i class=" icon-signal"></i> Length distribution</button>
</th>
</tr>
</tfoot>
......
......@@ -35,9 +35,7 @@ $(function () {
var max_xvalues = 30;
if ($(":checked[id^=chk_sample_]").size() == 0) {
$("#ng6modal-DTnoraw").modal();
} else {
if ($(":checked[id^=chk_sample_]").size() > 0) {
//Set dialog window
$("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>");
$("#modal-body-tmpl").html('<div id="highcharts_container"></div>');
......
......@@ -89,7 +89,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<tr>
<th align="left" colspan="{if $analyse_results|@count > 1 }10{else}9{/if}">
With selection :
<button type="button" class="btn length-view-btn"><i class="icon-signal"></i> Length distribution</button>
<button type="button" class="btn multiple-selection-btn length-view-btn"><i class="icon-signal"></i> Length distribution</button>
</th>
</tr>
</tfoot>
......
......@@ -31,9 +31,7 @@ $(function () {
var DUPLICATION_LIMIT = 20;
$(".js-duplication-profile-btn").click(function() {
if ($(":checked[id^=chk_sample_]").size() == 0) {
$("#ng6modal-DTnoraw").modal();
} else {
if ($(":checked[id^=chk_sample_]").size() > 0) {
// First confirm with the user if he wants to hide
$("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>");
$("#modal-body-tmpl").html('<div id="highcharts_container"></div>');
......
......@@ -38,9 +38,7 @@ $(function () {
});
$('#length-view-btn, #nmean-view-btn, #nnumber-view-btn, #quality-view-btn').click(function() {
if ($(':checked[id^=chk_sample_]').size() == 0) {
$("#ng6modal-DTnoraw").modal();
} else {
if ($(':checked[id^=chk_sample_]').size() == 1) {
//Set dialog window
$("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>");
$("#modal-body-tmpl").html('<div id="img_container"></div>');
......
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