From ead006c413633ecffbd207ff335675432f29a124 Mon Sep 17 00:00:00 2001
From: Guan Xiying <guanxiying@easycorp.ltd>
Date: Mon, 26 Jul 2021 11:50:05 +0800
Subject: [PATCH] * Adjust styles of job engine.

---
 module/job/view/browse.html.php | 22 +++++++++++-----------
 module/job/view/edit.html.php   |  5 +++++
 module/job/view/view.html.php   |  6 +++++-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/module/job/view/browse.html.php b/module/job/view/browse.html.php
index f4c3145e21..d423dba334 100644
--- a/module/job/view/browse.html.php
+++ b/module/job/view/browse.html.php
@@ -24,28 +24,28 @@
   <form class='main-table' id='ajaxForm' method='post'>
     <table id='jobList' class='table has-sort-head table-fixed'>
       <thead>
-        <tr class='text-center'>
+        <tr class='text-left'>
           <?php $vars = "orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
-          <th class='w-60px'><?php common::printOrderLink('id', $orderBy, $vars, $lang->job->id);?></th>
-          <th class='text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->job->name);?></th>
-          <th class='w-150px text-left'><?php common::printOrderLink('repo', $orderBy, $vars, $lang->job->repo);?></th>
+          <th class='w-60px text-center'><?php common::printOrderLink('id', $orderBy, $vars, $lang->job->id);?></th>
+          <th><?php common::printOrderLink('name', $orderBy, $vars, $lang->job->name);?></th>
+          <th class='w-150px'><?php common::printOrderLink('repo', $orderBy, $vars, $lang->job->repo);?></th>
+          <th class='w-100px'><?php common::printOrderLink('engine', $orderBy, $vars, $lang->job->engine);?></th>
           <th class='w-80px'><?php common::printOrderLink('frame', $orderBy, $vars, $lang->job->frame);?></th>
-          <th class='w-80px'><?php common::printOrderLink('engine', $orderBy, $vars, $lang->job->engine);?></th>
-          <th class='w-250px text-left'><?php common::printOrderLink('server', $orderBy, $vars, $lang->job->buildSpec);?></th>
+          <th class='w-250px'><?php common::printOrderLink('server', $orderBy, $vars, $lang->job->buildSpec);?></th>
           <th class='text-left'><?php echo $lang->job->triggerType;?></th>
           <th class='w-100px text-center'><?php common::printOrderLink('lastStatus', $orderBy, $vars, $lang->job->lastStatus);?></th>
-          <th class='w-130px text-left'><?php common::printOrderLink('lastExec', $orderBy, $vars, $lang->job->lastExec);?></th>
+          <th class='w-130px'><?php common::printOrderLink('lastExec', $orderBy, $vars, $lang->job->lastExec);?></th>
           <th class='w-120px c-actions-3'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody class='text-left'>
         <?php foreach($jobList as $id => $job):?>
-        <tr>
-          <td class='text-center'><?php echo $id; ?></td>
-          <td title='<?php echo $job->name; ?>'><?php echo common::hasPriv('job', 'view') ? html::a($this->createLink('job', 'view', "jobID={$job->id}", 'html', true), $job->name, '', "class='iframe' data-width='90%'") : $job->name;?></td>
+        <tr class='text-left'>
+          <td><?php echo $id; ?></td>
+          <td class='text-left' title='<?php echo $job->name; ?>'><?php echo common::hasPriv('job', 'view') ? html::a($this->createLink('job', 'view', "jobID={$job->id}", 'html', true), $job->name, '', "class='iframe' data-width='90%'") : $job->name;?></td>
           <td title='<?php echo $job->repoName; ?>'><?php echo $job->repoName; ?></td>
+          <td><?php echo zget($lang->job->engineList, $job->engine);?></td>
           <td><?php echo zget($lang->job->frameList, $job->frame);?></td>
-          <td><?php echo $job->engine;?></td>
           <?php if(strtolower($job->engine) == 'gitlab') $job->pipeline = $this->job->getGitlabProjectName($job->id);?>
           <?php $jenkins = urldecode($job->pipeline) . '@' . $job->jenkinsName;?>
           <td title='<?php echo $jenkins; ?>'><?php echo $jenkins; ?></td>
diff --git a/module/job/view/edit.html.php b/module/job/view/edit.html.php
index 781b7227db..419e0fa8e2 100644
--- a/module/job/view/edit.html.php
+++ b/module/job/view/edit.html.php
@@ -31,6 +31,11 @@
             <td class='required'><?php echo html::input('name', $job->name, "class='form-control'"); ?></td>
             <td colspan="2" ></td>
           </tr>
+          <tr>
+            <th><?php echo $lang->job->engine; ?></th>
+            <td><?php echo html::select('engine', $lang->job->engineList, $job->engine, "class='form-control chosen'");?>
+            </td>
+          </tr>
           <tr>
             <th><?php echo $lang->job->repo; ?></th>
             <td><?php echo html::select('repo', $repoPairs, $job->repo, "class='form-control chosen'");?>
diff --git a/module/job/view/view.html.php b/module/job/view/view.html.php
index ee280691db..ee94e781a5 100644
--- a/module/job/view/view.html.php
+++ b/module/job/view/view.html.php
@@ -38,7 +38,11 @@
       <div id='info' class='tab-pane <?php echo ($hasResult || $hasLog) ? '' : 'active';?>'>
         <table class='table table-data table-condensed table-borderless'>
           <tr>
-            <th class='w-100px strong'><?php echo $lang->job->repo;?></th>
+            <th class='w-100px'><?php echo $lang->job->engine;?></th>
+            <td><?php echo zget($lang->job->engineList, $job->engine);?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->job->repo;?></th>
             <td><?php echo $repo->name;?></td>
           </tr>
           <tr>