diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index e886d9cca..040def5c9 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -1289,6 +1289,7 @@ class slaRef extends App.ControllerContent 'click .js-activateColumn': 'activateColumn' 'click .js-activateRow': 'activateRow' 'click [data-type=new]': 'createNew' + 'click .js-toggle': 'toggleSla' constructor: -> super @@ -1297,6 +1298,13 @@ 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') + isInactive = !isInactive + sla.find('.js-toggle').text(if isInactive then 'Enable' else 'Disable') + activateColumn: (event) => checkbox = @$(event.currentTarget) columnName = checkbox.attr('data-target') @@ -1400,7 +1408,7 @@ class searchableSelectRef extends App.ControllerContent name: 'project-name' id: 'project-name-123' placeholder: 'Enter Project Name' - options: [{"value":0,"name":"Appleasdfasdfasdjflkajhsdlfkjahsdlfkjahsdlkfjahsdlkfjahsldkfjahsldkjfahsldkjfh asdf lkajshdfl kajshdfl kajhsdflk ajhsdlfk jahsdlfk jahsdlfk jahsdlkfj ahsdlkfj ahsldkjfahskdjfh aslkdjfhal skdjfha lksdjfhalksdjhfal ksjdal kjsdhfakl sjdhafl jsdhf laskdjhfal ksjdhfal ksdjhfal kjsdhal kjsdhfl akjsdhf lhkj"},{"value":1,"name":"Microsoft","selected":true},{"value":2,"name":"Google"},{"value":3,"name":"Deutsche Bahn"},{"value":4,"name":"Sparkasse"},{"value":5,"name":"Deutsche Post"},{"value":6,"name":"Mitfahrzentrale"},{"value":7,"name":"Starbucks"},{"value":8,"name":"Mac Donalds"},{"value":9,"name":"Flixbus"},{"value":10,"name":"Betahaus"},{"value":11,"name":"Bruno Banani"},{"value":12,"name":"Alpina"},{"value":13,"name":"Samsung"},{"value":14,"name":"ChariTea"},{"value":15,"name":"fritz-kola"},{"value":16,"name":"Vitamin Water"},{"value":17,"name":"Znuny"}] + options: [{"value":0,"name":"Appleasdfasdfasdjflkajhsdlfkjahsdlfkjahsdlkfjahsdlkfjahsldkfjahsldkjfahsldkjfh asdf lkajshdfl kajshdfl kajhsdflk ajhsdlfk jahsdlfk jahsdlfk jahsdlkfj ahsdlkfj ahsldkjfahskdjfh aslkdjfhal skdjfha lksdjfhalksdjhfal ksjdal kjsdhfakl sjdhafl jsdhf laskdjhfal ksjdhfal ksdjhfal kjsdhal kjsdhfl akjsdhf lhkj"},{"value":1,"name":"Microsoft","selected":true},{"value":2,"name":"Google"},{"value":3,"name":"Deutsche Bahn"},{"value":4,"name":"Sparkasse"},{"value":5,"name":"Deutsche & Post"},{"value":6,"name":"Mitfahrzentrale"},{"value":7,"name":"Starbucks"},{"value":8,"name":"Mac Donalds"},{"value":9,"name":"Flixbus"},{"value":10,"name":"Betahaus"},{"value":11,"name":"Bruno Banani"},{"value":12,"name":"Alpina"},{"value":13,"name":"Samsung"},{"value":14,"name":"ChariTea"},{"value":15,"name":"fritz-kola"},{"value":16,"name":"Vitamin Water"},{"value":17,"name":"Znuny"}] @html App.view('layout_ref/search_select') 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 119dae8f6..b770c07be 100644 --- a/app/assets/javascripts/app/views/layout_ref/sla.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/sla.jst.eco @@ -76,15 +76,93 @@ -
-

- Service-Level-Agreements, abgekürzt SLAs, unterstützen Sie gegenüber Kunden gewisse zeitliche Reaktionen einzuhalten. Somit können Sie z. B. sagen Kunden sollen immer nach spätestens 8 Stunden eine Reaktion von Ihnen bekommen. Falls es zu einer drohenden Unterschreitung oder einer Unterschreitung kommt, weißt Zammad Sie auf solche Ereignisse hin. -

-

- Es können Reaktionszeit (Zeit zwischen Erstellung eines Tickets und erster Reaktion eines Agenten), Aktualisierungszeit (Zeit zwischen Nachfrage eines Kunden und Reaktion eines Agenten) und Lösungszeit (Zeit zwischen Erstellung und schließen eines Tickets) definiert werden. -

-

- Drohenden Unterschreitungen oder Unterschreitungen werden in einer eigenen Ansicht in den Übersichten angezeigt. Zudem können E-Mail Benachrichtigungen konfiguriert werden. -

+
+
+

Filters

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

Repsonse Times

+
+
+
00:30 Stunden
+
+ + First Response Time +
+
+
+
01:00 Stunden
+
+ + Update Time +
+
+
+
48:00 Stunden
+
+ + 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 Stunden
+
+ + First Response Time +
+
+
+
01:00 Stunden
+
+ + Update Time +
+
+
+
48:00 Stunden
+
+ + Solution Time +
+
+
+
+
+

Business Hours in European Central Time

+ Mo-Tu 7am - 5pm, Fr 7am - 1pm +
+
+
Enable
+
Edit
+
\ No newline at end of file diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 4da9c2340..0be48048a 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -16,7 +16,7 @@ body { font-family: "Fira Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; line-height: 1.45; font-weight: normal; - background: hsl(210,17%,98%); + background: hsl(210,14%,97%); height: 100%; color: hsl(198,19%,72%); word-wrap: break-word; @@ -5508,6 +5508,81 @@ output { } } +.sla { + background: white; + border: 1px solid hsl(199,44%,93%); + color: hsl(206,7%,28%); + display: flex; + flex-wrap: wrap; + padding: 20px; + box-shadow: 0 2px hsl(210,7%,94%); + + & + .sla { + margin-top: 17px; + } + + &.is-inactive { + box-shadow: none; + position: relative; + top: 2px; + + & > *:not(.sla-controls) { + opacity: 0.33; + } + } + + h3 { + color: hsl(0,0%,60%); + margin-top: 0; + } + + .arrow { + align-self: center; + margin: 25px 50px 0; + + .icon { + width: 15px; + height: 24px; + fill: hsl(198,17%,89%); + } + } + + .response-times-entry { + display: flex; + + .icon { + display: none; + vertical-align: middle; + margin-right: 3px; + + &:not(.icon-checkmark) { + } + } + + .response-time { + margin-right: 5px; + } + } + + .response-times-entry:not(:last-child) { + margin: 0 0 2px; + } + + .sla-businessHours { + flex-basis: 100%; + margin: 20px 0; + } + + .sla-controls { + flex-basis: 100%; + display: flex; + + .sla-edit { + margin-left: auto; + } + } +} + /* ---------------- diff --git a/contrib/icon-sprite.sketch b/contrib/icon-sprite.sketch index 56246c317..d8685df6d 100644 Binary files a/contrib/icon-sprite.sketch and b/contrib/icon-sprite.sketch differ