Merge branch 'sprint/tianshujie_modifyTip' into 'master'
* Modify Modify program prompt when editing a product. See merge request easycorp/zentaopms!3996
This commit is contained in:
孙广明
+26
-25
@@ -9,30 +9,31 @@
|
||||
* @version $Id: en.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $
|
||||
* @link http://www.zentao.net
|
||||
*/
|
||||
$lang->product->index = $lang->productCommon . ' Home';
|
||||
$lang->product->browse = 'Story List';
|
||||
$lang->product->dynamic = 'Dynamics';
|
||||
$lang->product->view = "{$lang->productCommon} Detail";
|
||||
$lang->product->edit = "Edit {$lang->productCommon}";
|
||||
$lang->product->batchEdit = 'Batch Edit';
|
||||
$lang->product->create = "Create {$lang->productCommon}";
|
||||
$lang->product->delete = "Delete {$lang->productCommon}";
|
||||
$lang->product->deleted = 'Deleted';
|
||||
$lang->product->close = "Close";
|
||||
$lang->product->select = "Select {$lang->productCommon}";
|
||||
$lang->product->mine = 'Mine';
|
||||
$lang->product->other = 'Others';
|
||||
$lang->product->closed = 'Closed';
|
||||
$lang->product->closedProduct = 'Closed Product';
|
||||
$lang->product->updateOrder = 'Order';
|
||||
$lang->product->all = "{$lang->productCommon} List";
|
||||
$lang->product->manageLine = "Manage {$lang->productCommon} Line";
|
||||
$lang->product->newLine = "Create {$lang->productCommon} Line";
|
||||
$lang->product->export = 'Export';
|
||||
$lang->product->dashboard = "Dashboard";
|
||||
$lang->product->changeProgram = "{$lang->productCommon} confirmation of the scope of influence of adjustment of the program set";
|
||||
$lang->product->addWhitelist = 'Add Whitelist';
|
||||
$lang->product->unbindWhitelist = 'Unbind Whitelist';
|
||||
$lang->product->index = $lang->productCommon . ' Home';
|
||||
$lang->product->browse = 'Story List';
|
||||
$lang->product->dynamic = 'Dynamics';
|
||||
$lang->product->view = "{$lang->productCommon} Detail";
|
||||
$lang->product->edit = "Edit {$lang->productCommon}";
|
||||
$lang->product->batchEdit = 'Batch Edit';
|
||||
$lang->product->create = "Create {$lang->productCommon}";
|
||||
$lang->product->delete = "Delete {$lang->productCommon}";
|
||||
$lang->product->deleted = 'Deleted';
|
||||
$lang->product->close = "Close";
|
||||
$lang->product->select = "Select {$lang->productCommon}";
|
||||
$lang->product->mine = 'Mine';
|
||||
$lang->product->other = 'Others';
|
||||
$lang->product->closed = 'Closed';
|
||||
$lang->product->closedProduct = 'Closed Product';
|
||||
$lang->product->updateOrder = 'Order';
|
||||
$lang->product->all = "{$lang->productCommon} List";
|
||||
$lang->product->manageLine = "Manage {$lang->productCommon} Line";
|
||||
$lang->product->newLine = "Create {$lang->productCommon} Line";
|
||||
$lang->product->export = 'Export';
|
||||
$lang->product->dashboard = "Dashboard";
|
||||
$lang->product->changeProgram = "{$lang->productCommon} confirmation of the scope of influence of adjustment of the program set";
|
||||
$lang->product->changeProgramTip = "%s > Change Program";
|
||||
$lang->product->addWhitelist = 'Add Whitelist';
|
||||
$lang->product->unbindWhitelist = 'Unbind Whitelist';
|
||||
|
||||
$lang->product->indexAction = "All {$lang->productCommon}";
|
||||
$lang->product->closeAction = "Close {$lang->productCommon}";
|
||||
@@ -86,7 +87,7 @@ $lang->product->confirmDelete = " Do you want to delete the {$lang->produ
|
||||
$lang->product->errorNoProduct = "No {$lang->productCommon} is created yet!";
|
||||
$lang->product->accessDenied = "You have no access to the {$lang->productCommon}.";
|
||||
$lang->product->programChangeTip = "The projects linked with this {$lang->productCommon}: %s will be transferred to the modified program set together.";
|
||||
$lang->product->notChangeProgramTip = "The {$lang->SRCommon} of {$lang->productCommon} has been linked to the following projects, please cancel the link before proceeding";
|
||||
$lang->product->notChangeProgramTip = "The {$lang->SRCommon} of {$lang->productCommon} has been linked to the following projects, please click the project name to enter the {$lang->SRCommon} list to cancel the link before proceeding";
|
||||
$lang->product->confirmChangeProgram = "The projects linked with this {$lang->productCommon}: %s is also linked with other products, whether to transfer projects to the modified program set.";
|
||||
$lang->product->changeProgramError = "The {$lang->SRCommon} of this {$lang->productCommon} has been linked to the project, please unlink it before proceeding";
|
||||
$lang->product->changeLineError = "Products already exist under the product line, so the program within them cannot be modified.";
|
||||
|
||||
@@ -9,30 +9,31 @@
|
||||
* @version $Id: zh-cn.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $
|
||||
* @link http://www.zentao.net
|
||||
*/
|
||||
$lang->product->index = $lang->productCommon . '主页';
|
||||
$lang->product->browse = "{$lang->SRCommon}列表";
|
||||
$lang->product->dynamic = $lang->productCommon . '动态';
|
||||
$lang->product->view = "{$lang->productCommon}概况";
|
||||
$lang->product->edit = "编辑{$lang->productCommon}";
|
||||
$lang->product->batchEdit = '批量编辑';
|
||||
$lang->product->create = "添加{$lang->productCommon}";
|
||||
$lang->product->delete = "删除{$lang->productCommon}";
|
||||
$lang->product->deleted = '已删除';
|
||||
$lang->product->close = '关闭';
|
||||
$lang->product->select = "请选择{$lang->productCommon}";
|
||||
$lang->product->mine = '我负责';
|
||||
$lang->product->other = '其他';
|
||||
$lang->product->closed = '已关闭';
|
||||
$lang->product->closedProduct = '已关闭的产品';
|
||||
$lang->product->updateOrder = '排序';
|
||||
$lang->product->all = "所有{$lang->productCommon}";
|
||||
$lang->product->manageLine = "维护{$lang->productCommon}线";
|
||||
$lang->product->newLine = "新建{$lang->productCommon}线";
|
||||
$lang->product->export = '导出数据';
|
||||
$lang->product->dashboard = "{$lang->productCommon}仪表盘";
|
||||
$lang->product->changeProgram = "{$lang->productCommon}调整所属项目集影响范围确认";
|
||||
$lang->product->addWhitelist = '添加白名单';
|
||||
$lang->product->unbindWhitelist = '移除白名单';
|
||||
$lang->product->index = $lang->productCommon . '主页';
|
||||
$lang->product->browse = "{$lang->SRCommon}列表";
|
||||
$lang->product->dynamic = $lang->productCommon . '动态';
|
||||
$lang->product->view = "{$lang->productCommon}概况";
|
||||
$lang->product->edit = "编辑{$lang->productCommon}";
|
||||
$lang->product->batchEdit = '批量编辑';
|
||||
$lang->product->create = "添加{$lang->productCommon}";
|
||||
$lang->product->delete = "删除{$lang->productCommon}";
|
||||
$lang->product->deleted = '已删除';
|
||||
$lang->product->close = '关闭';
|
||||
$lang->product->select = "请选择{$lang->productCommon}";
|
||||
$lang->product->mine = '我负责';
|
||||
$lang->product->other = '其他';
|
||||
$lang->product->closed = '已关闭';
|
||||
$lang->product->closedProduct = '已关闭的产品';
|
||||
$lang->product->updateOrder = '排序';
|
||||
$lang->product->all = "所有{$lang->productCommon}";
|
||||
$lang->product->manageLine = "维护{$lang->productCommon}线";
|
||||
$lang->product->newLine = "新建{$lang->productCommon}线";
|
||||
$lang->product->export = '导出数据';
|
||||
$lang->product->dashboard = "{$lang->productCommon}仪表盘";
|
||||
$lang->product->changeProgram = "{$lang->productCommon}调整所属项目集影响范围确认";
|
||||
$lang->product->changeProgramTip = "%s > 修改项目集";
|
||||
$lang->product->addWhitelist = '添加白名单';
|
||||
$lang->product->unbindWhitelist = '移除白名单';
|
||||
|
||||
$lang->product->indexAction = "所有{$lang->productCommon}仪表盘";
|
||||
$lang->product->closeAction = "关闭{$lang->productCommon}";
|
||||
@@ -86,7 +87,7 @@ $lang->product->confirmDelete = " 您确定删除该{$lang->productCommon
|
||||
$lang->product->errorNoProduct = "还没有创建{$lang->productCommon}！";
|
||||
$lang->product->accessDenied = "您无权访问该{$lang->productCommon}";
|
||||
$lang->product->programChangeTip = "如下项目只关联了该{$lang->productCommon}， 将直接转移至新项目集下。";
|
||||
$lang->product->notChangeProgramTip = "该{$lang->productCommon}的{$lang->SRCommon}已经关联到如下项目，请取消关联后再操作";
|
||||
$lang->product->notChangeProgramTip = "该{$lang->productCommon}的{$lang->SRCommon}已经关联到如下项目，请点击项目名称进入{$lang->SRCommon}列表取消关联后再操作";
|
||||
$lang->product->confirmChangeProgram = "如下项目既关联了该{$lang->productCommon}又关联了其他{$lang->productCommon}，请确认是否继续关联该{$lang->productCommon}，勾选后将取消与其他{$lang->productCommon}的关联关系，同时转移至新项目集下。";
|
||||
$lang->product->changeProgramError = "该{$lang->productCommon}的{$lang->SRCommon}已经关联到项目，请取消关联后再操作";
|
||||
$lang->product->changeLineError = "产品线下已有产品，不可修改所属项目集。";
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
<?php js::set('projectPathList', $projectPathList);?>
|
||||
<style>
|
||||
#changeProgram .icon-project {padding-right: 5px;}
|
||||
#changeProgram .modal-body {padding-top: 10px;}
|
||||
</style>
|
||||
<div id="mainContent" class="main-content">
|
||||
<div class="center-block">
|
||||
@@ -115,6 +116,8 @@
|
||||
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="icon icon-close"></i></button>
|
||||
<?php if($canChangeProgram):?>
|
||||
<h4 class="modal-title"><?php echo $lang->product->changeProgram;?></h4>
|
||||
<?php else:?>
|
||||
<h4 class="modal-title"><?php echo sprintf($lang->product->changeProgramTip, $product->name);?></h4>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
@@ -123,9 +126,11 @@
|
||||
<tr>
|
||||
<th class='text-left'><?php echo $lang->product->notChangeProgramTip;?></th>
|
||||
</tr>
|
||||
<?php foreach($linkStoriesProjects as $project):?>
|
||||
<?php foreach($linkStoriesProjects as $projectID => $projectName):?>
|
||||
<tr>
|
||||
<td><i class="icon icon-project"></i><?php echo $project;?></td>
|
||||
<td>
|
||||
<?php echo html::a($this->createLink('projectstory', 'story', 'projectID=' . $projectID), "<i class='icon icon-project'></i>" . $projectName, '', "title='$projectName'");?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
<?php endif;?>
|
||||
|
||||
Reference in New Issue
Block a user