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

* Finish task#51184,51176,51141

Browse Source
This commit is contained in:
zenggang
2022-03-24 06:21:10 +00:00
parent 4889b79a59
commit dd5cab2011
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/view/trash.html.php
+4
View File
@@ -76,6 +76,10 @@
{
echo $action->objectName;
}
elseif($action->objectType == 'program')
{
echo $action->objectName;
}
else
{
$tab = '';
module/common/model.php
+1 -1
View File
@@ -416,7 +416,7 @@ class commonModel extends model
echo '<li>' . html::a(helper::createLink('tutorial', 'start'), "<i class='icon icon-guide'></i> " . $lang->tutorialAB, '', "class='iframe' data-class-name='modal-inverse' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . '</li>';
}
echo '<li>' . html::a(helper::createLink('my', 'preference', '', '', true), "<i class='icon icon-controls'></i> " . $lang->preference, '', "class='iframe' data-width='650'") . '</li>';
echo '<li>' . html::a(helper::createLink('my', 'preference', '', '', true), "<i class='icon icon-controls'></i> " . $lang->preference, '', "class='iframe' data-width='700'") . '</li>';
}
echo '<li>' . html::a(helper::createLink('my', 'changepassword', '', '', true), "<i class='icon icon-cog-outline'></i> " . $lang->changePassword, '', "class='iframe' data-width='600'") . '</li>';
module/execution/view/task.html.php
+6 -6
View File
@@ -151,18 +151,18 @@ body {margin-bottom: 25px;}
<?php
if(commonModel::isTutorialMode())
{
$wizardParams = helper::safe64Encode("executionID=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : ""));
$actionLink = $this->createLink('tutorial', 'wizard', "module=task&method=create&params=$wizardParams");
$wizardParams = helper::safe64Encode("executionID=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : ""));
$taskCreateLink = $this->createLink('tutorial', 'wizard', "module=task&method=create&params=$wizardParams");
}
else
{
$actionLink = $this->createLink('task', 'create', "executionID=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : ""));
$taskCreateLink = $this->createLink('task', 'create', "executionID=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : ""));
}
echo html::a($actionLink, "<i class='icon icon-plus'></i> {$lang->task->create}", '', "class='btn btn-primary'");
echo html::a($taskCreateLink, "<i class='icon icon-plus'></i> {$lang->task->create}", '', "class='btn btn-primary'");
?>
<button type='button' class='btn btn-primary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
<ul class='dropdown-menu pull-right'>
<li><?php echo html::a($actionLink, $lang->task->create);?></li>
<li><?php echo html::a($taskCreateLink, $lang->task->create);?></li>
<li><?php echo html::a($this->createLink('task', 'batchCreate', "executionID=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : "")), $lang->task->batchCreate);?></li>
</ul>
</div>
@@ -217,7 +217,7 @@ body {margin-bottom: 25px;}
<p>
<span class="text-muted"><?php echo $lang->task->noTask;?></span>
<?php if($canBeChanged and common::hasPriv('task', 'create')):?>
<?php echo html::a($this->createLink('task', 'create', "execution=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : "")), "<i class='icon icon-plus'></i> " . $lang->task->create, '', "class='btn btn-info'");?>
<?php echo html::a($taskCreateLink, "<i class='icon icon-plus'></i> " . $lang->task->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
module/story/lang/en.php
+1 -1
View File
@@ -33,7 +33,7 @@ $lang->story->link = 'Link';
$lang->story->unlink = 'Unlink';
$lang->story->track = 'Track';
$lang->story->trackAB = 'Track';
$lang->story->processStoryChange = 'Process Story Change';
$lang->story->processStoryChange = 'Confirm Story Change';
$lang->story->splitRequirent = 'Decompose';
$lang->story->close = 'Close';
$lang->story->batchClose = 'Batch Close';
module/story/lang/zh-cn.php
+1 -1
View File
@@ -33,7 +33,7 @@ $lang->story->link = '关联';
$lang->story->unlink = '移除';
$lang->story->track = '跟踪矩阵';
$lang->story->trackAB = '矩阵';
$lang->story->processStoryChange = '处理需求变更';
$lang->story->processStoryChange = '确认需求变动';
$lang->story->splitRequirent = '拆分';
$lang->story->close = '关闭';
$lang->story->batchClose = '批量关闭';