diff --git a/awx/ui/static/js/forms/LogViewerStatus.js b/awx/ui/static/js/forms/LogViewerStatus.js index 51a9fd361b..22d0aa6687 100644 --- a/awx/ui/static/js/forms/LogViewerStatus.js +++ b/awx/ui/static/js/forms/LogViewerStatus.js @@ -30,12 +30,14 @@ angular.module('LogViewerStatusDefinition', []) }, "started": { label: "Started", - type: "text", + type: "date", + "filter": "date:'MM/dd/yy HH:mm:ss'", readonly: true }, "finished": { label: "Finished", - type: "text", + type: "date", + "filter": "date:'MM/dd/yy HH:mm:ss'", readonly: true }, "elapsed": { diff --git a/awx/ui/static/js/helpers/LogViewer.js b/awx/ui/static/js/helpers/LogViewer.js index c81c197265..1c3b2899f2 100644 --- a/awx/ui/static/js/helpers/LogViewer.js +++ b/awx/ui/static/js/helpers/LogViewer.js @@ -278,7 +278,9 @@ angular.module('LogViewerHelper', ['ModalDialog', 'Utilities', 'FormGenerator', } } else { - html += "{{ " + fld + " }}"; + html += "{{ " + fld ; + html += (form.fields[fld].filter) ? " | " + form.fields[fld].filter : "" ; + html += " }}"; } html += "\n"; } diff --git a/awx/ui/static/js/helpers/Schedules.js b/awx/ui/static/js/helpers/Schedules.js index d4f56ff501..2f3edd94a0 100644 --- a/awx/ui/static/js/helpers/Schedules.js +++ b/awx/ui/static/js/helpers/Schedules.js @@ -493,14 +493,14 @@ angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelpe itm = scope[list.name][item_idx]; itm.enabled = (itm.enabled) ? true : false; if (itm.enabled) { - itm.play_tip = 'Schedule is Active. Click to temporarily stop.'; + itm.play_tip = 'Schedule is active. Click to stop.'; itm.status = 'active'; - itm.status_tip = 'Schedule is Active. Click to temporarily stop.'; + itm.status_tip = 'Schedule is active. Click to stop.'; } else { - itm.play_tip = 'Schedule is temporarily stopped. Click to activate.'; + itm.play_tip = 'Schedule is stopped. Click to activate.'; itm.status = 'stopped'; - itm.status_tip = 'Schedule is temporarily stopped. Click to activate.'; + itm.status_tip = 'Schedule is stopped. Click to activate.'; } itm.nameTip = item.name + " schedule. Click to edit."; diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less index cdbd190706..23f04b5152 100644 --- a/awx/ui/static/less/ansible-ui.less +++ b/awx/ui/static/less/ansible-ui.less @@ -1032,7 +1032,7 @@ input[type="checkbox"].checkbox-no-label { } .icon-schedule-enabled-true:before { - content: "\f04c"; + content: "\f04d"; } .icon-schedule-enabled-false:before {