summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-07-03 11:11:10 -0700
committerelijah <elijah@riseup.net>2013-07-04 04:12:59 -0700
commit0cd386e0144601f5478f90bbdb401d55c019c828 (patch)
treee5a1eb9bf6e8031d9367c869f46ba717f2906c9c /app
parent179a6457d4e56052664a6895bb9ab5b721b57352 (diff)
better ticket view navigation: tickets are now either global in scope (for admins) or stay as a nested resource for a particular user (for normal users and when you visit the tickets list of a particular user).
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/leap.scss9
-rw-r--r--app/views/layouts/_navigation.html.haml11
2 files changed, 11 insertions, 9 deletions
diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss
index 4a3ca03..792aa3c 100644
--- a/app/assets/stylesheets/leap.scss
+++ b/app/assets/stylesheets/leap.scss
@@ -105,6 +105,15 @@ input, textarea {
background-image: url(/assets/glyphicons-halflings.png) !important;
}
+// override stupid bootstrap behavior of making the active tab appear non-clickable
+// and links not being underline
+.nav-tabs > li > a:hover, .sidenav > li > a:hover {
+ text-decoration: underline;
+}
+.nav-tabs > .active > a:hover {
+ cursor: pointer;
+}
+
//
// TICKETS
//
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
index 7cd0f38..cbe6d3a 100644
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -1,13 +1,6 @@
-//= link_to "Leap Web", root_path, :class => 'brand'
-//%ul.nav
-// // = render '/tickets/nav'
-//
-//%ul.nav.pull-right
-// = render '/sessions/nav'
-
%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)
- =# link_to_navigation t(:email_settings), edit_email_path(user), :active => controller?(:emails)
- = link_to_navigation t(:support_tickets), tickets_path, :active => controller?(:tickets)
+ = link_to_navigation t(:email_settings), edit_user_email_settings_path(user), :active => controller?(:email_settings)
+ = link_to_navigation t(:support_tickets), auto_tickets_path(user), :active => controller?(:tickets)
= link_to_navigation t(:logout), logout_path, :method => :delete