Moved login/logout form into topbar

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
+            - if user_signed_in?
-            a.button href="/profile" Login
+              = 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'

app/views/layouts/_user_widget.slim

@@ -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

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