From 3f51128e24e1ca3247169066aa6a03090df98dd6 Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 17 Jun 2013 01:26:35 -0700 Subject: start of new ui - css changes, layout changes, navigation changes. --- app/views/layouts/_navigation.html.haml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'app/views/layouts/_navigation.html.haml') diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index b75eed7..7cd0f38 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -1,6 +1,13 @@ -= link_to "Leap Web", root_path, :class => 'brand' -%ul.nav - // = render '/tickets/nav' +//= link_to "Leap Web", root_path, :class => 'brand' +//%ul.nav +// // = render '/tickets/nav' +// +//%ul.nav.pull-right +// = render '/sessions/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(:logout), logout_path, :method => :delete -- cgit v1.2.3 From 0cd386e0144601f5478f90bbdb401d55c019c828 Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 3 Jul 2013 11:11:10 -0700 Subject: 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). --- app/views/layouts/_navigation.html.haml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'app/views/layouts/_navigation.html.haml') 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 -- cgit v1.2.3 From adacb11c8ff6395f38c3c05bea4e6d276285118f Mon Sep 17 00:00:00 2001 From: elijah Date: Thu, 4 Jul 2013 01:35:49 -0700 Subject: help - fix ticket navigation & links (use @user, not user). --- app/views/layouts/_navigation.html.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/views/layouts/_navigation.html.haml') diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index cbe6d3a..b42c1fe 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -1,6 +1,6 @@ %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_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(: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_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 -- cgit v1.2.3