Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

style notification settings

Browse source
This commit is contained in:
Felix Niklas 2016-02-08 17:24:48 +01:00
parent c737813c7d
commit 772746a710
3 changed files with 71 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/_profile/notification.coffee
View file

@ -15,7 +15,7 @@ class Index extends App.Controller
group_ids: [] group_ids: []
matrix: matrix:
create: create:
name: 'new Ticket' name: 'New Ticket'
update: update:
name: 'Ticket update' name: 'Ticket update'
reminder_reached: reminder_reached:

81
app/assets/javascripts/app/views/profile/notification.jst.eco
View file

@ -4,45 +4,76 @@
<form div class="page-content"> <form div class="page-content">
<h3><%- @T( 'Matrix' ) %></h3>
<div class="settings-entry"> <div class="settings-entry">
<table class="table"> <table class="settings-list">
<tr> <thead>
<td><%- @T('On') %></td><td colspan="3"><%- @T('Criteria') %></td><td colspan="2"><%- @T('Notify via') %></td> <tr>
</tr> <th>
<tr> <th><%- @T('My Tickets') %>
<td></td><td><%- @T('Owned by me') %></td><td><%- @T('Owned by nobody') %></td><td><%- @T('no criteria') %></td><td><%- @T('Email & Online') %></td><td><%- @T('Online') %></td> <th><%- @T('Not Assigned') %>
</tr> <th><%- @T('All Tickets') %>
<th class="settings-list-separator"><%- @T('Email Notification') %>
</thead>
<tbody>
<% if @config.matrix: %> <% if @config.matrix: %>
<% for key, value of @config.matrix: %> <% for key, value of @config.matrix: %>
<tr> <tr>
<td><%= value.name %></td> <td>
<td><input type="checkbox" name="matrix.<%= key %>.criteria.owned_by_me" value="true" <% if value.criteria.owned_by_me: %>checked<% end %>/></td> <%= value.name %>
<td><input type="checkbox" name="matrix.<%= key %>.criteria.owned_by_nobody" value="true" <% if value.criteria.owned_by_nobody: %>checked<% end %>/></td> <td class="u-positionOrigin">
<td><input type="checkbox" name="matrix.<%= key %>.criteria.no" value="true" <% if value.criteria.no: %>checked<% end %>/></td> <label class="checkbox-replacement checkbox-replacement--fullscreen">
<td><input type="radio" name="matrix.<%= key %>.channel" value="email" <% if value.channel.email: %>checked<% end %>/></td> <input type="checkbox" name="matrix.<%= key %>.criteria.owned_by_me" value="true" <% if value.criteria.owned_by_me: %>checked<% end %>/>
<td><input type="radio" name="matrix.<%= key %>.channel" value="online" <% if !value.channel.email && value.channel.online: %>checked<% end %>/></td> <%- @Icon('checkbox', 'icon-unchecked') %>
</tr> <%- @Icon('checkbox-checked', 'icon-checked') %>
</label>
<td class="u-positionOrigin">
<label class="checkbox-replacement checkbox-replacement--fullscreen">
<input type="checkbox" name="matrix.<%= key %>.criteria.owned_by_nobody" value="true" <% if value.criteria.owned_by_nobody: %>checked<% end %>/>
<%- @Icon('checkbox', 'icon-unchecked') %>
<%- @Icon('checkbox-checked', 'icon-checked') %>
</label>
<td class="u-positionOrigin">
<label class="checkbox-replacement checkbox-replacement--fullscreen">
<input type="checkbox" name="matrix.<%= key %>.criteria.no" value="true" <% if value.criteria.no: %>checked<% end %>/>
<%- @Icon('checkbox', 'icon-unchecked') %>
<%- @Icon('checkbox-checked', 'icon-checked') %>
</label>
<td class="u-positionOrigin settings-list-separator">
<label class="checkbox-replacement checkbox-replacement--fullscreen">
<input type="checkbox" name="matrix.<%= key %>.channel" value="email" <% if value.channel.email: %>checked<% end %>/>
<%- @Icon('checkbox', 'icon-unchecked') %>
<%- @Icon('checkbox-checked', 'icon-checked') %>
</label>
<% end %> <% end %>
<% end %> <% end %>
</tbody>
</table> </table>
</div> </div>
<% if @groups: %>
<h3><%- @T( 'Groups' ) %></h3> <h2><%- @T( 'Limit Groups' ) %></h2>
<%- @T('For "owned by nobody" and "no criteria" only notify about tickets in theres groups.') %>
<div class="settings-entry"> <div class="settings-entry">
<table class="table"> <table class="settings-list">
<% if @groups: %> <thead>
<tr>
<th><%- @T('Group') %>
<th><%- @T('Not Assigned & All Tickets') %>
</thead>
<tbody>
<% for group in @groups: %> <% for group in @groups: %>
<tr> <tr>
<td><%= group.displayName() %></td><td><input type="checkbox" name="group_ids" value="<%= group.id %>" <% if _.include(@config.group_ids, group.id.toString()): %>checked<% end %>/></td> <td><%= group.displayName() %>
</tr> <td class="u-positionOrigin">
<label class="checkbox-replacement checkbox-replacement--fullscreen">
<input type="checkbox" name="group_ids" value="<%= group.id %>" <% if _.include(@config.group_ids, group.id.toString()): %>checked<% end %>/>
<%- @Icon('checkbox', 'icon-unchecked') %>
<%- @Icon('checkbox-checked', 'icon-checked') %>
</label>
<% end %> <% end %>
<% end %> </tbody>
</table> </table>
</div> </div>
<% end %>
<button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button> <button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button>
</form> </form>

14
app/assets/stylesheets/zammad.scss
View file

@ -936,6 +936,16 @@ th.align-right {
justify-content: center; 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, .checkbox-replacement.checkbox-replacement--inline,
.radio-replacement.radio-replacement--inline { .radio-replacement.radio-replacement--inline {
display: inline-flex; display: inline-flex;
@ -6816,6 +6826,10 @@ output {
td.empty-cell { td.empty-cell {
border-top: none; border-top: none;
} }
.settings-list-separator {
border-left-width: 2px;
}
.text-muted { .text-muted {
text-transform: none; text-transform: none;