From 87e9ccbcdf4f99dd898b0715750092a27fff7e94 Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 4 Jul 2014 15:40:54 +0200 Subject: Enable unblocking handles in identities tab There's an identities tab now for admins that will allow unblocking blocked handles. It should be easy to expand for aliases and forwards and other types of actions such as editing. --- engines/support/app/views/tickets/index.html.haml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'engines/support') diff --git a/engines/support/app/views/tickets/index.html.haml b/engines/support/app/views/tickets/index.html.haml index 526cd6d..d107ce2 100644 --- a/engines/support/app/views/tickets/index.html.haml +++ b/engines/support/app/views/tickets/index.html.haml @@ -1,19 +1,5 @@ - @show_navigation = params[:user_id].present? = render 'tickets/tabs' - -%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") - += table @tickets, %w(subject created updated voices) = paginate @tickets -- cgit v1.2.3 From bdb4b0e275c205b0b44bbe3cc4ec4c162b309b37 Mon Sep 17 00:00:00 2001 From: Azul Date: Sat, 5 Jul 2014 11:41:43 +0200 Subject: make link_to_navigation more generic and reuse it Use link_to_navigation for all important navigation items. It creates a link in a list item for use with bootstrap. It supports an :active flag and an :icon option in the html_options now. It also translates the label. This way it can be used in a lot of places as the generic navigation link. --- engines/support/app/helpers/tickets_helper.rb | 42 +++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'engines/support') diff --git a/engines/support/app/helpers/tickets_helper.rb b/engines/support/app/helpers/tickets_helper.rb index 11b02e4..7db31dc 100644 --- a/engines/support/app/helpers/tickets_helper.rb +++ b/engines/support/app/helpers/tickets_helper.rb @@ -35,32 +35,32 @@ module TicketsHelper # def link_to_status(new_status) - label = t(:".#{new_status}", cascade: true) - link_to label, auto_tickets_path(:open_status => new_status, :sort_order => search_order) + label = ".#{new_status}" + link_to_navigation label, auto_tickets_path(open_status: new_status, sort_order: search_order) end def link_to_order(order_field) - if search_order.start_with?(order_field) - # link for currently-filtered field. Link to other direction of this field. - if search_order.end_with? 'asc' - direction = 'desc' - icon_direction = 'up' - else - direction = 'asc' - icon_direction = 'down' - end - arrow = content_tag(:i, '', class: 'icon-arrow-'+ icon_direction) - else - # for not-currently-filtered field, don't display an arrow, and link to descending direction - arrow = '' - direction = 'desc' - end + direction = new_direction_for_order(order_field) + icon = icon_for_direction(direction) + # for not-currently-filtered field link to descending direction + direction ||= 'desc' + label = ".#{order_field}" + link_to_navigation label, auto_tickets_path(sort_order: order_field + '_at_' + direction, open_status: search_status), + icon: icon + end - label = t(:".#{order_field}", cascade: true) - link_to auto_tickets_path(:sort_order => order_field + '_at_' + direction, :open_status => search_status) do - arrow + label - end + def new_direction_for_order(order_field) + # return if we're not filtering by this field + return unless search_order.start_with?(order_field) + # Link to the other direction for the filtered field. + search_order.end_with?('asc') ? 'desc' : 'asc' + end + + def icon_for_direction(direction) + # Don't display an icon if we do not filter this field + return if direction.blank? + direction == 'asc' ? 'arrow-down' : 'arrow-up' end end -- cgit v1.2.3