From 8391cf56797d5e435ddd2a53ab0d272c367b7531 Mon Sep 17 00:00:00 2001
From: zhaoke <zhaoke@easycorp.ltd>
Date: Mon, 13 Feb 2023 07:33:10 +0000
Subject: [PATCH] * Fix bug 31967.

---
 module/testcase/css/browse.css           | 1 +
 module/testcase/lang/de.php              | 2 +-
 module/testcase/lang/en.php              | 2 +-
 module/testcase/lang/fr.php              | 2 +-
 module/testcase/lang/zh-cn.php           | 2 +-
 module/testcase/view/automation.html.php | 2 +-
 module/testcase/view/caseheader.html.php | 7 ++-----
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/module/testcase/css/browse.css b/module/testcase/css/browse.css
index 3695c8e51c..9764be43be 100644
--- a/module/testcase/css/browse.css
+++ b/module/testcase/css/browse.css
@@ -30,3 +30,4 @@ tbody > tr > td   .icon-share {font-size: 9px;}
 
 #mainMenu .pull-left .dividing-line {margin: 7px 5px 0 0;}
 .btn-toolbar>.btn, .btn-toolbar>.btn-group, .btn-toolbar>.dropdown {margin-right: 5px;}
+.checkbox-primary{float: left;}
diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php
index 2f5bb81309..6141fe951c 100644
--- a/module/testcase/lang/de.php
+++ b/module/testcase/lang/de.php
@@ -265,6 +265,6 @@ $lang->testcase->featureBar['browse']['wait']        = 'Wartend';
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
 $lang->testcase->featureBar['browse']['group']       = 'Group View';
 $lang->testcase->featureBar['browse']['zerocase']    = 'Zero Case Story';
-$lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
 $lang->testcase->featureBar['browse']['suite']       = 'Suite';
+$lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 5615527217..742b76eef3 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -265,6 +265,6 @@ $lang->testcase->featureBar['browse']['wait']        = 'Waiting';
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
 $lang->testcase->featureBar['browse']['group']       = 'Group View';
 $lang->testcase->featureBar['browse']['zerocase']    = 'Zero Case Story';
-$lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
 $lang->testcase->featureBar['browse']['suite']       = 'Suite';
+$lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php
index d124bc8831..ae5af1a001 100644
--- a/module/testcase/lang/fr.php
+++ b/module/testcase/lang/fr.php
@@ -265,6 +265,6 @@ $lang->testcase->featureBar['browse']['wait']        = 'En Attente';
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
 $lang->testcase->featureBar['browse']['group']       = 'Group View';
 $lang->testcase->featureBar['browse']['zerocase']    = 'Zero Case Story';
-$lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
 $lang->testcase->featureBar['browse']['suite']       = 'Suite';
+$lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 956d9281f3..7eff48ce95 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -265,6 +265,6 @@ $lang->testcase->featureBar['browse']['wait']        = '待评审';
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
 $lang->testcase->featureBar['browse']['group']       = '分组查看';
 $lang->testcase->featureBar['browse']['zerocase']    = "零用例{$lang->SRCommon}";
-$lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
 $lang->testcase->featureBar['browse']['suite']       = '套件';
+$lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/view/automation.html.php b/module/testcase/view/automation.html.php
index 0bfc8d1f25..07aff412c9 100644
--- a/module/testcase/view/automation.html.php
+++ b/module/testcase/view/automation.html.php
@@ -18,7 +18,7 @@
   <div class='center-block'>
     <div class='main-header'>
       <h2>
-        <span title='<?php echo $lang->zanode->automation;?>'><?php echo $lang->zanode->automation;?></span>
+        <span title='<?php echo $lang->zanode->automation;?>'><?php echo $lang->zanode->automation;?>&nbsp;<icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='bottom' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->zanode->automationTips;?>"></icon></span>
       </h2>
     </div>
     <form method='post' target='hiddenwin'>
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index af58afa9b1..32e9a150fb 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -196,13 +196,10 @@
     <?php if(!empty($productID)): ?>
     <div class='btn-group'>
       <?php common::printLink('testcase', 'automation', "productID=$productID", "<i class='icon-wrench muted'> </i>" . $lang->testcase->automation, '', "class='btn btn-link iframe' data-width='50%'", true, true)?>
-      <?php if(common::hasPriv('testcase', 'automation')):?>
-      <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='bottom' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->zanode->automationTips;?>"></icon>
-      <?php endif;?>
     </div>
     <div class='btn-group'>
       <button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown'>
-        <i class='icon icon-export muted'></i> <?php echo $lang->export ?>
+        <i class='icon icon-export muted'></i> 
         <span class='caret'></span>
       </button>
       <ul class='dropdown-menu pull-right' id='exportActionMenu'>
@@ -223,7 +220,7 @@
     <?php if(empty($productID) or common::canModify('product', $product)):?>
     <?php if(!empty($productID) and (common::hasPriv('testcase', 'import') or common::hasPriv('testcase', 'importFromLib'))): ?>
     <div class='btn-group'>
-      <button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown' id='importAction'><i class='icon icon-import muted'></i> <?php echo $lang->import ?><span class='caret'></span></button>
+      <button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown' id='importAction'><i class='icon icon-import muted'></i> <span class='caret'></span></button>
       <ul class='dropdown-menu pull-right' id='importActionMenu'>
       <?php
       if(common::hasPriv('testcase', 'import')) echo "<li>" . html::a($this->createlink('testcase', 'import', "productID=$productID&branch=$branch"), $lang->testcase->fileImport, '', "class='export' data-app={$app->tab}") . "</li>";