diff options
author | jessib <jessib@leap.se> | 2013-01-17 10:39:15 -0800 |
---|---|---|
committer | jessib <jessib@leap.se> | 2013-01-17 10:39:15 -0800 |
commit | 7d7741f7d26c3ae7ee1dc347a6b1a1142a3c2824 (patch) | |
tree | 5ec11b9600d4330ec94f56dda779634cd7dcae1b /help/app/views/tickets/_new_comment.html.haml | |
parent | 2485527650c4832d764d318e91c10bafde8b8ae5 (diff) | |
parent | b550cd14f33b9664fe6b547dc56107fae7d12caf (diff) |
Merge branch 'master' into feature/unauthenticated_tickets
Conflicts:
help/app/views/tickets/_comment.html.haml
help/app/views/tickets/_new_comment.html.haml
Diffstat (limited to 'help/app/views/tickets/_new_comment.html.haml')
-rw-r--r-- | help/app/views/tickets/_new_comment.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/help/app/views/tickets/_new_comment.html.haml b/help/app/views/tickets/_new_comment.html.haml index 8d40bb6..96388ea 100644 --- a/help/app/views/tickets/_new_comment.html.haml +++ b/help/app/views/tickets/_new_comment.html.haml @@ -1,4 +1,4 @@ = f.simple_fields_for :comments, @comment do |c| - = c.input :body, :label => 'Comment', :as => :text, :input_html => {:class => "span12", :rows=>4} + = c.input :body, :label => 'Comment', :as => :text, :input_html => {:class => "span9", :rows=>4} - if admin? = c.input :private, :as => :boolean, :label => false, :inline_label => true |