minor change in pc_link; clean up comments

4 files changed, 13 insertions, 26 deletions

diff --git a/views/details.haml b/views/details.haml
index 9f6915f..b478f39 100644
--- a/views/details.haml
+++ b/views/details.haml
@@ -23,6 +23,6 @@
       = @names
     %p{:style=>"padding-left:0.5em;"}
       / pubchem link
-      %a{:href=>"http://aop.in-silico.ch/", :title=>"link opens in new tab", :alt=>"pubchem link", :target=>"_blank"} PubChem read across 
+      %a{:href=>"http://aop.in-silico.ch/", :title=>"Link opens in new window.", :alt=>"pubchem read across", :target=>"_blank"} PubChem read across 
       %i (experimental)
 
diff --git a/views/neighbors.haml b/views/neighbors.haml
index 7785eaa..f742cff 100644
--- a/views/neighbors.haml
+++ b/views/neighbors.haml
@@ -42,7 +42,6 @@
                 sortList: [[2,1]]
               });
             });
-          /%h2= "Neighbors: "
           - $logger.debug "neighbors compounds:\t#{p.data_entries[0]}\n"
           - if p.data_entries[0][2] != nil && p.data_entries[0].size != 3
             %h2= "Neighbors: "
@@ -70,7 +69,7 @@
                       %dt
                         Similarity
                       %dd
-                        %code lazar 
+                        %code{:style=>"font-size:x-large;"} lazar 
                         calculates 
                         %em
                           activity specific 
@@ -93,10 +92,6 @@
                 - case c
                 - when /(false|true|inactive|active)/i
                   - c = c
-                -#- when /(0|false|inactive)/
-                  - c = "non-carcinogen"
-                -#- when /(1|true|active)/
-                  - c = "carcinogen"
                 - else
                   /- c = Array.new
                   - c = p.data_entries[count][2].round(3)
diff --git a/views/predict.haml b/views/predict.haml
index 8831c56..fbc8d53 100644
--- a/views/predict.haml
+++ b/views/predict.haml
@@ -94,11 +94,12 @@
           #details{:id => "#{@detail_count}", :style=> "display:none;"}
             %h3 Model Details:
             //%p= "Training Dataset:\t#{model[RDF::OT.trainingDataset]}"
-            %p Algorithm: Lazar
+            %p{:style=>"display:inline;"} Algorithm:
+            %code{:style=>"font-size:x-large;"} lazar
             %p Type: regression
             %p Training compounds: 580
             %p{:style=>"display:inline;"} Descriptors:
-            %a{:href=>"https://services.in-silico.ch/algorithm/descriptor/physchem", :title=>"link opens in new window.", :target=>"_blank"} Physico-chemical (PC)properties
+            %a{:href=>"https://services.in-silico.ch/algorithm/descriptor/physchem/list", :title=>"link opens in new window.", :target=>"_blank"} Physico-chemical (PC) properties
             //%p= "Training Dataset:\t#{model[RDF::OT.trainingDataset]}"
             //%p= "Feature Dataset:\t#{model[RDF::OT.featureDataset]}"
             /%h3 Validation: 
@@ -126,7 +127,8 @@
           #details{:id=>"#{@detail_count}", :style=> "display:none;"}
             %h3 Model Details:
             //%p= "Training Dataset:\t#{model[RDF::OT.trainingDataset]}"
-            %p Algorithm: Lazar
+            %p{:style=>"display:inline;"} Algorithm:
+            %code{:style=>"font-size:x-large;"} lazar
             %p Type: classification
             %p Training compounds: 86
             %p{:style=>"display:inline;"} Descriptors:
@@ -159,7 +161,8 @@
           #details{:id => "#{@detail_count}", :style=> "display:none;"}
             %h3 Model Details:
             //%p= "Training Dataset:\t#{model[RDF::OT.trainingDataset]}"
-            %p Algorithm: Lazar
+            %p{:style=>"display:inline;"} Algorithm:
+            %code{:style=>"font-size:x-large;"} lazar
             %p Type: classification
             %p Training compounds: 828
             %p{:style=>"display:inline;"} Descriptors:
diff --git a/views/prediction.haml b/views/prediction.haml
index 16101d3..f2d938c 100644
--- a/views/prediction.haml
+++ b/views/prediction.haml
@@ -42,10 +42,6 @@
               - case c
               - when /(false|true|inactive|active)/i
                 - c = c
-              -#- when /(0|false|inactive)/
-                - c = "non-carcinogen"
-              -#- when /(1|true|active)/
-                - c = "carcinogen"
               - else
                 /- c = Array.new
                 - c = (p.data_entries[0][0].class == Float) ? p.data_entries[0][0].round(3) : (p.data_entries[0][0] != nil ? p.data_entries[0][0] : "no prediction")
@@ -72,9 +68,10 @@
                     %dt
                       Result
                     %dd
-                      %code lazar 
+                      %code{:style=>"font-size:x-large;"} lazar 
                       calculates searches the training dataset for similar compounds (neighbors) 
-                      and calculates the prediction from their measured activities. lazar 
+                      and calculates the prediction from their measured activities. 
+                      %code{:style=>"font-size:x-large;"} lazar 
                       calculates predictions using
                       %ul
                         %li a majority vote (weighted by compound similarity) for 
@@ -109,7 +106,7 @@
                   /TODO add tooltip for significant ftagments and descriptors
                   - if @model_type[count] =~ /classification/i && (p.data_entries[0][1] != nil && p.data_entries[0][1] != 0.0)
                     / Significant fragments:
-                    %a{:href => to("/prediction/#{CGI.escape(@model_uri)}/#{@model_type[count]}/#{CGI.escape(@compound.uri)}/fingerprints"), :id=>"linkPredictionSf", :target=>"details_overview"}Significant fragments
+                    %a{:href => to("/prediction/#{CGI.escape(@model_uri)}/#{@model_type[count]}/#{CGI.escape(@compound.uri)}/fingerprints"), :id=>"linkPredictionSf", :title=>"", :target=>"details_overview"}Significant fragments
                     :javascript
                       $(function() {
                         $("a#linkPredictionSf").on('click', function(e) {
@@ -125,14 +122,6 @@
                           $('#iframe_overview').bPopup();
                         });
                       });
-                  / title must be empty for tooltip
-                  -#%a{:href =>"#sfragments", :title=>"", :id=>"sfragments"}
-                    %img{:src=>"/images/info_white.png"}
-                  -#.tooltip{:style=>"font-weight: normal; font-size: 1em; width: 50%; text-align: left;"}
-                    %dt
-                      Significant fragments
-                    %dd
-                      Significant fragments are solely used to determine activity specific similarities of neighbors.
                   %p
                   - if c != ''
                     %b Neighbors: