From 772746a7100cb0499c0572bfa4635bdbc504d4ec Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 8 Feb 2016 17:24:48 +0100 Subject: [PATCH] style notification settings --- .../controllers/_profile/notification.coffee | 2 +- .../app/views/profile/notification.jst.eco | 81 +++++++++++++------ app/assets/stylesheets/zammad.scss | 14 ++++ 3 files changed, 71 insertions(+), 26 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_profile/notification.coffee b/app/assets/javascripts/app/controllers/_profile/notification.coffee index d3cfd56f8..d63c79618 100644 --- a/app/assets/javascripts/app/controllers/_profile/notification.coffee +++ b/app/assets/javascripts/app/controllers/_profile/notification.coffee @@ -15,7 +15,7 @@ class Index extends App.Controller group_ids: [] matrix: create: - name: 'new Ticket' + name: 'New Ticket' update: name: 'Ticket update' reminder_reached: diff --git a/app/assets/javascripts/app/views/profile/notification.jst.eco b/app/assets/javascripts/app/views/profile/notification.jst.eco index c0f5e363c..9b50578a7 100644 --- a/app/assets/javascripts/app/views/profile/notification.jst.eco +++ b/app/assets/javascripts/app/views/profile/notification.jst.eco @@ -4,45 +4,76 @@
-

<%- @T( 'Matrix' ) %>

-
- - - - - - - +
<%- @T('On') %><%- @T('Criteria') %><%- @T('Notify via') %>
<%- @T('Owned by me') %><%- @T('Owned by nobody') %><%- @T('no criteria') %><%- @T('Email & Online') %><%- @T('Online') %>
+ + + + <% if @config.matrix: %> <% for key, value of @config.matrix: %> - - - - - - - +
+ <%- @T('My Tickets') %> + <%- @T('Not Assigned') %> + <%- @T('All Tickets') %> + <%- @T('Email Notification') %> +
<%= value.name %>checked<% end %>/>checked<% end %>/>checked<% end %>/>checked<% end %>/>checked<% end %>/>
+ <%= value.name %> + + + + + + + + <% end %> <% end %> +
- -

<%- @T( 'Groups' ) %>

- <%- @T('For "owned by nobody" and "no criteria" only notify about tickets in theres groups.') %> + <% if @groups: %> +

<%- @T( 'Limit Groups' ) %>

- - <% if @groups: %> +
+ + + + <% for group in @groups: %> - - - + +
<%- @T('Group') %> + <%- @T('Not Assigned & All Tickets') %> +
<%= group.displayName() %>checked<% end %>/>
<%= group.displayName() %> + + <% end %> - <% end %> +
+ <% end %>
\ No newline at end of file diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index 48c036d46..426a98ee7 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -936,6 +936,16 @@ th.align-right { justify-content: center; } +.checkbox-replacement.checkbox-replacement--fullscreen, +.radio-replacement.radio-replacement--fullscreen { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; +} + + .checkbox-replacement.checkbox-replacement--inline, .radio-replacement.radio-replacement--inline { display: inline-flex; @@ -6816,6 +6826,10 @@ output { td.empty-cell { border-top: none; } + + .settings-list-separator { + border-left-width: 2px; + } .text-muted { text-transform: none;