From bab5c40cb1f7e356230a948fe8a14000b4cc83df Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 18 Sep 2014 14:43:26 +0200 Subject: [PATCH 1/4] refactor className --modifierName .btn-primary -> .btn--primary .btn-create -> .btn--create https://gist.github.com/fat/a47b882eb5f84293c4ed#components --- .../javascripts/app/views/agent_ticket_create.jst.eco | 2 +- app/assets/javascripts/app/views/agent_ticket_merge.jst.eco | 2 +- app/assets/javascripts/app/views/agent_user_create.jst.eco | 2 +- .../app/views/customer_not_ticket_exists.jst.eco | 2 +- .../javascripts/app/views/customer_ticket_create.jst.eco | 2 +- app/assets/javascripts/app/views/getting_started.jst.eco | 4 ++-- app/assets/javascripts/app/views/login.jst.eco | 2 +- app/assets/javascripts/app/views/maintenance.jst.eco | 2 +- app/assets/javascripts/app/views/modal.jst.eco | 2 +- app/assets/javascripts/app/views/package.jst.eco | 2 +- app/assets/javascripts/app/views/password/reset.jst.eco | 2 +- .../javascripts/app/views/password/reset_change.jst.eco | 2 +- app/assets/javascripts/app/views/signup.jst.eco | 2 +- app/assets/javascripts/app/views/task_widget.jst.eco | 2 +- app/assets/stylesheets/zzz.css.erb | 6 +++--- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco index 6cce00c13..7dfd5683b 100644 --- a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco @@ -219,7 +219,7 @@
<%- @T( 'Cancel & Go Back' ) %> - +
diff --git a/app/assets/javascripts/app/views/agent_ticket_merge.jst.eco b/app/assets/javascripts/app/views/agent_ticket_merge.jst.eco index e6b91a8bf..ce11d67c8 100644 --- a/app/assets/javascripts/app/views/agent_ticket_merge.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_merge.jst.eco @@ -19,7 +19,7 @@
<%- @T( 'Cancel & Go Back' ) %> - +
diff --git a/app/assets/javascripts/app/views/agent_user_create.jst.eco b/app/assets/javascripts/app/views/agent_user_create.jst.eco index d968f6bbd..4396424e9 100644 --- a/app/assets/javascripts/app/views/agent_user_create.jst.eco +++ b/app/assets/javascripts/app/views/agent_user_create.jst.eco @@ -10,7 +10,7 @@
<%- @T( 'Cancel & Go Back' ) %> - +
diff --git a/app/assets/javascripts/app/views/customer_not_ticket_exists.jst.eco b/app/assets/javascripts/app/views/customer_not_ticket_exists.jst.eco index 957e20456..d10ef6364 100644 --- a/app/assets/javascripts/app/views/customer_not_ticket_exists.jst.eco +++ b/app/assets/javascripts/app/views/customer_not_ticket_exists.jst.eco @@ -7,7 +7,7 @@

<%- @T('The way to communicate with us is this thing called "Ticket".') %>

<%- @T('Please click the button below to create your first one.') %>

-

<%- @T('Create your first Ticket') %>

+

<%- @T('Create your first Ticket') %>

diff --git a/app/assets/javascripts/app/views/customer_ticket_create.jst.eco b/app/assets/javascripts/app/views/customer_ticket_create.jst.eco index bfa35931b..47af85cd9 100644 --- a/app/assets/javascripts/app/views/customer_ticket_create.jst.eco +++ b/app/assets/javascripts/app/views/customer_ticket_create.jst.eco @@ -18,7 +18,7 @@
<%- @T( 'Cancel & Go Back' ) %> - +
diff --git a/app/assets/javascripts/app/views/getting_started.jst.eco b/app/assets/javascripts/app/views/getting_started.jst.eco index a70ad3bd0..ce630e1aa 100644 --- a/app/assets/javascripts/app/views/getting_started.jst.eco +++ b/app/assets/javascripts/app/views/getting_started.jst.eco @@ -8,14 +8,14 @@ <% if @master_user: %>
- +
<% end %>
- +
diff --git a/app/assets/javascripts/app/views/login.jst.eco b/app/assets/javascripts/app/views/login.jst.eco index 0411d665d..99b67a059 100644 --- a/app/assets/javascripts/app/views/login.jst.eco +++ b/app/assets/javascripts/app/views/login.jst.eco @@ -15,7 +15,7 @@
- + <% if @C('user_lost_password'): %> <%- @T( 'Forgot password?' ) %> diff --git a/app/assets/javascripts/app/views/maintenance.jst.eco b/app/assets/javascripts/app/views/maintenance.jst.eco index b2a46bdc8..7d09d5ac5 100644 --- a/app/assets/javascripts/app/views/maintenance.jst.eco +++ b/app/assets/javascripts/app/views/maintenance.jst.eco @@ -22,5 +22,5 @@
- + diff --git a/app/assets/javascripts/app/views/modal.jst.eco b/app/assets/javascripts/app/views/modal.jst.eco index c49d7ac78..57967392e 100644 --- a/app/assets/javascripts/app/views/modal.jst.eco +++ b/app/assets/javascripts/app/views/modal.jst.eco @@ -22,7 +22,7 @@ <%- @T( 'Cancel & Go Back' ) %> <% end %> <% if @button: %> - + <% end %> diff --git a/app/assets/javascripts/app/views/package.jst.eco b/app/assets/javascripts/app/views/package.jst.eco index 91cf19ae7..054a0bf89 100644 --- a/app/assets/javascripts/app/views/package.jst.eco +++ b/app/assets/javascripts/app/views/package.jst.eco @@ -13,7 +13,7 @@

- +

diff --git a/app/assets/javascripts/app/views/password/reset.jst.eco b/app/assets/javascripts/app/views/password/reset.jst.eco index afb08c97b..b934523ce 100644 --- a/app/assets/javascripts/app/views/password/reset.jst.eco +++ b/app/assets/javascripts/app/views/password/reset.jst.eco @@ -10,7 +10,7 @@
<%- @T( 'Cancel & Go Back' ) %> - +
<% end %> diff --git a/app/assets/javascripts/app/views/password/reset_change.jst.eco b/app/assets/javascripts/app/views/password/reset_change.jst.eco index 5b194a5fc..135d2cd75 100644 --- a/app/assets/javascripts/app/views/password/reset_change.jst.eco +++ b/app/assets/javascripts/app/views/password/reset_change.jst.eco @@ -2,7 +2,7 @@

<%- @T( 'Choose your new password.' ) %>

- +
diff --git a/app/assets/javascripts/app/views/signup.jst.eco b/app/assets/javascripts/app/views/signup.jst.eco index 09348e852..4975a4b66 100644 --- a/app/assets/javascripts/app/views/signup.jst.eco +++ b/app/assets/javascripts/app/views/signup.jst.eco @@ -4,7 +4,7 @@
<%- @T( 'Cancel & Go Back' ) %> - +
diff --git a/app/assets/javascripts/app/views/task_widget.jst.eco b/app/assets/javascripts/app/views/task_widget.jst.eco index d210a06c4..cc1701ca1 100644 --- a/app/assets/javascripts/app/views/task_widget.jst.eco +++ b/app/assets/javascripts/app/views/task_widget.jst.eco @@ -3,7 +3,7 @@ <% if !_.isEmpty( @taskBarActions ): %>
- + <%- @T('New') %> diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 9880e9642..b2216e910 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -1390,14 +1390,14 @@ footer { padding: 9px 24px 8px; } -.btn-primary { +.btn--primary { color: white; background: #419ed7; border-color: #419ed7; } -.btn-create, -.btn-create:hover { +.btn--create, +.btn--create:hover { color: white; background: hsl(145,51%,45%); } From e39ec902ff842725d53200ec0c1167edada70eaf Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Fri, 19 Sep 2014 13:18:58 +0200 Subject: [PATCH 2/4] refactor main navigation because of annoying bootstrap inheritance --- .../app/controllers/navigation.js.coffee | 2 +- .../javascripts/app/views/navigation.jst.eco | 2 +- app/assets/stylesheets/zzz.css.erb | 40 ++++++++++--------- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/app/assets/javascripts/app/controllers/navigation.js.coffee b/app/assets/javascripts/app/controllers/navigation.js.coffee index 0ca690c1a..dae7113fd 100644 --- a/app/assets/javascripts/app/controllers/navigation.js.coffee +++ b/app/assets/javascripts/app/controllers/navigation.js.coffee @@ -59,7 +59,7 @@ class App.Navigation extends App.Controller href = $(d).attr('href') active_tab[href] = true ) - @el.find('.navbar-items-menu').html App.view('navigation/menu')( + @el.find('.main-navigation').html App.view('navigation/menu')( items: items open_tab: open_tab active_tab: active_tab diff --git a/app/assets/javascripts/app/views/navigation.jst.eco b/app/assets/javascripts/app/views/navigation.jst.eco index a44dfca16..0b8297f16 100644 --- a/app/assets/javascripts/app/views/navigation.jst.eco +++ b/app/assets/javascripts/app/views/navigation.jst.eco @@ -9,7 +9,7 @@ -
    +
      diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index b2216e910..1ad071048 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -1412,26 +1412,34 @@ footer { display: none !important; } - .navigation .navbar-nav, - .navigation .navbar-nav > li { - float: none; - } +.main-navigation { + padding: 0; + margin: 0; + list-style: none; +} - .navigation .nav > li.active > a, - .navigation .nav > li > a:hover, - .navigation .nav > li > a:focus { - background: none; - color: #F0FAFF; - } - - .navbar-nav > li > a { + .main-navigation a { padding: 0 15px; height: 48px; color: rgba(240, 250, 255, .25); border-bottom: 1px solid rgba(240, 250, 255, .05); + text-decoration: none; } - .navigation .nav > li.active > a { + .main-navigation > li.active > a, + .main-navigation > li > a:hover, + .main-navigation > li > a:focus { + background: none; + color: #F0FAFF; + } + + .main-navigation > li.active > a .icon, + .main-navigation > li > a:hover .icon, + .main-navigation > li > a:focus .icon { + opacity: 1; + } + + .main-navigation li.active > a { background: #389ed9; } @@ -1441,12 +1449,6 @@ footer { vertical-align: bottom; } - .navigation .nav > li.active > a .icon, - .navigation .nav > li > a:hover .icon, - .navigation .nav > li > a:focus .icon { - opacity: 1; - } - .tasks { background: #2c2d36; overflow: auto; From 8cae085febdfe0431930194bd99f0cf705203cd3 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Fri, 19 Sep 2014 13:39:47 +0200 Subject: [PATCH 3/4] .horizontal, .vertical: remove important --- app/assets/stylesheets/layout.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/layout.css b/app/assets/stylesheets/layout.css index 6097e3a06..d6629249a 100755 --- a/app/assets/stylesheets/layout.css +++ b/app/assets/stylesheets/layout.css @@ -1,9 +1,9 @@ .horizontal, .vertical, .centered { - display: -webkit-box !important; - display: -ms-flexbox !important; - display: -moz-flex !important; - display: -webkit-flex !important; - display: flex !important; + display: -webkit-box; + display: -ms-flexbox; + display: -moz-flex; + display: -webkit-flex; + display: flex; } .horizontal { From 42bc26a9fd1d066df7981fce14cc422e20d3b3f6 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Fri, 19 Sep 2014 13:39:56 +0200 Subject: [PATCH 4/4] bulk action wizard --- .../_application_controller_form.js.coffee | 3 ++ .../app/controllers/ticket_overview.js.coffee | 30 +++++++++++++- .../app/views/agent_ticket_view/bulk.jst.eco | 17 ++++++-- .../app/views/generic/attribute.jst.eco | 4 +- .../app/views/generic/select.jst.eco | 2 +- app/assets/stylesheets/zzz.css.erb | 39 ++++++++++++++++--- 6 files changed, 81 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee index f07430279..694b980b9 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee @@ -172,6 +172,9 @@ class App.ControllerForm extends App.Controller # create item id attribute.id = classname + '_' + attribute.name + # set label class name + attribute.label_class = @model.labelClass + # set autofocus if @autofocus && attribute_count is 1 attribute.autofocus = 'autofocus' diff --git a/app/assets/javascripts/app/controllers/ticket_overview.js.coffee b/app/assets/javascripts/app/controllers/ticket_overview.js.coffee index c309d4984..981c3d2ef 100644 --- a/app/assets/javascripts/app/controllers/ticket_overview.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_overview.js.coffee @@ -270,6 +270,8 @@ class Table extends App.ControllerContent # hide @el.find('.bulk-action').addClass('hide') + + @resetBulkForm() else # show @@ -282,6 +284,21 @@ class Table extends App.ControllerContent $(e.target).parents().find('[name="bulk_all"]').attr('checked', false) ) + # bind bulk form buttons + @$('.js-confirm').click(@bulkFormConfirm) + @$('.js-cancel').click(@resetBulkForm) + + bulkFormConfirm: => + @$('.js-action-step').addClass('hide') + @$('.js-confirm-step').removeClass('hide') + + # need a delay because of the click event + setTimeout ( => @$('.textarea.form-group textarea').focus() ), 0 + + resetBulkForm: => + @$('.js-action-step').removeClass('hide') + @$('.js-confirm-step').addClass('hide') + page: (e) => e.preventDefault() id = $(e.target).data('id') @@ -310,8 +327,7 @@ class Table extends App.ControllerContent { name: 'group_id', display: 'Group', tag: 'select', multiple: false, null: true, relation: 'Group', filter: @bulk, nulloption: true, class: '', item_class: '' }, { name: 'owner_id', display: 'Owner', tag: 'select', multiple: false, null: true, relation: 'User', filter: @bulk, nulloption: true, class: '', item_class: '' }, { name: 'type_id', display: 'Type', tag: 'select', multiple: false, null: true, relation: 'TicketArticleType', filter: articleTypeFilter, default: '9', translate: true, class: 'medium' }, - { name: 'internal', display: 'Visibility', tag: 'select', null: true, options: { true: 'internal', false: 'public' }, class: 'medium', item_class: '', default: false }, - { name: 'body', display: 'Text', tag: 'textarea', rows: 8, null: true, upload: false }, + { name: 'internal', display: 'Visibility', tag: 'select', null: true, options: { true: 'internal', false: 'public' }, class: 'medium', item_class: '', default: false } ] # render init page @@ -321,6 +337,16 @@ class Table extends App.ControllerContent model: configure_attributes: @configure_attributes_ticket className: 'create' + labelClass: 'input-group-addon' + form_data: @bulk + noFieldset: true + ) + new App.ControllerForm( + el: html.find('#form-ticket-bulk-text') + model: + configure_attributes: [{ name: 'body', display: 'Comment', tag: 'textarea', rows: 1, null: true, upload: false, item_class: 'flex' }] + className: 'create' + labelClass: 'input-group-addon' form_data: @bulk noFieldset: true ) diff --git a/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco b/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco index 60f70d07a..f42417e4b 100644 --- a/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco @@ -1,9 +1,18 @@ -
      -
      - + +
      +
      +
      <%- @T('Confirm') %>
      +
      +
      +
      +
      + <%- @T( 'Cancel' ) %> + +
      +