* finish task #2383.

This commit is contained in:
chenfeiCF
2015-11-11 13:10:07 +08:00
parent fcadcec130
commit 9c7cff9c16
4 changed files with 12 additions and 4 deletions

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>

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>

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();
}

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'")?>