summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgebele <gebele@in-silico.ch>2017-11-02 10:36:15 +0000
committergebele <gebele@in-silico.ch>2017-11-02 10:36:15 +0000
commit2d19e8a294b0c95a4b49d963f383b9b9b3918ea0 (patch)
tree43aa60b4b7b96a51b35afa8c2c51ad5d3bfbf9e9
parent120ae520e6a72bb9f32bd904767decb87882b260 (diff)
re-order nav element and div heigth
-rw-r--r--views/task.haml18
1 files changed, 10 insertions, 8 deletions
diff --git a/views/task.haml b/views/task.haml
index a81f764..6d87416 100644
--- a/views/task.haml
+++ b/views/task.haml
@@ -32,8 +32,8 @@
progress(response['percent'],id);
if (response['percent'] == 100){
window.clearInterval(markers[id]);
- $("a#downbutton_"+id).show();
- $("a#detailsbutton_"+id).show();
+ $("a#downbutton_"+id).removeClass("disabled");
+ $("a#detailsbutton_"+id).removeClass("disabled");
//pagePredictions(task_id,model_id,id);
};
});
@@ -75,7 +75,8 @@
callback: function(data, pagination) {
var html = simpleTemplating(data);
$('#data-container_'+id).html(html);
- //$('#data-container_'+id).height(300);
+ $('#data-container_'+id).css("min-height", $(window).height() + "px" );
+ //$('#data-container_'+id).height(500);
}
});
} else if (span.className = "glyphicon glyphicon-menu-down"){
@@ -106,15 +107,16 @@
%div.row
%div.col-md-6
%h5= (model == "Cramer") ? "Oral toxicity (Cramer rules)" : (m.endpoint =~ /Mutagenicity/i ? "Consensus mutagenicity" : "#{m.endpoint} (#{m.species})")
+ #pager{:id=>idx}
%div.col-md-6.h5
- %a.btn.btn-default.btn-xs{:id => "detailsbutton_#{idx}", :data=>{:toggle=>"collapse"}, :href=>"javascript:void(0)", :onclick=>"pagePredictions('#{task}','#{model}','#{idx}')", :style=>"display:none;font-size:small;"}
+ %a.btn.btn-default.btn-xs.disabled{:id => "detailsbutton_#{idx}", :data=>{:toggle=>"collapse"}, :href=>"javascript:void(0)", :onclick=>"pagePredictions('#{task}','#{model}','#{idx}')", :style=>"font-size:small;"}
%span.glyphicon.glyphicon-menu-right
Details
- %a.btn.btn-default.btn-xs{:id => "downbutton_#{idx}", :href=>"#{to("/predict/csv/#{task}/#{model}/#{@filename}")}", :title=>"download", :style=>"display:none;font-size:small;"}
+ %a.btn.btn-default.btn-xs.disabled{:id => "downbutton_#{idx}", :href=>"#{to("/predict/csv/#{task}/#{model}/#{@filename}")}", :title=>"download", :style=>"font-size:small;"}
%span.glyphicon.glyphicon-download-alt
CSV
- %div{:id=>"progress_#{idx}", :style=>"width:100%;height:2px;position:relative;background-color:#ccc;"}
- %div{:id=>"bar_#{idx}", :style=>"background-color: #4CAF50;width:10px;height:2px;position:absolute;"}
+ %div{:id=>"progress_#{idx}", :style=>"width:100%;height:3px;position:relative;background-color:#ccc;"}
+ %div{:id=>"bar_#{idx}", :style=>"background-color: #4CAF50;width:10px;height:3px;position:absolute;"}
- # increase interval timer for large datasets
- ctimer = ((@compounds.size/1000) == 0 ? 1000 : ((@compounds.size/1000)*1000))
:javascript
@@ -125,4 +127,4 @@
}, timer );
});
#data-container{:id=>idx,:style=>"width:100%;"}
- #pager{:id=>idx}
+ -#pager{:id=>idx}