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

[oozie] Add informative message about "to" field in kill node editor

Abraham Elmahrek 12 жил өмнө
parent
commit
487a3df

+ 11 - 12
apps/oozie/src/oozie/templates/editor/action_utils.mako

@@ -88,22 +88,21 @@
     </div>
   </div>
   <!-- /ko -->
-% endif
 
-<hr/>
+  <hr/>
+% endif
 
 <div class="control-group">
-  <label class="control-label"></label>
   <div class="controls">
-  <p class="alert alert-info span7">
-    % if node_type != 'fs':
-      ${ _('All the paths are relative to the deployment directory. They can be absolute but this is not recommended.') }
-    % else:
-      ${ _('All the paths need to be absolute.') }
-    % endif
-    <br/>
-    ${ _('You can parameterize values using case sensitive') } <code>${"${"}parameter}</code>.
-  </p>
+    <p class="alert alert-info span7">
+      % if node_type != 'fs':
+        ${ _('All the paths are relative to the deployment directory. They can be absolute but this is not recommended.') }
+      % else:
+        ${ _('All the paths need to be absolute.') }
+      % endif
+      <br/>
+      ${ _('You can parameterize values using case sensitive') } <code>${"${"}parameter}</code>.
+    </p>
   % if node_type == 'ssh':
     <br style="clear: both" />
     <p class="alert alert-warn span5">

+ 9 - 4
apps/oozie/src/oozie/templates/editor/edit_workflow.mako

@@ -119,8 +119,13 @@ ${ layout.menubar(section='workflows') }
       </fieldset>
     </div>
 
-    <div id="editKill" class="section hide span12">
-      <div class="alert alert-info"><h3>${ _('Kill node') }</h3></div>
+    <div id="editKill" class="section hide">
+      <div class="alert alert-info">
+        <h3>${ _('Kill node') }</h3>
+        <p>${_('If the "to" field has content, then the workflow editor assumes that the defined email action is to be placed before the kill action.')}</p>
+        <p data-bind="if: context().node().to"><i class="icon-check"></i>&nbsp;${_('Email action before kill node enabled.')}</p>
+        <p data-bind="ifnot: context().node().to"><i class="icon-check"></i>&nbsp;${_('Email action before kill node disabled.')}</p>
+      </div>
       <fieldset data-bind="with: context().node">
         % for form_info in action_forms:
           % if form_info[0] == 'email':
@@ -800,7 +805,7 @@ $('#importJobsub').on('click', '.action-row', function(e) {
 
           workflow.el.trigger('workflow:rebuild');
           routie('editWorkflow');
-          $.jHueNotify.success("${ _('Action imported at the top of the workflow.') } ");
+          $.jHueNotify.info("${ _('Action imported at the top of the workflow.') } ");
         } else {
           $.jHueNotify.error("${ _('Received invalid response from server: ') } " + JSON.stringify(data));
         }
@@ -841,7 +846,7 @@ $('#importOozieAction').on('click', '.action-row', function(e) {
 
     workflow.el.trigger('workflow:rebuild');
     routie('editWorkflow');
-    $.jHueNotify.success("${ _('Action imported at the top of the workflow.') } ");
+    $.jHueNotify.info("${ _('Action imported at the top of the workflow.') } ");
   }
 });
 

+ 4 - 0
apps/oozie/static/css/workflow.css

@@ -37,6 +37,10 @@ ul {
   padding: 5px;
 }
 
+#editKill [class*="span"] {
+    margin-left: 0;
+}
+
 .action {
   border: 1px solid #DDD;
   padding: 0px;