From b5475f51b214f37ce7fd70b4796fe20a855ea8ba Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Mon, 11 Jul 2022 03:28:17 +0000
Subject: [PATCH 1/2] * Finish task #60394 #60392 #60389.

---
 module/admin/view/safe.html.php    | 10 +++++++---
 module/branch/css/manage.css       |  2 ++
 module/branch/view/manage.html.php |  3 ++-
 module/product/control.php         |  2 +-
 module/story/view/create.html.php  |  1 -
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php
index 5e8370764d..6de6484323 100644
--- a/module/admin/view/safe.html.php
+++ b/module/admin/view/safe.html.php
@@ -10,7 +10,11 @@
  * @link        http://www.zentao.net
  */
 ?>
-<style>.table-form>tbody>tr>th{width:118px !important;}</style>
+<style>
+.table-form>tbody>tr>th {width:118px !important;}
+#mode1Rule .icon {color:#2667E3; margin-right: 8px;}
+.notice {color:#2667E3; margin-left: 12px;}
+</style>
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
@@ -36,11 +40,11 @@
           <tr>
             <th class='thWidth'><?php echo $lang->admin->safe->password?></th>
             <td class='w-250px'><?php echo html::radio('mode', $lang->admin->safe->modeList, isset($config->safe->mode) ? $config->safe->mode : 0, "onclick=showModeRule(this.value)")?></td>
-            <td><?php echo $lang->admin->safe->noticeMode?></td>
+            <td class='notice'><?php echo $lang->admin->safe->noticeMode?></td>
           </tr>
           <tr id='mode1Rule' class='hidden'>
             <th></th>
-            <td colspan='2'><span style='color:#03b8cf;font-weight:bold;'><?php echo $lang->admin->safe->modeRuleList[1] . $lang->admin->safe->noticeStrong;?></span></td>
+            <td colspan='2'><span style='color:#5E626D;font-weight:bold;font-size:13px;'><i class="icon icon-exclamation-sign"></i><?php echo $lang->admin->safe->modeRuleList[1] . $lang->admin->safe->noticeStrong;?></span></td>
           </tr>
           <tr id='mode2Rule' class='hidden'>
             <th></th>
diff --git a/module/branch/css/manage.css b/module/branch/css/manage.css
index 55102d185f..10cba3ac05 100644
--- a/module/branch/css/manage.css
+++ b/module/branch/css/manage.css
@@ -9,3 +9,5 @@ td.branchName > span {vertical-align: middle;}
 
 #mergeBranch .form-actions {padding-top: 20px;}
 .modal-body {padding-top: 0;}
+.tips {background-color: #ffffff; max-width: 600px; float: left;}
+.icon-exclamation-sign.icon {float: left; margin-top: 40px; color: #2667E3; font-size: 24px;}
diff --git a/module/branch/view/manage.html.php b/module/branch/view/manage.html.php
index 8287f4b387..aaf50d33b8 100644
--- a/module/branch/view/manage.html.php
+++ b/module/branch/view/manage.html.php
@@ -153,7 +153,8 @@
           <table class='table table-form'>
             <tr>
               <td colspan="8">
-                <div class="alert alert-info no-margin">
+                <i class="icon-exclamation-sign icon"></i>
+                <div class="alert no-margin tips">
                   <p><?php echo $lang->branch->mergedMain;?></p>
                   <p><?php echo $lang->branch->mergeTips;?></p>
                   <p><?php echo $lang->branch->targetBranchTips;?></p>
diff --git a/module/product/control.php b/module/product/control.php
index 31991f072e..b36190efde 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -1100,7 +1100,7 @@ class product extends control
         /* Get product reviewers. */
         $product          = $this->product->getByID($productID);
         $productReviewers = $product->reviewer;
-        if(!$productReviewers and $product->acl != 'open') $productReviewers = $this->loadModel('user')->getProductViewListUsers($product, '', '', '');
+        if(!$productReviewers and $product->acl != 'open') $productReviewers = $this->loadModel('user')->getProductViewListUsers($product, '', '', '', '');
 
         $storyReviewers = '';
         if($storyID)
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index bce9c0c014..cf519dbeda 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -13,7 +13,6 @@
 <?php include './header.html.php';?>
 <style>
 #product_chosen {border-right:1px solid #dcdcdc;}
-#branch_chosen>a {border-left:0px;}
 </style>
 <?php js::set('page', 'create');?>
 <?php js::set('holders', $lang->story->placeholder); ?>

From d2fe52d3b239287009934849b1936f8ff8efdfed Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Mon, 11 Jul 2022 06:55:36 +0000
Subject: [PATCH 2/2] * Finish task #60394 #60392 #60389.

---
 module/admin/view/safe.html.php | 4 ++--
 module/branch/css/manage.css    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php
index 6de6484323..4de89dacb2 100644
--- a/module/admin/view/safe.html.php
+++ b/module/admin/view/safe.html.php
@@ -12,7 +12,7 @@
 ?>
 <style>
 .table-form>tbody>tr>th {width:118px !important;}
-#mode1Rule .icon {color:#2667E3; margin-right: 8px;}
+.icon-exclamation-sign.icon {color:#2667E3; margin-right: 8px;}
 .notice {color:#2667E3; margin-left: 12px;}
 </style>
 <?php include '../../common/view/header.html.php';?>
@@ -48,7 +48,7 @@
           </tr>
           <tr id='mode2Rule' class='hidden'>
             <th></th>
-            <td colspan='2'><span style='color:#03b8cf;font-weight:bold;'><?php echo $lang->admin->safe->modeRuleList[2] . $lang->admin->safe->noticeStrong;?></span></td>
+            <td colspan='2'><span style='color:#5E626D;font-weight:bold;font-size:13px;'><i class="icon icon-exclamation-sign"></i><?php echo $lang->admin->safe->modeRuleList[2] . $lang->admin->safe->noticeStrong;?></span></td>
           </tr>
           <tr>
             <th><?php echo $lang->admin->safe->weak?></th>
diff --git a/module/branch/css/manage.css b/module/branch/css/manage.css
index 10cba3ac05..5110e64cb2 100644
--- a/module/branch/css/manage.css
+++ b/module/branch/css/manage.css
@@ -9,5 +9,5 @@ td.branchName > span {vertical-align: middle;}
 
 #mergeBranch .form-actions {padding-top: 20px;}
 .modal-body {padding-top: 0;}
-.tips {background-color: #ffffff; max-width: 600px; float: left;}
+.tips {background-color: #ffffff; max-width: 615px; float: left;}
 .icon-exclamation-sign.icon {float: left; margin-top: 40px; color: #2667E3; font-size: 24px;}