From ef2a03720514c55c92850c3c25d16d034c0e1a9c Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 9 Feb 2016 16:28:38 -0500 Subject: [PATCH] update scheduler list styling --- awx/ui/client/legacy-styles/lists.less | 9 ++++ awx/ui/client/src/lists/Schedules.js | 27 +++++----- .../src/scheduler/scheduleToggle.block.less | 52 +++++++++++++++++++ awx/ui/client/src/shared/generator-helpers.js | 6 +++ 4 files changed, 82 insertions(+), 12 deletions(-) create mode 100644 awx/ui/client/src/scheduler/scheduleToggle.block.less diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less index 0dd92dbdff..899d55cb6d 100644 --- a/awx/ui/client/legacy-styles/lists.less +++ b/awx/ui/client/legacy-styles/lists.less @@ -285,6 +285,15 @@ table, tbody { padding-right: 0px!important; } +.List-staticColumn--toggle { + width: 55px; + padding-right: 0px !important; +} + +.List-staticColumn--schedulerTime { + max-width: 164px; +} + .List-staticColumnAdjacent { padding-left: 10px!important; } diff --git a/awx/ui/client/src/lists/Schedules.js b/awx/ui/client/src/lists/Schedules.js index c6bed3edfa..2dfe3fc120 100644 --- a/awx/ui/client/src/lists/Schedules.js +++ b/awx/ui/client/src/lists/Schedules.js @@ -18,29 +18,40 @@ export default hover: true, fields: { + toggleSchedule: { + label: '', + columnClass: 'List-staticColumn--toggle', + type: "toggle", + ngClick: "toggleSchedule($event, schedule.id)", + awToolTip: "{{ schedule.play_tip }}", + dataTipWatch: "schedule.play_tip", + dataPlacement: "right", + searchable: false, + nosort: true, + }, name: { key: true, label: 'Name', ngClick: "editSchedule(schedule.id)", - columnClass: "col-md-3 col-sm-3 col-xs-3" + columnClass: "col-md-3 col-sm-3 col-xs-6" }, dtstart: { label: 'First Run', filter: "longDate", searchable: false, - columnClass: "col-md-2 col-sm-3 hidden-xs" + columnClass: "List-staticColumn--schedulerTime hidden-sm hidden-xs" }, next_run: { label: 'Next Run', filter: "longDate", searchable: false, - columnClass: "col-md-2 col-sm-3 col-xs-3" + columnClass: "List-staticColumn--schedulerTime hidden-xs" }, dtend: { label: 'Final Run', filter: "longDate", searchable: false, - columnClass: "col-md-2 col-sm-3 hidden-xs" + columnClass: "List-staticColumn--schedulerTime hidden-xs" } }, @@ -63,14 +74,6 @@ export default }, fieldActions: { - "play": { - mode: "all", - ngClick: "toggleSchedule($event, schedule.id)", - awToolTip: "{{ schedule.play_tip }}", - dataTipWatch: "schedule.play_tip", - iconClass: "{{ 'fa icon-schedule-enabled-' + schedule.enabled }}", - dataPlacement: "top" - }, edit: { label: 'Edit', ngClick: "editSchedule(schedule.id)", diff --git a/awx/ui/client/src/scheduler/scheduleToggle.block.less b/awx/ui/client/src/scheduler/scheduleToggle.block.less new file mode 100644 index 0000000000..f7015f4dc1 --- /dev/null +++ b/awx/ui/client/src/scheduler/scheduleToggle.block.less @@ -0,0 +1,52 @@ +/** @define ScheduleToggle */ + +.ScheduleToggle { + border-radius: 5px; + border: 1px solid #b7b7b7; + background-color: #b7b7b7; + width: 40px; + margin-top: 2px; + cursor: pointer; +} + +.ScheduleToggle-switch { + color: #848992; + background-color: #fff; + margin-left: 4px; + border-left: 1px solid #b7b7b7; + margin-right: 0px; + text-align: center; + text-transform: uppercase; + font-size: 11px; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; +} + +.ScheduleToggle.is-on { + border-color: #1678c4; + background-color: #fff; +} + +.ScheduleToggle-switch.is-on { + margin-right: 5px; + margin-left: 0px; + background-color: #1678c4; + color: #fff; + border-left: 0; + border-top-right-radius: 0px; + border-bottom-right-radius: 0px; + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; +} + +.ScheduleToggle-switch:hover { + background-color: #fafafa; +} + +.ScheduleToggle.is-on:hover { + border-color: #4498DA; +} + +.ScheduleToggle-switch.is-on:hover { + background-color: #4498DA; +} diff --git a/awx/ui/client/src/shared/generator-helpers.js b/awx/ui/client/src/shared/generator-helpers.js index 5e3fcfe148..44364a49e2 100644 --- a/awx/ui/client/src/shared/generator-helpers.js +++ b/awx/ui/client/src/shared/generator-helpers.js @@ -458,6 +458,12 @@ angular.module('GeneratorHelpers', [systemStatus.name]) html = Badge(field); } else if (field.type === 'template') { html = Template(field); + } else if (field.type === 'toggle') { + html += "
ON
OFF
"; + console.log(html); } else { html += "