9 files changed, 85 insertions, 38 deletions
diff --git a/help/app/views/tickets/_admin-nav.html.haml b/help/app/views/tickets/_admin-nav.html.haml
new file mode 100644
index 0000000..0e45c40
--- /dev/null
+++ b/help/app/views/tickets/_admin-nav.html.haml
@@ -0,0 +1,5 @@
+%ul.nav.nav-pills.nav-stacked
+  %li{:class => ("active" if admin == 'mine')}
+    = link_to 'tickets i admin', {:admin_status => 'mine', :open_status => status, :sort_order => order}
+  %li{:class => ("active" if admin == 'all')} 
+    = link_to 'all tickets', {:admin_status => 'all', :open_status => status, :sort_order => order}
diff --git a/help/app/views/tickets/_new_comment.html.haml b/help/app/views/tickets/_new_comment.html.haml
index a924dfd..b216311 100644
--- a/help/app/views/tickets/_new_comment.html.haml
+++ b/help/app/views/tickets/_new_comment.html.haml
@@ -1,3 +1,2 @@
-= #do we want this partial? not using it now
-= simple_fields_for :comment do |c|
+= f.simple_fields_for :comments, comment_object do |c|
   = c.input :body, :label => 'Comment', :as => :text
diff --git a/help/app/views/tickets/_order-nav.html.haml b/help/app/views/tickets/_order-nav.html.haml
new file mode 100644
index 0000000..9e8bcee
--- /dev/null
+++ b/help/app/views/tickets/_order-nav.html.haml
@@ -0,0 +1,5 @@
+%ul.nav.nav-pills.pull-right
+  %li{:class=> ("active" if order.start_with? 'created_at' )}
+    = link_to_order('created')
+  %li{:class=> ("active" if order.start_with? 'updated_at' )}
+    = link_to_order('updated')
diff --git a/help/app/views/tickets/_status-nav.html.haml b/help/app/views/tickets/_status-nav.html.haml
new file mode 100644
index 0000000..69f4248
--- /dev/null
+++ b/help/app/views/tickets/_status-nav.html.haml
@@ -0,0 +1,7 @@
+%ul.nav.nav-tabs
+  %li{:class => ("active" if status == 'open')}
+    = link_to_status 'open'
+  %li{:class => ("active" if status == 'closed')}
+    = link_to_status 'closed'
+  %li{:class => ("active" if status == 'all')}
+    = link_to_status 'all'
diff --git a/help/app/views/tickets/_table-nav.html.haml b/help/app/views/tickets/_table-nav.html.haml
new file mode 100644
index 0000000..635b59b
--- /dev/null
+++ b/help/app/views/tickets/_table-nav.html.haml
@@ -0,0 +1,5 @@
+.row
+  .span6
+    = render 'tickets/status-nav'
+  .span4
+    = render 'tickets/order-nav'
diff --git a/help/app/views/tickets/_ticket.html.haml b/help/app/views/tickets/_ticket.html.haml
new file mode 100644
index 0000000..3edfa8b
--- /dev/null
+++ b/help/app/views/tickets/_ticket.html.haml
@@ -0,0 +1,13 @@
+%tr
+  %td
+    %b
+      = link_to ticket.title, ticket
+    %br
+    %small
+      created:
+      = ticket.created_at.to_s(:short)
+      updated:
+      = ticket.updated_at.to_s(:short)
+    %small.pull-right
+      comments by:
+      = ticket.commenters 
diff --git a/help/app/views/tickets/index.html.haml b/help/app/views/tickets/index.html.haml
index 6db2140..fdbeec5 100644
--- a/help/app/views/tickets/index.html.haml
+++ b/help/app/views/tickets/index.html.haml
@@ -1,10 +1,22 @@
-%h2 tickets index (just as space)
+%h1 tickets index
+
 Create a 
 = link_to "new ticket", new_ticket_path
-= # below shouldn't be unless logged in
-%h2 Tickets
-= # want to have selection option to see tickets, that are open, closed or all
-- @tickets.each do |ticket|
-  %p
-  = link_to ticket.title, ticket
-= #render(:partial => "ticket", :collection => @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
+
+%div{"data-pjax-container" => ""}
+  / PJAX updates will go here
+  hmmm
+
+
diff --git a/help/app/views/tickets/new.html.haml b/help/app/views/tickets/new.html.haml
index 537b97f..0ee47ff 100644
--- a/help/app/views/tickets/new.html.haml
+++ b/help/app/views/tickets/new.html.haml
@@ -1,16 +1,9 @@
 %h2=t :new_ticket
 = simple_form_for(@ticket, :html => {:novalidate => true})  do |f| #turn off html5 validations to test
-  = #@ticket.errors.messages
   = f.input :title
-  = #f.input :email #if there is no current_user
   = f.input :email if !current_user  #hmm--might authenticated users want to submit an alternate email?
-
-  = f.simple_fields_for :comments do |c|
-    = c.input :body, :label => 'Comment', :as => :text
-
-  = #render :partial => 'new_comment' #what we were using
+  = render :partial => 'new_comment', :locals => {:f => f, :comment_object => nil}
   = # regarding_user if not logged in
   = # email if not logged in
-  = #f.button :submit, :value => t(:submit), :class => 'btn-primary' 
   = f.button :submit
   = link_to t(:cancel), tickets_path, :class => :btn
diff --git a/help/app/views/tickets/show.html.haml b/help/app/views/tickets/show.html.haml
index a9b994e..b9f2ce6 100644
--- a/help/app/views/tickets/show.html.haml
+++ b/help/app/views/tickets/show.html.haml
@@ -1,26 +1,34 @@
-- if flash[:notice]
-  =flash[:notice]
-- if flash[:alert]
-  =flash[:alert]
 %h2= @ticket.title
-is open?
-= @ticket.is_open
-- if @ticket.code
-  code:
-  = @ticket.code
+
+%a#title.editable.editable-click{"data-name" => "title", "data-resource" => "post", "data-type" => "text", "data-url" => ticket_path(@ticket.id), "data-pk" => @ticket.id, :href => "#"} 
+  = @ticket.title
+
+%p
 - if @ticket.email
   email:
   = @ticket.email
-- if User.find(@ticket.created_by)
-  Created by
-  = User.find(@ticket.created_by).login 
-- else
-  Unauthenticated ticket creator
+%li
+  - if User.find(@ticket.created_by)
+    Created by
+    = User.find(@ticket.created_by).login 
+  - else
+    Unauthenticated ticket creator
+%li
+  = "status:" 
+  - if @ticket.is_open
+    = 'open'
+    = button_to 'close', {:post => {:is_open => false}}, :method => :put
+  - else 
+    = 'closed'
+    = button_to 'open', {:post => {:is_open => true}}, :method => :put
 = render(:partial => "comment", :collection => @ticket.comments)
+= #render @ticket.comments should work if view is in /app/views/comments/_comment
 
-= simple_form_for (@ticket, :html => {:novalidate => true}) do |f| #turn off html5 validations to test
-  = f.simple_fields_for :comments, TicketComment.new do |c|
-    = c.input :body, :label => 'Comment', :as => :text
-  = #render :partial => 'new_comment'
-  = f.button :submit
-  = link_to t(:cancel), tickets_path, :class => :btn
-\ No newline at end of file
+= simple_form_for(@ticket, :html => {:novalidate => true}) do |f| #turn off html5 validations to test
+  = render :partial => 'new_comment', :locals => {:f => f, :comment_object => TicketComment.new}
+  = f.button :submit, @post_reply_str
+  - if @ticket.is_open
+    = f.button :submit, @reply_close_str
+= #link_to t(:destroy), ticket_path,  :confirm => 'are you sure?', :method => :delete, :class => :btn if admin? # for link_to to work with delete, need to figure out jquery interaction correctly. see  http://stackoverflow.com/questions/3774925/delete-link-sends-get-instead-of-delete-in-rails-3-view etc..
+= button_to 'destroy', ticket_path, :confirm => 'are you sure?', :method => :delete if admin?
+= link_to t(:cancel), tickets_path, :class => :btn