Bläddra i källkod

[oozie] Remove some fields in the workflow dashboard tables

Need to add some air.
Romain Rigaux 11 år sedan
förälder
incheckning
a9c207b1fa
1 ändrade filer med 15 tillägg och 27 borttagningar
  1. 15 27
      apps/oozie/src/oozie/templates/dashboard/list_oozie_workflows.mako

+ 15 - 27
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflows.mako

@@ -59,15 +59,13 @@ ${ layout.menubar(section='workflows', dashboard=True) }
     <table class="table table-condensed" id="running-table">
       <thead>
         <tr>
-          <th width="12%">${ _('Submission') }</th>
+          <th width="15%">${ _('Submission') }</th>
           <th width="5%">${ _('Status') }</th>
-          <th width="20%">${ _('Name') }</th>
-          <th width="5%">${ _('Progress') }</th>
-          <th width="5%">${ _('Submitter') }</th>
-          <th width="13%">${ _('Created') }</th>
-          <th width="13%">${ _('Last Modified') }</th>
-          <th width="2%">${ _('Run') }</th>
-          <th width="15%">${ _('Id') }</th>
+          <th width="21%">${ _('Name') }</th>
+          <th width="7%">${ _('Progress') }</th>
+          <th width="7%">${ _('Submitter') }</th>
+          <th width="15%">${ _('Last Modified') }</th>
+          <th width="20%">${ _('Id') }</th>
           <th width="10%">${ _('Action') }</th>
         </tr>
       </thead>
@@ -83,14 +81,12 @@ ${ layout.menubar(section='workflows', dashboard=True) }
     <table class="table table-condensed" id="completed-table" data-tablescroller-disable="true">
       <thead>
         <tr>
-          <th width="12%">${ _('Completion') }</th>
-          <th width="5%">${ _('Status') }</th>
+          <th width="15%">${ _('Completion') }</th>
+          <th width="7%">${ _('Status') }</th>
           <th width="25%">${ _('Name') }</th>
-          <th width="5%">${ _('Duration') }</th>
-          <th width="5%">${ _('Submitter') }</th>
-          <th width="13%">${ _('Created') }</th>
-          <th width="13%">${ _('Last Modified') }</th>
-          <th width="2%">${ _('Run') }</th>
+          <th width="7%">${ _('Duration') }</th>
+          <th width="10%">${ _('Submitter') }</th>
+          <th width="15%">${ _('Last Modified') }</th>
           <th width="25%">${ _('Id') }</th>
         </tr>
       </thead>
@@ -152,11 +148,9 @@ ${ layout.menubar(section='workflows', dashboard=True) }
         { "sType":"date" },
         null,
         null,
-        { "sSortDataType":"dom-sort-value", "sType":"numeric" },
-        null,
-        null,
         null,
         null,
+        { "sSortDataType":"dom-sort-value", "sType":"numeric" },
         null,
         { "bSortable":false }
       ],
@@ -190,11 +184,9 @@ ${ layout.menubar(section='workflows', dashboard=True) }
         { "sType":"date" },
         null,
         null,
-        { "sSortDataType":"dom-sort-value", "sType":"numeric" },
-        null,
-        null,
         null,
         null,
+        { "sSortDataType":"dom-sort-value", "sType":"numeric" },
         null
       ],
       "aaSorting":[
@@ -382,11 +374,9 @@ ${ layout.menubar(section='workflows', dashboard=True) }
                     wf.appName,
                     '<div class="progress"><div class="' + wf.progressClass + '" style="width:' + wf.progress + '%">' + wf.progress + '%</div></div>',
                     wf.user,
-                    emptyStringIfNull(wf.created),
                     emptyStringIfNull(wf.lastModTime),
-                    wf.run,
                     '<a href="' + wf.absoluteUrl + '" data-row-selector="true">' + wf.id + '</a>',
-                    killCell + " " + (['RUNNING', 'PREP', 'WAITING'].indexOf(wf.status) > -1?suspendCell:resumeCell)
+                    killCell + " " + (['RUNNING', 'PREP', 'WAITING'].indexOf(wf.status) > -1 ? suspendCell : resumeCell)
                   ]);
                 }
                 catch (error) {
@@ -397,7 +387,7 @@ ${ layout.menubar(section='workflows', dashboard=True) }
             else {
               runningTable.fnUpdate('<span class="' + wf.statusClass + '">' + wf.status + '</span>', foundRow, 1, false);
               runningTable.fnUpdate('<div class="progress"><div class="' + wf.progressClass + '" style="width:' + wf.progress + '%">' + wf.progress + '%</div></div>', foundRow, 3, false);
-              runningTable.fnUpdate(killCell + " " + (['RUNNING', 'PREP', 'WAITING'].indexOf(wf.status) > -1?suspendCell:resumeCell), foundRow, 9, false);
+              runningTable.fnUpdate(killCell + " " + (['RUNNING', 'PREP', 'WAITING'].indexOf(wf.status) > -1?suspendCell:resumeCell), foundRow, 7, false);
             }
           });
         }
@@ -425,9 +415,7 @@ ${ layout.menubar(section='workflows', dashboard=True) }
               '<span class="' + wf.statusClass + '">' + wf.status + '</span>', decodeURIComponent(wf.appName),
               emptyStringIfNull(wf.duration),
               wf.user,
-              emptyStringIfNull(wf.created),
               emptyStringIfNull(wf.lastModTime),
-              wf.run,
               '<a href="' + wf.absoluteUrl + '" data-row-selector="true">' + wf.id + '</a>'
             ], false);
           }