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/_header.html.haml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 app/views/layouts/_header.html.haml (limited to 'app/views/layouts/_header.html.haml') diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml new file mode 100644 index 0000000..aa4054b --- /dev/null +++ b/app/views/layouts/_header.html.haml @@ -0,0 +1,3 @@ +- if user + %strong.user_address + = user.email_address -- cgit v1.2.3 From b8c44acfa5b1fbc8b35e812bd6c23aa6d824c4b1 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 2 Jul 2013 23:19:38 -0700 Subject: cleaned up application layout and some minor css. --- app/views/layouts/_header.html.haml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'app/views/layouts/_header.html.haml') diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index aa4054b..854ab40 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -1,3 +1,9 @@ -- if user - %strong.user_address +- if admin? + %ul.nav.nav-tabs + %li{:class => ("active" if controller?('users', 'email_settings', 'overviews') || params[:user_id])} + = link_to t(:users), users_path + %li{:class => ("active" if controller?('tickets') && !params[:user_id])} + = link_to t(:tickets), tickets_path +- if user && @show_navigation + .user_heading = user.email_address -- 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/_header.html.haml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'app/views/layouts/_header.html.haml') diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index 854ab40..b459545 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -4,6 +4,8 @@ = link_to t(:users), users_path %li{:class => ("active" if controller?('tickets') && !params[:user_id])} = link_to t(:tickets), tickets_path -- if user && @show_navigation + %li + = link_to t(:logout), logout_path, :method => :delete +- if @user && @show_navigation .user_heading - = user.email_address + = @user.email_address -- cgit v1.2.3