summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgebele <gebele@in-silico.ch>2018-04-03 14:24:09 +0000
committergebele <gebele@in-silico.ch>2018-04-03 14:24:09 +0000
commitca94d4b7e8ad0cab13e66be7a34b0cde21948c69 (patch)
tree58601f0f9d784032d8c995ebd220fc8cdb9e97a0
parentaa678ba1f3988d2b42f372b6da0499b403708e58 (diff)
follow up master
-rw-r--r--VERSION2
-rw-r--r--views/predict.haml3
-rw-r--r--views/prediction.haml13
3 files changed, 15 insertions, 3 deletions
diff --git a/VERSION b/VERSION
index 88c5fb8..f0bb29e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.4.0
+1.3.0
diff --git a/views/predict.haml b/views/predict.haml
index 89bef7c..2308911 100644
--- a/views/predict.haml
+++ b/views/predict.haml
@@ -180,5 +180,6 @@
%h2
3. Predict
%div.col-lg-10.col-md-10.col-sm-10.col-xs-10
- %input.btn.btn-warning.h2{ :type => "submit", :id => "submit", :value=>">>", :onclick => "getsmiles()"}
+ %button.has-feedback.btn.btn-warning.h2{:type => "submit", :id => "submit", :value=>"", :onclick => "getsmiles()"}
+ %span.glyphicon.glyphicon-play
%img.h2{:src=>"/images/wait30trans.gif", :id=>"circle", :class=>"circle", :alt=>"wait", :style=>"display:none;"}
diff --git a/views/prediction.haml b/views/prediction.haml
index 9cdedde..80b4d16 100644
--- a/views/prediction.haml
+++ b/views/prediction.haml
@@ -1,3 +1,11 @@
+:javascript
+ $(document).ready(function(){
+ $('[data-toggle="popover"]').popover();
+ $('.modal').on('hidden.bs.modal', function () {
+ $(this).removeData('bs.modal');
+ });
+ });
+
%div.well
%a.btn.btn-warning{:href => to('/predict')}
%i.glyphicon.glyphicon-menu-left
@@ -35,7 +43,10 @@
/ show message about dbhit and measurements
%p
- %b Compound is part of the training dataset
+ :plain
+ This compound was part of the training dataset. <i>All</i> information </br>
+ from this compound was removed from the training data before the </br>
+ prediction, to obtain unbiased results.
%p
%b Measured activity:
%br