From c9def4631ced0e06c4c10bbbc84d7e7fe313f91b Mon Sep 17 00:00:00 2001
From: gebele <gebele@in-silico.ch>
Date: Thu, 14 Dec 2017 15:53:53 +0100
Subject: changed info text rebuilding models

---
 views/info.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'views')

diff --git a/views/info.haml b/views/info.haml
index 34ded87..d8b93f9 100644
--- a/views/info.haml
+++ b/views/info.haml
@@ -1,2 +1,2 @@
 %div.info
-  currently no models available
+  We are rebuilding the models. It will take a while, please be patient and reload the page in some time.
-- 
cgit v1.2.3


From aa678ba1f3988d2b42f372b6da0499b403708e58 Mon Sep 17 00:00:00 2001
From: gebele <gebele@in-silico.ch>
Date: Tue, 3 Apr 2018 13:41:15 +0000
Subject: version bump;caret documentation fix

---
 views/model_details.haml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'views')

diff --git a/views/model_details.haml b/views/model_details.haml
index d85d2fb..c5e3370 100644
--- a/views/model_details.haml
+++ b/views/model_details.haml
@@ -28,8 +28,13 @@
     = ", min: #{model.model.algorithms["similarity"]["min"]}"
     %br
     Prediction:
-    %a{:href=>"http://www.rubydoc.info/gems/lazar/OpenTox%2F#{model.model.algorithms["prediction"]["method"].sub("::","%2f")}", :rel=>"external"}
-      = model.model.algorithms["prediction"]["method"]
+    - if model.model.algorithms["prediction"]["method"] !~ /Caret/
+      %a{:href=>"http://www.rubydoc.info/gems/lazar/OpenTox%2F#{model.model.algorithms["prediction"]["method"].sub("::","%2f")}", :rel=>"external"}
+        = model.model.algorithms["prediction"]["method"]
+    - else
+      %a{:href=>"http://www.rubydoc.info/gems/lazar/OpenTox/Algorithm/Caret", :rel=>"external"}
+        = model.model.algorithms["prediction"]["method"]
+
     %br
     Descriptors:
     = model.model.algorithms["descriptors"]["method"]+","
-- 
cgit v1.2.3


From ca94d4b7e8ad0cab13e66be7a34b0cde21948c69 Mon Sep 17 00:00:00 2001
From: gebele <gebele@in-silico.ch>
Date: Tue, 3 Apr 2018 14:24:09 +0000
Subject: follow up master

---
 views/predict.haml    |  3 ++-
 views/prediction.haml | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'views')

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
-- 
cgit v1.2.3