1 files changed, 30 insertions, 54 deletions
diff --git a/views/compound.haml b/views/compound.haml
index de4cf77..9509ce0 100644
--- a/views/compound.haml
+++ b/views/compound.haml
@@ -1,65 +1,41 @@
-%script{:type => "text/javascript", :src  => "sorttable.js"}
-%table{:class => "sortable"}
-  %tr
-    %th Structure
-    %th Targets (experimental data)
-    %th Other active assays (experimental data)
+:javascript
+  $(document).ready(function() {
+    /*/ prefetch predictions in order to fill cache in background
+    $.ajax({ 
+      url: "/cid/#{@compound.cid}/predicted_targets",
+      cache: true,
+      dataType: "html"
+    });
+    */
+    hide("Measured gene/protein targets",".targets", "/cid/#{@compound.cid}/targets");
+    hide("Other active assays",".active_assays", "/cid/#{@compound.cid}/other_active_assays");
+    hide("Measured gene/protein non-targets",".nontargets", "/cid/#{@compound.cid}/nontargets");
+    hide("Other inactive assays",".inactive_assays", "/cid/#{@compound.cid}/other_inactive_assays");
+    hide("Read across gene/protein targets",".predicted_targets", "/cid/#{@compound.cid}/predicted_targets");
+    hide("Other active read across assays",".predicted_active_assays", "/cid/#{@compound.cid}/other_predicted_active_assays");
+    hide("Read across gene/protein non-targets",".predicted_nontargets", "/cid/#{@compound.cid}/predicted_nontargets");
+    hide("Other inactive read across assays",".predicted_inactive_assays", "/cid/#{@compound.cid}/other_predicted_inactive_assays");
+    hide("Similar compounds",".neighbors", "/cid/#{@compound.cid}/neighbors");
+  });
+
+%table
+  %colgroup
+    %col{:width => "25%"}
+    %col{:width => "37%"}
+    %col{:width => "37%"}
   %tr
     %td{:valign => "top"}
-      %br= session[:compound].name
-      %img{:src => session[:compound].image_uri}
+      %br= @compound.name
+      %img{:src => @compound.image_uri}
     %td{:valign => "top"}
       .targets
-      :javascript
-        display(".targets", "/cid/#{session[:compound].cid}/targets");
-    %td{:valign => "top"}
-      .active_assays
-      :javascript
-        display(".active_assays", "/cid/#{session[:compound].cid}/other_active_assays");
-  %tr
-    %th 
-    %th Targets (predicted)
-    %th Other active assays (predicted)
-  %tr
-    %td
-    %td{:valign => "top"}
       .predicted_targets
-      :javascript
-        display(".predicted_targets", "/cid/#{session[:compound].cid}/predicted_targets");
-    %td{:valign => "top"}
-      .predicted_active_assays
-      :javascript
-        display(".predicted_active_assays", "/cid/#{session[:compound].cid}/other_predicted_active_assays");
-  %tr
-    %th 
-    %th Non-targets (experimental data)
-    %th Other inactive assays (experimental data)
-  %tr
-    %td
-    %td{:valign => "top"}
       .nontargets
-      :javascript
-        display(".nontargets", "/cid/#{session[:compound].cid}/nontargets");
-    %td{:valign => "top"}
-      .inactive_assays
-      :javascript
-        display(".inactive_assays", "/cid/#{session[:compound].cid}/other_inactive_assays");
-  %tr
-    %th 
-    %th Non-targets (predicted)
-    %th Other inactive assays (predicted)
-  %tr
-    %td
-    %td{:valign => "top"}
       .predicted_nontargets
-      :javascript
-        display(".predicted_nontargets", "/cid/#{session[:compound].cid}/predicted_nontargets");
     %td{:valign => "top"}
+      .active_assays
+      .predicted_active_assays
+      .inactive_assays
       .predicted_inactive_assays
-      :javascript
-        display(".predicted_inactive_assays", "/cid/#{session[:compound].cid}/other_predicted_inactive_assays");
 
-%h2 Read across compounds
 .neighbors
-:javascript
-  display(".neighbors", "/cid/#{session[:compound].cid}/neighbors");