summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/views/layouts/_header.html.haml6
-rw-r--r--app/views/layouts/_navigation.html.haml8
-rw-r--r--app/views/layouts/application.html.haml2
3 files changed, 9 insertions, 7 deletions
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 854ab40..b459545 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -4,6 +4,8 @@
= link_to t(:users), users_path
%li{:class => ("active" if controller?('tickets') && !params[:user_id])}
= link_to t(:tickets), tickets_path
-- if user && @show_navigation
+ %li
+ = link_to t(:logout), logout_path, :method => :delete
+- if @user && @show_navigation
.user_heading
- = user.email_address
+ = @user.email_address
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
index cbe6d3a..b42c1fe 100644
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -1,6 +1,6 @@
%ul.nav.sidenav
- = link_to_navigation t(:overview), user_overview_path(user), :active => controller?(:overviews)
- = link_to_navigation t(:account_settings), edit_user_path(user), :active => controller?(:users)
- = link_to_navigation t(:email_settings), edit_user_email_settings_path(user), :active => controller?(:email_settings)
- = link_to_navigation t(:support_tickets), auto_tickets_path(user), :active => controller?(:tickets)
+ = link_to_navigation t(:overview), user_overview_path(@user), :active => controller?(:overviews)
+ = link_to_navigation t(:account_settings), edit_user_path(@user), :active => controller?(:users)
+ = link_to_navigation t(:email_settings), edit_user_email_settings_path(@user), :active => controller?(:email_settings)
+ = link_to_navigation t(:support_tickets), auto_tickets_path(@user), :active => controller?(:tickets)
= link_to_navigation t(:logout), logout_path, :method => :delete
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index db612b7..d5adca9 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,4 +1,4 @@
-- @show_navigation = true if @show_navigation.nil?
+- @show_navigation = true if @show_navigation.nil? && logged_in?
!!!
%html
%head