diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index 72e57561e..6a1e58096 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -1282,6 +1282,7 @@ class userListRef extends App.ControllerContent App.Config.set( 'layout_ref/user_list', userListRef, 'Routes' ) + class slaRef extends App.ControllerContent events: @@ -1307,4 +1308,16 @@ class slaRef extends App.ControllerContent App.Config.set( 'layout_ref/sla', slaRef, 'Routes' ) +class schedulersRef extends App.ControllerContent + + constructor: -> + super + @render() + + render: -> + @html App.view('layout_ref/schedulers')() + +App.Config.set( 'layout_ref/schedulers', schedulersRef, 'Routes' ) + + App.Config.set( 'LayoutRef', { prio: 1700, parent: '#current_user', name: 'Layout Reference', translate: true, target: '#layout_ref', role: [ 'Admin' ] }, 'NavBarRight' ) \ No newline at end of file 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 4ed610d36..00d2373b6 100644 --- a/app/assets/javascripts/app/views/agent_user_create.jst.eco +++ b/app/assets/javascripts/app/views/agent_user_create.jst.eco @@ -8,7 +8,7 @@

<%- @T( @head ) %>

-
+
<%- @T( 'Cancel & Go Back' ) %>
diff --git a/app/assets/javascripts/app/views/layout_ref/index.jst.eco b/app/assets/javascripts/app/views/layout_ref/index.jst.eco index a29719a31..e5231455d 100644 --- a/app/assets/javascripts/app/views/layout_ref/index.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/index.jst.eco @@ -4,6 +4,7 @@
-
+
Cancel & Go Back
diff --git a/app/assets/javascripts/app/views/layout_ref/schedulers.jst.eco b/app/assets/javascripts/app/views/layout_ref/schedulers.jst.eco new file mode 100644 index 000000000..1d498c5b5 --- /dev/null +++ b/app/assets/javascripts/app/views/layout_ref/schedulers.jst.eco @@ -0,0 +1,338 @@ +
+
+
+
+
+
+
+ +
+

New Scheduler

+
+
+

Selector

+

Create rules that single out the tickets for automated processing.

+

Filters

+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+ +
+
+ +
+
+
+
+
+

Preview 2 matches

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
CustomerTitleGroupCreated
+ + + + + Nicole Braun (Zammad Foundation) + + + Welcome to our little planet with flowers and forests asdfasdfasdfasdfasfasdfasdfasdfasdfasdfasdfasdfasdfasdf asdfasdfasdfasdfasfasdfasdfasdfasdfasdfasdfasdfasdfasdf + + + Users + + 01/12/2015 +
+ + + + + Nicole Braun (Zammad Foundation) + + + script/scheduler.rb start script/scheduler.rb start script/scheduler.rb start script/scheduler.rb start script/scheduler.rb start script/scheduler.rb start script/scheduler.rb start script/scheduler.rb start script/scheduler.rb start script/scheduler + + + Users + + 5 days 3 hours ago +
+
+ +

Actions

+
+
+
+
+
+ + +
+
+
+
+
+ +
+
+ +
+
+
+
+ +

Timer

+

+ When should the job run?
+ + Run every Monday, Tuesday, Wednesday, Thursday and Friday at 07:30 o'clock. + +

+ + + + + + + + + + + + + + + + + + + + + + + +
Day + Hour + Minute +
+ + + + +
+ + + + +
+ + + + +
+ + + + +
+ + + + +
+ + + + +
+ + + + +
+ + + + +
+
+
+ Cancel & Go Back + +
+
+
+
+
+ +
+

Manage

+ + + +

Channels

+ + + +

Settings

+ + + +

System

+ + +
+ +
+
+
+

SLAs Management

+
+ +
+ New SLA +
+
+ +
+

+ 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. +

+
+
\ 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 443a9f34c..f9426f428 100644 --- a/app/assets/javascripts/app/views/layout_ref/sla.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/sla.jst.eco @@ -11,7 +11,7 @@

Selector

-

Create rules that single out the tickets for the Service Level Agreement.

+

Create rules that single out the tickets for the Service Level Agreement.

Filters

@@ -70,7 +70,7 @@
-

Preview matches 5

+

Preview 5 matches

@@ -285,13 +285,6 @@

Schedule

Business Hours in European Central Time (change)

- - - - - - -
@@ -394,7 +387,7 @@
-
+
Cancel & Go Back
diff --git a/app/assets/javascripts/app/views/modal.jst.eco b/app/assets/javascripts/app/views/modal.jst.eco index 11211f2de..3783e4784 100644 --- a/app/assets/javascripts/app/views/modal.jst.eco +++ b/app/assets/javascripts/app/views/modal.jst.eco @@ -20,7 +20,7 @@ <%- @content %> <% end %>
-
+
<% if @cancel: %>
<%- @T( 'Cancel & Go Back' ) %> diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 3e528fc4f..eb0541bca 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -4226,11 +4226,16 @@ footer { .modal-body { padding: 0 23px; + + h2:first-child { + margin-top: 0; + } } .modal-footer { padding: 23px 23px 20px; border: none; + display: flex; } .modal-leftFooter, @@ -5210,7 +5215,7 @@ label + .wizard-buttonList { display: flex; align-items: center; background: hsl(197,20%,93%); - padding: 14px 10px; + padding: 7px; border: 1px solid hsl(198,19%,86%); &:first-child { @@ -5226,7 +5231,7 @@ label + .wizard-buttonList { } & + .horizontal-filter { - border-top: 1px solid hsl(198,19%,87%); + border-top: none; } .horizontal-filter-body { @@ -5251,6 +5256,14 @@ label + .wizard-buttonList { } } +output { + border-bottom: 1px solid hsl(200,71%,59%); + margin: 14px 0 0; + display: inline-block; + padding: 10px 20px; + background: hsl(201,62%,93%); +} + .horizontal-filter-text { margin-right: 5px; } @@ -5264,8 +5277,8 @@ label + .wizard-buttonList { display: flex; align-items: center; justify-content: center; - width: 34px; - height: 34px; + width: 30px; + height: 30px; border: 1px solid hsl(198,19%,86%); border-radius: 100%; background: white;