diff options
| author | Azul <azul@leap.se> | 2014-04-23 14:58:30 +0200 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2014-04-25 12:18:40 +0200 |
| commit | 689c10b618c6c469ce82a7f09e117567def577de (patch) | |
| tree | 2e0d37efb7821ac65f03056a28366809c786d50d /engines/support/app/views/tickets/_tabs.html.haml | |
| parent | 76ad25ba0ee344f185f8e8cdfe066685cd3b0447 (diff) | |
simple form: add wrapped and loading... buttons #5542
the loading... text on the buttons was not capitalized before.
So in order to change this in a (more or less) single place i added
new button types to simple_form:
button :wrapped - normal button, with loading and an optional cancel button wrapped in the classical bootstrap action div.
cancel option contains the url to go to when canceling.
button :loading - simple button with loading text capitalized by using i18n (simple_form.buttons.loading)
Conflicts:
engines/support/app/views/tickets/new.html.haml
Diffstat (limited to 'engines/support/app/views/tickets/_tabs.html.haml')
| -rw-r--r-- | engines/support/app/views/tickets/_tabs.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/support/app/views/tickets/_tabs.html.haml b/engines/support/app/views/tickets/_tabs.html.haml index b7b5d3a..445a909 100644 --- a/engines/support/app/views/tickets/_tabs.html.haml +++ b/engines/support/app/views/tickets/_tabs.html.haml @@ -1,7 +1,7 @@ -# -# SORT ORDER TABS -# -- unless action?(:new) +- unless action?(:new) or action?(:create) %ul.nav.nav-pills.pull-right.slim %li{:class=> ("active" if search_order.start_with? 'created_at')} = link_to_order('created') @@ -19,5 +19,5 @@ = link_to_status 'closed' %li{:class => ("active" if search_status == 'all')} = link_to_status 'all' - %li{:class => ("active" if action?(:new))} + %li{:class => ("active" if action?(:new) || action?(:create))} = link_to icon(:plus, :black) + t(:new_ticket), auto_new_ticket_path |