several minor changes:color,buttons,text

3 files changed, 48 insertions, 37 deletions

diff --git a/views/details.haml b/views/details.haml
index 1697831..fc57d5e 100644
--- a/views/details.haml
+++ b/views/details.haml
@@ -1,10 +1,14 @@
 %link{ :href=>"/stylesheets/screen.css", :media=>"screen, projection", :rel=>"stylesheet", :type=>"text/css"}
 
 .content
+  %button{:id=>"closebutton", :onclick=>"parent.$('#iframe').bPopup().close();parent.$('#iframe_overview').bPopup().close();"}
+    X
+    
   .details
-    %h2
+    %h2{:style=>"margin-top:0px"}
       Details:
-    %img{:src=>"#{@compound_uri.uri}/image", :alt=>"", :width=>"100px"}
+    %img{:src=>"#{@compound_uri.uri}/image", :alt=>"", :width=>"300px", :heigth=>"300px"}
+    %br
     %br
     %b
       SMILES:
diff --git a/views/predict.haml b/views/predict.haml
index 98b9edb..12ed158 100644
--- a/views/predict.haml
+++ b/views/predict.haml
@@ -1,7 +1,7 @@
 :javascript
   function checksmiles () {
     if (document.form.identifier.value == "") {
-      alert("Please insert a compound.");
+      alert("Please draw or insert a chemical structure.");
       document.form.identifier.focus();
       return false;
     };
@@ -29,11 +29,11 @@
   };
 
 
-/ whole site content needs to be in one form. Input and checkboxes are checked by js functions. 
+/ whole site content needs to be in one form. Input and checkboxes are proofed by js functions. 
 %form{:name => "form", :action => to('/predict'), :method => "post", :enctype => "multipart/form-data", :onsubmit => "return  !!(checksmiles() & checkboxes())" }
   %fieldset#top
     %a{:href => "#", :id => "linkInsert"}
-      %h1 1. Draw or insert your compound   
+      %h1 1. Draw a chemical structure
     :javascript
       $("a#linkInsert").click(function () {
         $("#insert").toggle();
@@ -52,7 +52,7 @@
         
       
       .close
-        = hide_link "#insert"
+        -#= hide_link "#insert"
     
   .arrow
     %img{:src=>"/images/arrow_down_float.png", :alt=>"arrow", :class=> "arrow"}
@@ -68,7 +68,7 @@
         document.location = document.location + "#" + "models";
       });
       
-    #models{ :style => "display: none;"}
+    #models
       %i Please observe validation report for model details.
 
       // TODO order models by echa endpoint currently manually added and to find in model.type[0].split("#").last
@@ -80,11 +80,11 @@
           %label{:for => "selection[#{model.title}]"}
             = "DSSTox Carcinogenic Potency DBS "+model.title.split(" ").first
           %a{:href=>"#", :alt=>"#{model.title} validation"}
-            %i ( Validation Link )
+            %i ( Validation report )
           %br
           
       .close
-        = hide_link "#models"
+        -#= hide_link "#models"
 
   .arrow
     %img{:src=>"/images/arrow_down_float.png", :alt=>"arrow", :class=> "arrow"}
diff --git a/views/prediction.haml b/views/prediction.haml
index 89e66f0..bc8d96d 100644
--- a/views/prediction.haml
+++ b/views/prediction.haml
@@ -16,7 +16,7 @@
         %tr
           %td{:id=>"compound"}
             %a{:href => to("/prediction/#{CGI.escape(@compound.uri)}/details"), :id=>"linkCompound", :target=>"details_overview"}
-              %img{:src=>"#{@compound.uri}/image", :alt=>"image not available", :width=>"100"}
+              %img{:src=>"#{@compound.uri}/image", :alt=>"Compound image not available", :width=>"100"}
             %br
             %br
             %img{:src=>"/images/arrow_up_float.png", :alt=>"arrow"}
@@ -41,31 +41,38 @@
                 %b{:class => "title"}
                   = @@prediction_models[count].title
                 %br
-                %br            
-                  = "Result:"
-                  %b= p.data_entries[0][0] != nil ? p.data_entries[0][0] : "No prediction result"
-                  %a{:href=>"#result", :title=>"", :id=>"result"}
-                    %img{:src=>"/images/info_white.png"}
-                  .tooltip{:style=>"font-weight: normal; font-size: 1em; width: 50%; text-align: left;"}
-                    %dt
-                      Result
-                    %dd
-                      %code lazar 
-                      calculates searches the training dataset for similar compounds (neighbors) 
-                      and calculates the prediction from their measured activities. lazar 
-                      calculates predictions using
-                      %ul
-                        %li a majority vote (weighted by compound similarity) for 
-                        %em classification 
-                        (
-                        %a{:href=>"http://www.in-silico.de/articles/modi020905.pdf"} original publication
-                        )
-                        %li a local QSAR model based on neighbors for
-                        %em regression
-                        (
-                        %a{:href=>"http://www.in-silico.de/articles/mh_tf.pdf"} original publication
-                        )
-                      Please keep in mind that predictions are based on the measured activities of neighbors.
+                %br
+                  .result
+                    - if c != ''
+                      - if c == 0||"false"
+                        %image{:src=>"/images/greendot.png"}
+                      - elsif c == 1||"true"
+                        %image{:src=>"/images/reddot.png"}
+
+                    %b Result:
+                    %b= p.data_entries[0][0] != nil ? p.data_entries[0][0] : "No prediction result"
+                    %a{:href=>"#result", :title=>"", :id=>"result"}
+                      %img{:src=>"/images/info_white.png"}
+                    .tooltip{:style=>"font-weight: normal; font-size: 1em; width: 50%; text-align: left;"}
+                      %dt
+                        Result
+                      %dd
+                        %code lazar 
+                        calculates searches the training dataset for similar compounds (neighbors) 
+                        and calculates the prediction from their measured activities. lazar 
+                        calculates predictions using
+                        %ul
+                          %li a majority vote (weighted by compound similarity) for 
+                          %em classification 
+                          (
+                          %a{:href=>"http://www.in-silico.de/articles/modi020905.pdf"} original publication
+                          )
+                          %li a local QSAR model based on neighbors for
+                          %em regression
+                          (
+                          %a{:href=>"http://www.in-silico.de/articles/mh_tf.pdf"} original publication
+                          )
+                        Please keep in mind that predictions are based on the measured activities of neighbors.
                 %br
                   .confidence
                     %b Confidence:
@@ -97,5 +104,5 @@
     = haml :neighbors, :layout => false
   - else
     %h2
-      no neighbors available             
-%iframe{:id=>"iframe_overview", :name=>"details_overview", :height=>"90%", :width=>"90%", :style=>"display:none;border:0px"}            
+      no neighbors available
+%iframe{:id=>"iframe_overview", :name=>"details_overview", :height=>"90%", :width=>"90%", :style=>"display:none;border:0px"}