From 7ee5b8aec40634434f980c50f0c227c53d58cbad Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Thu, 17 Dec 2020 17:27:47 +0800
Subject: [PATCH] * Modify job view lable.

---
 module/job/view/view.html.php       | 22 +++++++++++-----------
 module/product/view/browse.html.php |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/module/job/view/view.html.php b/module/job/view/view.html.php
index 5edbb42ed5..4eefcc5aa0 100644
--- a/module/job/view/view.html.php
+++ b/module/job/view/view.html.php
@@ -26,25 +26,15 @@
   <?php $hasLog    = ($compile and !empty($compile->logs));?>
   <div class='tabs' id='tabsNav'>
     <ul class='nav nav-tabs'>
+      <li class='<?php echo ($hasResult || $hasLog) ? '' : 'active';?>'><a href='#info' data-toggle='tab'><?php echo $lang->job->lblBasic;?></a></li>
       <?php if($hasResult):?>
       <li class='active'><a href='#testresult' data-toggle='tab'><?php echo $lang->compile->result;?></a></li>
       <?php endif;?>
       <?php if($hasLog):?>
       <li class='<?php echo $hasResult ? '' : 'active';?>'><a href='#logs' data-toggle='tab'><?php echo $lang->compile->logs;?></a></li>
       <?php endif;?>
-      <li class='<?php echo ($hasResult || $hasLog) ? '' : 'active';?>'><a href='#info' data-toggle='tab'><?php echo $lang->job->lblBasic;?></a></li>
     </ul>
     <div class='tab-content'>
-      <?php if($hasResult):?>
-      <div id='testresult' class='tab-pane active'>
-        <?php include $this->app->getModuleRoot() . 'testtask/view/unitgroup.html.php';?>
-      </div>
-      <?php endif;?>
-      <?php if($hasLog):?>
-      <div id='logs' class='tab-pane <?php echo $hasResult ? '' : 'active';?>'>
-        <div class='main-content'><?php echo nl2br($compile->logs);?></div>
-      </div>
-      <?php endif;?>
       <div id='info' class='tab-pane <?php echo ($hasResult || $hasLog) ? '' : 'active';?>'>
         <table class='table table-data table-condensed table-borderless'>
           <tr>
@@ -113,6 +103,16 @@
           </tr>
         </table>
       </div>
+      <?php if($hasResult):?>
+      <div id='testresult' class='tab-pane active'>
+        <?php include $this->app->getModuleRoot() . 'testtask/view/unitgroup.html.php';?>
+      </div>
+      <?php endif;?>
+      <?php if($hasLog):?>
+      <div id='logs' class='tab-pane <?php echo $hasResult ? '' : 'active';?>'>
+        <div class='main-content'><?php echo nl2br($compile->logs);?></div>
+      </div>
+      <?php endif;?>
     </div>
   </div>
 </div>
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 97fec2787d..ef99c96744 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -251,8 +251,8 @@ js::set('foldAll',       $lang->project->treeLevel['root']);
             <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
             <ul class='dropdown-menu'>
               <?php
-              $class         = $canBatchClose ? '' : "class='disabled'";
-              $actionLink    = $this->createLink('story', 'batchClose', "productID=$productID&projectID=0");
+              $class      = $canBatchClose ? '' : "class='disabled'";
+              $actionLink = $this->createLink('story', 'batchClose', "productID=$productID&projectID=0");
               $misc = $canBatchClose ? "onclick=\"setFormAction('$actionLink')\"" : '';
               echo "<li $class>" . html::a('#', $lang->close, '', $misc) . "</li>";