diff options
author | mr <mr@mrautenberg.de> | 2011-10-25 13:40:35 +0200 |
---|---|---|
committer | mr <mr@mrautenberg.de> | 2011-10-25 13:40:35 +0200 |
commit | eb7d496c2eb0945c49381ab5ab3ddbc8a3115ff6 (patch) | |
tree | 37c000c843e6119223a277b228090427ff9d752b | |
parent | 596659faa751d19c90f72218592991cf0b773817 (diff) | |
parent | af65435267b86e6a98edf60e46b0cc2a34cfcfe7 (diff) |
Merge branch 'hotfix/helpuri' into development
-rw-r--r-- | application.rb | 6 | ||||
-rw-r--r-- | views/layout.haml | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/application.rb b/application.rb index 6cdfcfb..ef23522 100644 --- a/application.rb +++ b/application.rb @@ -85,7 +85,7 @@ get '/?' do redirect url_for('/create') end -get '/login' do +get '/login/?' do haml :login end @@ -206,11 +206,11 @@ get '/predict/?' do haml :predict end -get '/create' do +get '/create/?' do haml :create end -get '/help' do +get '/help/?' do haml :help end diff --git a/views/layout.haml b/views/layout.haml index 96f7d35..098c529 100644 --- a/views/layout.haml +++ b/views/layout.haml @@ -4,15 +4,15 @@ %head %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"} - %script{:type => "text/javascript", :src => "javascripts/jquery-ui-progressbar.js"} - %link{:rel=>'stylesheet', :href=>'stylesheets/style.css', :type => "text/css"} - %link{:rel=>'stylesheet', :href=>'progressbar/progressbar.css', :type => "text/css"} + %script{:type => "text/javascript", :src => "#{url_for('/javascripts/jquery.js')}"} + %script{:type => "text/javascript", :src => "#{url_for('/javascripts/toxcreate.js')}"} + %script{:type => "text/javascript", :src => "#{url_for('/javascripts/jquery-ui-progressbar.js')}"} + %link{:rel=>'stylesheet', :href=>"#{url_for('/stylesheets/style.css')}", :type => "text/css"} + %link{:rel=>'stylesheet', :href=>"#{url_for('/progressbar/progressbar.css')}", :type => "text/css"} %body .logo - %img{:src => "ToxCreate_rgb_72.png", :alt => 'ToxCreate', :align => 'right'}/ + %img{:src => "#{url_for('/ToxCreate_rgb_72.png')}", :alt => 'ToxCreate', :align => 'right'}/ %br Creates computational models to predict toxicity .index |