summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-01-10 16:27:49 -0800
committerelijah <elijah@riseup.net>2016-01-10 16:27:49 -0800
commit854746e247a1a05ebbfe59ba3ccac99d1c75ed51 (patch)
tree260ba4028c219abf677af4e61363e7daab65249d /app/views
parentc678806489cbe7d63d3946de1265697c7fb996e6 (diff)
highlight admin areas with caution tape (wip)
Diffstat (limited to 'app/views')
-rw-r--r--app/views/layouts/_header.html.haml2
-rw-r--r--app/views/layouts/_navigation.html.haml3
-rw-r--r--app/views/layouts/application.html.haml4
3 files changed, 5 insertions, 4 deletions
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