diff options
| author | azul <azul@riseup.net> | 2013-09-02 22:55:46 -0700 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2013-09-02 22:55:46 -0700 |
| commit | c17edbc069c6dcfc3dd20d8cdfb5922032769a5f (patch) | |
| tree | 719cdb3d4fd46b1e447262e4a29729513e4a08b1 /app | |
| parent | b69d37fcf00b7acfe1f35c3a6d79f244c5c28e01 (diff) | |
| parent | 57baaa65cab56d13b77fff674a57e7f3e4983f00 (diff) | |
Merge pull request #78 from jessib/finish_removing_email_settings_references
Remove references to email_settings controller, which has been removed. ...
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/layouts/_header.html.haml | 3 | ||||
| -rw-r--r-- | app/views/layouts/_navigation.html.haml | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index b459545..157f1df 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -1,6 +1,7 @@ - if admin? %ul.nav.nav-tabs - %li{:class => ("active" if controller?('users', 'email_settings', 'overviews') || params[:user_id])} + = # this navigation isn't quite right. also, we will want to active for an identity controller once it is added. + %li{:class => ("active" if controller?('users', 'overviews') || params[:user_id])} = link_to t(:users), users_path %li{:class => ("active" if controller?('tickets') && !params[:user_id])} = link_to t(:tickets), tickets_path diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index 053c62c..b89655f 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -1,6 +1,7 @@ %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) + - # will want link for identity settings = link_to_navigation t(:support_tickets), auto_tickets_path, :active => controller?(:tickets) = link_to_navigation t(:billing_settings), show_or_new_customer_link(@user), :active => controller?(:customer, :payments, :subscriptions, :credit_card_info) if APP_CONFIG[:payment].present? = link_to_navigation t(:logout), logout_path, :method => :delete |