فهرست منبع

HUE-1839 [oozie] SLA form is not pretty on edit workflow action popup

Styled the advanced hidden tab on workflow, coordinator and wf action
Enrico Berti 12 سال پیش
والد
کامیت
b2f7d6d

+ 13 - 18
apps/oozie/src/oozie/templates/editor/action_utils.mako

@@ -72,32 +72,27 @@
 
   <div id="node-advanced-container" class="hide">
 
-        <div class="control-group">
-          <label class="control-label">
-              ${ _('SLA') }
-          </label>
-
+    <div class="control-group">
+      <label class="control-label">${ _('SLA Configuration') }</label>
+      <div class="controls">
           ${ utils.slaForm() }
-        </div>
-
-        <div class="control-group" data-bind="visible: credentials().length > 0">
-          <label class="control-label">
-              ${ _('Credentials') }
-          </label>
+      </div>
+    </div>
 
+    <div class="control-group" data-bind="visible: credentials().length > 0">
+      <label class="control-label">${ _('Credentials') }</label>
+      <div class="controls">
           <div data-bind="foreach: credentials">
-            <div class="controls">
-              <div class="span3">
-                <span></span>
-              </div>
-              <div class="span9">
-                <span data-bind="text: name" class="span2"/>
+            <div class="control-group control-row" style="margin-bottom: 2px">
+              <label class="control-label" data-bind="text: name"></label>
+              <div class="controls">
                 <input type="checkbox" data-bind="checked: value"/>
                 <span data-bind="visible: name() == 'hbase'">${ _('Requires hbase-site.xml in job-xml field') }</span>
               </div>
             </div>
           </div>
-        </div>
+      </div>
+    </div>
 
     <!-- ko if: $root.context().nodes && $root.context().error_node -->
     <div class="control-group">

+ 7 - 5
apps/oozie/src/oozie/templates/editor/edit_coordinator.mako

@@ -278,11 +278,13 @@ ${ layout.menubar(section='coordinators') }
             </div>
 
             <div id="advanced-container" class="hide">
-              <div id="slaEditord" class="control-group">
-                <label class="control-label">
-                  ${ _('SLA') }
-                </label>
-                ${ utils.slaForm() }
+              <div id="slaEditord">
+                <div class="control-group">
+                  <label class="control-label">${ _('SLA Configuration') }</label>
+                  <div class="controls">
+                      ${ utils.slaForm() }
+                  </div>
+                </div>
               </div>
             </div>
           </div>

+ 7 - 6
apps/oozie/src/oozie/templates/editor/edit_workflow.mako

@@ -117,12 +117,13 @@ ${ layout.menubar(section='workflows') }
         </div>
 
       <div id="advanced-container" class="hide">
-        <div id="slaEditord" class="control-group">
-          <label class="control-label">
-            ${ _('SLA') }
-          </label>
-
-          ${ utils.slaForm() }
+        <div id="slaEditord">
+          <div class="control-group">
+            <label class="control-label">${ _('SLA Configuration') }</label>
+            <div class="controls">
+                ${ utils.slaForm() }
+            </div>
+          </div>
         </div>
 
         % if user_can_edit_job:

+ 6 - 8
apps/oozie/src/oozie/templates/utils.inc.mako

@@ -261,11 +261,9 @@
 
 <%def name="slaForm()">
   <div data-bind="foreach: { 'data': sla, 'afterRender': addSLATextAndPlaceholder }">
-    <div class="controls">
-      <div class="span3">
-        <span></span>
-      </div>
-      <div class="span9">
+    <div class="control-group control-row" style="margin-bottom: 2px">
+      <label class="control-label" style="text-align: left"></label>
+      <div class="controls">
         <!-- ko if:  key() == 'enabled' -->
         <input type="checkbox" data-bind="checked: value"/>
         <!-- /ko -->
@@ -282,7 +280,7 @@
 <%def name="slaGlobal()">
   function addSLATextAndPlaceholder(elements, $data) {
     var SLA_TEXT = {
-      'enabled': {'niceName': '${ _("Enabled") }', 'placeHolder': ''},
+      'enabled': {'niceName': '${ _("Enable") }', 'placeHolder': ''},
       'nominal-time': {'niceName': '${ _("Nominal time") } *', 'placeHolder': '${"$"}{nominal_time}'},
       'should-start': {'niceName': '${ _("Should start") }', 'placeHolder': '${"$"}{10 * MINUTES}'},
       'should-end': {'niceName': '${ _("Should end") } *', 'placeHolder': '${"$"}{30 * MINUTES}'},
@@ -295,10 +293,10 @@
     var text = SLA_TEXT[$data.key()];
     if (text) {
       $(elements).find('input').attr('placeholder', text.placeHolder);
-      $(elements).find('span').text(text.niceName);
+      $(elements).find('.control-label').text(text.niceName);
     } else {
       $(elements).find('input').attr('placeholder', '');
-      $(elements).find('span').text('');
+      $(elements).find('.control-label').text('');
     }
   }
 </%def>