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

Merge branch 'sprint214_leiyong_task_60375' into 'master'

Browse Source 
Sprint214 leiyong task 60375

See merge request easycorp/zentaopms!4456
This commit is contained in:
孙广明
2022-07-12 00:31:43 +00:00
parent 62673467ef e30505ddb7
commit 5fcb433409
13 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/custom/css/execution.css
+2
View File
@@ -0,0 +1,2 @@
#readOnlyOfExecution {font-size: 13px; color: #5e626d;}
#readOnlyOfExecution i {font-size: 14px; color: #0075ff; margin-right: 3px;}
module/custom/css/kanban.css
+2
View File
@@ -0,0 +1,2 @@
#readOnlyOfKanban {font-size: 13px; color: #5e626d;}
#readOnlyOfKanban i {font-size: 14px; color: #0075ff; margin-right: 3px;}
module/custom/css/product.css
+2
View File
@@ -0,0 +1,2 @@
#readOnlyOfProduct {font-size: 13px; color: #5e626d;}
#readOnlyOfProduct i {font-size: 14px; color: #0075ff; margin-right: 3px;}
module/custom/view/execution.html.php
+7 -1
View File
@@ -21,7 +21,13 @@
<label class="radio-inline"><input type="radio" name="execution" value="<?php echo $key?>"<?php echo $key == $checkedKey ? " checked='checked'" : ''?> id="execution<?php echo $key;?>"><?php echo $value;?></label>
<?php endforeach;?>
</td>
<td><span class='alert alert-info no-margin'><?php echo $lang->custom->notice->readOnlyOfExecution;?></span></td>
<td></td>
</tr>
<tr>
<th></th>
<td colspan="2" id="readOnlyOfExecution">
<i class="icon-exclamation-sign"></i>&nbsp;<?php echo $lang->custom->notice->readOnlyOfExecution;?>
</td>
</tr>
<tr>
<th></th>
module/custom/view/kanban.html.php
+7 -1
View File
@@ -21,7 +21,13 @@
<label class="radio-inline"><input type="radio" name="kanban" value="<?php echo $key?>"<?php echo $key == $checkedKey ? " checked='checked'" : ''?> id="kanban<?php echo $key;?>"><?php echo $value;?></label>
<?php endforeach;?>
</td>
<td><span class='alert alert-info no-margin'><?php echo $lang->custom->notice->readOnlyOfKanban;?></span></td>
<td></td>
</tr>
<tr>
<th></th>
<td colspan="2" id="readOnlyOfKanban">
<i class="icon-exclamation-sign"></i>&nbsp;<?php echo $lang->custom->notice->readOnlyOfKanban;?>
</td>
</tr>
<tr>
<th></th>
module/custom/view/product.html.php
+7 -1
View File
@@ -21,7 +21,13 @@
<label class="radio-inline"><input type="radio" name="product" value="<?php echo $key?>"<?php echo $key == $checkedKey ? " checked='checked'" : ''?> id="product<?php echo $key;?>"><?php echo $value;?></label>
<?php endforeach;?>
</td>
<td><div class='alert alert-info no-margin'><?php echo $lang->custom->notice->readOnlyOfProduct;?></div></td>
<td></td>
</tr>
<tr>
<th></th>
<td colspan="2" id="readOnlyOfProduct">
<i class="icon-exclamation-sign"></i>&nbsp;<?php echo $lang->custom->notice->readOnlyOfProduct;?>
</td>
</tr>
<tr>
<th></th>
module/dev/view/api.html.php
+6 -6
View File
@@ -54,9 +54,9 @@
<?php echo $api['desc'];?>
<table class='table table-bordered'>
<tr>
<td><?php echo $lang->dev->params?></td>
<td><?php echo $lang->dev->type?></td>
<td><?php echo $lang->dev->desc?></td>
<th><?php echo $lang->dev->params?></th>
<th><?php echo $lang->dev->type?></th>
<th><?php echo $lang->dev->desc?></th>
</tr>
<?php if(isset($api['param'])):?>
<?php foreach($api['param'] as $param):?>
@@ -78,9 +78,9 @@
<table class='table table-bordered'>
<caption><?php echo $lang->dev->post;?></caption>
<tr>
<td><?php echo $lang->dev->params?></td>
<td><?php echo $lang->dev->type?></td>
<td><?php echo $lang->dev->desc?></td>
<th><?php echo $lang->dev->params?></th>
<th><?php echo $lang->dev->type?></th>
<th><?php echo $lang->dev->desc?></th>
</tr>
<?php foreach($config->dev->postParams[$selectedModule][$methodName] as $paramName => $paramType):?>
<tr>
module/message/lang/zh-cn.php
+1 -1
View File
@@ -27,7 +27,7 @@ $lang->message->label->assigned = '指派';
$lang->message->label->closed = '关闭';
$lang->message->label->deleted = '删除';
$lang->message->label->undeleted = '还原';
$lang->message->label->commented = '评论';
$lang->message->label->commented = '备注';
$lang->message->label->activated = '激活';
$lang->message->label->resolved = '解决';
$lang->message->label->reviewed = '评审';
module/message/lang/zh-tw.php
+1 -1
View File
@@ -27,7 +27,7 @@ $lang->message->label->assigned = '指派';
$lang->message->label->closed = '關閉';
$lang->message->label->deleted = '刪除';
$lang->message->label->undeleted = '還原';
$lang->message->label->commented = '評論';
$lang->message->label->commented = '備註';
$lang->message->label->activated = '激活';
$lang->message->label->resolved = '解決';
$lang->message->label->reviewed = '評審';
module/my/css/team.css
+4 -1
View File
@@ -1,2 +1,5 @@
.c-gender {width: 80px;}
.c-phone, .c-skype, .c-visits {width: 100px;}
.c-skype, .c-visits {width: 100px;}
.c-phone {width: 128px;}
.c-email {width: 128px;}
.c-role {width: 96px;}
module/report/css/productsummary.css
+2
View File
@@ -1,3 +1,5 @@
td.child {padding-left: 15px;}
.c-name {width: 200px;}
.c-count {width: 70px;}
#conditions {display: flex;}
#conditions .condition-options {margin-left: 16px;}
module/report/view/productsummary.html.php
+3 -4
View File
@@ -22,10 +22,9 @@
<div class='panel'>
<div class="panel-heading">
<div class="panel-title">
<div class="table-row" id='conditions'>
<div class="col-xs"><?php echo $title;?></div>
<div class="col-xs text-right text-gray text-middle"><?php echo $lang->report->conditions?></div>
<div class='col'>
<div id='conditions'>
<div><?php echo $title;?></div>
<div class='condition-options'>
<div class="checkbox-primary inline-block">
<input type="checkbox" name="closedProduct" value="closedProduct" id="closedProduct" <?php if(strpos($conditions, 'closedProduct') !== false) echo "checked='checked'"?> />
<label for="closedProduct"><?php echo $lang->report->closedProduct?></label>
module/story/control.php
+1 -2
View File
@@ -1200,8 +1200,7 @@ class story extends control
public function view($storyID, $version = 0, $param = 0)
{
$uri = $this->app->getURI(true);
$this->session->set('productList', $uri . "#app={$this->app->tab}", 'product');
$this->session->set('productPlanList', $uri, 'product');
$this->session->set('productList', $uri . "#app={$this->app->tab}", 'product');
$storyID = (int)$storyID;
$story = $this->story->getById($storyID, $version, true);