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

Merge branch 'sprint/master_zhouxudong_54991' into 'master'

Browse Source 
Sprint/master zhouxudong 54991

See merge request easycorp/zentaopms!3626
This commit is contained in:
王怡栋
2022-05-26 09:28:41 +00:00
parent 76c5d782a4 715527fd59
commit a0af734e79
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/css/create.css
+4 -2
View File
@@ -1,5 +1,7 @@
[lang^='en'] #tipsModal {margin-top: 10%; max-width: 620px;}
[lang^='zh-cn'] #tipsModal {margin-top: 10%; max-width: 530px;}
[lang^='en'] #newTipsModal {margin-top: 10%; max-width: 620px;}
[lang^='zh-cn'] #newTipsModal {margin-top: 10%; max-width: 530px;}
[lang^='zh-cn'] #classicTipsModal {margin-top: 10%; max-width: 420px;}
[lang^='en'] #classicTipsModal {margin-top: 10%; max-width: 450px;}
.chosen-container-single .chosen-single > span {max-width: 100%;}
#copyProjectModal {padding: 0;}
module/execution/view/create.html.php
+2 -1
View File
@@ -15,7 +15,8 @@
<?php $defaultURL = $this->createLink('execution', 'task', "execution=$executionID");?>
<?php include '../../common/view/header.html.php';?>
<body>
<div class='modal-dialog' id='tipsModal'>
<?php $tipsModal = $this->config->systemMode == 'new' ? 'newTipsModal' : 'classicTipsModal';?>
<div class='modal-dialog' id='<?php echo $tipsModal;?>'>
<div class='modal-header'>
<a href='<?php echo $defaultURL;?>' class='close'><i class="icon icon-close"></i></a>
<h4 class='modal-title' id='myModalLabel'><?php echo $lang->execution->tips;?></h4>
module/execution/view/tips.html.php
+3 -3
View File
@@ -5,7 +5,7 @@
<?php if($execution->lifetime != 'ops') echo html::a($this->createLink('execution', 'linkstory', "executionID=$executionID"), $lang->execution->linkStory, '', "class='btn' data-app='execution'");?>
<?php echo html::a($this->createLink('task', 'create', "execution=$executionID"), $lang->execution->createTask, '', "class='btn' data-app='execution'");?>
<?php echo html::a($this->createLink('execution', 'task', "executionID=$executionID"), $lang->execution->goback, '', "class='btn' data-app='execution'");?>
<?php echo html::a('javascript:void(0)', $lang->execution->gobackExecution, '', "class='btn' onclick='closeTipModal($projectID)' data-app='project'");?>
<?php if($this->config->systemMode == 'new') echo html::a('javascript:void(0)', $lang->execution->gobackExecution, '', "class='btn' onclick='closeTipsModal($projectID)' data-app='project'");?>
</div>
</div>
<script>
@@ -16,9 +16,9 @@
* @access public
* @return void
*/
function closeTipModal(projectID)
function closeTipsModal(projectID)
{
$(".close").trigger("click");
$.apps.close('execution');
var link = createLink('project', 'execution', 'status=all&projectID=' + projectID);
$.apps.open(link, 'project');
}