From da28c6440d71a4ff62a71ab11aed21fbf18c3034 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Wed, 15 Jul 2015 17:59:43 +0200 Subject: [PATCH] Moved login/logout form into topbar --- app/views/layouts/_topbar.slim | 6 ++++-- app/views/layouts/_user_widget.slim | 6 ------ app/views/layouts/application.html.slim | 1 - 3 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 app/views/layouts/_user_widget.slim diff --git a/app/views/layouts/_topbar.slim b/app/views/layouts/_topbar.slim index 2ad4ac7..1521a22 100644 --- a/app/views/layouts/_topbar.slim +++ b/app/views/layouts/_topbar.slim @@ -36,5 +36,7 @@ header li.divider // TODO: Show link for admin/moderation view if admin is logged in li.has-form - // TODO: Show "My" when the user is logged in - a.button href="/profile" Login + - if user_signed_in? + = link_to "#{current_user.email} logged in", destroy_user_session_path, :method => :delete, class: 'button' + - else + = link_to 'Login', new_user_session_path, class: 'button' diff --git a/app/views/layouts/_user_widget.slim b/app/views/layouts/_user_widget.slim deleted file mode 100644 index 7e7f569..0000000 --- a/app/views/layouts/_user_widget.slim +++ /dev/null @@ -1,6 +0,0 @@ -- if user_signed_in? - p Welcome #{current_user.email} - = link_to 'Logged In [click to logout]', destroy_user_session_path, :method => :delete -- else - p You are not signed in. - = link_to 'Login', new_user_session_path diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim index 825d1de..91a2a73 100644 --- a/app/views/layouts/application.html.slim +++ b/app/views/layouts/application.html.slim @@ -16,7 +16,6 @@ html // TODO: move topbar somewhere else than packages = render 'layouts/topbar' #messages - = render 'layouts/user_widget' = render 'layouts/messages' #content = yield