summaryrefslogtreecommitdiff
path: root/help/app/views/tickets
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-10-12 14:42:57 -0700
committerjessib <jessib@riseup.net>2012-10-12 14:42:57 -0700
commit56273c13f54a872d02db286c90a8d5103cf7a663 (patch)
tree2a093d43f09a3179d571f6f7d887a1176e5c27f7 /help/app/views/tickets
parent336d5f786bbd1aaf1847007db64e55f96e585b9d (diff)
more work on ticket creation/updating functionality
Diffstat (limited to 'help/app/views/tickets')
-rw-r--r--help/app/views/tickets/_comment.html.haml3
-rw-r--r--help/app/views/tickets/_new_comment.html.haml1
-rw-r--r--help/app/views/tickets/new.html.haml2
-rw-r--r--help/app/views/tickets/show.html.haml10
4 files changed, 12 insertions, 4 deletions
diff --git a/help/app/views/tickets/_comment.html.haml b/help/app/views/tickets/_comment.html.haml
index 77e29b8..19e1ddf 100644
--- a/help/app/views/tickets/_comment.html.haml
+++ b/help/app/views/tickets/_comment.html.haml
@@ -1,4 +1,5 @@
-%div
+- # 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
diff --git a/help/app/views/tickets/_new_comment.html.haml b/help/app/views/tickets/_new_comment.html.haml
index bf88da6..a924dfd 100644
--- a/help/app/views/tickets/_new_comment.html.haml
+++ b/help/app/views/tickets/_new_comment.html.haml
@@ -1,2 +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/new.html.haml b/help/app/views/tickets/new.html.haml
index 0a6b25b..d784720 100644
--- a/help/app/views/tickets/new.html.haml
+++ b/help/app/views/tickets/new.html.haml
@@ -13,4 +13,4 @@
= # email if not logged in
= #f.button :submit, :value => t(:submit), :class => 'btn-primary'
= f.button :submit
- = link_to t(:cancel), root_url, :class => :btn
+ = 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 1e1fab3..04dd676 100644
--- a/help/app/views/tickets/show.html.haml
+++ b/help/app/views/tickets/show.html.haml
@@ -1,3 +1,7 @@
+- if flash[:notice]
+ =flash[:notice]
+- if flash[:alert]
+ =flash[:alert]
%h2= @ticket.title
is open?
= @ticket.is_open
@@ -6,6 +10,8 @@ code:
= render(:partial => "comment", :collection => @ticket.comments)
= simple_form_for (@ticket, :html => {:novalidate => true}) do |f| #turn off html5 validations to test
- = render :partial => 'new_comment'
+ = 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), root_url, :class => :btn \ No newline at end of file
+ = link_to t(:cancel), tickets_path, :class => :btn \ No newline at end of file