diff options
| author | Azul <azul@leap.se> | 2014-05-27 17:52:26 +0200 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2014-05-27 17:52:26 +0200 |
| commit | 8ca32588c969ee9eca986da8cf1de92b39ce3576 (patch) | |
| tree | 80873d2b598f26e33062bc0cbdb44a81d7fe19ae | |
| parent | cc59ce53e52bf48d97de16d66012e8309bf98fe8 (diff) | |
move users key into layouts scope so it does not conflict with users scope
| -rw-r--r-- | app/views/layouts/_header.html.haml | 2 | ||||
| -rw-r--r-- | config/locales/users.en.yml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index fbc46b3..e827f60 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -2,7 +2,7 @@ %ul.nav.nav-tabs = # 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 + = link_to t(".users"), users_path %li{:class => ("active" if controller?('tickets') && !params[:user_id])} = link_to t(".tickets", cascade: true), tickets_path %li diff --git a/config/locales/users.en.yml b/config/locales/users.en.yml index 0375174..f0fcb3d 100644 --- a/config/locales/users.en.yml +++ b/config/locales/users.en.yml @@ -1,5 +1,6 @@ en: - overview: "Overview" + layouts: + users: "Users" user_control_panel: "user control panel" account_settings: "Account Settings" username: "Username" |