Merge branch 'development' of github.com:opentox/toxcreate into development

Conflicts:
	views/lazar.haml

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"}
+