Skip to content

Commit

Permalink
even if there is no conference (yet), the logout menu should be
Browse files Browse the repository at this point in the history
displayed (see manno#47)
  • Loading branch information
manno committed Mar 20, 2014
1 parent 5e588b6 commit 18db1b4
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions app/views/layouts/application.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 18db1b4

Please sign in to comment.