External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-14 12:57:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Changed schedule disable icon to fa-stop and simplified tooltip text. On log viewer dates are not formatted correctly.

Browse Source
This commit is contained in:
Chris Houseknecht
2014-04-02 17:14:40 -04:00
parent 61c0355f77
commit 5a69da96ab
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/static/js/forms/LogViewerStatus.js
View File

@@ -30,12 +30,14 @@ angular.module('LogViewerStatusDefinition', [])
}, },
"started": { "started": {
label: "Started", label: "Started",
type: "text", type: "date",
"filter": "date:'MM/dd/yy HH:mm:ss'",
readonly: true readonly: true
}, },
"finished": { "finished": {
label: "Finished", label: "Finished",
type: "text", type: "date",
"filter": "date:'MM/dd/yy HH:mm:ss'",
readonly: true readonly: true
}, },
"elapsed": { "elapsed": {

4
awx/ui/static/js/helpers/LogViewer.js
View File

@@ -278,7 +278,9 @@ angular.module('LogViewerHelper', ['ModalDialog', 'Utilities', 'FormGenerator',
} }
} }
else { else {
html += "{{ " + fld + " }}"; html += "{{ " + fld ;
html += (form.fields[fld].filter) ? " | " + form.fields[fld].filter : "" ;
html += " }}";
} }
html += "</td></tr>\n"; html += "</td></tr>\n";
} }

8
awx/ui/static/js/helpers/Schedules.js
View File

@@ -493,14 +493,14 @@ angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelpe
itm = scope[list.name][item_idx]; itm = scope[list.name][item_idx];
itm.enabled = (itm.enabled) ? true : false; itm.enabled = (itm.enabled) ? true : false;
if (itm.enabled) { 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 = 'active';
itm.status_tip = 'Schedule is Active. Click to temporarily stop.'; itm.status_tip = 'Schedule is active. Click to stop.';
} }
else { 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 = '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."; itm.nameTip = item.name + " schedule. Click to edit.";

2
awx/ui/static/less/ansible-ui.less
View File

@@ -1032,7 +1032,7 @@ input[type="checkbox"].checkbox-no-label {
} }
.icon-schedule-enabled-true:before { .icon-schedule-enabled-true:before {
content: "\f04c"; content: "\f04d";
} }
.icon-schedule-enabled-false:before { .icon-schedule-enabled-false:before {