diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index 6f9cbe8f6..2d6c953f2 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -1289,7 +1289,7 @@ class slaRef extends App.ControllerContent 'click .js-activateColumn': 'activateColumn' 'click .js-activateRow': 'activateRow' 'click [data-type=new]': 'createNew' - 'click .js-toggle': 'toggleSla' + 'click .js-toggle': 'toggle' constructor: -> super @@ -1298,12 +1298,12 @@ class slaRef extends App.ControllerContent render: -> @html App.view('layout_ref/sla')() - toggleSla: (e) => - sla = $(e.currentTarget).closest('.sla') - isInactive = sla.hasClass('is-inactive') - sla.toggleClass('is-inactive') + toggle: (e) => + entry = $(e.currentTarget).closest('.action') + isInactive = entry.hasClass('is-inactive') + entry.toggleClass('is-inactive') isInactive = !isInactive - sla.find('.js-toggle') + entry.find('.js-toggle') .toggleClass('btn--danger btn--secondary') .text(if isInactive then 'Enable' else 'Disable') @@ -1333,6 +1333,7 @@ class schedulersRef extends App.ControllerContent events: 'click .select-value': 'select' 'click [data-type=new]': 'createNew' + 'click .js-toggle': 'toggle' constructor: -> super @@ -1341,6 +1342,15 @@ class schedulersRef extends App.ControllerContent render: -> @html App.view('layout_ref/schedulers')() + toggle: (e) => + entry = $(e.currentTarget).closest('.action') + isInactive = entry.hasClass('is-inactive') + entry.toggleClass('is-inactive') + isInactive = !isInactive + entry.find('.js-toggle') + .toggleClass('btn--danger btn--secondary') + .text(if isInactive then 'Enable' else 'Disable') + createNew: => new App.ControllerModal head: 'New Scheduler' diff --git a/app/assets/javascripts/app/views/layout_ref/scheduler_modal.jst.eco b/app/assets/javascripts/app/views/layout_ref/scheduler_modal.jst.eco index d4f513c7d..eed0c8d40 100644 --- a/app/assets/javascripts/app/views/layout_ref/scheduler_modal.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/scheduler_modal.jst.eco @@ -195,8 +195,8 @@ - - + + diff --git a/app/assets/javascripts/app/views/layout_ref/schedulers.jst.eco b/app/assets/javascripts/app/views/layout_ref/schedulers.jst.eco index 4354394a0..4f6190487 100644 --- a/app/assets/javascripts/app/views/layout_ref/schedulers.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/schedulers.jst.eco @@ -76,8 +76,49 @@ -
-
+
+
+
+

Filters

+ Where State is open.
+ In Folder Spam. +
+ +
+

Actions

+ Set State to closed. +
+
+
+

Timer

+ Run every Monday, Tuesday, Wednesday, Thursday and Friday at 7:30 am and 1:30 pm. +
+
+
Disable
+
Edit
+
+
+ +
+
+
+

Filters

+ Where State is open.
+ In Folder Spam. +
+ +
+

Actions

+ Set State to closed. +
+
+
+

Timer

+ Run every Monday, Tuesday, Wednesday, Thursday and Friday at 7:30 am and 1:30 pm. +
+
+
Enable
+
Edit
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/layout_ref/sla.jst.eco b/app/assets/javascripts/app/views/layout_ref/sla.jst.eco index 63903522e..ee806f1da 100644 --- a/app/assets/javascripts/app/views/layout_ref/sla.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/sla.jst.eco @@ -76,54 +76,50 @@
-
-
-
+
+
+

Filters

Where Organization equals to Deutsche Bank.
Where Priority is high.
-
- -
-
+ +

Repsonse Times

00:30 hours First Response Time
02:00 hours Update Time
48:00 hours Solution Time
-
+

Business Hours in European Central Time

Mo-Tu 7am - 5pm, Fr 7am - 1pm
-
+
Disable
Edit
-
-
-
+
+
+

Filters

Where Organization equals to Deutsche Bank.
Where Priority is high.
-
- -
-
+ +

Repsonse Times

00:30 hours First Response Time
01:00 hours Update Time
-
+

Business Hours in European Central Time

Mo-Fr 8 Uhr - 18 Uhr
-
+
Enable
Edit
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index ff9a434a0..2fee6edb2 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -5521,7 +5521,7 @@ output { } } -.sla { +.action { background: white; border: 1px solid hsl(199,44%,93%); color: hsl(206,7%,28%); @@ -5530,7 +5530,7 @@ output { flex-wrap: wrap; padding: 10px; - & + .sla { + & + .action { margin-top: 17px; } @@ -5541,20 +5541,17 @@ output { top: 2px; border-color: hsl(199,44%,94%); - & > *:not(.sla-controls) { + & > *:not(.action-controls) { opacity: 0.33; } } - .sla-flow { + .action-flow { display: flex; } - .sla-filters, - .sla-arrow, - .sla-times, - .sla-businessHours, - .sla-controls { + .action-block, + .action-controls { padding: 10px; } @@ -5562,19 +5559,18 @@ output { color: hsl(0,0%,60%); margin-top: 0; } - - .sla-arrow { - align-self: center; - margin: 22px 20px 0; - .icon { - width: 15px; - height: 24px; - fill: hsl(198,17%,89%); - } + .action-flow-icon { + align-self: center; + width: 15px; + height: 24px; + margin-top: 20px; /* compensate for h3 height */ + margin-left: 20px; + margin-right: 20px; + fill: hsl(198,17%,89%); } - .sla-controls { + .action-controls { display: flex; margin-left: auto; align-items: flex-end;