diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/create.haml | 23 | ||||
| -rw-r--r-- | views/help.haml | 8 | ||||
| -rw-r--r-- | views/layout.haml | 8 | ||||
| -rw-r--r-- | views/lazar_description.haml | 43 | ||||
| -rw-r--r-- | views/model.haml | 3 | ||||
| -rw-r--r-- | views/models.haml | 4 | ||||
| -rw-r--r-- | views/predict.haml | 6 | ||||
| -rw-r--r-- | views/validation.haml | 8 |
8 files changed, 52 insertions, 51 deletions
diff --git a/views/create.haml b/views/create.haml index c04f841..82f48d0 100644 --- a/views/create.haml +++ b/views/create.haml @@ -1,17 +1,16 @@ .input - %p - This service creates - %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 - from your uploaded datasets. Further modelling algorithms will be added in future versions. + This service creates + %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 + from your uploaded datasets. Further modelling algorithms will be added in future versions. %p Please read the diff --git a/views/help.haml b/views/help.haml index a8bbf4b..da6495e 100644 --- a/views/help.haml +++ b/views/help.haml @@ -2,7 +2,7 @@ %p Input files have two columns. Enter in the first column the chemical structure in %a{:href => "http://en.wikipedia.org/wiki/Simplified_molecular_input_line_entry_specification"} SMILES - format, in the second column the toxic activity. + format, in the second column the toxic activity. The first line contains a description of the columns and is ignored. %dl %dt Classification datasets %dd Please use 1/0, active/inactive or true/false to indicate active/inactive compounds. @@ -36,6 +36,11 @@ %tr - n += 1 %th= n + %td SMILES + %td Hamster Carcinogenicity + %tr + - n += 1 + %th= n %td CC(=O)Nc1ccc(O)cc1 %td 1 %tr @@ -87,6 +92,7 @@ .code %code + %br SMILES, Hamster Carcinogenicity %br CC(=O)Nc1ccc(O)cc1, 1 %br O=c1[nH]cnc2[nH]ncc12, 1 %br CCCCNc1cc(cc(c1Oc2ccccc2)S(=O)(=O)N)C(=O)O, 1 diff --git a/views/layout.haml b/views/layout.haml index d54b413..d9d7783 100644 --- a/views/layout.haml +++ b/views/layout.haml @@ -1,8 +1,8 @@ -!!! +!!! %html{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en", :lang => "en"} %head - %meta{'http-equiv' => 'Content-Type', :content => 'text/html'} + %meta{'http-equiv' => 'Content-Type', :content => 'text/html; charset=UTF-8'} %title ToxCreate %script{:type => "text/javascript", :src => "javascripts/jquery.js"} %script{:type => "text/javascript", :src => "javascripts/toxcreate.js"} @@ -12,7 +12,7 @@ %body .logo - = image_tag "/ToxCreate_rgb_72.png", :alt => 'ToxCreate', :align => 'right' + %img{:src => "ToxCreate_rgb_72.png", :alt => 'ToxCreate', :align => 'right'}/ %br Create and evaluate models to predict toxicity .index @@ -37,7 +37,7 @@ - if `hostname`.match(/ot-test/) .notice This service is for testing purposes only - once a week all models will be deleted. Please send bug reports and feature requests to our - %a{:href => 'http://github.com/helma/opentox-toxmodel/issues'} issue tracker. + %a{:href => 'http://github.com/opentox/opentox-toxmodel/issues'} issue tracker. - if flash[:notice] %p diff --git a/views/lazar_description.haml b/views/lazar_description.haml index d870425..d8e995d 100644 --- a/views/lazar_description.haml +++ b/views/lazar_description.haml @@ -5,25 +5,24 @@ = hide_link "#lazar_description" ) %dd - %p - %code lazar - searches the training dataset for - = toggle_link "#similarity", "similar" - compounds - %em (neighbors) - and calculates the prediction from their measured activities. - %code lazar - calculates predictions using - %ul - %li - a majority vote (weighted by compound similarity) for - %em= toggle_link("#classification","classification") - ( - %a{:href => "http://www.in-silico.de/articles/modi020905.pdf"} original publication - ) - %li - a local QSAR model based on neighbors for - %em= toggle_link("#regression","regression") - ( - %a{:href => "http://www.in-silico.de/articles/mh_tf.pdf"} original publication - ) + %code lazar + searches the training dataset for + = toggle_link "#similarity", "similar" + compounds + %em (neighbors) + and calculates the prediction from their measured activities. + %code lazar + calculates predictions using + %ul + %li + a majority vote (weighted by compound similarity) for + %em= toggle_link("#classification","classification") + ( + %a{:href => "http://www.in-silico.de/articles/modi020905.pdf"} original publication + ) + %li + a local QSAR model based on neighbors for + %em= toggle_link("#regression","regression") + ( + %a{:href => "http://www.in-silico.de/articles/mh_tf.pdf"} original publication + ) diff --git a/views/model.haml b/views/model.haml index 5addcb0..91d7016 100644 --- a/views/model.haml +++ b/views/model.haml @@ -83,4 +83,5 @@ %a{:href => File.join(model.validation_qmrf_uri,"editor")} QMRF Editor, %a{:href => "#{model.uri}.yaml#{subjectstring}"} YAML %em (experts, models cannot be represented in Excel) - = haml :validation, :locals=>{:model=>model,:subjectstring => subjectstring}, :layout => false + + = haml :validation, :locals=>{:model=>model,:subjectstring => subjectstring}, :layout => false diff --git a/views/models.haml b/views/models.haml index a99144a..67c061c 100644 --- a/views/models.haml +++ b/views/models.haml @@ -10,12 +10,14 @@ }); -# %p Get an overview about ToxCreate models. This page is refreshed every 15 seconds to update the model status. -%p Get an overview about ToxCreate models. This page is refreshed every 5 seconds to update the model status. +%p Get an overview about ToxCreate models. Parts of this page are refreshed every 5 seconds to update the model status. -# explanations = haml :lazar_description, :layout => false = haml :classification, :layout => false = haml :regression, :layout => false += haml :similarity, :layout => false += haml :significant_fragments, :layout => false - @models.each do |model| = haml :model, :locals=>{:model=>model,:subjectstring=>subjectstring}, :layout => false diff --git a/views/predict.haml b/views/predict.haml index 347592c..d8c34a2 100644 --- a/views/predict.haml +++ b/views/predict.haml @@ -16,7 +16,7 @@ .jme %applet{:code => "JME.class", :name => "JME", :archive => "JME.jar", :width => "500", :height => "360"} %param{ :name => "options", :value => "polarnitro"} - Please enable Java and JavaScript in your browser to use the JME editor. + Please enable Java and JavaScript in your browser to use the JME editor. %label{:for => 'identifier'} or enter a Name, InChI, Smiles, CAS, ... %input{:type => 'text', :name => 'identifier', :id => 'identifier', :size => '60'} @@ -24,10 +24,10 @@ %legend Choose one or more prediction models - @models.each do |model| - %label{:for => model.id} + %label{:for => "model#{model.id}"} = model.name -#%input{:type => 'checkbox', :name => "selection[#{model.id}]", :value => true, :id => model.id, :disabled => !is_authorized(model.uri, "GET")} - %input{:type => 'checkbox', :name => "selection[#{model.id}]", :value => true, :id => model.id, :disabled => false} + %input{:type => 'checkbox', :name => "selection[#{model.id}]", :value => true, :id => "model#{model.id}", :disabled => false} %br %input{:type => 'hidden', :name => 'subjectid', :id => 'subjectid', :value => session[:subjectid]} diff --git a/views/validation.haml b/views/validation.haml index 06a57e7..b8a6eaa 100644 --- a/views/validation.haml +++ b/views/validation.haml @@ -2,22 +2,16 @@ %dl{:id => "model_validation_#{model.id}"} %dt Validation: - -# %input{ :id => "model_validation_report_#{model.id}", :type => "hidden", :value => "#{model.validation_report_status}", :class => "model_validation_report" } %dd %dl - if model.validation_report_uri %dt Detailed report: %dd %a{:href => model.validation_report_uri + subjectstring, :target => "_blank"} show - %dt Number of predictions + %dt Number of predictions: %dd= model.nr_predictions.to_s - case model.type - when "classification" = haml :classification_validation, :locals=>{:model=>model}, :layout => false if model.correct_predictions - when "regression" = haml :regression_validation, :locals=>{:model=>model}, :layout => false --# else - = image_tag("/snake_transparent.gif") if model.validation_status == "Running" - %a{:href => model.validation_task_uri} #{model.validation_status} - - |