summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormr <mr@mrautenberg.de>2011-05-13 14:09:51 +0200
committermr <mr@mrautenberg.de>2011-05-13 14:09:51 +0200
commitad1d77ba245913751f10dbb0ae17d15e047f38f3 (patch)
treec792cb38aa0f9dc4dfa877973e6647facec3dfb9
parentdb1251962cc926312d1b5d06a06f95344130b537 (diff)
parent2fa1764ffc79b1bcd751e57b4f4e71a264e3b168 (diff)
Merge branch 'hotfix/login_page_haml_3' into development
-rw-r--r--views/login.haml14
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"}
+