Merge branch 'release/v2.1.0' into development

3 files changed, 17 insertions, 18 deletions

diff --git a/public/javascripts/toxcreate.js b/public/javascripts/toxcreate.js
index a5dc44c..91789f8 100755
--- a/public/javascripts/toxcreate.js
+++ b/public/javascripts/toxcreate.js
@@ -77,8 +77,7 @@ $(function() {
         if (progress == "100") return -1;         
         
         $("div#model_" + id + "_progress").progressbar("value", parseInt(progress)); 
-        $("div#model_" + id + "_progress").attr({title: parseInt(progress) + "%", alt: parseInt(progress) + "%"});
-        //$("div#model_" + id + "_progress").attr("alt", parseInt(progress) + "%");
+        $("div#model_" + id + "_progress").attr({title: parseInt(progress) + "%"});
       },
       error: function(data) {
         id = -1;
diff --git a/views/help.haml b/views/help.haml
index 2b39d6c..f602dff 100644
--- a/views/help.haml
+++ b/views/help.haml
@@ -87,13 +87,13 @@
 
 %p
   Excel examples for download:
-  %ul
-    %li
-      = link_to "hamster_carcinogenicity.xls", "/hamster_carcinogenicity.xls"
-      (classification)
-    %li
-      = link_to "EPAFHM.xls", "/EPAFHM.xls"
-      (regression)
+%ul
+  %li
+    = link_to "hamster_carcinogenicity.xls", "/hamster_carcinogenicity.xls"
+    (classification)
+  %li
+    = link_to "EPAFHM.xls", "/EPAFHM.xls"
+    (regression)
 
 %h3 CSV example
 
@@ -113,13 +113,13 @@
 
 %p
   CSV examples for download:
-  %ul
-    %li
-      = link_to "hamster_carcinogenicity.csv", "/hamster_carcinogenicity.csv"
-      (classification)
-    %li
-      = link_to "EPAFHM.csv", "/EPAFHM.csv"
-      (regression)
+%ul
+  %li
+    = link_to "hamster_carcinogenicity.csv", "/hamster_carcinogenicity.csv"
+    (classification)
+  %li
+    = link_to "EPAFHM.csv", "/EPAFHM.csv"
+    (regression)
 
 %p You can create CSV files in Excel: Create a sheet with two columns and export them as CSV file with the "Save As" option from the menu, selecting the CSV (comma delimited) format.
 
diff --git a/views/model.haml b/views/model.haml
index fe43a1f..e688ae9 100644
--- a/views/model.haml
+++ b/views/model.haml
@@ -24,7 +24,7 @@
                 #{js}
               });
               
-            %div{:id => "model_#{model.id}_progress", :class => "model_progress", :title => "#{percentage_completed}%", :alt => "#{percentage_completed}%"}
+            %div{:id => "model_#{model.id}_progress", :class => "model_progress", :title => "#{percentage_completed}%"}
               //= haml :model_progress, :locals=>{:percentage_completed=>percentage_completed}, :layout => false        
         - if is_authorized(model.web_uri, "DELETE")
           %a{:href => url_for("/model/#{model.id}"), :id => "delete_#{model.id}", :class => 'delete_link'} 
@@ -46,7 +46,7 @@
       - if CONFIG[:logger]=="debug"
         %dt Task:
         %dd
-          %a{:href => "#{model.task_uri}", :rel => "external"}
+          %a{:href => "#{model.task_uri}", :id => "model_#{model.id}_task_link", :rel => "external"}
             = model.task_uri
       - if model.warnings
         %dt Warnings: