From ad61c290fb92133a4e82fd0447eb0d6f94cff212 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Fri, 23 Jul 2010 19:44:34 -0700 Subject: [PATCH] took current user's name out of the layout --- app/views/dashboards/index.html.haml | 6 +++++- app/views/layouts/application.html.haml | 5 ----- app/views/requests/new.html.haml | 2 +- app/views/users/show.html.haml | 1 - 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/views/dashboards/index.html.haml b/app/views/dashboards/index.html.haml index a19ff1e51..e5d4fb593 100644 --- a/app/views/dashboards/index.html.haml +++ b/app/views/dashboards/index.html.haml @@ -1,4 +1,8 @@ - +- if user_signed_in? + %h1#user_name + = link_to current_user.real_name, root_path + %span.description + = my_latest_message %h1= title_for_page %ul#stream - for post in @posts diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 85ca17c53..addc5fa3d 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -52,11 +52,6 @@ = render 'people/sidebar' if user_signed_in? .span-20.last - - if user_signed_in? - %h1#user_name - = link_to current_user.real_name, root_path - %span.description - = my_latest_message = yield = render "posts/debug" diff --git a/app/views/requests/new.html.haml b/app/views/requests/new.html.haml index 9343e8273..8a5276998 100644 --- a/app/views/requests/new.html.haml +++ b/app/views/requests/new.html.haml @@ -1,4 +1,4 @@ -- title "New Request" +%h1 requests = render 'form' diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index dbf775230..9182161a3 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -1,4 +1,3 @@ -%h1 user page! .span-20.last %h1= "#{@user.real_name}" - if @user_profile