diff --git a/framework/base/router.class.php b/framework/base/router.class.php index 847452b748..37f524b96e 100644 --- a/framework/base/router.class.php +++ b/framework/base/router.class.php @@ -1830,7 +1830,7 @@ class baseRouter global $filter; /* Remove these three params. */ - unset($passedParams['PRJ']); + unset($passedParams['project']); unset($passedParams['onlybody']); unset($passedParams['HTTP_X_REQUESTED_WITH']); diff --git a/module/action/control.php b/module/action/control.php index 677c13c296..2d67b28ee0 100755 --- a/module/action/control.php +++ b/module/action/control.php @@ -24,6 +24,8 @@ class action extends control */ public function trash($type = 'all', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { + $this->loadModel('backup'); + /* Save session. */ $uri = $this->app->getURI(true); $this->session->set('productList', $uri); diff --git a/module/action/model.php b/module/action/model.php index b5d66c8a55..abf3a1fd64 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -396,6 +396,7 @@ class actionModel extends model } elseif(($actionName == 'opened' or $actionName == 'managed' or $actionName == 'edited') and ($objectType == 'execution' || $objectType == 'project')) { + $this->app->loadLang('executon'); $linkedProducts = $this->dao->select('id,name')->from(TABLE_PRODUCT)->where('id')->in($action->extra)->fetchPairs('id', 'name'); $action->extra = ''; if($linkedProducts) diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php index aa52c3176e..9f41580d6d 100755 --- a/module/action/view/trash.html.php +++ b/module/action/view/trash.html.php @@ -12,14 +12,24 @@ ?> -
+
+
recTotal}&recPerPage={$pager->recPerPage}"; ?> diff --git a/module/admin/view/checkweak.html.php b/module/admin/view/checkweak.html.php index 2b5f05ca65..3f8456d442 100644 --- a/module/admin/view/checkweak.html.php +++ b/module/admin/view/checkweak.html.php @@ -13,36 +13,47 @@ -
-
-
- - - - - - - - - - - - - - - - - - - - - - -
idAB;?>user->realname;?>user->account;?>user->phone;?>user->mobile;?>admin->safe->reason;?>actions;?>
id?>realname?>account?>phone?>mobile?>admin->safe->reasonList[$user->weakReason];?>id", '', 'list');?>
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
idAB;?>user->realname;?>user->account;?>user->phone;?>user->mobile;?>admin->safe->reason;?>actions;?>
id?>realname?>account?>phone?>mobile?>admin->safe->reasonList[$user->weakReason];?>id", '', 'list');?>
+
diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php index 6abc597224..e020158c19 100644 --- a/module/admin/view/safe.html.php +++ b/module/admin/view/safe.html.php @@ -14,51 +14,62 @@ -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
admin->safe->password?>admin->safe->modeList, isset($config->safe->mode) ? $config->safe->mode : 0, "onclick=showModeRule(this.value)")?>admin->safe->noticeMode?>
admin->safe->weak?>safe->weak, "class='form-control' style='height:100px'")?>
admin->safe->changeWeak?>admin->safe->modifyPasswordList, isset($config->safe->changeWeak) ? $config->safe->changeWeak : 0)?>
admin->safe->modifyPasswordFirstLogin?>admin->safe->modifyPasswordList, isset($config->safe->modifyPasswordFirstLogin) ? $config->safe->modifyPasswordFirstLogin : 0)?>
admin->safe->loginCaptcha?>admin->safe->loginCaptchaList, isset($config->safe->loginCaptcha) ? $config->safe->loginCaptcha : 0)?>
- - -
-
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
admin->safe->password?>admin->safe->modeList, isset($config->safe->mode) ? $config->safe->mode : 0, "onclick=showModeRule(this.value)")?>admin->safe->noticeMode?>
admin->safe->weak?>safe->weak, "class='form-control' style='height:100px'")?>
admin->safe->changeWeak?>admin->safe->modifyPasswordList, isset($config->safe->changeWeak) ? $config->safe->changeWeak : 0)?>
admin->safe->modifyPasswordFirstLogin?>admin->safe->modifyPasswordList, isset($config->safe->modifyPasswordFirstLogin) ? $config->safe->modifyPasswordFirstLogin : 0)?>
admin->safe->loginCaptcha?>admin->safe->loginCaptchaList, isset($config->safe->loginCaptcha) ? $config->safe->loginCaptcha : 0)?>
+ + +
+
+
- +

block->noData;?>

@@ -104,139 +92,110 @@ $(function()
- -
+ +
- model == 'scrum'):?>
-
+
- story->common . $lang->project->doneStories;?> - doneStories;?> + task->statusList['done'];?> + progress;?>percent;?>
-
project->allStories;?>
-
allStories;?>
+
execution->totalEstimate;?>
+
totalEstimate;?> task->hour;?>
-
project->doneStories;?>
-
doneStories;?>
+
execution->totalConsumed;?>
+
totalConsumed;?> task->hour;?>
-
project->leftStories;?>
-
leftStories;?>
+
execution->totalLeft;?>
+
totalLeft;?> task->hour;?>
-
-

project->allInput;?>

-
- project->membersUnit, $project->teamCount);?> - project->hoursUnit, $project->estimate);?> - budget . ' ' . zget($lang->project->unitList, $project->budgetUnit);?> -
-
-
- -

project->lastIteration;?>

- executions as $execution):?> - - 3) break;?> -
name;?>
-
-
-
- hours->progress . '%';?> -
+
+
task->yesterdayFinished;?> yesterdayFinished;?>
+
+
- -
-
- -
-
- project->weekly;?> - current;?> -
-
-
-
project->PRJProgress;?>
-
progress . '%';?>
-
-
-
+
+
+ + + + + + + + + +
task->allTasks;?> :totalTasks) ? 0 : html::a($this->createLink('project', 'task', "executionID={$execution->id}&status=all"), $execution->totalTasks);?>
task->noFinished;?> :undoneTasks) ? 0 : html::a($this->createLink('project', 'task', "executionID={$execution->id}&status=undone"), $execution->undoneTasks);?>
+
-
-
-
project->pv;?>
-
pv;?>
+
+
story->released;?> releasedStories;?>
+
+
-
-
project->ev;?>
-
ev;?>
+
+
+ + + + + + + + + +
story->total;?> :totalStories) ? 0 : html::a($this->createLink('project', 'story', "executionID={$execution->id}&orderBy=order_desc&type=all"), $execution->totalStories);?>
story->unclosed;?> :unclosedStories) ? 0 : html::a($this->createLink('project', 'story', "executionID={$execution->id}&orderBy=order_desc&type=unclosed"), $execution->unclosedStories);?>
+
-
-
project->sv;?>
-
sv;?>
+
+
+
bug->yesterdayResolved;?> yesterdayResolved;?>
+
+
+
+
+
+
+ + + + + + + + + +
bug->allBugs;?> :totalBugs) ? 0 : html::a($this->createLink('project', 'bug', "executionID={$execution->id}&orderBy=status,id_desc&build=0&type=all"), $execution->totalBugs);?>
bug->unResolved;?> :activeBugs) ? 0 : html::a($this->createLink('project', 'bug', "executionID={$execution->id}&orderBy=status,id_desc&build=0&type=unresolved"), $execution->activeBugs);?>
+
-
-
-
- project->allInput;?> -
-
-
-
-
-
-
project->PRJPM;?>
-
PM ? zget($users, $project->PM) : $lang->project->emptyPM;?>
-
-
-
project->teamCount;?>
-
teamCount;?>
-
-
-
project->PRJBudget;?>
-
budget;?>
-
-
-
-
-
-
project->ac;?>
-
ac;?>
-
-
-
project->cv;?>
-
cv;?>
-
-
-
-
-
-
diff --git a/module/block/view/programteamblock.html.php b/module/block/view/executionteamblock.html.php similarity index 80% rename from module/block/view/programteamblock.html.php rename to module/block/view/executionteamblock.html.php index 7e4fff2426..20cea8dba9 100644 --- a/module/block/view/programteamblock.html.php +++ b/module/block/view/executionteamblock.html.php @@ -8,13 +8,12 @@ $maxConsumed = 0;
-
project->name;?>
teamCount); $maxConsumed = max($maxConsumed, $project->consumed); ?> -
name;?>
+
name;?>
@@ -37,7 +36,7 @@ $maxConsumed = 0;
-
consumed . $lang->execution->workHourUnit;?>
+
consumed;?>
@@ -48,7 +47,7 @@ $maxConsumed = 0;
-
- '> - - - - - - - - - - - - - - - - - - createLink('program', 'index', "programID={$project->id}"); - ?> - - - - - - - - app->getClientLang(), ['zh-cn','zh-tw']) && $project->budget >= 10000 ? number_format($project->budget / 10000, 1) . $this->lang->program->tenThousand : number_format((float)$project->budget, 1);?> - - - - - - - - -
project->name;?>program->PM;?>program->status;?>program->teamCount;?>task->consumed;?>program->budget;?>project->leftStories;?>project->leftTasks;?>project->leftBugs;?>
name);?>PM, $project->PM)?> - project->statusList, $project->status);?> - teamCount;?>consumed . ' ' . $lang->execution->workHourUnit;?>budget != 0 ? zget($lang->project->currencySymbol, $project->budgetUnit) . ' ' . $programBudget : $lang->project->future;?>leftStories;?>leftTasks;?>leftBugs;?>
-
- diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php index 6ab7f38894..5af4c1331f 100644 --- a/module/block/view/projectblock.html.php +++ b/module/block/view/projectblock.html.php @@ -1,72 +1,49 @@ - - * @package block - * @version $Id$ - * @link http://www.zentao.net - */ -?> - -
" . $lang->project->create, '', "class='btn btn-primary'")?>
+ +
block->emptyTip;?>
-
- + +
+
'> - - - + + + + - - - - - - - - - + + + + + + - - - + + get->entry}'" : "class='text-center'"; - $viewLink = $this->createLink('execution', 'task', 'execution=' . $execution->id); + $viewLink = $this->createLink('program', 'index', "programID={$project->id}"); ?> - > - - - - - - - - - + + + - + + + app->getClientLang(), ['zh-cn','zh-tw']) && $project->budget >= 10000 ? number_format($project->budget / 10000, 1) . $this->lang->program->tenThousand : number_format((float)$project->budget, 1);?> + + + + - - + +
project->name;?>project->end;?>
project->name;?>program->PM;?>program->status;?> statusAB;?>execution->totalEstimate;?>execution->totalConsumed;?>execution->totalLeft;?>project->progress;?>execution->burn;?>program->teamCount;?>task->consumed;?>program->budget;?>project->leftStories;?>project->leftTasks;?>project->leftBugs;?>
createLink('execution', 'task', 'execution=' . $execution->id), $execution->name, '', "title='$execution->name'");?>end;?> - delay)):?> - execution->delayed;?> - - processStatus('project', $execution);?> - - - hours->totalEstimate . ' ' . $lang->execution->workHourUnit;?>hours->totalConsumed . ' ' . $lang->execution->workHourUnit;?>hours->totalLeft . ' ' . $lang->execution->workHourUnit;?> -
-
- hours->progress;?>% -
-
+
name);?>PM, $project->PM)?> + project->statusList, $project->status);?> burns);?>'>teamCount;?>consumed . ' ' . $lang->execution->workHourUnit;?>budget != 0 ? zget($lang->project->currencySymbol, $project->budgetUnit) . ' ' . $programBudget : $lang->project->future;?>leftStories;?>leftTasks;?>leftBugs;?>
diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php index d6da2a5acc..e42dac008b 100644 --- a/module/block/view/projectstatisticblock.html.php +++ b/module/block/view/projectstatisticblock.html.php @@ -55,9 +55,21 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po .block-statistic.block-sm .nav-secondary > li.active > a.btn-view {width: auto; left: 0; right: 0;} .block-statistic.block-sm .nav-secondary > li.active > a.btn-view > i {display: none;} .block-statistic.block-sm .nav-secondary > li.active > a.btn-view:hover {cursor: pointer; background: rgba(0,0,0,.1)} +.block-statistic .program-info .info span+span{margin-left: 15px} +.block-statistic .project-info{margin-top: 25px} +.block-statistic .project-info .col-xs-5, .block-statistic .project-info .col-xs-7{margin-top: 8px} +.block-statistic .project-info .col-xs-5{padding-left: 0px;} .status-count{margin:auto} .status-count tr:first-child td:last-child{color:#000;font-weight:bold} + +.block-statistic .progress-group{margin-top: 20px; margin-bottom: 10px; height: 65px;} +.block-statistic .weekly-title{font-weight: bold; font-size:14px; color: #3C4253;} +.block-statistic .weekly-small{font-size:12px; color: #838A9D;} +.block-statistic .weekly-progress {font-weight: bold; font-size:24px;} +.block-statistic .weekly-name{font-size:14px; color: #838A9D;} +.block-statistic .weekly-value{font-size:14px;} +.block-statistic .col-6 .stage{margin-left: 10px}
- +

block->noData;?>

@@ -92,110 +104,139 @@ $(function()
- -
+ +
+ model == 'scrum'):?>
-
+
- task->statusList['done'];?> - progress;?>percent;?> + story->common . $lang->project->doneStories;?> + doneStories;?>
-
project->totalEstimate;?>
-
totalEstimate;?> task->hour;?>
+
project->allStories;?>
+
allStories;?>
-
project->totalConsumed;?>
-
totalConsumed;?> task->hour;?>
+
project->doneStories;?>
+
doneStories;?>
-
project->totalLeft;?>
-
totalLeft;?> task->hour;?>
+
project->leftStories;?>
+
leftStories;?>
-
-
task->yesterdayFinished;?> yesterdayFinished;?>
-
-
-
-
-
-
- - - - - - - - - -
task->allTasks;?> :totalTasks) ? 0 : html::a($this->createLink('project', 'task', "executionID={$execution->id}&status=all"), $execution->totalTasks);?>
task->noFinished;?> :undoneTasks) ? 0 : html::a($this->createLink('project', 'task', "executionID={$execution->id}&status=undone"), $execution->undoneTasks);?>
-
+
+

project->allInput;?>

+
+ project->membersUnit, $project->teamCount);?> + project->hoursUnit, $project->estimate);?> + budget . ' ' . zget($lang->project->unitList, $project->budgetUnit);?>
-
-
story->released;?> releasedStories;?>
-
-
-
-
-
- - - - - - - - - -
story->total;?> :totalStories) ? 0 : html::a($this->createLink('project', 'story', "executionID={$execution->id}&orderBy=order_desc&type=all"), $execution->totalStories);?>
story->unclosed;?> :unclosedStories) ? 0 : html::a($this->createLink('project', 'story', "executionID={$execution->id}&orderBy=order_desc&type=unclosed"), $execution->unclosedStories);?>
+
+ +

project->lastIteration;?>

+ executions as $execution):?> + + 3) break;?> +
name;?>
+
+
+
+ hours->progress . '%';?> +
+ +
+
+ +
+
+ project->weekly;?> + current;?> +
+
+
+
project->progress;?>
+
progress . '%';?>
+
+
+
+
-
-
bug->yesterdayResolved;?> yesterdayResolved;?>
-
-
-
+
+
+
project->pv;?>
+
pv;?>
-
-
- - - - - - - - - -
bug->allBugs;?> :totalBugs) ? 0 : html::a($this->createLink('project', 'bug', "executionID={$execution->id}&orderBy=status,id_desc&build=0&type=all"), $execution->totalBugs);?>
bug->unResolved;?> :activeBugs) ? 0 : html::a($this->createLink('project', 'bug', "executionID={$execution->id}&orderBy=status,id_desc&build=0&type=unresolved"), $execution->activeBugs);?>
-
+
+
project->ev;?>
+
ev;?>
+
+
+
project->sv;?>
+
sv;?>
+
+
+
+ project->allInput;?> +
+
+
+
+
+
+
project->PM;?>
+
PM ? zget($users, $project->PM) : $lang->project->emptyPM;?>
+
+
+
project->teamCount;?>
+
teamCount;?>
+
+
+
project->budget;?>
+
budget;?>
+
+
+
+
+
+
project->ac;?>
+
ac;?>
+
+
+
project->cv;?>
+
cv;?>
+
+
+
+
+
+
diff --git a/module/block/view/projectteamblock.html.php b/module/block/view/projectteamblock.html.php index 20cea8dba9..7e4fff2426 100644 --- a/module/block/view/projectteamblock.html.php +++ b/module/block/view/projectteamblock.html.php @@ -8,12 +8,13 @@ $maxConsumed = 0;
+
project->name;?>
teamCount); $maxConsumed = max($maxConsumed, $project->consumed); ?> -
name;?>
+
name;?>
@@ -36,7 +37,7 @@ $maxConsumed = 0;
-
consumed;?>
+
consumed . $lang->execution->workHourUnit;?>
@@ -47,7 +48,7 @@ $maxConsumed = 0;