Эх сурвалжийг харах

HUE-1658 [oozie] Shifting Sunday to first week day

Minor UX changes
Romain Rigaux 11 жил өмнө
parent
commit
2b852ec

+ 15 - 15
apps/oozie/src/oozie/templates/editor/coordinator_utils.mako

@@ -21,19 +21,19 @@
 
 
 <%def name="frequency_fields()">
-              <div class="control-group" rel="popover" >
-                <label class="control-label">${ _('When') }</label>
-                <div class="controls">
-                  <div class="row-fluid">
-                    <div class="span9">
-                      <input data-bind="visible: isAdvancedCron" id="coord-frequency" name="cron_frequency" class="pull-right"/>
-                      <span data-bind="visible: isAdvancedCron" class="pull-right" style="padding-right:20px">${ _('Crontab') }</span>&nbsp;
-                      <input type="checkbox" name="isAdvancedCron" data-bind="checked: isAdvancedCron" /> (${ _('advanced') })
-                    </div>
-                    <div class="span3">
-                    </div>
-                  </div>
-                  <span class="help-block">${ _('The time frequency at which interval a workflow should be submitted by the coordinator. For example, once a day, every Monday at midnight, every week days, every three days...') }</span>
-                </div>
-            </div>
+  <div class="control-group" rel="popover" >
+    <label class="control-label">${ _('When') }</label>
+    <div class="controls">
+      <div class="row-fluid">
+        <div class="span9">
+          <input data-bind="visible: isAdvancedCron" id="coord-frequency" name="cron_frequency" class="pull-right"/>
+          <span data-bind="visible: isAdvancedCron" class="pull-right" style="padding-right:20px">${ _('Crontab') }</span>&nbsp;
+          <input type="checkbox" name="isAdvancedCron" data-bind="checked: isAdvancedCron" /> (${ _('advanced') })
+        </div>
+        <div class="span3">
+        </div>
+      </div>
+      <span class="help-block">${ _('The time frequency at which interval a workflow should be submitted by the coordinator. For example, once a day, every Monday at midnight, every week days, every three days...') }</span>
+    </div>
+  </div>
 </%def>

+ 1 - 1
apps/oozie/src/oozie/templates/editor/create_coordinator.mako

@@ -68,7 +68,7 @@ ${ layout.menubar(section='coordinators') }
         <div class="steps">
 
           <div id="step1" class="stepDetails">
-            <div class="alert alert-info"><h3>${ _('What to schedule') }</h3></div>
+            <div class="alert alert-info"><h3>${ _('Schedule') }</h3></div>
             <div class="fieldWrapper">
               ${ utils.render_field_no_popover(coordinator_form['name'], extra_attrs = {'validate':'true'}) }
               ${ utils.render_field_no_popover(coordinator_form['description']) }

+ 1 - 1
apps/oozie/src/oozie/templates/editor/edit_coordinator.mako

@@ -103,7 +103,7 @@ ${ layout.menubar(section='coordinators') }
 
         <div class="steps">
           <div id="step1" class="stepDetails">
-            <div class="alert alert-info"><h3>${ _('What to schedule') }</h3></div>
+            <div class="alert alert-info"><h3>${ _('Schedule') }</h3></div>
             <div class="fieldWrapper">
               ${ utils.render_field_no_popover(coordinator_form['name'], extra_attrs = {'validate':'true'}) }
               ${ utils.render_field_no_popover(coordinator_form['description']) }

+ 19 - 20
apps/oozie/static/js/coordinator.js

@@ -20,22 +20,22 @@ function initCoordinator(coordinator_json) {
 
   var coordCron =
     $('#coord-frequency')
-    .jqCron({
-      enabled_minute: true,
-      multiple_dom: true,
-      multiple_month: true,
-      multiple_mins: true,
-      multiple_dow: true,
-      multiple_time_hours: true,
-      multiple_time_minutes: true,
-      default_period: 'day',
-      default_value: coordinator_json.frequency,
-      no_reset_button: false,
-      lang: 'en'
-    })
-    .jqCronGetInstance();
-
-  var coordModel = function() {
+      .jqCron({
+        enabled_minute: false,
+        multiple_dom: true,
+        multiple_month: true,
+        multiple_mins: true,
+        multiple_dow: true,
+        multiple_time_hours: true,
+        multiple_time_minutes: false,
+        default_period: 'day',
+        default_value: coordinator_json.frequency,
+        no_reset_button: true,
+        lang: 'en'
+      })
+      .jqCronGetInstance();
+
+  var coordViewModel = function() {
     var self = this;
 
     self.isSaveVisible = ko.observable(false);
@@ -49,10 +49,9 @@ function initCoordinator(coordinator_json) {
     });
   };
 
-  window.coordModel = new coordModel();
-  window.coordModel.isAdvancedCron(coordinator_json.isAdvancedCron);
+  window.coordViewModel = new coordViewModel();
+  window.coordViewModel.isAdvancedCron(coordinator_json.isAdvancedCron);
   $('#coord-frequency').val(coordinator_json.frequency),
 
-  ko.applyBindings(window.coordModel, document.getElementById('step2'));
+  ko.applyBindings(window.coordViewModel, document.getElementById('step2'));
 }
-

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
desktop/core/static/ext/jqCron/jqCron.min.js


Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно