From 7d58f640e89a89a4767e59883b864afcd4e9dad4 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 17 Jun 2013 01:27:01 -0700
Subject: new ui - ticket navigation

---
 help/app/views/tickets/index.html.haml | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'help/app/views/tickets/index.html.haml')

diff --git a/help/app/views/tickets/index.html.haml b/help/app/views/tickets/index.html.haml
index 23a503d..a3cbfcf 100644
--- a/help/app/views/tickets/index.html.haml
+++ b/help/app/views/tickets/index.html.haml
@@ -1,17 +1,12 @@
-%h1 tickets index
+- if admin?
+  = render 'tickets/admin-nav'
 
-Create a 
-= link_to "new ticket", new_ticket_path
+= render 'tickets/table-nav'
+
+%table.table-striped.table-bordered.table-hover
+  //{:style => "width:100%;"}
+  %tbody
+    = render @tickets.all
+= paginate @tickets
 
-= #%div{"data-pjax-container" => ""} # not sure how to get this working right
-.row
-  .span2
-    - if admin?
-      = render 'tickets/admin-nav'
-  .span10
-    = render 'tickets/table-nav'
-    %table.table-striped.table-bordered.table-hover{:style => "width:100%;"}
-      %tbody
-        = render @tickets.all
-    = paginate @tickets
 
-- 
cgit v1.2.3


From 8393058ac15d72be702a6de481d6129aed4bbef3 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 19 Jun 2013 00:33:19 -0700
Subject: new ui for tickets

---
 help/app/views/tickets/index.html.haml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'help/app/views/tickets/index.html.haml')

diff --git a/help/app/views/tickets/index.html.haml b/help/app/views/tickets/index.html.haml
index a3cbfcf..f4597a7 100644
--- a/help/app/views/tickets/index.html.haml
+++ b/help/app/views/tickets/index.html.haml
@@ -1,12 +1,17 @@
-- if admin?
-  = render 'tickets/admin-nav'
-
 = render 'tickets/table-nav'
 
-%table.table-striped.table-bordered.table-hover
-  //{:style => "width:100%;"}
+%table.table.table-striped.table-bordered
+  %thead
+    %tr
+      %th= t(:subject)
+      %th= t(:created)
+      %th= t(:updated)
+      %th= t(:voices)
   %tbody
-    = render @tickets.all
-= paginate @tickets
-
+    - if @tickets.any?
+      = render @tickets.all
+    - else
+      %tr
+        %td{:colspan=>4}= t(:none)
 
+= paginate @tickets
-- 
cgit v1.2.3


From 0cd386e0144601f5478f90bbdb401d55c019c828 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
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).

---
 help/app/views/tickets/index.html.haml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'help/app/views/tickets/index.html.haml')

diff --git a/help/app/views/tickets/index.html.haml b/help/app/views/tickets/index.html.haml
index f4597a7..1b32dc1 100644
--- a/help/app/views/tickets/index.html.haml
+++ b/help/app/views/tickets/index.html.haml
@@ -1,3 +1,5 @@
+- @show_navigation = !params[:user_id].nil?
+
 = render 'tickets/table-nav'
 
 %table.table.table-striped.table-bordered
-- 
cgit v1.2.3


From adacb11c8ff6395f38c3c05bea4e6d276285118f Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 4 Jul 2013 01:35:49 -0700
Subject: help - fix ticket navigation & links (use @user, not user).

---
 help/app/views/tickets/index.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'help/app/views/tickets/index.html.haml')

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
-- 
cgit v1.2.3