diff options
| author | Christoph Helma <helma@in-silico.ch> | 2011-08-22 16:25:21 +0000 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2011-08-22 16:25:21 +0000 |
| commit | a8f6072f32ef5ae650216a4612d13eeb6b310c7e (patch) | |
| tree | 60cb79d76b74c94b46201038c260e083a626806f /views | |
| parent | f5eccd4ce22acb2fa05e84fb80e8385cce235d51 (diff) | |
| parent | 4fc732ca31b07ba1469358836abf6ffd3c955098 (diff) | |
Merge branch 'development' of github.com:opentox/toxcreate into development
Diffstat (limited to 'views')
| -rw-r--r-- | views/model.haml | 18 | ||||
| -rw-r--r-- | views/models.haml | 6 | ||||
| -rw-r--r-- | views/validation.haml | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/views/model.haml b/views/model.haml index f0fd660..356ec65 100644 --- a/views/model.haml +++ b/views/model.haml @@ -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/models.haml b/views/models.haml index 9ab2858..a1ef8ba 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; }); @@ -20,6 +20,6 @@ - if @models - @models.each do |model| - = haml :model, :locals=>{:model=>model,:subjectstring=>subjectstring}, :layout => false --if @models.size == 0 + = 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/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 |