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

fix border in caller log, remove pulsing

Browse source
This commit is contained in:
Felix Niklas 2016-05-03 12:30:25 +02:00
parent 31e7a054ec
commit d4d73ed598
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/cti.coffee
View file

@ -130,7 +130,7 @@ class App.CTI extends App.Controller
item.status_class = 'neutral' item.status_class = 'neutral'
else if item.state is 'answer' else if item.state is 'answer'
item.state_human = 'connected' item.state_human = 'connected'
item.status_class = 'pulsate-animation ok' item.status_class = 'ok'
else if item.state is 'hangup' else if item.state is 'hangup'
item.state_human = switch item.comment item.state_human = switch item.comment
when 'cancel', 'noAnswer', 'congestion' then 'not reached' when 'cancel', 'noAnswer', 'congestion' then 'not reached'

6
app/assets/javascripts/app/views/cti/index.jst.eco
View file

@ -17,13 +17,11 @@
<% for item in @list: %> <% for item in @list: %>
<tr <% if item.state is 'hangup' && item.done: %>class="is-grayed-out"<% end %> data-id="<%- item.id %>"> <tr <% if item.state is 'hangup' && item.done: %>class="is-grayed-out"<% end %> data-id="<%- item.id %>">
<td class="table-checkbox" style="vertical-align: middle"> <td class="table-checkbox" style="vertical-align: middle">
<% if item.state is 'hangup': %> <label class="checkbox-replacement<% if item.state isnt 'hangup': %> is-disabled<% end %>">
<label class="checkbox-replacement"> <input type="checkbox" class="js-check"<% if item.done: %> checked<% end %><% if item.state isnt 'hangup': %> disabled<% end %>>
<input type="checkbox" class="js-check" <% if item.done: %>checked<% end %>>
<%- @Icon('checkbox', 'icon-unchecked') %> <%- @Icon('checkbox', 'icon-unchecked') %>
<%- @Icon('checkbox-checked', 'icon-checked') %> <%- @Icon('checkbox-checked', 'icon-checked') %>
</label> </label>
<% end %>
</td> </td>
<td> <td>
<% shown = false %> <% shown = false %>

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

@ -914,15 +914,11 @@ th.align-right {
.table > tbody > tr > td { .table > tbody > tr > td {
padding: 10px 10px 8px; padding: 10px 10px 8px;
border: none; border-color: hsl(0,0%,95%);
box-shadow: 0 1px rgba(0,0,0,.03);
} }
.table-hover > tbody > tr:hover > td { .table-hover > tbody > tr:hover > td {
background: white; background: white;
box-shadow:
0 1px rgba(0,0,0,.03),
0 -1px rgba(0,0,0,.03);
} }
.table-hover > tbody > tr:hover > th { .table-hover > tbody > tr:hover > th {
@ -964,7 +960,11 @@ th.align-right {
} }
.table tr.is-grayed-out { .table tr.is-grayed-out {
color: hsl(120,1%,77%);
.icon {
opacity: 0.33; opacity: 0.33;
}
} }
.table .icon-draggable, .table .icon-draggable,