瀏覽代碼

[oozie] Add loading button to edit workflow

Smaller rows for list worflows/coordinators
Romain Rigaux 12 年之前
父節點
當前提交
d5110c63e0

+ 4 - 4
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinators.mako

@@ -58,9 +58,9 @@ ${layout.menubar(section='dashboard')}
     <table class="table table-condensed" id="running-table">
       <thead>
         <tr>
-          <th width="10%">${ _('Next submission') }</th>
+          <th width="105%">${ _('Next submission') }</th>
           <th width="10%">${ _('Status') }</th>
-          <th width="30%">${ _('Name') }</th>
+          <th width="25%">${ _('Name') }</th>
           <th width="10%">${ _('Progress') }</th>
           <th width="15%">${ _('Submitter') }</th>
           <th width="15%">${ _('Id') }</th>
@@ -78,9 +78,9 @@ ${layout.menubar(section='dashboard')}
     <table class="table table-condensed" id="completed-table" data-tablescroller-disable="true">
       <thead>
         <tr>
-          <th width="10%">${ _('Completion') }</th>
+          <th width="15%">${ _('Completion') }</th>
           <th width="10%">${ _('Status') }</th>
-          <th width="35%">${ _('Name') }</th>
+          <th width="30%">${ _('Name') }</th>
           <th width="10%">${ _('Duration') }</th>
           <th width="15%">${ _('Submitter') }</th>
           <th width="20%">${ _('Id') }</th>

+ 4 - 4
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflows.mako

@@ -59,11 +59,11 @@ ${ layout.menubar(section='dashboard') }
     <table class="table table-condensed" id="running-table">
       <thead>
         <tr>
-          <th width="10%">${ _('Submission') }</th>
+          <th width="15%">${ _('Submission') }</th>
           <th width="10%">${ _('Status') }</th>
           <th width="30%">${ _('Name') }</th>
           <th width="10%">${ _('Progress') }</th>
-          <th width="15%">${ _('Submitter') }</th>
+          <th width="10%">${ _('Submitter') }</th>
           <th width="15%">${ _('Id') }</th>
           <th width="10%">${ _('Action') }</th>
         </tr>
@@ -80,11 +80,11 @@ ${ layout.menubar(section='dashboard') }
     <table class="table table-condensed" id="completed-table" data-tablescroller-disable="true">
       <thead>
         <tr>
-          <th width="10%">${ _('Completion') }</th>
+          <th width="15%">${ _('Completion') }</th>
           <th width="10%">${ _('Status') }</th>
           <th width="35%">${ _('Name') }</th>
           <th width="10%">${ _('Duration') }</th>
-          <th width="15%">${ _('Submitter') }</th>
+          <th width="10%">${ _('Submitter') }</th>
           <th width="20%">${ _('Id') }</th>
         </tr>
       </thead>

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

@@ -323,7 +323,7 @@
 
       <div class="modal-footer">
         <a class="btn cancelButton" href="javascript:void(0);">Cancel</a>
-        <button class="btn btn-primary doneButton" type="button" data-bind="visible: !$root.context().read_only">${ _('Done')}</button>
+        <button class="btn btn-primary doneButton disable-feedback" type="button" data-bind="visible: !$root.context().read_only">${ _('Done')}</button>
       </div>
 
     </form>

+ 3 - 1
apps/oozie/src/oozie/templates/editor/edit_workflow.mako

@@ -244,7 +244,7 @@ ${ layout.menubar(section='workflows') }
 
   <div class="form-actions center">
   % if user_can_edit_job:
-    <button data-bind="disable: workflow.read_only, visible: !workflow.read_only(), click: function() { workflow.loading(true); workflow.save({ success: workflow_save_success, error: workflow_save_error }) }" class="btn btn-primary disable-feedback">${ _('Save') }</button>
+    <button data-bind="disable: workflow.read_only, visible: !workflow.read_only(), click: function() { workflow.loading(true); workflow.save({ success: workflow_save_success, error: workflow_save_error }) }" class="btn btn-primary" id="btn-save-wf">${ _('Save') }</button>
   % endif
     <a href="${ url('oozie:list_workflows') }" class="btn">${ _('Back') }</a>
   </div>
@@ -420,11 +420,13 @@ function workflow_save_success(data) {
   workflow.reload(data.data);
   workflow.is_dirty( false );
   workflow.loading(false);
+  $("#btn-save-wf").button('reset');
 }
 
 function workflow_save_error(data) {
   $.jHueNotify.error("${ _('Could not save workflow') }");
   workflow.loading(false);
+  $("#btn-save-wf").button('reset');
 }
 
 function workflow_load_success(data) {