Merge branch 'help_develop' into develop

5 files changed, 55 insertions, 0 deletions

diff --git a/help/app/views/tickets/_comment.html.haml b/help/app/views/tickets/_comment.html.haml
new file mode 100644
index 0000000..19e1ddf
--- /dev/null
+++ b/help/app/views/tickets/_comment.html.haml
@@ -0,0 +1,11 @@
+- # style is super ugly but just for now
+%div{:style => "border: solid 1px"}
+  - if User.find(comment.posted_by)
+    Posted by
+    = User.find(comment.posted_by).login 
+    %p
+  Posted at
+  = comment.posted_at
+  %p
+  = comment.body
+  %p
\ No newline at end of file
diff --git a/help/app/views/tickets/_new_comment.html.haml b/help/app/views/tickets/_new_comment.html.haml
new file mode 100644
index 0000000..a924dfd
--- /dev/null
+++ b/help/app/views/tickets/_new_comment.html.haml
@@ -0,0 +1,3 @@
+= #do we want this partial? not using it now
+= simple_fields_for :comment do |c|
+  = c.input :body, :label => 'Comment', :as => :text
diff --git a/help/app/views/tickets/index.html.haml b/help/app/views/tickets/index.html.haml
new file mode 100644
index 0000000..d2e0ea0
--- /dev/null
+++ b/help/app/views/tickets/index.html.haml
@@ -0,0 +1,8 @@
+%h2 Tickets
+- @tickets.each do |ticket|
+  %p
+  = link_to ticket.title, ticket
+%p 
+Create a 
+= link_to "new ticket", new_ticket_path
+= #render(:partial => "ticket", :collection => @tickets)
diff --git a/help/app/views/tickets/new.html.haml b/help/app/views/tickets/new.html.haml
new file mode 100644
index 0000000..d784720
--- /dev/null
+++ b/help/app/views/tickets/new.html.haml
@@ -0,0 +1,16 @@
+%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 !User.current_test #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
+  = # 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
new file mode 100644
index 0000000..04dd676
--- /dev/null
+++ b/help/app/views/tickets/show.html.haml
@@ -0,0 +1,17 @@
+- if flash[:notice]
+  =flash[:notice]
+- if flash[:alert]
+  =flash[:alert]
+%h2= @ticket.title
+is open?
+= @ticket.is_open
+code:
+= @ticket.code
+= render(:partial => "comment", :collection => @ticket.comments)
+
+= 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