Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/master_zhouxudong_60389' into 'master'

Browse Source 
Sprint/master zhouxudong 60389

See merge request easycorp/zentaopms!4451
This commit is contained in:
王怡栋
2022-07-11 07:56:48 +00:00
parent 4c3d59333a d2fe52d3b2
commit 7bc7fe0e54
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/admin/view/safe.html.php
+8 -4
View File
@@ -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;}
.icon-exclamation-sign.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,15 +40,15 @@
<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>
<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>
module/branch/css/manage.css
+2
View File
@@ -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: 615px; float: left;}
.icon-exclamation-sign.icon {float: left; margin-top: 40px; color: #2667E3; font-size: 24px;}
module/branch/view/manage.html.php
+2 -1
View File
@@ -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>
module/product/control.php
+1 -1
View File
@@ -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)
module/story/view/create.html.php
-1
View File
@@ -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); ?>