Fixed margin on start date error and made it span the full width. Cha…

…nged frequency label and optios- no more 'minutely'.
chouseknecht · Mar 11, 2014 · f9df5d0 · f9df5d0
1 parent a73b120
commit f9df5d0
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/lib/angular-scheduler.css b/lib/angular-scheduler.css
@@ -47,9 +47,10 @@
     margin-top: 0;
     padding-top: 3px;
 }
-.pull-up { 
-    margin-top: -15px;
-    margin-bottom: 10px;
+.error-pull-up {
+    position: relative;
+    top: -15px;
+    margin-bottom: 15px;
 }
 .red-text {
     color: #dd1b16;

diff --git a/lib/angular-scheduler.html b/lib/angular-scheduler.html
@@ -34,7 +34,6 @@
                                         <i class="fa fa-calendar"></i></button>
                                 </span>
                         </div>
-                        <div class="error" ng-show="scheduler_form_schedulerStartDt_error" ng-bind="scheduler_form_schedulerStartDt_error"></div>
                     </div>
                 </div>
                 <div class="col-md-7">
@@ -52,6 +51,12 @@
                 </div>
             </div>
 
+            <div class="row error-pull-up">
+                <div class="col-md-12">
+                    <div class="error" ng-show="scheduler_form_schedulerStartDt_error" ng-bind="scheduler_form_schedulerStartDt_error"></div>
+                </div>
+            </div>
+
             <div class="row">
                 <div class="col-md-4" ng-show="schedulerShowTimeZone">
                     <div class="form-group">
@@ -71,7 +76,7 @@
             <div class="row">
                 <div class="col-md-4">
                     <div class="form-group">
-                        <label>Repeat</label>
+                        <label>Repeat frequency</label>
                         <select name="schedulerFrequency" id="schedulerFrequency" ng-model="schedulerFrequency"
                             ng-options="f.name for f in frequencyOptions" required class="form-control input-sm"
                             ng-change="scheduleRepeatChange()"></select>

diff --git a/lib/angular-scheduler.js b/lib/angular-scheduler.js
@@ -745,12 +745,12 @@ angular.module('AngularScheduler', ['underscore'])
 
             scope.frequencyOptions = [
                 { name: 'None (run once)', value: 'none', intervalLabel: '' },
-                { name: 'Minutely', value: 'minutely', intervalLabel: 'minutes' },
-                { name: 'Hourly', value: 'hourly', intervalLabel: 'hours' },
-                { name: 'Daily', value: 'daily', intervalLabel: 'days' },
-                { name: 'Weekly', value: 'weekly', intervalLabel: 'weeks' },
-                { name: 'Monthly', value: 'monthly', intervalLabel: 'months' },
-                { name: 'Yearly', value: 'yearly', intervalLabel: 'years' }
+                { name: 'Minute', value: 'minutely', intervalLabel: 'minutes' },
+                { name: 'Hour', value: 'hourly', intervalLabel: 'hours' },
+                { name: 'Day', value: 'daily', intervalLabel: 'days' },
+                { name: 'Week', value: 'weekly', intervalLabel: 'weeks' },
+                { name: 'Month', value: 'monthly', intervalLabel: 'months' },
+                { name: 'Year', value: 'yearly', intervalLabel: 'years' }
             ];
 
             scope.endOptions = [

diff --git a/lib/angular-scheduler.min.css b/lib/angular-scheduler.min.css