summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-07-04 01:35:49 -0700
committerelijah <elijah@riseup.net>2013-07-04 01:35:49 -0700
commitc96f3544c5e7289eb4157981cc9f680d689d861f (patch)
tree09c090e59b9b20404260634994116c1092f24df3
parent65fed45ce918011dd3e563b114651d434fadb23c (diff)
help - fix ticket navigation & links (use @user, not user).
-rw-r--r--app/views/layouts/_header.html.haml6
-rw-r--r--app/views/layouts/_navigation.html.haml8
-rw-r--r--app/views/layouts/application.html.haml2
-rw-r--r--help/app/views/tickets/_order-nav.html.haml5
-rw-r--r--help/app/views/tickets/_table-nav.html.haml4
-rw-r--r--help/app/views/tickets/_tabs.html.haml (renamed from help/app/views/tickets/_status-nav.html.haml)13
-rw-r--r--help/app/views/tickets/index.html.haml2
-rw-r--r--help/app/views/tickets/new.html.haml15
8 files changed, 34 insertions, 21 deletions
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
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
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index db612b7..d5adca9 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,4 +1,4 @@
-- @show_navigation = true if @show_navigation.nil?
+- @show_navigation = true if @show_navigation.nil? && logged_in?
!!!
%html
%head
diff --git a/help/app/views/tickets/_order-nav.html.haml b/help/app/views/tickets/_order-nav.html.haml
deleted file mode 100644
index b235350..0000000
--- a/help/app/views/tickets/_order-nav.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-%ul.nav.nav-pills.pull-right{:style => 'margin-bottom: 0'}
- %li{:class=> ("active" if search_order.start_with? 'created_at' )}
- = link_to_order('created')
- %li{:class=> ("active" if search_order.start_with? 'updated_at' )}
- = link_to_order('updated')
diff --git a/help/app/views/tickets/_table-nav.html.haml b/help/app/views/tickets/_table-nav.html.haml
deleted file mode 100644
index 45ebfb2..0000000
--- a/help/app/views/tickets/_table-nav.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-- unless action?(:new)
- = render 'tickets/order-nav'
-= render 'tickets/status-nav'
-
diff --git a/help/app/views/tickets/_status-nav.html.haml b/help/app/views/tickets/_tabs.html.haml
index 8e51497..b7b5d3a 100644
--- a/help/app/views/tickets/_status-nav.html.haml
+++ b/help/app/views/tickets/_tabs.html.haml
@@ -1,3 +1,16 @@
+-#
+-# SORT ORDER TABS
+-#
+- unless action?(:new)
+ %ul.nav.nav-pills.pull-right.slim
+ %li{:class=> ("active" if search_order.start_with? 'created_at')}
+ = link_to_order('created')
+ %li{:class=> ("active" if search_order.start_with? 'updated_at')}
+ = link_to_order('updated')
+
+-#
+-# STATUS FILTER TABS
+-#
%ul.nav.nav-tabs
- if logged_in?
%li{:class => ("active" if search_status == 'open')}
diff --git a/help/app/views/tickets/index.html.haml b/help/app/views/tickets/index.html.haml
index 1b32dc1..c02a326 100644
--- a/help/app/views/tickets/index.html.haml
+++ b/help/app/views/tickets/index.html.haml
@@ -1,6 +1,6 @@
- @show_navigation = !params[:user_id].nil?
-= render 'tickets/table-nav'
+= render 'tickets/tabs'
%table.table.table-striped.table-bordered
%thead
diff --git a/help/app/views/tickets/new.html.haml b/help/app/views/tickets/new.html.haml
index 04b091c..4d35659 100644
--- a/help/app/views/tickets/new.html.haml
+++ b/help/app/views/tickets/new.html.haml
@@ -1,13 +1,20 @@
- @show_navigation = !params[:user_id].nil?
-= render 'tickets/table-nav'
+= render 'tickets/tabs'
+
+- if admin? && @user
+ - email = @user.email_address
+ - regarding = @user.login
+- elsif logged_in?
+ - email = current_user.email_address
+ - regarding = current_user.login
= simple_form_for @ticket, :validate => true, :html => {:class => 'form-horizontal'} do |f|
= hidden_ticket_fields
= f.input :title, :label => t(:subject)
- - if user
- = f.input :email, input_html: {value: user.email_address}
- = f.input :regarding_user, input_html: {value: user.login}
+ - if logged_in?
+ = f.input :email, input_html: {value: email}
+ = f.input :regarding_user, input_html: {value: regarding}
- else
= f.input :email
= f.input :regarding_user