From 41945b3dc251ca00580916c3cbc7d26c2093ca89 Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.ch>
Date: Mon, 25 Jul 2011 16:25:10 +0000
Subject: text modifications as suggested by davids review

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

(limited to 'views/layout.haml')

diff --git a/views/layout.haml b/views/layout.haml
index 174db9f..6f6afcb 100644
--- a/views/layout.haml
+++ b/views/layout.haml
@@ -14,7 +14,7 @@
     .logo
       %img{:src => "ToxCreate_rgb_72.png", :alt => 'ToxCreate', :align => 'right'}/
       %br
-      Create and evaluate models to predict toxicity
+      Creates computational models to predict toxicity
     .index
       %ul
         %li{:class => ("selected" if /\/create|echa|ambit|feature/ =~ request.path )}
@@ -47,7 +47,18 @@
       = yield
 
     .footer
+      Disclaimer: ToxCreate uses state-of-the-art published and tested algorithms and methodologies with full validation information. However, just as with experimental measurements, computational predictions are subject to varying degrees of accuracy and uncertainty, so please read the full report carefully, particularly the validation information.  No liability is accepted for any inaccuracy in predictions.
+      %p
+        - tag = `git tag`.split("\n").last
+        - tagdate = `git show #{tag}|grep Date`.chomp
+        Version:
+        = tag
+        ,
+        = tagdate
       &copy;
       %a{:href => 'http://www.in-silico.ch', :rel => "external"} in silico toxicology
       2009-2011, powered by
       %a{:href => 'http://www.opentox.org', :rel => "external"} <span style="color:#5D308A;font-family:arial,sans-serif,helvetica;letter-spacing:-1px;">Open</span><span style="color:#000;font-family:arial,sans-serif,helvetica;font-weight:bold;letter-spacing:-1px;">Tox</span>
+      (a project funded by the 
+      %a{:href => "http://cordis.europa.eu/fp7/"} 7th Framework Programme
+      of the European Commission)
-- 
cgit v1.2.3


From 091957683d81ab84412581dea062e1294fc00a33 Mon Sep 17 00:00:00 2001
From: gebele <gebele@alfadeo.de>
Date: Tue, 26 Jul 2011 12:17:09 +0200
Subject: fp7 link to new window

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

(limited to 'views/layout.haml')

diff --git a/views/layout.haml b/views/layout.haml
index 6f6afcb..d20b964 100644
--- a/views/layout.haml
+++ b/views/layout.haml
@@ -60,5 +60,5 @@
       2009-2011, powered by
       %a{:href => 'http://www.opentox.org', :rel => "external"} <span style="color:#5D308A;font-family:arial,sans-serif,helvetica;letter-spacing:-1px;">Open</span><span style="color:#000;font-family:arial,sans-serif,helvetica;font-weight:bold;letter-spacing:-1px;">Tox</span>
       (a project funded by the 
-      %a{:href => "http://cordis.europa.eu/fp7/"} 7th Framework Programme
+      %a{:href => "http://cordis.europa.eu/fp7/", :rel => "external"} 7th Framework Programme
       of the European Commission)
-- 
cgit v1.2.3


From 91b70cba5d1d0045b0db0d9c77f867e68e61fe2e Mon Sep 17 00:00:00 2001
From: mr <mr@mrautenberg.de>
Date: Tue, 2 Aug 2011 16:28:13 +0200
Subject: remove text 'user:' if no A&A

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

(limited to 'views/layout.haml')

diff --git a/views/layout.haml b/views/layout.haml
index d20b964..c76396d 100644
--- a/views/layout.haml
+++ b/views/layout.haml
@@ -31,8 +31,9 @@
 
     .content
       .login_info
-        User:
-        %b= session[:username]
+        - if session[:username].size > 0
+          User:
+          %b= session[:username]
 
       - if `hostname`.match(/ot-test/)
         .notice 
-- 
cgit v1.2.3