open not toggle, resizeable table

5 files changed, 16 insertions, 12 deletions

diff --git a/public/stylesheets/screen.sass b/public/stylesheets/screen.sass
index 6af7e85..120953b 100644
--- a/public/stylesheets/screen.sass
+++ b/public/stylesheets/screen.sass
@@ -165,6 +165,7 @@ body
         td
           background-color: #FFFFF0
           
+          
 input#predict
   border: 0px
   background-color: $ist-color
diff --git a/views/details.haml b/views/details.haml
index 028b5b1..9c0a0c2 100644
--- a/views/details.haml
+++ b/views/details.haml
@@ -1,4 +1,5 @@
 %link{ :href=>"/stylesheets/screen.css", :media=>"screen, projection", :rel=>"stylesheet", :type=>"text/css"}
+
 .content
   .details
     %h2
diff --git a/views/layout.haml b/views/layout.haml
index a12b324..9cc2ed3 100644
--- a/views/layout.haml
+++ b/views/layout.haml
@@ -5,10 +5,11 @@
     %meta{'http-equiv' => "X-UA-Compatible", :content => "chrome=1"}
     %title Lazar Toxicity Predictions
     %link{ :href=>"/stylesheets/screen.css", :media=>"screen, projection", :rel=>"stylesheet", :type=>"text/css"}
-    %link{:rel=>"stylesheet", :href=>"/stylesheets/jquery-ui.css"}
+    %link{ :href=>"/stylesheets/jquery-ui.css", :rel=>"stylesheet"}
     %script{:src=>"/javascripts/jquery-1.9.1.min.js"}
     %script{ :src=>"/javascripts/jquery-ui.js"}
     %script{ :src=>"/javascripts/lazar-gui.js"}
+    %script{:src=>"/javascripts/jquery.tablesorter.min.js"}
     
 
   %body
diff --git a/views/neighbours.haml b/views/neighbours.haml
index ad22e10..e89fc7b 100644
--- a/views/neighbours.haml
+++ b/views/neighbours.haml
@@ -3,13 +3,14 @@
 / prepare it for neighbours ;
 / align single prediction to endpoint ;
 / display preordered in table view ;
-/ loaded in iframe, necessary to load js/css here ;
-%link{ :href=>"/stylesheets/screen.css", :media=>"screen, projection", :rel=>"stylesheet", :type=>"text/css"}
-%link{:rel=>"stylesheet", :href=>"http://code.jquery.com/ui/1.10.0/themes/base/jquery-ui.css"}
-%script{:src=>"http://code.jquery.com/jquery-1.9.1.js"}
-%script{ :src=>"http://code.jquery.com/ui/1.10.0/jquery-ui.js"}
-%script{:src=>"/javascripts/jquery.tablesorter.min.js"}
 
+:javascript
+  $(function() {
+    $( ".results" ).resizable({
+      containment: ".content"
+    });
+  });
+  
 .results{:style=>"display:none"}
   - count_m = 0
   / tabs div ;
@@ -74,10 +75,10 @@
                     %img{:src=>"/images/arrow_right_float.png", :alt=>"arrow"}
                   :javascript
                     $("a#link#{count_rs}#{count}").click(function () {
-                      $(".details").toggle();
-                      document.getElementById('details').focus();
+                      $("#iframe").show();
+                      document.getElementById('iframe').focus();
                     });
                     
                 - count += 1
--#= haml :details, :layout => false
-%iframe{:id=>"details", :name=>"details", :height=>"400px", :width=>"100%", :style=>"border:0px"}
+
+%iframe{:id=>"iframe", :name=>"details", :height=>"400px", :width=>"100%", :style=>"display:none;border:0px"}
diff --git a/views/prediction.haml b/views/prediction.haml
index 82c7254..ed51d09 100644
--- a/views/prediction.haml
+++ b/views/prediction.haml
@@ -33,7 +33,7 @@
                   %img{:src=>"/images/arrow_down_float.png", :alt=>"arrow"}
                   :javascript
                     $("a#link#{count}").click(function () {
-                      $(".results").toggle();
+                      $(".results").show();
                       document.getElementById('tabs').focus();
                       $("#tabs").tabs({ active: "#{count}" });
                     });