Merge branch 'release/v3.0.0'

20 files changed, 250 insertions, 121 deletions

diff --git a/application.rb b/application.rb
index 3b88700..2b320e0 100644
--- a/application.rb
+++ b/application.rb
@@ -9,8 +9,9 @@ require 'ftools'
 require File.join(File.dirname(__FILE__),'model.rb')
 require File.join(File.dirname(__FILE__),'helper.rb')
 
-use Rack::Session::Cookie, :expire_after => 28800, 
-                           :secret => "ui6vaiNi-change_me"
+#moved to wrapper->environment
+#use Rack::Session::Cookie, :expire_after => 28800, 
+#                           :secret => "ui6vaiNi-change_me"
 use Rack::Flash
 
 set :lock, true
@@ -31,7 +32,7 @@ helpers do
 
   private 
   def delete_model(model, subjectid=nil)
-    task = OpenTox::Task.create("Deleting model: #{model.uri}",url_for("/delete",:full)) do |task|
+    task = OpenTox::Task.create("Deleting model: #{model.web_uri}", url_for("/delete",:full)) do |task|
       begin OpenTox::RestClientWrapper.put(File.join(model.task_uri, "Cancelled"), "Cancelled",{:subjectid => subjectid}) if model.task_uri rescue LOGGER.warn "Cannot cancel task #{model.task_uri}" end
       task.progress(15)
       delete_dependent(model.uri, subjectid) if model.uri
@@ -49,15 +50,25 @@ helpers do
       if model.feature_dataset
         delete_dependent(model.feature_dataset, subjectid) if model.feature_dataset.match(CONFIG[:services]["opentox-dataset"])
       end
+      task.progress(95)
+      model.delete
+      unless ToxCreateModel.get(model.id)
+      begin
+        aa = OpenTox::Authorization.delete_policies_from_uri(model.web_uri, @subjectid)
+        LOGGER.debug "Policy deleted for ToxCreateModel URI: #{model.web_uri} with result: #{aa}"
+      rescue
+        LOGGER.warn "Policy delete error for ToxCreateModel URI: #{model.web_uri}"
+      end
+    end
       task.progress(100)
-      ""
+      url_for("/models",:full)
     end
   end
 
   def delete_dependent(uri, subjectid=nil)
     begin
-      RestClient.delete(uri, :subjectid => subjectid) if subjectid
-      RestClient.delete(uri) if !subjectid
+      OpenTox::RestClientWrapper.delete(uri, :subjectid => subjectid) if subjectid
+      OpenTox::RestClientWrapper.delete(uri) if !subjectid
     rescue
       LOGGER.warn "Can not delete uri: #{uri}"
     end
@@ -79,10 +90,25 @@ get '/login' do
 end
 
 get '/models/?' do
-  @models = ToxCreateModel.all.sort(:order => "DESC")
+  @page = params[:page] ? params[:page].to_i : 0
+  order = params["order"] == "ASC" ? "ASC" : "DESC"
+  params["order"] = order
+  sort_by = params["sort_by"]
+  if sort_by
+    case sort_by
+    when "name", "created_at", "type"
+      @models = ToxCreateModel.all.sort_by(sort_by.to_sym, :order => "#{order} ALPHA")
+    when "id"
+      @models = ToxCreateModel.all.sort(:order => "#{order}")
+    end
+  else
+    params["sort_by"] = "created_at"
+  end
+
+  @models = ToxCreateModel.all.sort(:order => "DESC") unless @models
   @models.each{|m| raise "internal redis error: model is nil" unless m}
-  subjectstring = session[:subjectid] ? "?subjectid=#{CGI.escape(session[:subjectid])}" : ""
-  haml :models, :locals=>{:models=>@models, :subjectstring => subjectstring}
+  @models.delete_if{|m| !is_authorized(m.web_uri, "GET")}
+  haml :models, :locals=>{:models=>@models}
 end
 
 get '/model/:id/status/?' do
@@ -145,13 +171,12 @@ end
 get '/model/:id/:view/?' do
   response['Content-Type'] = 'text/plain'
   model = ToxCreateModel.get(params[:id])
-  subjectstring = session[:subjectid] ? "?subjectid=#{CGI.escape(session[:subjectid])}" : ""
   begin
     case params[:view]
       when "model"
-        haml :model, :locals=>{:model=>model,:subjectstring => subjectstring}, :layout => false
+        haml :model, :locals=>{:model=>model}, :layout => false
       when /validation/
-        haml :validation, :locals=>{:model=>model,:subjectstring => subjectstring}, :layout => false
+        haml :validation, :locals=>{:model=>model}, :layout => false
       else
         return "unable to render model: id #{params[:id]}, view #{params[:view]}"
     end
@@ -199,7 +224,7 @@ end
 post '/feature' do
   session[:dataset] = params[:dataset]
   @features = []
-  OpenTox::Dataset.new(params[:dataset]).load_features.each do |uri,metadata|
+  OpenTox::Dataset.new(params[:dataset], @subjectid).load_features(@subjectid).each do |uri,metadata|
     @features << OpenTox::Feature.find(uri, @subjectid) if metadata[OWL.sameAs].match(/#{session[:echa]}/)
   end
   haml :feature
@@ -218,18 +243,16 @@ post '/models' do # create a new model
     redirect url_for('/create')
   end
 
-  subjectid = session[:subjectid] ? session[:subjectid] : nil
-
   if params[:dataset] and params[:prediction_feature]
-    @dataset = OpenTox::Dataset.new(params[:dataset],subjectid)
+    @dataset = OpenTox::Dataset.new(params[:dataset], @subjectid)
     name = @dataset.load_metadata[DC.title]
-    @prediction_feature = OpenTox::Feature.find params[:prediction_feature], subjectid
+    @prediction_feature = OpenTox::Feature.find params[:prediction_feature], @subjectid
     @dataset.load_compounds
   elsif params[:file][:filename]
     name = params[:file][:filename].sub(/\..*$/,"")
   end
 
-  @model = ToxCreateModel.create(:name => name, :subjectid => subjectid)
+  @model = ToxCreateModel.create(:name => name, :subjectid => @subjectid)
   @model.update :web_uri => url_for("/model/#{@model.id}", :full), :warnings => ""
   task = OpenTox::Task.create("Toxcreate Task - Uploading dataset and creating lazar model",url_for("/models",:full)) do |task|
 
@@ -238,33 +261,33 @@ post '/models' do # create a new model
 
     unless params[:dataset] and params[:prediction_feature]
       begin
-        @dataset = OpenTox::Dataset.create(nil, subjectid)
+        @dataset = OpenTox::Dataset.create(nil, @subjectid)
         # check format by extension - not all browsers provide correct content-type]) 
         case File.extname(params[:file][:filename])
         when ".csv"
           csv = params[:file][:tempfile].read
-          @dataset.load_csv(csv, subjectid)
+          @dataset.load_csv(csv, @subjectid)
         when ".xls", ".xlsx"
           excel_file = params[:file][:tempfile].path + File.extname(params[:file][:filename])
           File.rename(params[:file][:tempfile].path, excel_file) # add extension, spreadsheet does not read files without extensions
-          @dataset.load_spreadsheet(Excel.new excel_file, subjectid)
+          @dataset.load_spreadsheet(Excel.new excel_file, @subjectid)
           if @dataset.metadata[OT.Errors]
             raise "Incorrect file format. Please follow the instructions for #{link_to "Excel", "/help"} or #{link_to "CSV", "/help"} formats."
           end
         when ".sdf"
           sdf = params[:file][:tempfile].read
-          @dataset.load_sdf(sdf, subjectid)
+          @dataset.load_sdf(sdf, @subjectid)
         else
           raise "#{params[:file][:filename]} has an unsupported file type."
         end
-        @dataset.save(subjectid)
+        @dataset.save(@subjectid)
       rescue => e
         error "Dataset creation failed '#{e.message}'",e
       end
       if @dataset.features.keys.size != 1
         error "More than one feature in dataset #{params[:file][:filename]}. Please delete irrelvant columns and try again."
       else
-        @prediction_feature = OpenTox::Feature.find(@dataset.features.keys.first,subjectid)
+        @prediction_feature = OpenTox::Feature.find(@dataset.features.keys.first,@subjectid)
       end
     end
 
@@ -276,7 +299,7 @@ post '/models' do # create a new model
     @model.update :warnings => @dataset.metadata[OT.Warnings] unless @dataset.metadata[OT.Warnings] and @dataset.metadata[OT.Warnings].empty?
     task.progress(15)
     begin
-      lazar = OpenTox::Model::Lazar.create( {:dataset_uri => @dataset.uri, :prediction_feature => @prediction_feature.uri, :subjectid => subjectid}, 
+      lazar = OpenTox::Model::Lazar.create( {:dataset_uri => @dataset.uri, :prediction_feature => @prediction_feature.uri, :subjectid => @subjectid}, 
         OpenTox::SubTask.new(task,15,25))
     rescue => e
       error "Model creation failed",e # Please check if the input file is in a valid #{link_to "Excel", "/help"} or #{link_to "CSV", "/help"} format."
@@ -297,7 +320,7 @@ post '/models' do # create a new model
         crossvalidation = OpenTox::Crossvalidation.create( {
             :algorithm_uri => lazar.metadata[OT.algorithm],
             :dataset_uri => lazar.parameter("dataset_uri"),
-            :subjectid => subjectid,
+            :subjectid => @subjectid,
             :prediction_feature => lazar.parameter("prediction_feature"),
             :algorithm_params => "feature_generation_uri=#{lazar.parameter("feature_generation_uri")}" },
             nil, OpenTox::SubTask.new(task,25,80))
@@ -306,12 +329,12 @@ post '/models' do # create a new model
         LOGGER.debug "Validation URI: #{@model.validation_uri}"
 
         # create summary
-        validation = crossvalidation.statistics(subjectid)
+        validation = crossvalidation.statistics(@subjectid)
         @model.update(:nr_predictions => validation.metadata[OT.numInstances].to_i - validation.metadata[OT.numUnpredicted].to_i)
         if validation.metadata[OT.classificationStatistics]
           @model.update(:correct_predictions => validation.metadata[OT.classificationStatistics][OT.percentCorrect].to_f)
           @model.update(:confusion_matrix => validation.confusion_matrix.to_yaml)
-          @model.update(:weighted_area_under_roc => validation.metadata[OT.classificationStatistics][OT.weightedAreaUnderRoc].to_f)
+          @model.update(:average_area_under_roc => validation.metadata[OT.classificationStatistics][OT.averageAreaUnderRoc].to_f)
           validation.metadata[OT.classificationStatistics][OT.classValueStatistics].each do |m|
             if m[OT.classValue] =~ TRUE_REGEXP
               #HACK: estimate true feature value correctly 
@@ -332,9 +355,9 @@ post '/models' do # create a new model
     
       begin
         @model.update :status => "Creating validation report"
-        validation_report_uri = crossvalidation.find_or_create_report(subjectid, OpenTox::SubTask.new(task,80,90)) #unless @model.dirty?
+        validation_report_uri = crossvalidation.find_or_create_report(@subjectid, OpenTox::SubTask.new(task,80,90)) #unless @model.dirty?
         @model.update :validation_report_uri => validation_report_uri, :status => "Creating QMRF report"
-        qmrf_report = OpenTox::Crossvalidation::QMRFReport.create(@model.uri, subjectid, OpenTox::SubTask.new(task,90,99))
+        qmrf_report = OpenTox::Crossvalidation::QMRFReport.create(@model.uri, @subjectid, OpenTox::SubTask.new(task,90,99))
         @model.update(:validation_qmrf_uri => qmrf_report.uri, :status => "Completed")
       rescue => e
         error "Model report creation failed",e
@@ -353,7 +376,7 @@ post '/models' do # create a new model
 end
 
 post '/predict/?' do # post chemical name to model
-  subjectid = session[:subjectid] ? session[:subjectid] : nil
+  
   @identifier = params[:identifier]
   unless params[:selection] and params[:identifier] != ''
     flash[:notice] = "Please enter a compound identifier and select an endpoint from the list."
@@ -372,15 +395,15 @@ post '/predict/?' do # post chemical name to model
     confidence = nil
     title = nil
     db_activities = []
-    lazar = OpenTox::Model::Lazar.find model.uri
-    prediction_dataset_uri = lazar.run({:compound_uri => @compound.uri, :subjectid => subjectid})
+    lazar = OpenTox::Model::Lazar.find model.uri, @subjectid
+    prediction_dataset_uri = lazar.run({:compound_uri => @compound.uri, :subjectid => @subjectid})
     LOGGER.debug "Prediction dataset_uri: #{prediction_dataset_uri}"
     if lazar.value_map
       @value_map = lazar.value_map
     else
       @value_map = nil
     end
-    prediction_dataset = OpenTox::LazarPrediction.find(prediction_dataset_uri, subjectid)
+    prediction_dataset = OpenTox::LazarPrediction.find(prediction_dataset_uri, @subjectid)
     if prediction_dataset.metadata[OT.hasSource].match(/dataset/)
       @predictions << {
         :title => model.name,
@@ -388,7 +411,7 @@ post '/predict/?' do # post chemical name to model
       }
     else
       predicted_feature = prediction_dataset.metadata[OT.dependentVariables]
-      prediction = OpenTox::Feature.find(predicted_feature, subjectid)
+      prediction = OpenTox::Feature.find(predicted_feature, @subjectid)
       if prediction.metadata[OT.error]
         @predictions << {
           :title => model.name,
@@ -418,14 +441,14 @@ post "/lazar/?" do # get detailed prediction
   @page = 0
   @page = params[:page].to_i if params[:page]
   @model_uri = params[:model_uri]
-  lazar = OpenTox::Model::Lazar.find @model_uri
-  prediction_dataset_uri = lazar.run(:compound_uri => params[:compound_uri], :subjectid => session[:subjectid])
+  lazar = OpenTox::Model::Lazar.find @model_uri, @subjectid
+  prediction_dataset_uri = lazar.run(:compound_uri => params[:compound_uri], :subjectid => @subjectid)
   if lazar.value_map
     @value_map = lazar.value_map
   else
     @value_map = nil
   end
-  @prediction = OpenTox::LazarPrediction.find(prediction_dataset_uri, session[:subjectid])
+  @prediction = OpenTox::LazarPrediction.find(prediction_dataset_uri, @subjectid)
   @compound = OpenTox::Compound.new(params[:compound_uri])
   haml :lazar
 end
@@ -453,18 +476,10 @@ delete '/model/:id/?' do
   model = ToxCreateModel.get(params[:id])
   raise OpenTox::NotFoundError.new("Model with id: #{params[:id]} not found!") unless model
   begin
-    delete_model(model, @subjectid)   
-    model.delete
-    unless ToxCreateModel.get(params[:id])
-      begin
-        aa = OpenTox::Authorization.delete_policies_from_uri(model.web_uri, @subjectid)
-        LOGGER.debug "Policy deleted for Dataset URI: #{uri} with result: #{aa}"
-      rescue
-        LOGGER.warn "Policy delete error for Dataset URI: #{uri}"
-      end
-    end
+    delete_model(model, @subjectid)
     flash[:notice] = "#{model.name} model deleted."
   rescue
+    LOGGER.error "#{model.name} model delete error."
     flash[:notice] = "#{model.name} model delete error."
   end
   redirect url_for('/models')
diff --git a/helper.rb b/helper.rb
index 698fd3e..9b47142 100644
--- a/helper.rb
+++ b/helper.rb
@@ -1,35 +1,5 @@
 helpers do
 
-  def login(username, password)
-    logout
-    session[:subjectid] = OpenTox::Authorization.authenticate(username, password)
-    #LOGGER.debug "ToxCreate login user #{username} with subjectid: " + session[:subjectid].to_s
-    if session[:subjectid] != nil
-      session[:username] = username
-      return true
-    else
-      session[:username] = ""
-      return false
-    end
-  end
-
-  def logout
-    if session[:subjectid] != nil
-      session[:subjectid] = nil
-      session[:username] = ""
-      return true
-    end
-    return false
-  end
-
-  def logged_in()
-    return true if !AA_SERVER
-    if session[:subjectid] != nil
-      return OpenTox::Authorization.is_token_valid(session[:subjectid])
-    end
-    return false
-  end
-
   def is_authorized(uri, action)
     if OpenTox::Authorization.server && session[:subjectid] != nil
       return OpenTox::Authorization.authorized?(uri, action, session[:subjectid])
@@ -121,5 +91,29 @@ helpers do
     haml :neighbors_navigation, :layout => false
   end
 
-end
+  def models_navigation
+    @page = 0 unless @page
+    haml :models_navigation, :layout => false
+  end
 
+  def endpoint_option_list(max_time=3600)
+    out = ""
+    tmpfile = File.join(TMP_DIR, "endpoint_option_list")
+    if File.exists? tmpfile
+      if Time.now-File.mtime(tmpfile) <= max_time
+        f = File.open(tmpfile, 'r+')
+        f.each{|line| out << line}
+        return out
+      else
+        File.unlink(tmpfile)
+      end
+    end
+    result = OpenTox::Ontology::Echa.endpoint_option_list()
+    if result.lines.count > 3
+      f = File.new(tmpfile,"w")
+      f.print result
+      f.close
+    end
+    return result
+  end
+end
diff --git a/model.rb b/model.rb
index e433893..bab5bde 100644
--- a/model.rb
+++ b/model.rb
@@ -31,7 +31,7 @@ class ToxCreateModel < Ohm::Model
 	attribute :nr_compounds
   attribute :nr_predictions
   attribute :correct_predictions
-	attribute :weighted_area_under_roc
+	attribute :average_area_under_roc
 	attribute :sensitivity
 	attribute :specificity
 	attribute :r_square
diff --git a/public/arrow_down.png b/public/arrow_down.png
new file mode 100644
index 0000000..d298656
--- /dev/null
+++ b/public/arrow_down.png
diff --git a/public/arrow_left.png b/public/arrow_left.png
new file mode 100644
index 0000000..8d18c67
--- /dev/null
+++ b/public/arrow_left.png
diff --git a/public/arrow_left_inactive.png b/public/arrow_left_inactive.png
new file mode 100644
index 0000000..52c11bf
--- /dev/null
+++ b/public/arrow_left_inactive.png
diff --git a/public/arrow_right.png b/public/arrow_right.png
new file mode 100644
index 0000000..7fe64a8
--- /dev/null
+++ b/public/arrow_right.png
diff --git a/public/arrow_right_inactive.png b/public/arrow_right_inactive.png
new file mode 100644
index 0000000..496f79e
--- /dev/null
+++ b/public/arrow_right_inactive.png
diff --git a/public/arrow_up.png b/public/arrow_up.png
new file mode 100644
index 0000000..70417dc
--- /dev/null
+++ b/public/arrow_up.png
diff --git a/public/javascripts/toxcreate.js b/public/javascripts/toxcreate.js
index 91789f8..0e82040 100755
--- a/public/javascripts/toxcreate.js
+++ b/public/javascripts/toxcreate.js
@@ -18,20 +18,20 @@ $(function() {
     return this.replace(/^\s+|\s+$/g, '');
   }
 
-  checkStati = function(stati, subjectstr) {
+  checkStati = function(stati) {
     stati = stati.split(", ");
     $("body")
     var newstati = new Array;
     $.each(stati, function(){
-      checkProgress(this, subjectstr);
-      if(checkStatus(this, subjectstr) > 0) newstati.push(this);
+      checkProgress(this);
+      if(checkStatus(this) > 0) newstati.push(this);
     });  
-    if (newstati.length > 0) var statusCheck = setTimeout('checkStati("' + newstati.join(", ") + '", "' + subjectstr + '")',10000);
+    if (newstati.length > 0) var statusCheck = setTimeout('checkStati("' + newstati.join(", ") + '")',10000);
   };
   
-  checkStatus = function(id, subjectstr) {
+  checkStatus = function(id) {
     if(id == "") return -1; 
-    var opts = {method: 'get', action: 'model/' + id + '/status' + subjectstr, id: id};
+    var opts = {method: 'get', action: 'model/' + id + '/status', id: id};
     var status_changed = $.ajax({
       type: opts.method,
       url: opts.action,
@@ -62,7 +62,7 @@ $(function() {
   };
   
   
-  checkProgress = function(id, subjectstr) {
+  checkProgress = function(id) {
     var task = $("input#model_" + id + "_task").attr('value');
     var opts = {action: task + "/percentageCompleted" , id: id};
     var progress_changed = $.ajax({
@@ -207,6 +207,7 @@ jQuery.fn.deleteModel = function(type, options) {
     if(confirm(opts.confirm_message)) {
       $("div#model_" + opts.id).fadeTo("slow",0.5);
       $("span#model_" + opts.id + "_status").html("Deleting");
+      $("a#delete_" + opts.id).html("");
       $.ajax({
          type: opts.method,
          url:  opts.action,
diff --git a/views/classification_validation.haml b/views/classification_validation.haml
index f25a321..e06cb65 100644
--- a/views/classification_validation.haml
+++ b/views/classification_validation.haml
@@ -3,15 +3,26 @@
   = sprintf("%.2f", model.correct_predictions.to_f) if model.correct_predictions
   = '%'
 %dt
-  %a{:href => "http://en.wikipedia.org/wiki/Receiver_operating_characteristic", :rel => "external"} Weighted area under ROC:
+  %a{:href => "http://en.wikipedia.org/wiki/Receiver_operating_characteristic", :rel => "external"} Average area under ROC:
 %dd 
-  = sprintf("%.3f", model.weighted_area_under_roc.to_f) if model.weighted_area_under_roc
+  - if model.average_area_under_roc
+    = sprintf("%.3f", model.average_area_under_roc.to_f)
+  - else
+    = 'NA'
 %dt
   %a{:href => "http://en.wikipedia.org/wiki/Sensitivity_and_specificity", :rel => "external"} Specificity:
-%dd= sprintf("%.3f", model.specificity.to_f) if model.specificity
+%dd
+  - if model.specificity
+    = sprintf("%.3f", model.specificity.to_f)
+  - else
+    = 'NA'
 %dt
   %a{:href => "http://en.wikipedia.org/wiki/Sensitivity_and_specificity", :rel => "external"} Sensitivity:
-%dd= sprintf("%.3f", model.sensitivity.to_f) if model.sensitivity
+%dd
+  - if model.sensitivity
+    = sprintf("%.3f", model.sensitivity.to_f)
+  - else
+    = 'NA'
 %dt
   %a{:href => "http://en.wikipedia.org/wiki/Confusion_matrix", :rel => "external"} Confusion Matrix:
 - if model.confusion_matrix
@@ -32,7 +43,7 @@
             %th{:bgcolor => "#CCD2DC"}
               = cm[1][i]
           - else
-            %td= cm[1][i]
+            %td= cm[1][i].to_i
       - if cm.size > 2
         - (2..cm.size-1).each do |i|
           %tr
@@ -41,4 +52,4 @@
                 %th{:bgcolor => "#CCD2DC"}
                   = cm[i][j]
               - else
-                %td= cm[i][j]
+                %td= cm[i][j].to_i
diff --git a/views/create.haml b/views/create.haml
index b706484..da85382 100644
--- a/views/create.haml
+++ b/views/create.haml
@@ -24,6 +24,8 @@
         = link_to "SDF", '/help'
         format:
       %input{:type => 'file', :name => 'file', :id => 'file', :size => '41'}
+      %br
+      -# = haml :model_echa, :layout => false
     %input{ :type => "submit", :value => "Create model"}
     =# link_to "Cancel", '/create'
 
@@ -47,15 +49,16 @@
     structure-activity models from your experimental data. The models can be used to predict toxicity of new chemicals (e.g. for 
     %a{:href => "http://ec.europa.eu/environment/chemicals/reach/reach_intro.htm", :rel => "external"} REACH
     purposes) and to reduce the need for animal testing.  The following methods are currently available:
-    %ul
-      %li
-        = toggle_link("#lazar_description","lazar")
-        %em= toggle_link("#classification","classification")
-        models and
-      %li
-        = toggle_link("#lazar_description","lazar")
-        %em= toggle_link("#regression","regression")
-        models (experimental) 
+  %ul
+    %li
+      = toggle_link("#lazar_description","lazar")
+      %em= toggle_link("#classification","classification")
+      models and
+    %li
+      = toggle_link("#lazar_description","lazar")
+      %em= toggle_link("#regression","regression")
+      models (experimental)
+  %p
     Further modelling algorithms may be added in future versions.
 
   .login_notice
diff --git a/views/endpoint.haml b/views/endpoint.haml
index af06b80..9c250ca 100644
--- a/views/endpoint.haml
+++ b/views/endpoint.haml
@@ -9,4 +9,4 @@
     %em in-vitro,
     or
     %em in-vivo
-    expriment, clinical trial or epidemiological study
+    experiment, clinical trial or epidemiological study
diff --git a/views/model.haml b/views/model.haml
index e688ae9..356ec65 100644
--- a/views/model.haml
+++ b/views/model.haml
@@ -29,9 +29,9 @@
         - if is_authorized(model.web_uri, "DELETE")
           %a{:href => url_for("/model/#{model.id}"), :id => "delete_#{model.id}", :class => 'delete_link'} 
             - if model.status =~ /Completed|Error|Cancelled/ 
-              (delete)
+              &nbsp;(delete)
             - else
-              (stop)
+              &nbsp;(stop)
         %span
           %br
         
@@ -65,26 +65,26 @@
         %dt Training dataset:
         %dd
           - if model.training_dataset.match(/ambit/i)
-            %a{:href => "#{model.training_dataset}#{subjectstring}", :rel => "external"} Ambit database
+            %a{:href => "#{model.training_dataset}", :rel => "external"} Ambit database
           - else
-            %a{:href => "#{model.training_dataset}.xls#{subjectstring}"} Excel sheet
+            %a{:href => "#{model.training_dataset}.xls"} Excel sheet
             ,
             -#%a{:href => "#{model.training_dataset}.rdf"} RDF/XML
             -#%em (experts) ,
-            %a{:href => "#{model.training_dataset}.sdf#{subjectstring}" } SDF
+            %a{:href => "#{model.training_dataset}.sdf" } SDF
             ,
-            %a{:href => "#{model.training_dataset}.yaml#{subjectstring}" } YAML
+            %a{:href => "#{model.training_dataset}.yaml" } YAML
             %em  (experts)
       - if model.feature_dataset
         %dt Feature dataset:
         %dd
           -#%a{:href => "#{model.feature_dataset}.rdf"} RDF/XML
           -#,
-          %a{:href => "#{model.feature_dataset}.xls#{subjectstring}"} Excel sheet
+          %a{:href => "#{model.feature_dataset}.xls"} Excel sheet
           ,
-          %a{:href => "#{model.feature_dataset}.sdf#{subjectstring}"} SDF
+          %a{:href => "#{model.feature_dataset}.sdf"} SDF
           ,
-          %a{:href => "#{model.feature_dataset}.yaml#{subjectstring}"} YAML
+          %a{:href => "#{model.feature_dataset}.yaml"} YAML
           %em  (experts)
       - if model.uri
         %dt Model:
@@ -94,7 +94,7 @@
           -#,
           - if model.validation_qmrf_uri
             %a{:href => File.join(model.validation_qmrf_uri,"editor")} QMRF Editor, 
-          %a{:href => "#{model.uri}.yaml#{subjectstring}"} YAML
+          %a{:href => "#{model.uri}.yaml"} YAML
           %em  (experts, models cannot be represented in Excel)
 
-    = haml :validation, :locals=>{:model=>model,:subjectstring => subjectstring}, :layout => false     
+    = haml :validation, :locals=>{:model=>model}, :layout => false
diff --git a/views/model_echa.haml b/views/model_echa.haml
new file mode 100644
index 0000000..257a28a
--- /dev/null
+++ b/views/model_echa.haml
@@ -0,0 +1,2 @@
+Select an endpoint:
+= endpoint_option_list
\ No newline at end of file
diff --git a/views/models.haml b/views/models.haml
index 9ab2858..1419e37 100644
--- a/views/models.haml
+++ b/views/models.haml
@@ -3,7 +3,7 @@
 :javascript
   $(function() {
     if(#{stati != 0}) { 
-      setTimeout('checkStati("#{stati_to_check}", "#{subjectstring}")',5000);
+      setTimeout('checkStati("#{stati_to_check}", "")',5000);
     }
     var reload_validation = true;
   });
@@ -18,8 +18,11 @@
 = haml :similarity, :layout => false
 = haml :significant_fragments, :layout => false
 
-- if @models
-  - @models.each do |model|
-    = haml :model, :locals=>{:model=>model,:subjectstring=>subjectstring}, :layout => false 
--if @models.size == 0 
+- first = 5*@page
+- last = first+4
+= models_navigation if @models.size > 1
+- if @models[first..last]
+  - @models[first..last].each do |model|
+    = haml :model, :locals=>{:model=>model}, :layout => false
+-if @models.size == 0
   .notice There are currently no models. You have to create a model first.
diff --git a/views/models_navigation.haml b/views/models_navigation.haml
new file mode 100644
index 0000000..b491cb5
--- /dev/null
+++ b/views/models_navigation.haml
@@ -0,0 +1,70 @@
+.models_navigation
+
+  %form{:name => "nav", :action => url_for('/models'), :method => "get", :id => "nav"}
+    %input{:type => :hidden, :name => :sort_by, :id => "sort_by", :value => params[:sort_by]}
+    %input{:type => :hidden, :name => :order, :id => "order", :value => params[:order]}
+    %input{:type => :hidden, :name => :page, :id => "page", :value => params[:page]}
+
+    Sort by:
+    - ["created_at","name","type"].each do |s|
+      - idname = s == "created_at" ? "date" : s
+      - if params[:sort_by] == s
+        %div{:id => idname, :class => "active"}
+          %span="#{idname.capitalize}"
+          - if params[:order] == "ASC"
+            #up{:class => "link"}
+              %img{:src => "arrow_down.png", :alt => 'in ascending order', :title => 'in ascending order'}/
+          - else
+            #down{:class => "link"}
+              %img{:src => "arrow_up.png", :alt => 'in descending order', :title => 'in descending order'}/
+      - else
+        %div{:id => idname, :class => "link"}="#{idname.capitalize}&nbsp;"
+    - if @models.size > 5
+      |
+      Models:
+      = "#{@models.size}"
+      - unless @page.to_i == 0
+        #prev
+          %img{:src => "arrow_left.png", :alt => 'previous', :title => 'previous'}/
+      -else
+        %img{:src => "arrow_left_inactive.png", :alt => '', :title => ''}/
+  
+      - if @models.size < 5*@page+5
+        - last = @models.size
+      - else
+        - last = 5*@page+5
+  
+      = "(#{5*@page+1}-#{last}/#{@models.size})"
+      - unless 5*@page.to_i+5 >= @models.size
+        #next
+          %img{:src => "arrow_right.png", :alt => 'next', :title => 'next'}/
+      -else
+        %img{:src => "arrow_right_inactive.png", :alt => '', :title => ''}/
+
+    - js = ""
+    - ["id","created_at","name","type"].each do |s|
+      - idname = s == "created_at" ? "date" : s
+      - js += "$('##{idname}').click(function() \{ \n "
+      - js += "  $('#sort_by').val('#{s}');\n "
+      - js += "  $('#nav').submit();\n "
+      - js += "});\n "
+
+    :javascript
+      $("#prev").click(function() {
+        $("#page").val(#{@page-1});
+        $("#nav").submit();
+      });
+      $("#next").click(function() {
+        $("#page").val(#{@page+1});
+        $("#nav").submit();
+      });
+      #{js}
+      $("#down").click(function() {
+        $("#order").val("ASC");
+        $("#nav").submit();
+      });
+      $("#up").click(function() {
+        $("#order").val("DESC");
+        $("#nav").submit();
+      });
+      
\ No newline at end of file
diff --git a/views/predict.haml b/views/predict.haml
index 8aae7cf..670ca44 100644
--- a/views/predict.haml
+++ b/views/predict.haml
@@ -20,7 +20,7 @@
           %span{:style=>"font-size:75%"} 
             &copy;
             %a{:href => 'http://www.molinspiration.com/jme/index.html', :rel => "external"} JME Editor
-            courtesy of Peter Ertl, Novartis</span> 
+            courtesy of Peter Ertl, Novartis 
         %br  
         -# %label{:for => 'identifier'} or enter a Name, InChI, Smiles, CAS, ...
         %label{:for => 'identifier'} or enter a Smiles string
diff --git a/views/style.sass b/views/style.sass
index 15ae256..c2a74cb 100644
--- a/views/style.sass
+++ b/views/style.sass
@@ -267,3 +267,33 @@ dl
   margin-left: 16px
   margin-right: 16px
   float: left
+
+.models_navigation
+  #prev
+    @extend a
+    display: inline
+    cursor: pointer
+  #next
+    @extend a
+    display: inline
+    cursor: pointer
+  .link
+    @extend a
+    display: inline
+    cursor: pointer
+  .active
+    display: inline
+    color: #000
+    font-weight: bold
+  .thin
+    font-weight: 100
+
+.level_1
+  padding-left: 10px
+  font-weight: bold
+.level_2
+  padding-left: 20px
+.level_3
+  padding-left: 30px
+.level_4
+  padding-left: 40px
diff --git a/views/validation.haml b/views/validation.haml
index b8a6eaa..0a094d6 100644
--- a/views/validation.haml
+++ b/views/validation.haml
@@ -7,7 +7,7 @@
         - if model.validation_report_uri
           %dt Detailed report:
           %dd
-            %a{:href => model.validation_report_uri + subjectstring, :target => "_blank"} show
+            %a{:href => model.validation_report_uri, :target => "_blank"} show
         %dt Number of predictions:
         %dd= model.nr_predictions.to_s
         - case model.type