From 827e49aa7dcfa4b1542b081428b450f90c5c2d9e Mon Sep 17 00:00:00 2001
From: gebele <gebele@in-silico.ch>
Date: Mon, 8 May 2017 08:03:49 +0000
Subject: updated jsme;warnings;info

---
 views/layout.haml     | 16 +++++++++++-----
 views/prediction.haml |  6 +++---
 views/style.scss      | 34 ++++++++++++++++++++++++++--------
 3 files changed, 40 insertions(+), 16 deletions(-)

(limited to 'views')

diff --git a/views/layout.haml b/views/layout.haml
index 8a920ea..3c6fa5d 100644
--- a/views/layout.haml
+++ b/views/layout.haml
@@ -22,19 +22,19 @@
       Your web browser must have JavaScript enabled in order for this application to display correctly.
     %header.page-header
       %div.row
-        %div.col-md-2
+        %div.col-md-3
           %a{:href=> to("/predict")}
-            %img.media-object{:src=>"/images/IST_logo_s.png", :alt=>"logo", :width=>"150px", :heigth=>"150px", :style=>"margin:0 3em 0 2em;"}
-        %div.col-md-8
+            %img.media-object{:src=>"/images/IST_logo_s.png", :alt=>"logo", :width=>"150px", :heigth=>"150px"}
+        %div.col-md-6
           %h1.media-heading
             lazar toxicity predictions
-        %div.col-md-2
+        %div.col-md-3
           %h1.media-heading
             %small
               %a{:href=>"https://nano-lazar.in-silico.ch", :rel=>"external"} nano-lazar
 
     %div.container-fluid
-      %topline
+      %topline.alert
         %div.row
           %div.col-md-10
             Problems, bugs, ideas for improvements ? Please report at our
@@ -54,6 +54,12 @@
               %img.share{:src=>"/images/LinkedIn.png"}
             %a{:href=>"https://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2Flazar.in-silico.ch&title=&summary=&source=http%3A%2F%2Flazar.in-silico.ch", :rel=>"external", :title=>"Share on Facebook"}
               %img.share{:src=>"/images/Facebook.png"}
+        %div.row
+          %div.col-md-12
+            Please refer this 
+            %a{ :href=>"https://doi.org/10.3389/fphar.2013.00038", :rel=>"external"}
+              %img{ :src=>"https://zenodo.org/badge/DOI/10.3389/zenodo.10.3389.svg", :alt=>"DOI"}
+            for any citations.
       
       :javascript
         $(document).ready(function(){
diff --git a/views/prediction.haml b/views/prediction.haml
index 12a1fde..24d62fa 100644
--- a/views/prediction.haml
+++ b/views/prediction.haml
@@ -52,7 +52,7 @@
                 %p
                   %b Prediction:
                   / prediction popover
-                  %a.btn.glyphicon.glyphicon-info-sign{:href=>"javascript:void(0)", :title=>"Prediction", :tabindex=>"0", data: {trigger:"focus", toggle:"popover", placement:"left", html:"true", content:"<p>lazar searches the training dataset for similar compounds (neighbors) and calculates the prediction from their experimental activities.<p><b>Classification:</b></br>Majority vote of neighbor activities weighted by similarity.<p><b>Regression:</b></br>Prediction from a local partial least squares regression model with neighbor activities weighted by similarity.<p><a href=\"http://www.frontiersin.org/Journal/10.3389/fphar.2013.00038/abstract\", target=\"_blank\"> Original publication</a>."}}
+                  %a.btn.glyphicon.glyphicon-info-sign{:href=>"javascript:void(0)", :title=>"Prediction", :tabindex=>"0", data: {trigger:"focus", toggle:"popover", placement:"left", html:"true", content:"<p>lazar searches the training dataset for similar compounds (neighbors) and calculates the prediction from their experimental activities.<p><b>Classification:</b></br>Majority vote of neighbor activities weighted by similarity.<p><b>Regression:</b></br>Prediction from a local partial least squares regression model with neighbor activities weighted by similarity.<p><a href=\"http://www.frontiersin.org/Journal/10.3389/fphar.2013.00038/abstract\", target=\"_blank\"> Original publication</a>.<hr></hr><a href=\"https://doi.org/10.3389/fphar.2013.00038\", target=\"_blank\"><img src=\"https://zenodo.org/badge/DOI/10.3389/zenodo.10.3389.svg\" alt=\"DOI\"></a>"}}
                   %br
                   = (type == "Regression") ? "#{prediction[:value].delog10.signif(3)} (#{unit})</br>#{@compound.mmol_to_mg(prediction[:value].delog10).signif(3)} #{(unit =~ /\b(mol\/L)\b/) ? "(mg/L)" : "(mg/kg_bw/day)"}" : prediction[:value]
                   
@@ -86,7 +86,7 @@
                   %p=prediction[:info].sub(/excluded/, "excluded<br>")
                 - if !prediction[:warnings].blank?
                   %b warnings:
-                  - prediction[:warnings].each do |warning|
+                  - prediction[:warnings].uniq.each do |warning|
                     %br
                     %p=warning
                     %p=warning.sub(/substances/, "substances<br>").sub(/prediction\:/, "prediction\:<br>")
@@ -99,7 +99,7 @@
                   %p=prediction[:info].sub(/excluded/, "excluded<br>")
                 - if !prediction[:warnings].blank?
                   %b warnings:
-                  - prediction[:warnings].each do |warning|
+                  - prediction[:warnings].uniq.each do |warning|
                     %br
                     %p=warning.sub(/substances/, "substances<br>").sub(/prediction\:/, "prediction\:<br>")
 
diff --git a/views/style.scss b/views/style.scss
index 5c56d14..308d1ba 100644
--- a/views/style.scss
+++ b/views/style.scss
@@ -1,3 +1,29 @@
+@media (min-width: 320px){
+  .page-header{
+    img.media-object{
+      margin-left:0;
+    }
+    background-color: #fff;
+    padding:10px 0 10px 0;
+    margin: 0;
+    text-align:left;
+    //display:inline-block;
+    width:100%;
+  }
+}
+@media (min-width: 480px){
+  .page-header{
+    img.media-object{
+      margin-left:1em;
+    }
+    background-color: #fff;
+    padding:20px 0 20px 0;
+    margin: 0;
+    text-align:center;
+    //display:inline-block;
+    width:100%;
+  }
+}
 body {
   background-color:#E7E7E7;
 }
@@ -53,14 +79,6 @@ ul.share-buttons{
 .dropdown-menu a {
   padding: 0 2px 1px 2px !important;
 }
-.page-header{
-  background-color: #fff;
-  padding:20px 0 20px 0;
-  margin: 0;
-  text-align:center;
-  display:inline-block;
-  width:100%;
-}
 .share{
   width: 30px;
   padding-right: 5px;
-- 
cgit v1.2.3