bterkuile/cmtool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better cmtool_user linking

Browse Source
This commit is contained in:
Benjamin ter Kuile
2015-07-16 17:13:01 +02:00
parent 11185626d7
commit 97c4203c0e
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/cmtool/application/_menu.html.slim
+3 -2
View File
@@ -1,3 +1,4 @@
- user = defined?(cmtool_user) ? cmtool_user : (defined?(current_user) ? current_user : nil)
.fixed .fixed
nav.top-bar data-topbar="" role="navigation" nav.top-bar data-topbar="" role="navigation"
ul.title-area ul.title-area
@@ -8,10 +9,10 @@
a href="#" a href="#"
span Menu span Menu
section.top-bar-section section.top-bar-section
- if cmtool_user.present? - if user.present?
ul.right ul.right
li.has-dropdown li.has-dropdown
a href="#" = cmtool_user.email a href="#" = user.email
ul.dropdown ul.dropdown
li.log-out= link_to t('helpers.links.logout'), main_app.root_path li.log-out= link_to t('helpers.links.logout'), main_app.root_path
ul.left ul.left
app/views/cmtool/application/_user_info.html.slim
-7
View File
@@ -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