diff options
| author | Azul <azul@leap.se> | 2012-12-20 10:57:34 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-20 10:57:34 +0100 |
| commit | 5d61ba0a80399b9e725881f857fdfa5414e5ef3f (patch) | |
| tree | 041d1938f02b8aa27f68e90f8c71672ec89ce810 /help/app/views/tickets | |
| parent | 69a6c34998328b2168053184e1e487b60e1cc536 (diff) | |
| parent | d6c881294880a934424e4d399786561d5c107167 (diff) | |
Merge remote-tracking branch 'origin/feature/tickets-refactor'
Diffstat (limited to 'help/app/views/tickets')
| -rw-r--r-- | help/app/views/tickets/new.html.haml | 5 | ||||
| -rw-r--r-- | help/app/views/tickets/show.html.haml | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/help/app/views/tickets/new.html.haml b/help/app/views/tickets/new.html.haml index ca036a5..a8c5f8f 100644 --- a/help/app/views/tickets/new.html.haml +++ b/help/app/views/tickets/new.html.haml @@ -5,5 +5,6 @@ = render :partial => 'new_comment', :locals => {:f => f} = # regarding_user if not logged in = # email if not logged in - = f.button :submit - = link_to t(:cancel), tickets_path, :class => :btn + .form-actions + = f.button :submit, :class => 'btn-primary' + = 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 a4f3b5f..46d86de 100644 --- a/help/app/views/tickets/show.html.haml +++ b/help/app/views/tickets/show.html.haml @@ -28,7 +28,7 @@ = render :partial => 'new_comment', :locals => {:f => f} = f.button :submit, @post_reply_str - if @ticket.is_open - = f.button :submit, @reply_close_str + = f.button :submit, @reply_close_str, :class => 'btn-primary' = #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? += button_to 'Destroy', ticket_path, :confirm => 'are you sure?', :class => 'btn btn-danger', :method => :delete if admin? = link_to t(:cancel), tickets_path, :class => :btn |