Merge branch 'release/2.0.0'v2.0.0

1 files changed, 9 insertions, 3 deletions

diff --git a/views/create.haml b/views/create.haml
index 5450ddf..0b299f5 100644
--- a/views/create.haml
+++ b/views/create.haml
@@ -17,18 +17,24 @@
     = link_to "instructions for creating training datasets", '/help'
     before submitting.
 
+
   %form{ :action => url_for('/models'), :method => "post", :enctype => "multipart/form-data" }
     %input{:type => 'hidden', :name => 'subjectid', :id => 'subjectid', :value => session[:subjectid]}
     %fieldset
       %label{:for => 'file'}
-        Select training data in
+        Upload training data in
         = link_to "Excel", '/help'
         or
         = link_to "CSV", '/help'
         format:
       %input{:type => 'file', :name => 'file', :id => 'file', :size => '41'}
     %input{ :type => "submit", :value => "Create model"}
-    = link_to "Cancel", '/create'
+    =# link_to "Cancel", '/create'
+
+  %p
+    or
+    %a{:href => "echa"} Select a AMBIT dataset
+    (experimental)
 
   -# explanations
   = haml :lazar_description, :layout => false
@@ -45,5 +51,5 @@
       and your models can be modified or deleted by other guests. Please
       = link_to "log in", "/login"
       with your
-      %a{:href => "www.opentox.org"} OpenTox
+      %a{:href => "http://www.opentox.org", :rel => "external"} OpenTox
       account to control your model permissions.