zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-15 03:48:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Adding a date filter that will format dates in Tower UI""

Browse Source 
This reverts commit a5119f681d688ea1bdf07b952a065f90a03ea757.
This commit is contained in:
Jared Tabor
2015-05-15 11:14:29 -04:00
parent 052c808b8f
commit 20ec360692
17 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/ui/static/partials/job_detail.html
+2 -2
View File
@@ -45,8 +45,8 @@
<div class="form-group" ng-show="job_status.started">
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-3 control-label">Timing</label>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-9">
<div ng-show="job_status.started" id="started-time">Started &nbsp;{{ job_status.started | date:'MM/dd/yy HH:mm:ss' }}</div>
<div ng-show="job_status.finished" id="finished-time">Finished &nbsp;{{ job_status.finished | date:'MM/dd/yy HH:mm:ss' }}</div>
<div ng-show="job_status.started" id="started-time">Started &nbsp;{{ job_status.started | longDate }}</div>
<div ng-show="job_status.finished" id="finished-time">Finished &nbsp;{{ job_status.finished | longDate }}</div>
<div ng-show="job_status.finished" id="elapsed-time">Elapsed &nbsp;{{ job_status.elapsed }}</div>
</div>
</div>
awx/ui/static/partials/job_stdout_adhoc.html
+2 -2
View File
@@ -44,10 +44,10 @@
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12
StandardOutDetails-detailContent">
<div ng-show="job.started" id="started-time">
Started &nbsp;{{ job.started | date:'MM/dd/yy HH:mm:ss' }}
Started &nbsp;{{ job.started | longDate }}
</div>
<div ng-show="job.finished" id="finished-time">
Finished &nbsp;{{ job.finished | date:'MM/dd/yy HH:mm:ss' }}
Finished &nbsp;{{ job.finished | longDate }}
</div>
<div ng-show="job.finished" id="elapsed-time">
Elapsed &nbsp;{{ job.elapsed }} seconds