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

Sla: move calendar into new row

Browse source
This commit is contained in:
Felix Niklas 2015-09-30 15:12:45 +02:00
parent d59cc46dda
commit 197b8a2b93
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/javascripts/app/views/sla/index.jst.eco
View file

@ -31,19 +31,23 @@
<div class="action-block action-block--flex"> <div class="action-block action-block--flex">
<div class="label"><%- @T('Escalation Times') %></div> <div class="label"><%- @T('Escalation Times') %></div>
<% if sla.first_response_time: %> <% if sla.first_response_time: %>
<%- sla.first_response_time_in_text %> <%- @T('hours') %> - <%- @T('First Response Time') %><br> <%- sla.first_response_time_in_text %> <%- @T('hours') %> - <%- @T('First Response Time') %>
<% end %> <% end %>
<% if sla.update_time: %> <% if sla.update_time: %>
<%- sla.update_time_in_text %> <%- @T('hours') %> - <%- @T('Update Time') %><br> <br>
<%- sla.update_time_in_text %> <%- @T('hours') %> - <%- @T('Update Time') %>
<% end %> <% end %>
<% if sla.solution_time: %> <% if sla.solution_time: %>
<br>
<%- sla.solution_time_in_text %> <%- @T('hours') %> - <%- @T('Solution Time') %> <%- sla.solution_time_in_text %> <%- @T('hours') %> - <%- @T('Solution Time') %>
<% end %> <% end %>
<br> <br>
<div class="label"><%- @T('Calendar') %></div>
<%= sla.calendar.displayName() %>
</div> </div>
</div> </div>
<div class="action-block">
<div class="label"><%- @T('Calendar') %></div>
<%= sla.calendar.displayName() %>
</div>
<div class="action-controls"> <div class="action-controls">
<div class="sla-toggle btn btn--danger btn--secondary js-delete"><%- @T('Delete') %></div> <div class="sla-toggle btn btn--danger btn--secondary js-delete"><%- @T('Delete') %></div>
<div class="sla-edit btn js-edit"><%- @T('Edit') %></div> <div class="sla-edit btn js-edit"><%- @T('Edit') %></div>

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

@ -6293,10 +6293,9 @@ output {
} }
.action-flow-icon { .action-flow-icon {
align-self: center;
width: 15px; width: 15px;
height: 24px; height: 24px;
margin-top: 20px; /* compensate for h3 height */ margin-top: 16px; /* compensate for h3 height */
margin-left: 20px; margin-left: 20px;
margin-right: 20px; margin-right: 20px;
fill: hsl(198,17%,89%); fill: hsl(198,17%,89%);