From d356e84babc0b753ba29f27f589b5a85bbd2e982 Mon Sep 17 00:00:00 2001
From: gebele <gebele@in-silico.ch>
Date: Thu, 18 Jun 2015 12:07:25 +0200
Subject: general css update with bootstrap

---
 views/layout.haml | 78 ++++++++++++++++++++++---------------------------------
 1 file changed, 31 insertions(+), 47 deletions(-)

(limited to 'views/layout.haml')

diff --git a/views/layout.haml b/views/layout.haml
index 05f4a70..8703042 100644
--- a/views/layout.haml
+++ b/views/layout.haml
@@ -1,70 +1,54 @@
 !!!
 %html{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en", :lang => "en"}
   %head
-    %meta{'http-equiv' => 'Content-Type', :content => 'text/html; charset=UTF-8'}
+    %meta{'charset'=>"utf-8"}
+    %meta{'http-equiv'=>"X-UA-Compatible", :content=>"IE=edge"}
+    %meta{'name'=>"viewport", :content=>"width=device-width, initial-scale=1"}
     %title Lazar Toxicity Predictions
     %link{:rel=>'icon', :type=>'image/x-icon', :href=>'/images/favicon.ico'}
-    %link{:rel=>'stylesheet', :href=>"#{'/style.css'}", :type => "text/css"}
+    %link{:rel=>'stylesheet', :href=>"#{'/css/bootstrap.min.css'}"}
+    %link{:rel=>'stylesheet', :href=>"#{'/css/theme.default.min.css'}"}
+    %link{:rel=>'stylesheet', :href=>"#{'/css/theme.bootstrap.min.css'}"}
     %link{ :href=>"/stylesheets/jquery-ui.css", :rel=>"stylesheet"}
     %link{ :href=>"/jsme/jsa.css", :rel=>"stylesheet"}
-    %script{:src=>"/javascripts/jquery-1.8.3.min.js", :type=>"text/javascript"}
-    %script{ :src=>"/javascripts/jquery-ui-1.10.3.custom.min.js", :type=>"text/javascript"}
-    %script{:src=>"/javascripts/jquery.tools.min.js", :type=>"text/javascript"}
-    %script{:src=>"/javascripts/jquery.tablesorter.min.js", :type=>"text/javascript"}
-    %script{:src=>"/javascripts/jquery.bpopup.min.js", :type=>"text/javascript"}
-    %script{ :src=>"/javascripts/lazar-gui.js", :type=>"text/javascript"}
-    %script{:src=>"/jsme/jsme.nocache.js", :type=>"text/javascript"}
-
-  %body
+    %script{:src=>"/javascripts/jquery-1.11.2.min.js"}
+    %script{:src=>"/javascripts/bootstrap.min.js"}
+    %script{:src=>"/javascripts/jquery-ui-1.10.3.custom.min.js"}
+    %script{:src=>"/javascripts/jquery.tablesorter.min.js"}
+    %script{:src=>"/javascripts/jquery.tablesorter.widgets.js"}
+    %script{ :src=>"/javascripts/lazar-gui.js"}
+  %body{:style=>"background-color:#E7E7E7"}
     %noscript
       %div{ :style=>"width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"}
-        Your web browser must have JavaScript enabled in order for this application to display correctly.
-    .logo
-      %a{:href=> to("/predict")}
-        %img{:src=>"/images/ist_logo.png", :alt=>"logo"}
-      %h1 Lazar Toxicity Predictions
-      %hr{:style=>"color:black;"}
+      Your web browser must have JavaScript enabled in order for this application to display correctly.
+    %header.page-header
+      %div.row
+        %div.col-md-2
+          %a{:href=> to("/predict")}
+            %img.media-object{:src=>"/images/ist_logo.png", :alt=>"logo", :style=>"margin-left:3em;margin-right:1em;"}
+        %div.col-md-8
+          %h1.media-heading Lazar Toxicity Predictions
     
-    .content
+    %div.container
       :javascript
         $(document).ready(function(){
-          // hide #back-top first
           $("#back-top").hide();
-          // fade in #back-top
-          $('a#confidence').tooltip({
-            predelay: 300,
-            position: 'bottom center',
-            offset: [-100, 0],
-          });
-          $('a#result').tooltip({
-            predelay: 300,
-            position: 'bottom center',
-            offset: [-100, 0],
-          });
-          $('a#similarity').tooltip({
-            predelay: 300,
-            position: 'bottom center',
-            offset: [-600, 0],
-          });
-          $('a#measured_activity').tooltip({
-            predelay: 300,
-            position: 'bottom center',
-            offset: [-500, 0],
+          $(".blind").error(function(){
+            $(this).attr('src', '/images/blind.png');
           });
         });
           
       = yield
     
-    .footer{:style=>"margin-bottom:2em;"}
-      &copy; 
-      %a{:href => 'http://www.in-silico.ch', :rel => "external"} <i style="font-family: serife">in silico</i> toxicology gmbh 2004 - #{Time.now.year.to_s}
+    %footer.footer
+      %div.container
+        %p.text-muted
+          &copy; 
+          %a{:href => 'http://www.in-silico.ch', :rel => "external"} <i style="font-family: serife">in silico</i> toxicology gmbh 2004 - #{Time.now.year.to_s}
 
-    #back-top{:style => "z-index:100;position:fixed;bottom:0%;width:98%;"}
-      %hr{:style => "margin-bottom:0;"}
+    #back-top{:style => "z-index:100;position:fixed;bottom:1%;right:1%;"}
       %a{:href => "", :style=>"text:decoration:none;color:#ccc;"}
-        %img{:src => "/rect.png", :alt => "top", :style=>"width:100%;height:50px"}
-      %div{:id=>"backtop", :style => "margin-top:-50px;text-align:right;cursor:default;"}
-        TOP
+        %span.glyphicon.glyphicon-circle-arrow-up{:style => "font-size:3em;color:black;"}
     :javascript
       $("#back-top").hide();
       $(function () {
-- 
cgit v1.2.3