Merge branch 'release/v2.1.0' into feature/policy

Conflicts:
	helper.rb

3 files changed, 7 insertions, 13 deletions

diff --git a/helper.rb b/helper.rb
index 698fd3e..35ddcd2 100644
--- a/helper.rb
+++ b/helper.rb
@@ -54,15 +54,10 @@ helpers do
   def sort(descriptors,value_map)
     features = {:activating => [], :deactivating => []}
     descriptors.each do |d|
-      if !value_map.empty?
-        features[:activating] << {:smarts => d[OT.smarts],:p_value => d[OT.pValue]} if d[OT.effect] == 2
-        features[:deactivating] << {:smarts => d[OT.smarts],:p_value => d[OT.pValue]} if d[OT.effect] == 1
-      else
-        if d[OT.effect] =~ TRUE_REGEXP 
-          features[:activating] << {:smarts => d[OT.smarts],:p_value => d[OT.pValue]} 
-        elsif d[OT.effect] =~ FALSE_REGEXP 
-          features[:deactivating] << {:smarts => d[OT.smarts],:p_value => d[OT.pValue]} 
-        end
+      if d[OT.effect] =~ TRUE_REGEXP
+        features[:activating] << {:smarts => d[OT.smarts],:p_value => d[OT.pValue]}
+      elsif d[OT.effect] =~ FALSE_REGEXP
+        features[:deactivating] << {:smarts => d[OT.smarts],:p_value => d[OT.pValue]}
       end
     end
     features
diff --git a/public/javascripts/toxcreate.js b/public/javascripts/toxcreate.js
index 72065cb..252ad78 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/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: