From 97c4203c0e4ba46173ed9faf0c0f69f2c10f1a94 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Thu, 16 Jul 2015 17:13:01 +0200 Subject: [PATCH] Better cmtool_user linking --- app/views/cmtool/application/_menu.html.slim | 5 +++-- app/views/cmtool/application/_user_info.html.slim | 7 ------- 2 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 app/views/cmtool/application/_user_info.html.slim diff --git a/app/views/cmtool/application/_menu.html.slim b/app/views/cmtool/application/_menu.html.slim index d49dba4..e771fb1 100644 --- a/app/views/cmtool/application/_menu.html.slim +++ b/app/views/cmtool/application/_menu.html.slim @@ -1,3 +1,4 @@ +- user = defined?(cmtool_user) ? cmtool_user : (defined?(current_user) ? current_user : nil) .fixed nav.top-bar data-topbar="" role="navigation" ul.title-area @@ -8,10 +9,10 @@ a href="#" span Menu section.top-bar-section - - if cmtool_user.present? + - if user.present? ul.right li.has-dropdown - a href="#" = cmtool_user.email + a href="#" = user.email ul.dropdown li.log-out= link_to t('helpers.links.logout'), main_app.root_path ul.left diff --git a/app/views/cmtool/application/_user_info.html.slim b/app/views/cmtool/application/_user_info.html.slim deleted file mode 100644 index fcb6cf4..0000000 --- a/app/views/cmtool/application/_user_info.html.slim +++ /dev/null @@ -1,7 +0,0 @@ -#user-info - #user-info-email= link_to cmtool_user.email, cmtool.user_path(current_user) - #user-info-sign-in-out class: user_signed_in? ? 'signed-in' : 'signed-out' - - if user_signed_in? - = link_to t('devise.sessions.sign_out'), cmtool.destroy_user_session_path - - else - = link_to t('devise.sessions.sign_in'), new_user_session_path