From a2a7347e70da54ae0f0177e01604756034dc1410 Mon Sep 17 00:00:00 2001 From: Coleman Date: Sat, 11 Oct 2008 17:37:43 -0500 Subject: [PATCH] move logout thing and add disclaimer link --- app/views/layout/application.html.haml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/views/layout/application.html.haml b/app/views/layout/application.html.haml index b4e6258..9d0a766 100644 --- a/app/views/layout/application.html.haml +++ b/app/views/layout/application.html.haml @@ -18,6 +18,15 @@ #header_image %a{ :href => '/', :title => 'B.A. Home' } %img{ :src => '/images/binaryattraction.png', :alt => 'Binary Attraction' } + - if logged_in? + #header_user + %p + Welcome, + == #{current_user.user_name} + %br + %a{ :href => url(:delete_session, :id => session[:user_id]), :title => 'Log out of B.A.' } + Log out + %img{ :src => '/images/system-log-out.png' } #tool_bar - menu_items.each do |menu_item| %a{ :href => menu_item[:href], :title => menu_item[:title] } @@ -25,10 +34,6 @@ = menu_item[:name] - if menu_item != menu_items.last | - - if logged_in? - | - %a{ :href => url(:delete_session, :id => session[:user_id]), :title => 'Log out of B.A.' } - %img{ :src => '/images/system-log-out.png' } #content = catch_content :for_layout #footer @@ -36,3 +41,5 @@ %a{ :href => 'http://penguincoder.org' } penguincoder | Usage of this site requires %a{ :href => '/acceptable_use' } acceptable use policy + | + %a{ :href => '/disclaimer' } disclaimer