From 18db1b4222a087f96afe9e47da0cc8212879b57d Mon Sep 17 00:00:00 2001 From: Mario Manno Date: Thu, 20 Mar 2014 20:39:24 +0100 Subject: [PATCH] even if there is no conference (yet), the logout menu should be displayed (see #47) --- app/views/layouts/application.html.haml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 0f5aada46..405daf2c7 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -57,12 +57,12 @@ %li= link_to t(:create_new_conference, :default => "Create new conference"), new_conference_path(:conference_acronym => nil) - elsif can? :manage, Conference %li= link_to t(:create_new_conference, :default => "Create new conference"), new_conference_path(:conference_acronym => nil) - - if @conference - %li.dropdown - = link_to t("show_account", :default => "Account"), "#", :class => "dropdown-toggle" - %ul.dropdown-menu + %li.dropdown + = link_to t("show_account", :default => "Account"), "#", :class => "dropdown-toggle" + %ul.dropdown-menu + - if @conference %li= link_to t("user_settings", :default => "Settings"), person_user_path(current_user.person) - %li= link_to t("web-app-theme.logout", :default => "Logout"), session_path, :method => :delete + %li= link_to t("web-app-theme.logout", :default => "Logout"), session_path, :method => :delete .container .main-content = render 'shared/flash', :flash => flash