diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index d3b5df595d..eb39daee2a 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -575,6 +575,10 @@ $lang->resource->productplan->linkBug = 'linkBug'; $lang->resource->productplan->unlinkBug = 'unlinkBug'; $lang->resource->productplan->batchUnlinkBug = 'batchUnlinkBug'; $lang->resource->productplan->batchEdit = 'batchEdit'; +$lang->resource->productplan->start = 'start'; +$lang->resource->productplan->finish = 'finish'; +$lang->resource->productplan->close = 'close'; +$lang->resource->productplan->activate = 'activate'; $lang->productplan->methodOrder[5] = 'browse'; $lang->productplan->methodOrder[10] = 'create'; @@ -588,6 +592,10 @@ $lang->productplan->methodOrder[45] = 'linkBug'; $lang->productplan->methodOrder[50] = 'unlinkBug'; $lang->productplan->methodOrder[55] = 'batchUnlinkBug'; $lang->productplan->methodOrder[60] = 'batchEdit'; +$lang->productplan->methodOrder[65] = 'start'; +$lang->productplan->methodOrder[70] = 'finish'; +$lang->productplan->methodOrder[75] = 'close'; +$lang->productplan->methodOrder[80] = 'activate'; /* Release. */ $lang->resource->release = new stdclass(); diff --git a/module/productplan/css/view.css b/module/productplan/css/view.css index 7109f43344..bbff474479 100644 --- a/module/productplan/css/view.css +++ b/module/productplan/css/view.css @@ -24,3 +24,6 @@ ol, ul {padding-left: 20px;} #tabsNav .tab-pane>.main-table {border-radius: 0;} .body-modal #mainMenu>.btn-toolbar {width: auto;} .body-modal #mainContent {min-height: 240px;} + +.btn.disabled{color: #9e54ae; background-color: transparent; border-color:transparent;} +.pull-right > .btn-link > .icon-checked, .pull-right > .btn-link > .icon-off, .pull-right > .btn-link > .icon-play, .pull-right > .btn-link > .icon-magic {margin-right: 3px;} diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php index 08a1a1d93d..36a319179b 100644 --- a/module/productplan/lang/zh-cn.php +++ b/module/productplan/lang/zh-cn.php @@ -18,6 +18,11 @@ $lang->productplan->delete = "删除计划"; $lang->productplan->start = "开始计划"; $lang->productplan->finish = "完成计划"; $lang->productplan->close = "关闭计划"; +$lang->productplan->startAB = "开始"; +$lang->productplan->finishAB = "完成"; +$lang->productplan->closeAB = "关闭"; +$lang->productplan->activateAB = "激活"; +$lang->productplan->view = "计划详情"; $lang->productplan->activate = "激活计划"; $lang->productplan->view = "计划详情"; $lang->productplan->bugSummary = "本页共 %s 个Bug"; diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index 72f943b8cf..0f27bc3296 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -42,6 +42,26 @@ { echo $this->buildOperateMenu($plan, 'view'); + if($plan->begin == '2030-01-01' or $plan->end == '2030-01-01') + { + $class = 'iframe'; + $attr = "data-toggle='modal' data-id='{$plan->id}' data-width='550px'"; + $isOnlyBody = true; + } + else + { + $attr = "target='hiddenwin'"; + $isOnlyBody = false; + } + $class = $plan->status == 'wait' ? $class : 'disabled'; + common::printLink('productplan', 'start', "planID=$plan->id", "{$lang->productplan->startAB}", '', "class='btn btn-link {$class}'{$attr} title='{$lang->productplan->start}'", '', $isOnlyBody); + $class = $plan->status == 'doing' ? '' : 'disabled'; + common::printLink('productplan', 'finish', "planID=$plan->id", "{$lang->productplan->finishAB}", '', "class='btn btn-link {$class}' target='hiddenwin' title='{$lang->productplan->finish}'"); + $class = $plan->status == 'done' ? '' : 'disabled'; + common::printLink('productplan', 'close', "planID=$plan->id", "{$lang->productplan->closeAB}", '', "class='btn btn-link {$class}' target='hiddenwin' title='{$lang->productplan->close}'"); + $class = $plan->status == 'closed' ? '' : 'disabled'; + common::printLink('productplan', 'activate', "planID=$plan->id", "{$lang->productplan->activateAB}", '', "class='btn btn-link {$class}' target='hiddenwin' title='{$lang->productplan->activate}'"); + if(common::hasPriv('productplan', 'create', $plan) and $plan->parent <= '0') echo html::a($this->createLink('productplan', 'create', "product={$plan->product}&branch={$plan->branch}&parent={$plan->id}"), " " . $this->lang->productplan->children , '', "class='btn btn-link' title='{$this->lang->productplan->children}'"); if(common::hasPriv('productplan', 'edit', $plan)) echo html::a($this->createLink('productplan', 'edit', "planID=$plan->id"), " " . $this->lang->edit, '', "class='btn btn-link' title='{$this->lang->edit}'"); if(common::hasPriv('productplan', 'delete', $plan) and $plan->parent >= 0) echo html::a($this->createLink('productplan', 'delete', "planID=$plan->id"), " " . $this->lang->delete, '', "class='btn btn-link' title='{$this->lang->delete}' target='hiddenwin'");