Merge pull request #421 from tojonmz/job-detail-consistency

Bug 1142994 - Consolidate terms and order in Job details panel
mozilla · Mar 13, 2015 · f252e55 · f252e55
2 parents d22ea89 + f362fbf
commit f252e55
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/ui/plugins/pluginpanel.html b/ui/plugins/pluginpanel.html
@@ -171,13 +171,13 @@
         </li>
 
         <li class="small">
-          <label>Request Time:</label><span> {{visibleTimeFields.requestTime}}</span>
+          <label>Requested:</label><span> {{visibleTimeFields.requestTime}}</span>
         </li>
         <li class="small" ng-show="visibleTimeFields.startTime">
-          <label>Start Time:</label><span> {{visibleTimeFields.startTime}}</span>
+          <label>Started:</label><span> {{visibleTimeFields.startTime}}</span>
         </li>
         <li class="small" ng-show="visibleTimeFields.endTime">
-          <label>End Time:</label><span> {{visibleTimeFields.endTime}}</span>
+          <label>Ended:</label><span> {{visibleTimeFields.endTime}}</span>
         </li>
         <li class="small">
           <label>Duration:</label><span> {{visibleTimeFields.duration}}</span>

diff --git a/ui/plugins/similar_jobs/main.html b/ui/plugins/similar_jobs/main.html
@@ -3,7 +3,7 @@
                 <table class="table table-super-condensed table-bordered table-hover">
                     <thead>
                         <tr>
-                            <th>Job</th><th>Push timestamp</th><th>Author</th><th>Revision</th>
+                            <th>Job</th><th>Pushed</th><th>Author</th><th>Revision</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -79,22 +79,22 @@
                             </td>
                         </tr>
                         <tr>
-                            <th>Options</th>
+                            <th>Build option</th>
                             <td>
                                 {{ similar_job_selected.platform_option }}
                             </td>
                         </tr>
+                        <tr><th>Job name</th><td>{{ similar_job_selected.job_type_name }}</td></tr>
                         <tr>
-                            <th>Duration</th>
+                            <th>Started</th>
                             <td>
-                                {{ similar_job_selected.duration >= 0 ? similar_job_selected.duration + ' minute(s)' : 'unknown' }}
+                                {{ similar_job_selected.start_timestamp*1000 | date:'EEE MMM d, H:mm:ss' }}
                             </td>
                         </tr>
-                        <tr><th>Job Name</th><td>{{ similar_job_selected.job_type_name }}</td></tr>
                         <tr>
-                            <th>Start time</th>
+                            <th>Duration</th>
                             <td>
-                                {{ similar_job_selected.start_timestamp*1000 | date:'EEE MMM d, H:mm:ss' }}
+                                {{ similar_job_selected.duration >= 0 ? similar_job_selected.duration + ' minute(s)' : 'unknown' }}
                             </td>
                         </tr>
                         <tr>