diff options
| -rw-r--r-- | app/assets/stylesheets/leap.scss | 8 | ||||
| -rw-r--r-- | app/views/layouts/_header.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/_navigation.html.haml | 3 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 4 |
4 files changed, 13 insertions, 4 deletions
diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss index 9fe2195..5bc3c10 100644 --- a/app/assets/stylesheets/leap.scss +++ b/app/assets/stylesheets/leap.scss @@ -43,6 +43,14 @@ display: none; } +.admin-area { + background-color: #fff6ef; + background-image: url(/leap-img/caution.png); + border: 1px dotted #eea; + border-radius: 4px; + padding: 4px 6px; +} + // // ICONS // diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index 7b7999a..fd654d8 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -1,5 +1,5 @@ - if admin? - %ul.nav.nav-tabs + %ul.nav.nav-pills.admin-area = render partial: 'common/navigation_item', collection: [:users, :identities, :tickets] = link_to_navigation :logout, logout_path, :method => :delete diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index 63a361a..b468fe8 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -11,4 +11,5 @@ active: (controller?(:donations) and action?(:new)) = link_to_navigation :subscriptions, billing_top_link(@braintree_customer_id), active: controller?(:subscriptions) - = link_to_navigation :logout, logout_path, method: :delete + - unless admin? + = link_to_navigation :logout, logout_path, method: :delete diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index d213fe1..0aeda8b 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -14,9 +14,9 @@ = render 'layouts/masthead' #main .container-fluid - - if @show_navigation + - if @show_navigation && !admin? .row-fluid - %h1= t(:user_control_panel) + %h1= t(:user_control_panel) - if logged_in? .row-fluid .span12 |