From 1a779e4fab4f42f27d867fcda24bf207cc2ece8a Mon Sep 17 00:00:00 2001
From: rautenberg <rautenberg@in-silico.ch>
Date: Wed, 23 Oct 2013 00:18:26 +0200
Subject: add basic csv download posibilities

---
 views/layout.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'views')

diff --git a/views/layout.haml b/views/layout.haml
index 827baaf..1e1c7d3 100644
--- a/views/layout.haml
+++ b/views/layout.haml
@@ -14,7 +14,7 @@
           url: uri,
           //timeout: 120000;
           success: function(data){
-            data = "<h4>"+title+"</h4>"+"<button onclick='hide(\"" + title + "\",\"" + element + "\",\"" + uri + "\");'>Hide</button>" + data;
+            data = "<h4>"+title+"</h4>"+"<button onclick='hide(\"" + title + "\",\"" + element + "\",\"" + uri + "\");'>Hide</button> <a href=\"" + uri + "/" + uri.replace("/cid/", "").replace("/",'-','g') + ".csv\"> (csv)</a>" + data;
             $(element).html(data);
           },
           error: function(data,textStatus,message){
-- 
cgit v1.2.3


From 773c75117fecdb6c328ce7ad8c8ce9d89e552f03 Mon Sep 17 00:00:00 2001
From: rautenberg <rautenberg@in-silico.ch>
Date: Wed, 23 Oct 2013 11:26:33 +0200
Subject: extend csv file feature, add ist link

---
 views/layout.haml |  3 +++
 views/style.scss  | 10 ++++++++++
 2 files changed, 13 insertions(+)

(limited to 'views')

diff --git a/views/layout.haml b/views/layout.haml
index 1e1c7d3..976d172 100644
--- a/views/layout.haml
+++ b/views/layout.haml
@@ -52,3 +52,6 @@
         %input{ :type => "submit", :value => "Search" }
     %em This is an experimental version. Loading data from PubChem can be slow. Please use the "Back" button and retry the offending operation if you have timeout problems.
     = yield
+
+    .footer
+      %a{:href => 'http://www.in-silico.ch', :rel => "external"} <i style="font-family: serife">in silico</i> toxicology gmbh 2013
\ No newline at end of file
diff --git a/views/style.scss b/views/style.scss
index 77f2f5c..01e3aa6 100644
--- a/views/style.scss
+++ b/views/style.scss
@@ -101,4 +101,14 @@ img.compound {
     color: $formborder;
     radius: 4px;
   }
+}
+.footer {
+  margin: 200px 0px 20px 4px;
+  width: 99%;
+  text-align: right;
+}
+.footer a {
+  text-decoration: none;
+  color: #000;
+  &:hover { color: #900; }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 9095a48b0e22f51ece2f4e9539e41310ff544052 Mon Sep 17 00:00:00 2001
From: rautenberg <rautenberg@in-silico.ch>
Date: Wed, 23 Oct 2013 12:27:50 +0200
Subject: IE js replace fix

---
 views/layout.haml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'views')

diff --git a/views/layout.haml b/views/layout.haml
index 976d172..5160c31 100644
--- a/views/layout.haml
+++ b/views/layout.haml
@@ -14,7 +14,8 @@
           url: uri,
           //timeout: 120000;
           success: function(data){
-            data = "<h4>"+title+"</h4>"+"<button onclick='hide(\"" + title + "\",\"" + element + "\",\"" + uri + "\");'>Hide</button> <a href=\"" + uri + "/" + uri.replace("/cid/", "").replace("/",'-','g') + ".csv\"> (csv)</a>" + data;
+            var slash = new RegExp("/","g");
+            data = "<h4>"+title+"</h4>"+"<button onclick='hide(\"" + title + "\",\"" + element + "\",\"" + uri + "\");'>Hide</button> <a href=\"" + uri + "/" + uri.replace("/cid/", "").replace(slash,'-') + ".csv\"> (csv)</a>" + data;
             $(element).html(data);
           },
           error: function(data,textStatus,message){
-- 
cgit v1.2.3


From f7c3b817e5de6ce3388caee15d1a4adc12b81334 Mon Sep 17 00:00:00 2001
From: rautenberg <rautenberg@in-silico.ch>
Date: Mon, 28 Oct 2013 11:38:33 +0100
Subject: minor style change

---
 views/style.scss | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'views')

diff --git a/views/style.scss b/views/style.scss
index 01e3aa6..225bee8 100644
--- a/views/style.scss
+++ b/views/style.scss
@@ -39,9 +39,10 @@ h4 {
 
 /* tables */
 th {
-  color: #333;
+  color: #000;
   text-align: left;
-  font-size: 1em;
+  font-size: 1.1em;
+  padding: 8px 0;
 }
 td {
   vertical-align: top;
@@ -111,4 +112,12 @@ img.compound {
   text-decoration: none;
   color: #000;
   &:hover { color: #900; }
+}
+.tooltip {
+  background-color: #fff;
+  border: 2px solid #ccc;
+  font-size: 0.5em;
+  padding: 1em;
+  display: none;
+  z-index: 50;
 }
\ No newline at end of file
-- 
cgit v1.2.3


From ecae07354c9a6b7f13fdf70ef832ccafc9c64d05 Mon Sep 17 00:00:00 2001
From: gebele <gebele@in-silico.ch>
Date: Mon, 17 Feb 2014 11:29:47 +0100
Subject: ensure correct loop end

---
 views/neighbors.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'views')

diff --git a/views/neighbors.haml b/views/neighbors.haml
index c7a181a..5563392 100644
--- a/views/neighbors.haml
+++ b/views/neighbors.haml
@@ -31,4 +31,4 @@
               :javascript
                 hide("Other inactive assays","#inactive_assays#{n}", "/cid/#{n}/assays/inactive");
         
-        - idx += 1
+      - idx += 1
-- 
cgit v1.2.3