diff options
| author | gebele <gebele@in-silico.ch> | 2018-04-03 14:26:14 +0000 |
|---|---|---|
| committer | gebele <gebele@in-silico.ch> | 2018-04-03 14:26:14 +0000 |
| commit | 781596de9a647e8422778bb3ec4019903bf84e06 (patch) | |
| tree | ac6d1c8b02c9fe2e8e45dc21eaebb5f40846339e /views | |
| parent | 7c1898e64c8a789786becdb6305a74e5c5c27c07 (diff) | |
| parent | ca94d4b7e8ad0cab13e66be7a34b0cde21948c69 (diff) | |
fixed merge from development
Diffstat (limited to 'views')
| -rw-r--r-- | views/info.haml | 2 | ||||
| -rw-r--r-- | views/model_details.haml | 9 | ||||
| -rw-r--r-- | views/predict.haml | 3 | ||||
| -rw-r--r-- | views/prediction.haml | 8 |
4 files changed, 18 insertions, 4 deletions
diff --git a/views/info.haml b/views/info.haml index 34ded87..d8b93f9 100644 --- a/views/info.haml +++ b/views/info.haml @@ -1,2 +1,2 @@ %div.info - currently no models available + We are rebuilding the models. It will take a while, please be patient and reload the page in some time. diff --git a/views/model_details.haml b/views/model_details.haml index d85d2fb..c5e3370 100644 --- a/views/model_details.haml +++ b/views/model_details.haml @@ -28,8 +28,13 @@ = ", min: #{model.model.algorithms["similarity"]["min"]}" %br Prediction: - %a{:href=>"http://www.rubydoc.info/gems/lazar/OpenTox%2F#{model.model.algorithms["prediction"]["method"].sub("::","%2f")}", :rel=>"external"} - = model.model.algorithms["prediction"]["method"] + - if model.model.algorithms["prediction"]["method"] !~ /Caret/ + %a{:href=>"http://www.rubydoc.info/gems/lazar/OpenTox%2F#{model.model.algorithms["prediction"]["method"].sub("::","%2f")}", :rel=>"external"} + = model.model.algorithms["prediction"]["method"] + - else + %a{:href=>"http://www.rubydoc.info/gems/lazar/OpenTox/Algorithm/Caret", :rel=>"external"} + = model.model.algorithms["prediction"]["method"] + %br Descriptors: = model.model.algorithms["descriptors"]["method"]+"," diff --git a/views/predict.haml b/views/predict.haml index 89bef7c..2308911 100644 --- a/views/predict.haml +++ b/views/predict.haml @@ -180,5 +180,6 @@ %h2 3. Predict %div.col-lg-10.col-md-10.col-sm-10.col-xs-10 - %input.btn.btn-warning.h2{ :type => "submit", :id => "submit", :value=>">>", :onclick => "getsmiles()"} + %button.has-feedback.btn.btn-warning.h2{:type => "submit", :id => "submit", :value=>"", :onclick => "getsmiles()"} + %span.glyphicon.glyphicon-play %img.h2{:src=>"/images/wait30trans.gif", :id=>"circle", :class=>"circle", :alt=>"wait", :style=>"display:none;"} diff --git a/views/prediction.haml b/views/prediction.haml index bb7c631..8c4af6f 100644 --- a/views/prediction.haml +++ b/views/prediction.haml @@ -1,3 +1,11 @@ +:javascript + $(document).ready(function(){ + $('[data-toggle="popover"]').popover(); + $('.modal').on('hidden.bs.modal', function () { + $(this).removeData('bs.modal'); + }); + }); + %div.well %a.btn.btn-warning{:href => to('/predict')} %i.glyphicon.glyphicon-menu-left |