summaryrefslogtreecommitdiff
path: root/help/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'help/app/views')
-rw-r--r--help/app/views/tickets/index.html.haml41
-rw-r--r--help/app/views/tickets/show.html.haml2
2 files changed, 27 insertions, 16 deletions
diff --git a/help/app/views/tickets/index.html.haml b/help/app/views/tickets/index.html.haml
index 0bb9c1d..b8ec6cc 100644
--- a/help/app/views/tickets/index.html.haml
+++ b/help/app/views/tickets/index.html.haml
@@ -14,21 +14,34 @@ Create a
%li{:class => ("active" if params[:admin_status] != 'mine')}
= link_to 'all tickets', {:admin_status => 'all', :open_status => params[:open_status]}
.span10
- %ul.nav.nav-tabs
- %li{:class => ("active" if params[:open_status] != 'closed' and params[:open_status] != 'all')}
- = link_to 'open issues', {:open_status => 'open', :admin_status => params[:admin_status]}
- %li{:class => ("active" if params[:open_status] == 'closed')}
- = link_to 'closed issues', {:open_status => 'closed', :admin_status => params[:admin_status]}
- = #%a{:href => "#"} closed issue
- %li{:class => ("active" if params[:open_status] == 'all')}
- = link_to 'open & closed issues', {:open_status => 'all', :admin_status => params[:admin_status]}
-
- - @tickets.each do |ticket|
- %p
- = link_to ticket.title, ticket
- comments by:
- = ticket.commenters
+ .table-bordered
+ = # TODO not sure if want table, but playing around with layout here.
+ %ul.nav.nav-tabs
+ %li{:class => ("active" if params[:open_status] != 'closed' and params[:open_status] != 'all')}
+ = link_to 'open issues', {:open_status => 'open', :admin_status => params[:admin_status]}
+ %li{:class => ("active" if params[:open_status] == 'closed')}
+ = link_to 'closed issues', {:open_status => 'closed', :admin_status => params[:admin_status]}
+ = #%a{:href => "#"} closed issue
+ %li{:class => ("active" if params[:open_status] == 'all')}
+ = link_to 'open & closed issues', {:open_status => 'all', :admin_status => params[:admin_status]}
+ %ul.nav.nav-pills
+ = #TODO-pull-right isn't working as i want, but want this to the right of tabs within the same div/table
+ %li
+ = link_to 'created at'
+ %li{:class=> ("active" if true)}
+ = link_to 'updated at'
+ .table-bordered
+ - @tickets.each do |ticket|
+ %p
+ = link_to ticket.title, ticket
+ created:
+ = ticket.created_at.to_s(:short)
+ updated:
+ = ticket.updated_at.to_s(:short)
+ comments by:
+ = ticket.commenters
+ = paginate @tickets
%div{"data-pjax-container" => ""}
/ PJAX updates will go here
diff --git a/help/app/views/tickets/show.html.haml b/help/app/views/tickets/show.html.haml
index 9b12f34..d9f594b 100644
--- a/help/app/views/tickets/show.html.haml
+++ b/help/app/views/tickets/show.html.haml
@@ -1,5 +1,3 @@
-%h1 tickets show (just as space for firefox)
-%h1 tickets show (just as space for firefox)
%h2= @ticket.title
- if @ticket.email
email: