summaryrefslogtreecommitdiff
path: root/help/app/views/tickets/show.html.haml
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2013-07-09 11:53:58 -0700
committerjessib <jessib@leap.se>2013-07-09 11:53:58 -0700
commit09b7f01cac6df1ae11f4129b20b781b78a3706ac (patch)
tree3921eaa5edd03d80e6b402c5c2f88dda6338ab3a /help/app/views/tickets/show.html.haml
parent9979b50848ce27730f880159512933e50d5ae0e4 (diff)
parent3113f8b814417a896ad5340fda88927733f8ab22 (diff)
Merge branch 'master' into feature/authentication_generic_error
Conflicts: app/views/layouts/_messages.html.haml app/views/layouts/application.html.haml users/app/assets/javascripts/users.js.coffee
Diffstat (limited to 'help/app/views/tickets/show.html.haml')
-rw-r--r--help/app/views/tickets/show.html.haml28
1 files changed, 11 insertions, 17 deletions
diff --git a/help/app/views/tickets/show.html.haml b/help/app/views/tickets/show.html.haml
index a69048b..bfdb773 100644
--- a/help/app/views/tickets/show.html.haml
+++ b/help/app/views/tickets/show.html.haml
@@ -1,18 +1,12 @@
-.spam12
- %h2
- %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
- = render 'tickets/ticket_data'
- %table.table-striped.table-bordered.table-hover{:style => "width:100%;"}
- %tbody
- = render(:partial => "comment", :collection => @ticket.comments)
- = #render @ticket.comments should work if view is in /app/views/comments/_comment
+- @show_navigation = !params[:user_id].nil?
- = simple_form_for @ticket, :html => {:class => 'form-horizontal'} do |f| # don't need validations so long as this is so simple
- = render :partial => 'new_comment', :locals => {:f => f}
- .span10.offset3
- = f.button :submit, @post_reply_str, :class => 'btn-primary'
- - if @ticket.is_open
- = f.button :submit, @reply_close_str
- = link_to t(:Destroy), ticket_path, :confirm => 'are you sure?', :method => :delete, :class => 'btn btn-danger' if admin?
- = link_to t(:cancel), tickets_path, :class => :btn
+.ticket
+ = render 'tickets/edit_form'
+ %table.table.table-striped.table-bordered
+ %tbody
+ = render :partial => 'tickets/comment', :collection => @ticket.comments
+ %tr
+ %td.user
+ = logged_in? ? current_user.login : t(:anonymous)
+ %td.comment
+ = render 'tickets/new_comment_form' \ No newline at end of file