summaryrefslogtreecommitdiff
path: root/help/app/views/tickets
diff options
context:
space:
mode:
Diffstat (limited to 'help/app/views/tickets')
-rw-r--r--help/app/views/tickets/_admin-nav.html.haml5
-rw-r--r--help/app/views/tickets/_comment.html.haml34
-rw-r--r--help/app/views/tickets/_edit_form.html.haml48
-rw-r--r--help/app/views/tickets/_new_comment.html.haml4
-rw-r--r--help/app/views/tickets/_new_comment_form.html.haml13
-rw-r--r--help/app/views/tickets/_order-nav.html.haml5
-rw-r--r--help/app/views/tickets/_status-nav.html.haml7
-rw-r--r--help/app/views/tickets/_table-nav.html.haml5
-rw-r--r--help/app/views/tickets/_tabs.html.haml23
-rw-r--r--help/app/views/tickets/_ticket.html.haml21
-rw-r--r--help/app/views/tickets/_ticket_data.html.haml35
-rw-r--r--help/app/views/tickets/index.html.haml30
-rw-r--r--help/app/views/tickets/new.html.haml38
-rw-r--r--help/app/views/tickets/show.html.haml28
14 files changed, 162 insertions, 134 deletions
diff --git a/help/app/views/tickets/_admin-nav.html.haml b/help/app/views/tickets/_admin-nav.html.haml
deleted file mode 100644
index 0e45c40..0000000
--- a/help/app/views/tickets/_admin-nav.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-%ul.nav.nav-pills.nav-stacked
- %li{:class => ("active" if admin == 'mine')}
- = link_to 'tickets i admin', {:admin_status => 'mine', :open_status => status, :sort_order => order}
- %li{:class => ("active" if admin == 'all')}
- = link_to 'all tickets', {:admin_status => 'all', :open_status => status, :sort_order => order}
diff --git a/help/app/views/tickets/_comment.html.haml b/help/app/views/tickets/_comment.html.haml
index 501ceec..4252eee 100644
--- a/help/app/views/tickets/_comment.html.haml
+++ b/help/app/views/tickets/_comment.html.haml
@@ -1,20 +1,20 @@
-- # style is super ugly but just for now
- if admin? or !comment.private # only show comment if user is admin or comment is not private
%tr
- %td
- - if comment.posted_by_user
- %b
- = 'Posted by' + (comment.posted_by_user.is_admin? ? ' admin' : '') + ':'
- = comment.posted_by_user.login
- - else
- %b
- Unauthenticated post
+ %td.user
+ %div
+ %strong
+ - if comment.posted_by_user
+ = comment.posted_by_user.login
+ - else
+ = t(:anonymous)
+ %div= comment.posted_at.to_s(:short)
+ - if comment.posted_by_user && comment.posted_by_user.is_admin?
+ %div
+ %span.label.label-inverse
+ = t(:admin)
- if comment.private
- (Private comment)
- .pull-right
- %b
- Posted at:
- = comment.posted_at.to_s(:short)
- %br
- = comment.body
-
+ %div
+ %span.label.label-important
+ = t(:private)
+ %td.comment
+ = comment.body \ No newline at end of file
diff --git a/help/app/views/tickets/_edit_form.html.haml b/help/app/views/tickets/_edit_form.html.haml
new file mode 100644
index 0000000..5252c2e
--- /dev/null
+++ b/help/app/views/tickets/_edit_form.html.haml
@@ -0,0 +1,48 @@
+:ruby
+ # created by user link
+ if @ticket.created_by_user
+ created_by = link_to(@ticket.created_by_user.login, user_overview_path(@ticket.created_by_user))
+ else
+ created_by = t(:anonymous)
+ end
+
+ # regarding user link
+ if admin?
+ if @ticket.regarding_user_actual_user
+ regarding_user_link = link_to @ticket.regarding_user_actual_user.login, user_overview_path(@ticket.regarding_user_actual_user)
+ else
+ regarding_user_link = "(#{t(:unknown)})"
+ end
+ else
+ regarding_user_link = ''
+ end
+
+= form_for @ticket do |f|
+ = hidden_ticket_fields
+ %p.first
+ - if @ticket.is_open?
+ %span.label.label-info= t(:open)
+ - else
+ %span.label.label-success= t(:closed)
+ %span.label.label-clear= t(:created_by_on, :user => created_by, :time => @ticket.created_at.to_s(:short)).html_safe
+ %div= t(:subject)
+ = f.text_field :title, :class => 'large full-width'
+ .row-fluid
+ .span4
+ %div= t(:status)
+ = f.select :is_open, [[t(:open), "true"], [t(:closed), "false"]]
+ .span4
+ %div= t(:email)
+ = f.text_field :email
+ .span4
+ %div
+ = t(:regarding_account)
+ = regarding_user_link
+ = f.text_field :regarding_user
+ = f.button t(:save), :name => 'commit', :class => 'btn', :type => 'submit', :value => 'save'
+ - if @ticket.is_open?
+ = f.button t(:close), :name => 'commit', :class => 'btn', :type => 'submit', :value => 'close'
+ - else
+ = f.button t(:open), :name => 'commit', :class => 'btn', :type => 'submit', :value => 'open'
+ - if admin?
+ = link_to t(:destroy), auto_ticket_path(@ticket), :confirm => t(:are_you_sure), :method => :delete, :class => 'btn'
diff --git a/help/app/views/tickets/_new_comment.html.haml b/help/app/views/tickets/_new_comment.html.haml
deleted file mode 100644
index 96388ea..0000000
--- a/help/app/views/tickets/_new_comment.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-= f.simple_fields_for :comments, @comment do |c|
- = 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
diff --git a/help/app/views/tickets/_new_comment_form.html.haml b/help/app/views/tickets/_new_comment_form.html.haml
new file mode 100644
index 0000000..8418e01
--- /dev/null
+++ b/help/app/views/tickets/_new_comment_form.html.haml
@@ -0,0 +1,13 @@
+-#
+-# for posting a new comment to an existing ticket.
+-#
+= simple_form_for @ticket, :html => {:class => 'slim'} do |f|
+ = hidden_ticket_fields
+ = f.simple_fields_for :comments, @comment, :wrapper => :none, :html => {:class => 'slim'} do |c|
+ = c.input :body, :label => false, :as => :text, :input_html => {:class => "full-width", :rows=> 5}
+ - if admin?
+ = c.input :private, :as => :boolean, :label => false, :inline_label => true
+ = f.button :button, t(:post_reply), :name => 'commit', :class => 'btn-primary', :type => 'submit', :value => 'post_reply'
+ - if logged_in? && @ticket.is_open
+ = f.button :button, t(:reply_and_close), :name => 'commit', :class => 'btn', :type => 'submit', :value => 'reply_and_close'
+ = link_to t(:cancel), auto_tickets_path, :class => :btn
diff --git a/help/app/views/tickets/_order-nav.html.haml b/help/app/views/tickets/_order-nav.html.haml
deleted file mode 100644
index 9e8bcee..0000000
--- a/help/app/views/tickets/_order-nav.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-%ul.nav.nav-pills.pull-right
- %li{:class=> ("active" if order.start_with? 'created_at' )}
- = link_to_order('created')
- %li{:class=> ("active" if order.start_with? 'updated_at' )}
- = link_to_order('updated')
diff --git a/help/app/views/tickets/_status-nav.html.haml b/help/app/views/tickets/_status-nav.html.haml
deleted file mode 100644
index 69f4248..0000000
--- a/help/app/views/tickets/_status-nav.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-%ul.nav.nav-tabs
- %li{:class => ("active" if status == 'open')}
- = link_to_status 'open'
- %li{:class => ("active" if status == 'closed')}
- = link_to_status 'closed'
- %li{:class => ("active" if status == 'all')}
- = link_to_status 'all'
diff --git a/help/app/views/tickets/_table-nav.html.haml b/help/app/views/tickets/_table-nav.html.haml
deleted file mode 100644
index 635b59b..0000000
--- a/help/app/views/tickets/_table-nav.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-.row
- .span6
- = render 'tickets/status-nav'
- .span4
- = render 'tickets/order-nav'
diff --git a/help/app/views/tickets/_tabs.html.haml b/help/app/views/tickets/_tabs.html.haml
new file mode 100644
index 0000000..b7b5d3a
--- /dev/null
+++ b/help/app/views/tickets/_tabs.html.haml
@@ -0,0 +1,23 @@
+-#
+-# SORT ORDER TABS
+-#
+- unless action?(:new)
+ %ul.nav.nav-pills.pull-right.slim
+ %li{:class=> ("active" if search_order.start_with? 'created_at')}
+ = link_to_order('created')
+ %li{:class=> ("active" if search_order.start_with? 'updated_at')}
+ = link_to_order('updated')
+
+-#
+-# STATUS FILTER TABS
+-#
+%ul.nav.nav-tabs
+ - if logged_in?
+ %li{:class => ("active" if search_status == 'open')}
+ = link_to_status 'open'
+ %li{:class => ("active" if search_status == 'closed')}
+ = link_to_status 'closed'
+ %li{:class => ("active" if search_status == 'all')}
+ = link_to_status 'all'
+ %li{:class => ("active" if action?(:new))}
+ = link_to icon(:plus, :black) + t(:new_ticket), auto_new_ticket_path
diff --git a/help/app/views/tickets/_ticket.html.haml b/help/app/views/tickets/_ticket.html.haml
index 7b37652..a064c4e 100644
--- a/help/app/views/tickets/_ticket.html.haml
+++ b/help/app/views/tickets/_ticket.html.haml
@@ -1,17 +1,6 @@
-- updated_at_text = 'updated: ' + ticket.updated_at.to_s(:long)
+- url = auto_ticket_path(ticket)
%tr
- %td
- %b
- = link_to ticket.title, ticket
- - if params[:controller] == 'tickets'
- %br
- %small
- created:
- = ticket.created_at.to_s(:long)
- = updated_at_text
- %small.pull-right
- comments by:
- = ticket.commenters
- - else
- %small
- = updated_at_text \ No newline at end of file
+ %td= link_to ticket.title, url
+ %td= link_to ticket.created_at.to_s(:short), url
+ %td= link_to ticket.updated_at.to_s(:short), url
+ %td= ticket.commenters
diff --git a/help/app/views/tickets/_ticket_data.html.haml b/help/app/views/tickets/_ticket_data.html.haml
deleted file mode 100644
index 6a1a896..0000000
--- a/help/app/views/tickets/_ticket_data.html.haml
+++ /dev/null
@@ -1,35 +0,0 @@
-.spam12
- %b
- Created by:
- - if @ticket.created_by_user
- = link_to @ticket.created_by_user.login, user_path(@ticket.created_by_user)
- - else
- Unauthenticated ticket creator
- - if @ticket.regarding_user
- %b
- Regarding user:
- - if admin?
- - if @ticket.regarding_user_actual_user
- = link_to @ticket.regarding_user_actual_user.login, user_path(@ticket.regarding_user_actual_user)
- - else
- = @ticket.regarding_user + ' (no such user)'
- - else # a non-admin is viewing the ticket, so they shouldn't see confirmation of whether the regarding_user exists or not.
- = @ticket.regarding_user
- - if @ticket.email
- %b
- email:
- = @ticket.email
- %b
- Created at:
- = @ticket.created_at.to_s(:short)
- %b
- Updated at:
- = @ticket.updated_at.to_s(:short)
- %b
- = "Status:"
- - if @ticket.is_open
- = 'open'
- = button_to 'Close', {:post => {:is_open => false}}, :method => :put, :class => 'btn btn-small'
- - else
- = 'closed'
- = button_to 'Open', {:post => {:is_open => true}}, :method => :put, :class => 'btn btn-small'
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
diff --git a/help/app/views/tickets/new.html.haml b/help/app/views/tickets/new.html.haml
index 1aa689b..4d35659 100644
--- a/help/app/views/tickets/new.html.haml
+++ b/help/app/views/tickets/new.html.haml
@@ -1,10 +1,30 @@
-.span12
- %h2=t :new_ticket
- = simple_form_for @ticket, :validate => true, :html => {:class => 'form-horizontal'} do |f|
- = f.input :title
- = f.input :email if !current_user #hmm--might authenticated users want to submit an alternate email?
+- @show_navigation = !params[:user_id].nil?
+
+= render 'tickets/tabs'
+
+- if admin? && @user
+ - email = @user.email_address
+ - regarding = @user.login
+- elsif logged_in?
+ - email = current_user.email_address
+ - regarding = current_user.login
+
+= simple_form_for @ticket, :validate => true, :html => {:class => 'form-horizontal'} do |f|
+ = hidden_ticket_fields
+ = f.input :title, :label => t(:subject)
+ - if logged_in?
+ = f.input :email, input_html: {value: email}
+ = f.input :regarding_user, input_html: {value: regarding}
+ - else
+ = f.input :email
= f.input :regarding_user
- = render :partial => 'new_comment', :locals => {:f => f}
- .form-actions
- = f.button :submit, :class => 'btn-primary'
- = link_to t(:cancel), tickets_path, :class => :btn
+ = f.simple_fields_for :comments, @comment do |c|
+ = c.input :body, :label => t(:description), :as => :text, :input_html => {:class => "full-width", :rows=> 5}
+ - if admin?
+ = c.input :private, :as => :boolean, :label => false, :inline_label => true
+ .form-actions
+ = f.button :submit, :class => 'btn-primary'
+ - if logged_in?
+ = link_to t(:cancel), auto_tickets_path, :class => :btn
+ - else
+ = link_to t(:cancel), root_path, :class => 'btn' \ No newline at end of file
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