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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2015-11-11 13:30:37 +08:00
parent a9d90a73c9 a178e19241
commit 68f9066039
6 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/productplan/view/browse.html.php
View File

@@ -13,7 +13,11 @@
<?php include '../../common/view/header.html.php';?>
<?php js::set('confirmDelete', $lang->productplan->confirmDelete)?>
<div id='titlebar'>
<div class='heading'><i class='icon-flag'></i> <?php echo $lang->productplan->browse;?> </div>
<div class='heading'>
<i class='icon-flag'></i>
<?php if($product->type !== 'normal') echo '<span class="label label-info label-badge">' . $branches[$branch] . '</span>';?>
<?php echo $lang->productplan->browse;?>
</div>
<div class='actions'>
<?php common::printIcon('productplan', 'create', "productID=$product->id&branch=$branch", '', 'button', 'plus');?>
</div>

6
module/release/view/browse.html.php
View File

@@ -15,7 +15,11 @@
<?php js::set('confirmDelete', $lang->release->confirmDelete)?>
<div>
<div id='titlebar'>
<div class='heading'><i class='icon-tags'></i> <?php echo $lang->release->browse;?> </div>
<div class='heading'>
<i class='icon-tags'></i>
<?php if($product->type !== 'normal') echo '<span class="label label-info label-badge">' . $branches[$branch] . '</span>';?>
<?php echo $lang->release->browse;?>
</div>
<div class='actions'>
<?php common::printIcon('release', 'create', "product=$product->id&branch=$branch");?>
</div>

2
module/story/control.php
View File

@@ -265,7 +265,7 @@ class story extends control
$this->view->storyTitle = $title;
$this->view->spec = $spec;
$this->view->branch = $branch;
$this->view->branchGroups = $this->loadModel('branch')->getByProducts($productID);
$this->view->branches = $this->loadModel('branch')->getPairs($productID);
$this->display();
}

2
module/story/lang/zh-cn.php
View File

@@ -40,7 +40,7 @@ $lang->story->common = '需求';
$lang->story->id = '编号';
$lang->story->product = "所属{$lang->productCommon}";
$lang->story->module = '所属模块';
$lang->story->source = '来源';
$lang->story->source = '需求来源';
$lang->story->fromBug = '来源Bug';
$lang->story->release = '发布计划';
$lang->story->bug = '相关bug';

2
module/story/lang/zh-tw.php
View File

@@ -40,7 +40,7 @@ $lang->story->common = '需求';
$lang->story->id = '編號';
$lang->story->product = "所屬{$lang->productCommon}";
$lang->story->module = '所屬模組';
$lang->story->source = '來源';
$lang->story->source = '需求來源';
$lang->story->fromBug = '來源Bug';
$lang->story->release = '發佈計劃';
$lang->story->bug = '相關bug';

2
module/story/view/batchcreate.html.php
View File

@@ -16,8 +16,8 @@
<span class='prefix'><?php echo html::icon($lang->icons['story']);?></span>
<strong>
<small class='text-muted'><?php echo html::icon($lang->icons['batchCreate']);?></small>
<?php if($product->type !== 'normal') echo '<span class="label label-info label-badge">' . $branches[$branch] . '</span>';?>
<?php echo $lang->story->batchCreate;?>
<?php if($product->type !== 'normal') echo '<span class="label label-danger">' . $branchGroups[$productID][$branch] . '</span>';?>
</strong>
<div class='actions'>
<?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=story&params=' . helper::safe64Encode("productID=$productID&moduleID=$moduleID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn' data-width='600px'")?>