diff options
author | jessib <jessib@leap.se> | 2013-07-09 11:53:58 -0700 |
---|---|---|
committer | jessib <jessib@leap.se> | 2013-07-09 11:53:58 -0700 |
commit | 09b7f01cac6df1ae11f4129b20b781b78a3706ac (patch) | |
tree | 3921eaa5edd03d80e6b402c5c2f88dda6338ab3a /help/app/views/tickets/index.html.haml | |
parent | 9979b50848ce27730f880159512933e50d5ae0e4 (diff) | |
parent | 3113f8b814417a896ad5340fda88927733f8ab22 (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/index.html.haml')
-rw-r--r-- | help/app/views/tickets/index.html.haml | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/help/app/views/tickets/index.html.haml b/help/app/views/tickets/index.html.haml index 23a503d..c02a326 100644 --- a/help/app/views/tickets/index.html.haml +++ b/help/app/views/tickets/index.html.haml @@ -1,17 +1,19 @@ -%h1 tickets index +- @show_navigation = !params[:user_id].nil? -Create a -= link_to "new ticket", new_ticket_path += render 'tickets/tabs' -= #%div{"data-pjax-container" => ""} # not sure how to get this working right -.row - .span2 - - if admin? - = render 'tickets/admin-nav' - .span10 - = render 'tickets/table-nav' - %table.table-striped.table-bordered.table-hover{:style => "width:100%;"} - %tbody - = render @tickets.all - = paginate @tickets +%table.table.table-striped.table-bordered + %thead + %tr + %th= t(:subject) + %th= t(:created) + %th= t(:updated) + %th= t(:voices) + %tbody + - if @tickets.any? + = render @tickets.all + - else + %tr + %td{:colspan=>4}= t(:none) += paginate @tickets |