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

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2015-09-30 14:34:34 +02:00
commit 3abed5f2cf
3 changed files with 38 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/app/lib/bootstrap/bootstrap-timepicker.js vendored
View file

@ -14,6 +14,7 @@
* - activate meridian on class 'time--12' * - activate meridian on class 'time--12'
* - normalize output to 24-hour clock * - normalize output to 24-hour clock
* - add hoursAndMinutes * - add hoursAndMinutes
* - disableMousewheel by default
* *
* For the full copyright and license information, please view the LICENSE * For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code. * file that was distributed with this source code.
@ -1131,7 +1132,7 @@
$.fn.timepicker.defaults = { $.fn.timepicker.defaults = {
defaultTime: false, defaultTime: false,
disableFocus: false, disableFocus: false,
disableMousewheel: false, disableMousewheel: true,
isOpen: false, isOpen: false,
minuteStep: 15, minuteStep: 15,
modalBackdrop: false, modalBackdrop: false,

24
app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco
View file

@ -58,7 +58,13 @@
</div> </div>
</div> </div>
<div class="filter-preview"> <div class="filter-preview">
<h3>Preview <span class="subtitle"><span class="u-highlight">5</span> matches</span></h3> <h3>
Preview
<span class="subtitle hide">
<span class="u-highlight">5</span> matches
</span>
<span class="tiny loading icon" style="margin-left: 3px;"></span>
</h3>
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
@ -849,6 +855,7 @@
<th>Active <th>Active
<th>Type <th>Type
<th>Time <span class="text-muted">in hours</span> <th>Time <span class="text-muted">in hours</span>
<th>Advance Warning <span class="text-muted">in hours</span>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -857,21 +864,30 @@
<td> <td>
<label class="inline-label" for="first_response_time">First Response Time</label> <label class="inline-label" for="first_response_time">First Response Time</label>
<p class="subtle">Timeframe for the first response.</p> <p class="subtle">Timeframe for the first response.</p>
<td><input type="text" value="02:00" class="timeframe js-responseTime"> <td>
<input type="text" value="02:00" class="form-control--small timeframe js-responseTime">
<td>
<input type="text" value="00:30" class="form-control--small timeframe js-responseTime">
</tr> </tr>
<tr class="is-active"> <tr class="is-active">
<td style="text-align: center"><input type="checkbox" checked class="js-activateRow" id="update_time"> <td style="text-align: center"><input type="checkbox" checked class="js-activateRow" id="update_time">
<td> <td>
<label class="inline-label" for="update_time">Update Time</label> <label class="inline-label" for="update_time">Update Time</label>
<p class="subtle">Timeframe for every following response.</p> <p class="subtle">Timeframe for every following response.</p>
<td><input type="text" value="04:00" class="timeframe js-responseTime"> <td>
<input type="text" value="04:00" class="form-control--small timeframe js-responseTime">
<td>
<input type="text" value="00:30" class="form-control--small timeframe js-responseTime">
</tr> </tr>
<tr> <tr>
<td style="text-align: center"><input type="checkbox" id="solution_time" class="js-activateRow"> <td style="text-align: center"><input type="checkbox" id="solution_time" class="js-activateRow">
<td> <td>
<label class="inline-label" for="solution_time">Solution Time</label> <label class="inline-label" for="solution_time">Solution Time</label>
<p class="subtle">Timeframe for solving the problem.</p> <p class="subtle">Timeframe for solving the problem.</p>
<td><input type="text" value="16:00" class="timeframe js-responseTime"> <td>
<input type="text" value="16:00" class="form-control--small timeframe js-responseTime">
<td>
<input type="text" value="00:30" class="form-control--small timeframe js-responseTime">
</tr> </tr>
</tbody> </tbody>
</table> </table>

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

@ -1918,6 +1918,11 @@ ol.tabs li {
height: 20px; height: 20px;
} }
.tiny.loading.icon {
width: 12px;
height: 12px;
}
@keyframes rotateplane { @keyframes rotateplane {
0% { 0% {
transform: perspective(120px) rotateX(0deg) rotateY(0deg); transform: perspective(120px) rotateX(0deg) rotateY(0deg);
@ -6489,6 +6494,17 @@ output {
} }
} }
.loading-placeholder {
display: flex;
align-items: center;
justify-content: center;
height: 133px;
.loading-text {
margin-left: 10px;
}
}
/* /*
---------------- ----------------