From ab6c1a0ab2af3b2410695ee2f8695126f043188d Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Fri, 17 Jun 2016 11:24:45 -0400 Subject: [PATCH 1/2] fixed styling of scheduler spinners --- awx/ui/client/src/scheduler/schedulerForm.partial.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/awx/ui/client/src/scheduler/schedulerForm.partial.html b/awx/ui/client/src/scheduler/schedulerForm.partial.html index 6b1636c0e2..0287239bf1 100644 --- a/awx/ui/client/src/scheduler/schedulerForm.partial.html +++ b/awx/ui/client/src/scheduler/schedulerForm.partial.html @@ -87,6 +87,7 @@ sch-spinner="scheduler_form" class="scheduler-time-spinner ScheduleTime-input SpinnerInput" + aw-spinner="schedulerStartHour" ng-model="schedulerStartHour" placeholder="HH24" aw-min="0" min="0" aw-max="23" @@ -101,6 +102,7 @@ sch-spinner="scheduler_form" class="scheduler-time-spinner SchedulerTime-input SpinnerInput" + aw-spinner="schedulerStartMinute" ng-model="schedulerStartMinute" placeholder="MM" min="0" max="59" data-zero-pad="2" @@ -115,6 +117,7 @@ sch-spinner="scheduler_form" class="scheduler-time-spinner SchedulerTime-input SpinnerInput" + aw-spinner="schedulerStartSecond" ng-model="schedulerStartSecond" placeholder="SS" min="0" max="59" data-zero-pad="2" @@ -178,6 +181,7 @@ sch-spinner="scheduler_form" class="scheduler-spinner SpinnerInput" + aw-spinner="schedulerInterval" ng-model="schedulerInterval" min="1" max="999" @@ -213,6 +217,7 @@ id="monthDay" sch-spinner="scheduler_form" class="scheduler-spinner SpinnerInput" + aw-spinner="$parent.monthDay" ng-model="$parent.monthDay" min="1" max="31" ng-change="resetError('scheduler_monthDay_error')" > @@ -291,6 +296,7 @@ sch-spinner="scheduler_form" class="scheduler-spinner SpinnerInput" + aw-spinner="$parent.yearlyMonthDay" ng-model="$parent.yearlyMonthDay" min="1" max="31" ng-change="resetError('scheduler_yearlyMonthDay_error')" @@ -464,6 +470,7 @@ sch-spinner="scheduler_form" class="scheduler-spinner SpinnerInput" + aw-spinner="$parent.schedulerOccurrenceCount" ng-model="$parent.schedulerOccurrenceCount" min="1" max="999" on-change="resetError('scheduler_occurrenceCount_error')" @@ -529,6 +536,7 @@ sch-spinner="scheduler_form" class="scheduler-time-spinner ScheduleTime-input SpinnerInput" + aw-spinner="$parent.schedulerEndHour" ng-model="$parent.schedulerEndHour" placeholder="HH24" aw-min="0" min="0" aw-max="23" @@ -543,6 +551,7 @@ sch-spinner="scheduler_form" class="scheduler-time-spinner SchedulerTime-input SpinnerInput" + aw-spinner="$parent.schedulerEndMinute" ng-model="$parent.schedulerEndMinute" placeholder="MM" min="0" max="59" data-zero-pad="2" @@ -557,6 +566,7 @@ sch-spinner="scheduler_form" class="scheduler-time-spinner SchedulerTime-input SpinnerInput" + aw-spinner="$parent.schedulerEndSecond" ng-model="$parent.schedulerEndSecond" placeholder="SS" min="0" max="59" data-zero-pad="2" From d46adee6c1215c685bd6c8c873330b58932ade21 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Fri, 17 Jun 2016 11:59:42 -0400 Subject: [PATCH 2/2] fix styling of management scheduler spinners --- .../scheduler/schedulerForm.partial.html | 1237 +++++++++-------- 1 file changed, 622 insertions(+), 615 deletions(-) diff --git a/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html b/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html index a4fb115005..3b23ee861a 100644 --- a/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html +++ b/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html @@ -10,634 +10,641 @@
+
- - -
+
+ + +
+ A schedule name is required. +
+
+
+ +
+ + + + +
+
+
+
+
+ +
+ + + : + + + + : + + + +
+
+ The time must be in HH24:MM:SS format. +
+
+
+ + +
+
+ + +
+
+
+
+ + +
A value is required.
+
This is not a valid number.
+
+
+ Frequency Details
+
+
+ + + +
+ Please provide a value between 1 and 999. +
+
+
+
+
+ +
+ The day must be between 1 and 31. +
+
+
+
+ +
+
+ + +
+
+
+
+ * + +
+
+ + +
+
+ The day must be between 1 and 31. +
+
+
+
+ +
+
+ + + +
+
+
+ +
+
+ + + + + + + +
+
+
+ Please select one or more days. +
+
+
+ +
+ +
+
+
+ +
+ Please provide a value between 1 and 999. +
+
+
+ +
+ -
- A schedule name is required. -
-
-
- -
- - - - -
-
-
-
-
- -
- - - : - - - - : - - - -
-
- The time must be in HH24:MM:SS format. -
-
-
- - -
-
- - -
-
-
-
- - -
A value is required.
-
This is not a valid number.
-
-
- Frequency Details
-
-
- - + +
-
-
- -
- -
- The day must be between 1 and 31. -
-
-
-
- -
-
- - -
-
-
-
- * - -
-
- - -
-
- The day must be between 1 and 31. -
-
-
-
- -
-
- - - -
-
-
- -
-
- - - - - - - -
-
-
- Please select one or more days. -
-
-
- -
- -
-
-
- - -
- Please provide a value between 1 and 999. -
-
-
- -
- - - - -
-
- Please provide a valid date. -
-
+ + +
-
+
+ Please provide a valid date.
- -
- Note: For facts collected older than the time period specified, save one fact scan (snapshot) per time window (frequency). For example, facts older than 30 days are purged, while one weekly fact scan is kept. - Caution: Setting both numerical variables to "0" will delete all facts.
- -
- -
- -
Please enter the number of days you would like to keep this data.
-
Please enter a valid number.
-
Please enter a non-negative number.
-
Please enter a number smaller than 9999.
- -
-
- -
- -
- -
Please enter the number of days you would like to keep this data.
-
Please enter a valid number.
-
Please enter a non-negative number.
-
Please enter a number smaller than 9999.
- -
-
- - -
-

- The scheduler options are invalid or incomplete. -

-
-
+
+
+ +
+ Note: For facts collected older than the time period specified, save one fact scan (snapshot) per time window (frequency). For example, facts older than 30 days are purged, while one weekly fact scan is kept. + Caution: Setting both numerical variables to "0" will delete all facts.
+ +
+ +
+ +
Please enter the number of days you would like to keep this data.
+
Please enter a valid number.
+
Please enter a non-negative number.
+
Please enter a number smaller than 9999.
+ +
+
+ +
+ +
+ +
Please enter the number of days you would like to keep this data.
+
Please enter a valid number.
+
Please enter a non-negative number.
+
Please enter a number smaller than 9999.
+ +
+
+ + +
+

+ The scheduler options are invalid or incomplete. +

+
+
+ +
+ {{ rrule_nlp_description }} +
+
+ +
+ + + -
- {{ rrule_nlp_description }} -
-
- -
- - - -
-
-
    -
  • - {{ occurrence.utc }} -
    • -
-
    -
  • - {{ occurrence.local }} -
    • -
+
+
    +
  • + {{ occurrence.utc }} +
    • +
+
    +
  • + {{ occurrence.local }} +
    • +
+
-
- - -
+
+ + +