Bläddra i källkod

HUE-1176 [jb] Harmonize fields of job listing

Romain Rigaux 8 år sedan
förälder
incheckning
399e443
1 ändrade filer med 14 tillägg och 12 borttagningar
  1. 14 12
      apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

+ 14 - 12
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -157,8 +157,8 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
               <!-- ko ifnot: jobs.loadingJobs() -->
               <!-- ko ifnot: jobs.loadingJobs() -->
                 <!-- ko if: $root.isMini -->
                 <!-- ko if: $root.isMini -->
                 <ul class="unstyled" id="jobsTable" data-bind="foreach: jobs.apps">
                 <ul class="unstyled" id="jobsTable" data-bind="foreach: jobs.apps">
-                  <li class="status-border" data-bind="css: {'completed': apiStatus() == 'SUCCEEDED', 'running': isRunning(), 'failed': apiStatus() == 'FAILED'}, attr:{ 'title': status }, click: fetchJob">
-                    <span class="muted pull-left" data-bind="momentFromNow: {data: submitted, interval: 10000, titleFormat: 'LLL'}"></span></td>
+                  <li class="status-border pointer" data-bind="css: {'completed': apiStatus() == 'SUCCEEDED', 'running': isRunning(), 'failed': apiStatus() == 'FAILED'}, click: fetchJob">
+                    <span class="muted pull-left" data-bind="momentFromNow: {data: submitted, interval: 10000, titleFormat: 'LLL'}"></span><span data-bind="text: status"></span></td>
                     <span class="muted pull-right" data-bind="text: duration().toHHMMSS()"></span>
                     <span class="muted pull-right" data-bind="text: duration().toHHMMSS()"></span>
                     <div class="clearfix"></div>
                     <div class="clearfix"></div>
                     <strong class="pull-left" data-bind="text: type"></strong>
                     <strong class="pull-left" data-bind="text: type"></strong>
@@ -176,27 +176,29 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
                   <thead>
                   <thead>
                   <tr>
                   <tr>
                     <th width="1%"><div class="select-all hueCheckbox fa" data-bind="hueCheckAll: { allValues: jobs.apps, selectedValues: jobs.selectedJobs }"></div></th>
                     <th width="1%"><div class="select-all hueCheckbox fa" data-bind="hueCheckAll: { allValues: jobs.apps, selectedValues: jobs.selectedJobs }"></div></th>
-                    <th>${_('Duration')}</th>
-                    <th>${_('Started')}</th>
-                    <th>${_('Type')}</th>
-                    <th>${_('Progress')}</th>
-                    <th>${_('Name')}</th>
-                    <th>${_('User')}</th>
-                    <th>${_('Id')}</th>
+                    <th width="15%">${_('Id')}</th>
+                    <th width="20%">${_('Name')}</th>
+                    <th width="3%">${_('Duration')}</th>
+                    <th width="10%">${_('Started')}</th>
+                    <th width="7%">${_('Type')}</th>
+                    <th width="5%">${_('Status')}</th>
+                    <th width="5%">${_('Progress')}</th>
+                    <th width="10%">${_('User')}</th>
                   </tr>
                   </tr>
                   </thead>
                   </thead>
                   <tbody data-bind="foreach: jobs.apps">
                   <tbody data-bind="foreach: jobs.apps">
-                    <tr class="status-border" data-bind="css: {'completed': apiStatus() == 'SUCCEEDED', 'running': isRunning(), 'failed': apiStatus() == 'FAILED'}, attr:{ 'title': status }, click: fetchJob">
+                    <tr class="status-border pointer" data-bind="css: {'completed': apiStatus() == 'SUCCEEDED', 'running': isRunning(), 'failed': apiStatus() == 'FAILED'}, click: fetchJob">
                       <td>
                       <td>
                         <div class="hueCheckbox fa" data-bind="click: function() {}, clickBubble: false, multiCheck: '#jobsTable', value: $data, hueChecked: $parent.jobs.selectedJobs"></div>
                         <div class="hueCheckbox fa" data-bind="click: function() {}, clickBubble: false, multiCheck: '#jobsTable', value: $data, hueChecked: $parent.jobs.selectedJobs"></div>
                       </td>
                       </td>
+                      <td data-bind="text: id"></td>
+                      <td data-bind="text: name"></td>
                       <td data-bind="text: duration().toHHMMSS()"></td>
                       <td data-bind="text: duration().toHHMMSS()"></td>
                       <td data-bind="moment: {data: submitted, format: 'LLL'}"></td>
                       <td data-bind="moment: {data: submitted, format: 'LLL'}"></td>
                       <td data-bind="text: type"></td>
                       <td data-bind="text: type"></td>
+                      <td data-bind="text: status"></td>
                       <td data-bind="text: progress"></td>
                       <td data-bind="text: progress"></td>
-                      <td data-bind="text: name"></td>
                       <td data-bind="text: user"></td>
                       <td data-bind="text: user"></td>
-                      <td data-bind="text: id"></td>
                     </tr>
                     </tr>
                   </tbody>
                   </tbody>
                 </table>
                 </table>