diff options
author | Christoph Helma <helma@in-silico.ch> | 2011-05-16 14:47:42 +0000 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2011-05-16 14:47:42 +0000 |
commit | 243a1a6975543f12a6ea84eab5c4dda6c3d22d4a (patch) | |
tree | 691d19fe532b7168a3d43f3e06111548258e87d4 | |
parent | b19f254428c46061a88dbe11b0298a48abf85648 (diff) | |
parent | e9a1905129b84ce06925c08538b088697fbfa640 (diff) |
Merge branch 'development' of github.com:opentox/toxcreate into development
Conflicts:
views/lazar.haml
-rw-r--r-- | views/login.haml | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/views/login.haml b/views/login.haml index 1a74f12..e944e77 100644 --- a/views/login.haml +++ b/views/login.haml @@ -33,15 +33,5 @@ %form{ :action => url_for('/login'), :method => "post" } %input{:type => 'hidden', :name => 'username', :id => 'username', :value => "guest"} %input{:type => 'hidden', :name => 'password', :id => 'password', :value => "guest"} - %input{ :type => "submit", :value => "Login as guest"} - -# else - %form{ :action => url_for('/logout'), :method => "post" } - -#%p - You are logged in as: - %b= session[:username] - -# if LOGGER.level == Logger::DEBUG - %br - = session[:subjectid] - %input{ :type => "submit", :value => "Switch user"} - = link_to "Cancel", '/login' - + %input{:type => "submit", :value => "Login as guest"} + |