diff --git a/module/action/control.php b/module/action/control.php index 08dc85bf7a..86e156ef8e 100755 --- a/module/action/control.php +++ b/module/action/control.php @@ -161,7 +161,6 @@ class action extends control /* Title and position. */ $this->view->title = $this->lang->action->trash; - $this->view->position[] = $this->lang->action->trash; $this->view->trashes = $trashes; $this->view->type = $type; diff --git a/module/admin/control.php b/module/admin/control.php index 2d654af245..c94b1d0ce3 100755 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -145,7 +145,6 @@ class admin extends control } $this->view->title = $this->lang->admin->registerNotice->caption; - $this->view->position[] = $this->lang->admin->registerNotice->caption; $this->view->register = $this->admin->getRegisterInfo(); $this->view->sn = $this->config->global->sn; $this->view->from = $from; @@ -187,7 +186,6 @@ class admin extends control } $this->view->title = $this->lang->admin->bind->caption; - $this->view->position[] = $this->lang->admin->bind->caption; $this->view->sn = $this->config->global->sn; $this->view->from = $from; $this->display(); @@ -208,7 +206,6 @@ class admin extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload')); } $this->view->title = $this->lang->admin->safe->common . $this->lang->colon . $this->lang->admin->safe->set; - $this->view->position[] = $this->lang->admin->safe->common; $this->display(); } @@ -221,8 +218,6 @@ class admin extends control public function checkWeak() { $this->view->title = $this->lang->admin->safe->common . $this->lang->colon . $this->lang->admin->safe->checkWeak; - $this->view->position[] = html::a(inlink('safe'), $this->lang->admin->safe->common); - $this->view->position[] = $this->lang->admin->safe->checkWeak; $this->view->weakUsers = $this->loadModel('user')->getWeakUsers(); $this->display(); } @@ -254,7 +249,6 @@ class admin extends control if(!isset($this->config->sso)) $this->config->sso = new stdclass(); $this->view->title = $this->lang->admin->sso; - $this->view->position[] = $this->lang->admin->sso; $this->view->turnon = isset($this->config->sso->turnon) ? $this->config->sso->turnon : 1; $this->view->redirect = isset($this->config->sso->redirect) ? $this->config->sso->redirect : 0; @@ -316,7 +310,6 @@ class admin extends control } $this->view->title = $this->lang->admin->certifyEmail; - $this->view->position[] = $this->lang->admin->certifyEmail; $this->view->email = helper::safe64Decode($email); $this->display(); @@ -340,7 +333,6 @@ class admin extends control } $this->view->title = $this->lang->admin->certifyMobile; - $this->view->position[] = $this->lang->admin->certifyMobile; $this->view->mobile = helper::safe64Decode($mobile); $this->display(); @@ -363,7 +355,6 @@ class admin extends control } $this->view->title = $this->lang->admin->ztCompany; - $this->view->position[] = $this->lang->admin->ztCompany; $this->view->fields = explode(',', $fields); $this->display(); @@ -402,9 +393,6 @@ class admin extends control $this->loadModel('webhook'); $this->view->title = $this->lang->admin->log; - $this->view->position[] = html::a($this->createLink('webhook', 'browse'), $this->lang->admin->api); - $this->view->position[] = $this->lang->admin->log; - $this->view->position[] = $this->lang->admin->setting; $this->display(); } diff --git a/module/automation/control.php b/module/automation/control.php index bcac97957c..ca8db55b49 100644 --- a/module/automation/control.php +++ b/module/automation/control.php @@ -47,7 +47,6 @@ class automation extends control $this->loadModel('qa')->setMenu($this->products, $productID, $branch); $this->view->title = $this->lang->automation->common; - $this->view->position[] = $this->lang->automation->browse; $this->display(); } } diff --git a/module/backup/control.php b/module/backup/control.php index a45540a11e..8575003e90 100644 --- a/module/backup/control.php +++ b/module/backup/control.php @@ -70,7 +70,6 @@ class backup extends control krsort($backups); $this->view->title = $this->lang->backup->common; - $this->view->position[] = $this->lang->backup->common; $this->view->backups = $backups; $this->display(); } diff --git a/module/bug/control.php b/module/bug/control.php index 514ea7666c..7c013b7073 100755 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -165,8 +165,6 @@ class bug extends control $this->qa->setMenu($this->products, $productID, $branchID); $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->common . $this->lang->colon . $this->lang->bug->reportChart; - $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]); - $this->view->position[] = $this->lang->bug->reportChart; $this->view->productID = $productID; $this->view->browseType = $browseType; $this->view->branchID = $branchID; @@ -471,7 +469,6 @@ class bug extends control } $this->view->title = $product->name . $this->lang->colon . "BUG" . $this->lang->bug->batchEdit; - $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID&branch=$branch"), $this->products[$productID]); $this->view->plans = $plans; } else @@ -505,7 +502,6 @@ class bug extends control $this->lang->task->menu = $this->lang->my->menu->work; $this->lang->my->menu->work['subModule'] = 'bug'; - $this->view->position[] = html::a($this->createLink('my', 'bug'), $this->lang->my->bug); $this->view->title = "BUG" . $this->lang->bug->batchEdit; $this->view->plans = $this->loadModel('productplan')->getPairs($product->id, $branch); $this->view->productList = $productList; diff --git a/module/bug/zen.php b/module/bug/zen.php index 5c14a9677c..9142231141 100644 --- a/module/bug/zen.php +++ b/module/bug/zen.php @@ -1469,8 +1469,6 @@ class bugZen extends bug /* Header and positon. */ $this->view->title = "BUG #$bug->id $bug->title - " . $product->name; - $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $product->name); - $this->view->position[] = $this->lang->bug->view; /* Assign. */ $this->view->project = $this->project->getByID($bug->project); @@ -1674,8 +1672,6 @@ class bugZen extends bug $this->qa->setMenu($this->products, $productID, $bug->branch); $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->activate; - $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]); - $this->view->position[] = $this->lang->bug->activate; $this->view->bug = $bug; $this->view->users = $this->user->getPairs('noclosed', $bug->resolvedBy); diff --git a/module/build/control.php b/module/build/control.php index 9493ff919b..9adf3674c5 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -117,7 +117,6 @@ class build extends control foreach($productGroups as $product) $products[$product->id] = $product->name; $this->view->title = $this->lang->build->create; - $this->view->position[] = $this->lang->build->create; $this->view->product = isset($productGroups[$productID]) ? $productGroups[$productID] : ''; $this->view->branches = $branches; @@ -215,7 +214,6 @@ class build extends control $this->commonActions($build->project); $this->view->title = $build->name . $this->lang->colon . $this->lang->build->edit; - $this->view->position[] = $this->lang->build->edit; $this->view->product = isset($productGroups[$build->product]) ? $productGroups[$build->product] : ''; $this->view->branchTagOption = $branchTagOption; $this->view->orderBy = $orderBy; diff --git a/module/caselib/control.php b/module/caselib/control.php index ac84e04cbd..cc4f815cc7 100644 --- a/module/caselib/control.php +++ b/module/caselib/control.php @@ -88,9 +88,6 @@ class caselib extends control $this->caselib->setLibMenu($libraries, $libID); $this->view->title = $libraries[$libID] . $this->lang->colon . $this->lang->caselib->edit; - $this->view->position[] = html::a($this->createLink('caselib', 'browse', "libID=$libID"), $libraries[$libID]); - $this->view->position[] = $this->lang->caselib->common; - $this->view->position[] = $this->lang->caselib->edit; $this->view->lib = $lib; $this->display(); @@ -201,7 +198,6 @@ class caselib extends control $this->view->modulePairs = $showModule ? $this->tree->getModulePairs($libID, 'caselib', $showModule) : array(); $this->view->title = $this->lang->caselib->common . $this->lang->colon . $libraries[$libID]; - $this->view->position[] = html::a($this->createLink('caselib', 'browse', "libID=$libID"), $libraries[$libID]); $this->view->libID = $libID; $this->view->libName = $libraries[$libID]; @@ -289,9 +285,6 @@ class caselib extends control } $this->view->title = $libraries[$libID] . $this->lang->colon . $this->lang->testcase->create; - $this->view->position[] = html::a($this->createLink('caselib', 'browse', "libID=$libID"), $libraries[$libID]); - $this->view->position[] = $this->lang->caselib->common; - $this->view->position[] = $this->lang->testcase->create; foreach(explode(',', $this->config->caselib->customCreateFields) as $field) $customFields[$field] = $this->lang->testcase->$field; $this->view->showFields = $this->config->caselib->custom->createFields; @@ -336,8 +329,6 @@ class caselib extends control $this->caselib->setLibMenu($libraries, $libID); $this->view->title = $libraries[$libID] . $this->lang->colon . $this->lang->testcase->batchCreate; - $this->view->position[] = html::a($this->createLink('caselib', 'browse', "libID=$libID"), $libraries[$libID]); - $this->view->position[] = $this->lang->testcase->batchCreate; $this->view->libID = $libID; $this->view->moduleOptionMenu = $this->loadModel('tree')->getOptionMenu($libID, $viewType = 'caselib', $startModuleID = 0); $this->view->currentModuleID = (int)$moduleID; @@ -364,9 +355,6 @@ class caselib extends control $this->loadModel('testcase'); $this->view->title = $lib->name . $this->lang->colon . $this->lang->caselib->view; - $this->view->position[] = html::a($this->createLink('caselib', 'browse', "libID=$libID"), $lib->name); - $this->view->position[] = $this->lang->caselib->common; - $this->view->position[] = $this->lang->caselib->view; $this->view->lib = $lib; $this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter'); @@ -763,7 +751,6 @@ class caselib extends control if($showSuhosinInfo) $this->view->suhosinInfo = extension_loaded('suhosin') ? sprintf($this->lang->suhosinInfo, $countInputVars) : sprintf($this->lang->maxVarsInfo, $countInputVars); $this->view->title = $this->lang->caselib->common . $this->lang->colon . $this->lang->testcase->showImport; - $this->view->position[] = $this->lang->testcase->showImport; $this->view->modules = $modules; $this->view->cases = $this->dao->select('id,module,stage,status,pri,type')->from(TABLE_CASE)->where('lib')->eq($libID)->andWhere('deleted')->eq(0)->andWhere('product')->eq(0)->fetchAll('id'); diff --git a/module/company/control.php b/module/company/control.php index 6a84f863e0..d6d0708292 100755 --- a/module/company/control.php +++ b/module/company/control.php @@ -81,7 +81,6 @@ class company extends control /* Assign. */ $this->view->title = $this->lang->company->index . $this->lang->colon . $this->lang->dept->common; - $this->view->position[] = $this->lang->dept->common; $this->view->users = $users; $this->view->searchForm = $this->fetch('search', 'buildForm', $this->config->company->browse->search); $this->view->deptTree = $this->dept->getTreeMenu($rooteDeptID = 0, array('deptModel', 'createMemberLink')); @@ -153,7 +152,6 @@ class company extends control { $this->company->setMenu(); $this->view->title = $this->lang->company->common . $this->lang->colon . $this->lang->company->view; - $this->view->position[] = $this->lang->company->view; $this->view->company = $this->company->getById($this->app->company->id); $this->display(); } @@ -245,7 +243,6 @@ class company extends control /* The header and position. */ $this->view->title = $this->lang->company->common . $this->lang->colon . $this->lang->company->dynamic; - $this->view->position[] = $this->lang->company->dynamic; /* Get actions. */ if($browseType != 'bysearch') diff --git a/module/compile/control.php b/module/compile/control.php index 616db15d29..47d532a668 100644 --- a/module/compile/control.php +++ b/module/compile/control.php @@ -56,8 +56,6 @@ class compile extends control $pager = new pager($recTotal, $recPerPage, $pageID); $this->view->title = $this->lang->ci->job . $this->lang->colon . $this->lang->compile->browse; - $this->view->position[] = html::a($this->createLink('job', 'browse'), $this->lang->ci->job); - $this->view->position[] = $this->lang->compile->browse; $this->view->repoID = $repoID; $this->view->jobID = $jobID; @@ -88,9 +86,6 @@ class compile extends control $this->view->job = $job; $this->view->title = $this->lang->ci->job . $this->lang->colon . $this->lang->compile->logs; - $this->view->position[] = html::a($this->createLink('job', 'browse'), $this->lang->ci->job); - $this->view->position[] = html::a($this->createLink('compile', 'browse', "jobID=" . $build->job), $this->lang->compile->browse); - $this->view->position[] = $this->lang->compile->logs; $this->display(); } diff --git a/module/convert/control.php b/module/convert/control.php index e2b7e082a9..ac9477c702 100644 --- a/module/convert/control.php +++ b/module/convert/control.php @@ -21,7 +21,6 @@ class convert extends control { $this->convert->saveState(); $this->view->title = $this->lang->convert->common; - $this->view->position[] = $this->lang->convert->common; $this->display(); } @@ -34,8 +33,6 @@ class convert extends control public function selectSource() { $this->view->title = $this->lang->convert->common . $this->lang->colon . $this->lang->convert->start; - $this->view->position[] = $this->lang->convert->common; - $this->view->position[] = $this->lang->convert->start; $this->display(); } @@ -57,8 +54,6 @@ class convert extends control list($sourceName, $version) = explode('_', $this->post->source); $setFunc = "set$sourceName"; $this->view->title = $this->lang->convert->common . $this->lang->colon . $this->lang->convert->setting; - $this->view->position[] = $this->lang->convert->common; - $this->view->position[] = $this->lang->convert->setting; $this->view->source = $sourceName; $this->view->version = $version; $this->view->setting = $this->fetch('convert', $setFunc, "version=$version"); @@ -108,8 +103,6 @@ class convert extends control { $checkFunc = 'check' . $this->post->source; $this->view->title = $this->lang->convert->common . $this->lang->colon . $this->lang->convert->checkConfig; - $this->view->position[] = $this->lang->convert->common; - $this->view->position[] = $this->lang->convert->checkConfig; $this->view->source = $this->post->source; $this->view->checkResult = $this->fetch('convert', $checkFunc, "version={$this->post->version}"); $this->display(); @@ -192,8 +185,6 @@ class convert extends control { $convertFunc = 'convert' . $this->post->source; $this->view->title = $this->lang->convert->common . $this->lang->colon . $this->lang->convert->execute; - $this->view->position[] = $this->lang->convert->common; - $this->view->position[] = $this->lang->convert->execute; $this->view->source = $this->post->source; $this->view->version = $this->post->version; diff --git a/module/cron/control.php b/module/cron/control.php index 48320f9b78..5bb7604091 100644 --- a/module/cron/control.php +++ b/module/cron/control.php @@ -20,7 +20,6 @@ class cron extends control public function index() { $this->view->title = $this->lang->cron->common; - $this->view->position[] = $this->lang->cron->common; $this->view->crons = $this->cron->getCrons(); $this->display(); @@ -66,8 +65,6 @@ class cron extends control return print(js::locate(inlink('index'), 'parent')); } $this->view->title = $this->lang->cron->create . $this->lang->cron->common; - $this->view->position[] = html::a(inlink('index'), $this->lang->cron->common); - $this->view->position[] = $this->lang->cron->create; $this->display(); } @@ -88,8 +85,6 @@ class cron extends control return print(js::locate(inlink('index'), 'parent')); } $this->view->title = $this->lang->cron->edit . $this->lang->cron->common; - $this->view->position[] = html::a(inlink('index'), $this->lang->cron->common); - $this->view->position[] = $this->lang->cron->edit; $this->view->cron = $this->cron->getById($cronID); $this->display(); diff --git a/module/custom/control.php b/module/custom/control.php index bd707c630d..be0ad26642 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -282,8 +282,6 @@ class custom extends control } $this->view->title = $this->lang->custom->common . $this->lang->colon . $this->lang->$module->common; - $this->view->position[] = $this->lang->custom->common; - $this->view->position[] = $this->lang->$module->common; $this->view->fieldList = $fieldList; $this->view->dbFields = $dbFields; $this->view->field = $field; @@ -334,7 +332,6 @@ class custom extends control } $this->view->title = $this->lang->custom->working; - $this->view->position[] = $this->lang->custom->working; $this->display(); } @@ -369,7 +366,6 @@ class custom extends control } $this->view->title = $this->lang->custom->required; - $this->view->position[] = $this->lang->custom->required; $this->view->requiredFields = $requiredFields; $this->view->module = $moduleName; @@ -391,8 +387,6 @@ class custom extends control } $this->view->title = $this->lang->custom->score; - $this->view->position[] = $this->lang->custom->common; - $this->view->position[] = $this->view->title; $this->display(); } @@ -414,7 +408,6 @@ class custom extends control $this->lang->admin->menu->system['subModule'] = 'custom'; $this->view->title = $this->lang->custom->timezone; - $this->view->position[] = $this->lang->custom->timezone; $this->display(); } @@ -427,7 +420,6 @@ class custom extends control public function browseStoryConcept() { $this->view->title = $this->lang->custom->browseStoryConcept; - $this->view->position[] = $this->lang->custom->browseStoryConcept; $this->view->URSRList = $this->custom->getURSRList(); $this->view->module = 'product'; @@ -452,7 +444,6 @@ class custom extends control } $this->view->title = $this->lang->custom->setStoryConcept; - $this->view->position[] = $this->lang->custom->setStoryConcept; $this->display(); } @@ -567,8 +558,6 @@ class custom extends control } $this->view->title = $this->lang->custom->productName; - $this->view->position[] = $this->lang->custom->common; - $this->view->position[] = $this->view->title; $this->view->module = 'product'; $this->display(); @@ -589,8 +578,6 @@ class custom extends control } $this->view->title = $this->lang->custom->kanban; - $this->view->position[] = $this->lang->custom->common; - $this->view->position[] = $this->view->title; $this->display(); } @@ -615,7 +602,6 @@ class custom extends control } $this->view->title = $this->lang->custom->flow; - $this->view->position[] = $this->lang->custom->flow; $this->display(); } @@ -648,8 +634,6 @@ class custom extends control list($disabledFeatures, $enabledScrumFeatures, $disabledScrumFeatures) = $this->custom->computeFeatures(); $this->view->title = $this->lang->custom->mode; - $this->view->position[] = $this->lang->custom->common; - $this->view->position[] = $this->view->title; $this->view->mode = $mode; $this->view->programs = $this->loadModel('program')->getTopPairs('', 'noclosed', true); $this->view->programID = isset($this->config->global->defaultProgram) ? $this->config->global->defaultProgram : 0; @@ -930,8 +914,6 @@ class custom extends control } $this->view->title = $this->lang->custom->beginAndEndDate; - $this->view->position[] = $this->lang->custom->common; - $this->view->position[] = $this->view->title; $this->view->module = 'task'; $this->display(); diff --git a/module/dept/control.php b/module/dept/control.php index cbf366ef24..598a6d9085 100644 --- a/module/dept/control.php +++ b/module/dept/control.php @@ -36,7 +36,6 @@ class dept extends control { $parentDepts = $this->dept->getParents($deptID); $this->view->title = $this->lang->dept->manage . $this->lang->colon . $this->app->company->name; - $this->view->position[] = $this->lang->dept->manage; $this->view->deptID = $deptID; $this->view->depts = $this->dept->getTreeMenu($rootDeptID = 0, array('deptmodel', 'createManageLink')); $this->view->parentDepts = $parentDepts; diff --git a/module/design/control.php b/module/design/control.php index 9964b82378..1ddc7f4c1c 100755 --- a/module/design/control.php +++ b/module/design/control.php @@ -127,7 +127,6 @@ class design extends control $this->view->hiddenProduct = $project->hasProduct ? false : true; $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->browse; - $this->view->position[] = $this->lang->design->browse; $this->view->designs = $designs; $this->view->type = $type; @@ -180,7 +179,6 @@ class design extends control $project = $this->loadModel('project')->getByID($projectID); $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->create; - $this->view->position[] = $this->lang->design->create; $this->view->users = $this->loadModel('user')->getPairs('noclosed'); $this->view->stories = $this->loadModel('story')->getProductStoryPairs($productIdList, 'all', 0, 'active', 'id_desc', 0, 'full', 'story', false); @@ -229,7 +227,6 @@ class design extends control $project = $this->loadModel('project')->getByID($projectID); $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->batchCreate; - $this->view->position[] = $this->lang->design->batchCreate; $this->view->stories = $this->loadModel('story')->getProductStoryPairs($productIdList); $this->view->users = $this->loadModel('user')->getPairs('noclosed'); @@ -260,7 +257,6 @@ class design extends control $project = $this->loadModel('project')->getByID($design->project); $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->view; - $this->view->position[] = $this->lang->design->view; $this->view->design = $design; $this->view->stories = $this->loadModel('story')->getProductStoryPairs($productIdList); @@ -315,7 +311,6 @@ class design extends control $project = $this->loadModel('project')->getByID($design->project); $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->edit; - $this->view->position[] = $this->lang->design->edit; $this->view->design = $design; $this->view->project = $project; @@ -383,7 +378,6 @@ class design extends control $revisions = array_chunk($revisions, $pager->recPerPage); $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->linkCommit; - $this->view->position[] = $this->lang->design->linkCommit; $this->view->repos = $repos; $this->view->repoID = $repoID; @@ -445,7 +439,6 @@ class design extends control $design = $this->design->getCommit($designID, $pager); $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->submission; - $this->view->position[] = $this->lang->design->submission; $this->view->design = $design; $this->view->pager = $pager; @@ -562,7 +555,6 @@ class design extends control $design = $this->design->getByID($designID); $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->assignedTo; - $this->view->position[] = $this->lang->design->assignedTo; $this->view->design = $design; $this->view->users = $this->loadModel('project')->getTeamMemberPairs($design->project); diff --git a/module/dev/control.php b/module/dev/control.php index e16e7d8777..944b520fb1 100644 --- a/module/dev/control.php +++ b/module/dev/control.php @@ -25,8 +25,6 @@ class dev extends control if($module == 'restapi') return print($this->fetch('dev', 'restAPI', "apiID=$apiID")); $this->view->title = $this->lang->dev->api; - $this->view->position[] = html::a(inlink('api'), $this->lang->dev->common); - $this->view->position[] = $this->lang->dev->api; $this->view->tables = $this->dev->getTables(); $this->view->tab = 'api'; @@ -70,8 +68,6 @@ class dev extends control public function db($table = '') { $this->view->title = $this->lang->dev->db; - $this->view->position[] = html::a(inlink('api'), $this->lang->dev->common); - $this->view->position[] = $this->lang->dev->db; $this->view->tableTree = $this->dev->getTree($table, 'table'); $this->view->selectedTable = $table; @@ -89,8 +85,6 @@ class dev extends control public function editor() { $this->view->title = $this->lang->dev->editor; - $this->view->position[] = html::a(inlink('api'), $this->lang->dev->common); - $this->view->position[] = $this->lang->dev->editor; $this->view->tab = 'editor'; $this->display(); diff --git a/module/doc/control.php b/module/doc/control.php index b0d9b58b68..c9479dfa6f 100755 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -1063,7 +1063,6 @@ class doc extends control $files = $this->doc->getLibFiles($type, $objectID, $orderBy, $pager); $this->view->title = $object->name; - $this->view->position[] = $object->name; $this->view->type = $type; $this->view->object = $object; diff --git a/module/editor/control.php b/module/editor/control.php index a2a4a45220..bdc9e31f5d 100644 --- a/module/editor/control.php +++ b/module/editor/control.php @@ -35,7 +35,6 @@ class editor extends control { $this->app->loadLang('dev'); $this->view->title = $this->lang->editor->common; - $this->view->position[] = $this->lang->editor->common; $this->view->tab = $type; $this->view->moduleTree = $this->loadModel('dev')->getTree($type, 'module'); $this->display(); diff --git a/module/entry/control.php b/module/entry/control.php index 96bd6feaf9..f0e184e49c 100644 --- a/module/entry/control.php +++ b/module/entry/control.php @@ -28,8 +28,6 @@ class entry extends control $this->view->title = $this->lang->entry->common . $this->lang->colon . $this->lang->entry->list; $this->view->entries = $this->entry->getList($orderBy, $pager); - $this->view->position[] = html::a(inlink('browse'), $this->lang->entry->api); - $this->view->position[] = $this->lang->entry->common; $this->view->orderBy = $orderBy; $this->view->pager = $pager; $this->display(); @@ -55,9 +53,6 @@ class entry extends control $this->view->title = $this->lang->entry->common . $this->lang->colon . $this->lang->entry->create; $this->view->users = $this->loadModel('user')->getPairs('nodeleted|noclosed'); - $this->view->position[] = html::a(inlink('browse'), $this->lang->entry->api); - $this->view->position[] = html::a(inlink('browse'), $this->lang->entry->common); - $this->view->position[] = $this->lang->entry->create; $this->display(); } @@ -86,9 +81,6 @@ class entry extends control $entry = $this->entry->getById($id); $this->view->title = $this->lang->entry->edit . $this->lang->colon . $entry->name; $this->view->users = $this->loadModel('user')->getPairs('nodeleted|noclosed'); - $this->view->position[] = html::a(inlink('browse'), $this->lang->entry->api); - $this->view->position[] = html::a(inlink('browse'), $this->lang->entry->common); - $this->view->position[] = $this->lang->entry->edit; $this->view->entry = $entry; $this->display(); } @@ -127,9 +119,6 @@ class entry extends control $entry = $this->entry->getByID($id); $this->view->title = $this->lang->entry->log . $this->lang->colon . $entry->name; $this->view->logs = $this->entry->getLogs($id, $orderBy, $pager); - $this->view->position[] = html::a(inlink('browse'), $this->lang->entry->api); - $this->view->position[] = html::a(inlink('browse'), $this->lang->entry->common); - $this->view->position[] = $this->lang->entry->log; $this->view->entry = $entry; $this->view->orderBy = $orderBy; $this->view->pager = $pager; diff --git a/module/execution/control.php b/module/execution/control.php index f93cc7d16e..d22aa11a5e 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -278,8 +278,6 @@ class execution extends control /* Header and session. */ $this->view->title = $execution->name . $this->lang->colon . $this->lang->execution->task; - $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name); - $this->view->position[] = $this->lang->execution->task; /* Get tasks and group them. */ if(empty($groupBy))$groupBy = 'story'; @@ -1337,8 +1335,6 @@ class execution extends control /* Header and position. */ $this->view->title = $execution->name . $this->lang->colon . $this->lang->execution->build; - $this->view->position[] = html::a(inlink('browse', "executionID=$executionID"), $execution->name); - $this->view->position[] = $this->lang->execution->build; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->buildsTotal = count($builds); @@ -1385,8 +1381,6 @@ class execution extends control foreach($tasks as $key => $task) $productTasks[$task->product][] = $task; $this->view->title = $this->executions[$executionID] . $this->lang->colon . $this->lang->testtask->common; - $this->view->position[] = html::a($this->createLink('execution', 'testtask', "executionID=$executionID"), $this->executions[$executionID]); - $this->view->position[] = $this->lang->testtask->common; $this->view->execution = $execution; $this->view->project = $this->loadModel('project')->getByID($execution->project); $this->view->executionID = $executionID; @@ -1874,7 +1868,6 @@ class execution extends control if(isset($project->hasProduct) and $project->hasProduct == 0) $this->lang->execution->PO = $this->lang->common->story . $this->lang->execution->owner; $this->view->title = $this->app->tab == 'execution' ? $this->lang->execution->createExec : $this->lang->execution->create; - $this->view->position[] = $this->view->title; $this->view->gobackLink = (isset($output['from']) and $output['from'] == 'global') ? $this->createLink('execution', 'all') : ''; $this->view->groups = $this->loadModel('group')->getPairs(); $this->view->allProducts = $allProducts; @@ -2210,7 +2203,6 @@ class execution extends control if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink; $this->view->title = $this->lang->execution->batchEdit; - $this->view->position[] = $this->lang->execution->batchEdit; $this->view->executions = $executions; $this->view->allProjects = $allProjects; $this->view->projects = $projects; @@ -2310,8 +2302,6 @@ class execution extends control } $this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->execution->start; - $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $this->view->execution->name); - $this->view->position[] = $this->lang->execution->start; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->actions = $this->loadModel('action')->getList($this->objectType, $executionID); $this->display(); @@ -2353,8 +2343,6 @@ class execution extends control } $this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->execution->putoff; - $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $this->view->execution->name); - $this->view->position[] = $this->lang->execution->putoff; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->actions = $this->loadModel('action')->getList($this->objectType, $executionID); $this->display(); @@ -2402,8 +2390,6 @@ class execution extends control } $this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->execution->suspend; - $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $this->view->execution->name); - $this->view->position[] = $this->lang->execution->suspend; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->actions = $this->loadModel('action')->getList($this->objectType, $executionID); $this->display(); @@ -2447,8 +2433,6 @@ class execution extends control $newEnd = date('Y-m-d', strtotime($execution->end) + $dateDiff * 24 * 3600); $this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->execution->activate; - $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $this->view->execution->name); - $this->view->position[] = $this->lang->execution->activate; $this->view->execution = $execution; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->actions = $this->loadModel('action')->getList($this->objectType, $executionID); @@ -2492,8 +2476,6 @@ class execution extends control } $this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->execution->close; - $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $this->view->execution->name); - $this->view->position[] = $this->lang->execution->close; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->actions = $this->loadModel('action')->getList($this->objectType, $executionID); $this->display(); @@ -2583,8 +2565,6 @@ class execution extends control if(!$execution->projectInfo->hasProduct) $this->lang->execution->PO = $this->lang->common->story . $this->lang->execution->owner; $this->view->title = $this->lang->execution->view; - $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name); - $this->view->position[] = $this->view->title; $this->view->execution = $execution; $this->view->products = $products; @@ -2948,8 +2928,6 @@ class execution extends control if($execution->lifetime == 'ops') unset($this->lang->execution->treeLevel['story']); $this->view->title = $this->lang->execution->tree; - $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name); - $this->view->position[] = $this->lang->execution->tree; $this->view->execution = $execution; $this->view->executionID = $executionID; $this->view->level = $type; @@ -3098,8 +3076,6 @@ class execution extends control $this->app->session->set('executionStoryList', $this->app->getURI(true), 'execution'); $this->view->title = $this->lang->execution->storyKanban; - $this->view->position[] = html::a($this->createLink('execution', 'story', "executionID=$executionID"), $execution->name); - $this->view->position[] = $this->lang->execution->storyKanban; $this->view->stories = $this->story->getKanbanGroupData($stories); $this->view->realnames = $this->loadModel('user')->getPairs('noletter'); $this->view->executionID = $executionID; @@ -3539,8 +3515,6 @@ class execution extends control /* Assign. */ $this->view->title = $object->name . $this->lang->colon . $this->lang->execution->linkStory; - $this->view->position[] = html::a($browseLink, $object->name); - $this->view->position[] = $this->lang->execution->linkStory; $this->view->objectID = $originObjectID; $this->view->object = $object; $this->view->products = $products; @@ -3711,8 +3685,6 @@ class execution extends control /* The header and position. */ $execution = $this->execution->getByID($executionID); $this->view->title = $execution->name . $this->lang->colon . $this->lang->execution->dynamic; - $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name); - $this->view->position[] = $this->lang->execution->dynamic; $this->view->userIdPairs = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution', 'nodeleted|useid'); $this->view->accountPairs = $this->loadModel('user')->getPairs('noletter|nodeleted'); @@ -4010,7 +3982,6 @@ class execution extends control $this->execution->buildSearchForm($queryID, $actionURL); $this->view->title = $this->lang->execution->allExecutions; - $this->view->position[] = $this->lang->execution->allExecutions; $executionStats = $this->execution->getStatData(0, $status, $productID, 0, false, $queryID, $orderBy, $pager); diff --git a/module/extension/control.php b/module/extension/control.php index a26227cd5a..101ea528ae 100644 --- a/module/extension/control.php +++ b/module/extension/control.php @@ -28,7 +28,6 @@ class extension extends control { $this->loadModel('admin')->setMenu(); $this->view->title = $this->lang->extension->browse; - $this->view->position[] = $this->lang->extension->browse; $statusFile = str_replace('\\', '/', $statusFile); $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile, $statusFile); @@ -73,7 +72,6 @@ class extension extends control } $this->view->title = $this->lang->extension->browse; - $this->view->position[] = $this->lang->extension->browse; $this->view->tab = $status; $this->view->extensions = $extensions; $this->view->versions = $versions; @@ -109,7 +107,6 @@ class extension extends control } $this->view->title = $this->lang->extension->obtain; - $this->view->position[] = $this->lang->extension->obtain; $this->view->moduleTree = $this->extension->getModulesByAPI(); $this->view->extensions = $extensions; $this->view->installeds = $this->extension->getLocalExtensions('installed,deactivated'); @@ -391,7 +388,6 @@ class extension extends control $this->extension->copyPackageFiles($extension); $this->extension->updateExtension($extension, array('status' => 'installed')); $this->view->title = $this->lang->extension->activateFinished; - $this->view->position[] = $this->lang->extension->activateFinished; $this->display(); } @@ -407,7 +403,6 @@ class extension extends control $this->extension->updateExtension($extension, array('status' => 'deactivated')); $this->view->removeCommands = $this->extension->removePackage($extension); $this->view->title = $this->lang->extension->deactivateFinished; - $this->view->position[] = $this->lang->extension->deactivateFinished; $this->display(); } @@ -477,7 +472,6 @@ class extension extends control { $this->view->removeCommands = $this->extension->erasePackage($extension); $this->view->title = $this->lang->extension->eraseFinished; - $this->view->position[] = $this->lang->extension->eraseFinished; $this->display(); } diff --git a/module/group/control.php b/module/group/control.php index 38c07f0327..7871250a75 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -75,7 +75,6 @@ class group extends control } $this->view->title = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->create; - $this->view->position[] = $this->lang->group->create; $this->display(); } @@ -124,7 +123,6 @@ class group extends control } $this->view->title = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->copy; - $this->view->position[] = $this->lang->group->copy; $this->view->group = $this->group->getById($groupID); $this->display(); } @@ -224,8 +222,6 @@ class group extends control $groupPrivs = $this->group->getPrivs($groupID); $this->view->title = $this->lang->company->common . $this->lang->colon . $group->name . $this->lang->colon . $this->lang->group->managePriv; - $this->view->position[] = $group->name; - $this->view->position[] = $this->lang->group->managePriv; /* Join changelog when be equal or greater than this version.*/ $realVersion = str_replace('_', '.', $version); @@ -328,7 +324,6 @@ class group extends control { $this->group->sortResource(); $this->view->title = $this->lang->company->common . $this->lang->colon . $this->lang->group->managePriv; - $this->view->position[] = $this->lang->group->managePriv; $privs = $this->group->getPrivsListByView(''); $privs = $this->group->getCustomPrivs('', $privs); diff --git a/module/jenkins/control.php b/module/jenkins/control.php index d6e0a4d275..72c6d753a8 100644 --- a/module/jenkins/control.php +++ b/module/jenkins/control.php @@ -39,8 +39,6 @@ class jenkins extends control $pager = new pager($recTotal, $recPerPage, $pageID); $this->view->title = $this->lang->jenkins->common . $this->lang->colon . $this->lang->jenkins->browse; - $this->view->position[] = $this->lang->jenkins->common; - $this->view->position[] = $this->lang->jenkins->browse; $this->view->jenkinsList = $this->jenkins->getList($orderBy, $pager); $this->view->orderBy = $orderBy; @@ -66,8 +64,6 @@ class jenkins extends control } $this->view->title = $this->lang->jenkins->common . $this->lang->colon . $this->lang->jenkins->create; - $this->view->position[] = html::a(inlink('browse'), $this->lang->jenkins->common); - $this->view->position[] = $this->lang->jenkins->create; $this->display(); } @@ -90,8 +86,6 @@ class jenkins extends control } $this->view->title = $this->lang->jenkins->common . $this->lang->colon . $this->lang->jenkins->edit; - $this->view->position[] = html::a(inlink('browse'), $this->lang->jenkins->common); - $this->view->position[] = $this->lang->jenkins->edit; $this->view->jenkins = $jenkins; diff --git a/module/job/control.php b/module/job/control.php index 887a53e845..e4aa5fe879 100644 --- a/module/job/control.php +++ b/module/job/control.php @@ -67,8 +67,6 @@ class job extends control } $this->view->title = $this->lang->ci->job . $this->lang->colon . $this->lang->job->browse; - $this->view->position[] = $this->lang->ci->job; - $this->view->position[] = $this->lang->job->browse; $this->view->repoID = $repoID; $this->view->jobList = $jobList; $this->view->orderBy = $orderBy; @@ -139,8 +137,6 @@ class job extends control } $this->view->title = $this->lang->ci->job . $this->lang->colon . $this->lang->job->create; - $this->view->position[] = html::a(inlink('browse'), $this->lang->ci->job); - $this->view->position[] = $this->lang->job->create; $this->view->repoPairs = $repoPairs; $this->view->gitlabRepos = $gitlabRepos; $this->view->repoTypes = $repoTypes; @@ -219,8 +215,6 @@ class job extends control } $this->view->title = $this->lang->ci->job . $this->lang->colon . $this->lang->job->edit; - $this->view->position[] = html::a(inlink('browse'), $this->lang->ci->job); - $this->view->position[] = $this->lang->job->edit; $this->view->repoPairs = $repoPairs; $this->view->gitlabRepos = $gitlabRepos; $this->view->repoTypes = $repoTypes; @@ -318,8 +312,6 @@ class job extends control } $this->view->title = $this->lang->ci->job . $this->lang->colon . $this->lang->job->browse; - $this->view->position[] = $this->lang->ci->job; - $this->view->position[] = $this->lang->job->browse; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->job = $job; diff --git a/module/mail/control.php b/module/mail/control.php index 6db592cb35..9a4e770d88 100755 --- a/module/mail/control.php +++ b/module/mail/control.php @@ -45,8 +45,6 @@ class mail extends control if($this->config->mail->mta == 'smtp') $this->locate(inlink('edit')); } $this->view->title = $this->lang->mail->common . $this->lang->colon . $this->lang->mail->index; - $this->view->position[] = html::a(inlink('index'), $this->lang->mail->common); - $this->view->position[] = $this->lang->mail->index; $this->display(); } @@ -77,8 +75,6 @@ class mail extends control } $this->view->title = $this->lang->mail->common . $this->lang->colon . $this->lang->mail->detect; - $this->view->position[] = html::a(inlink('index'), $this->lang->mail->common); - $this->view->position[] = $this->lang->mail->detect; $this->view->fromAddress = $this->session->mailConfig ? $this->session->mailConfig->fromAddress : ''; @@ -112,8 +108,6 @@ class mail extends control $mailConfig->domain = isset($this->config->mail->domain) ? $this->config->mail->domain : common::getSysURL(); $this->view->title = $this->lang->mail->common . $this->lang->colon . $this->lang->mail->edit; - $this->view->position[] = html::a(inlink('index'), $this->lang->mail->common); - $this->view->position[] = $this->lang->mail->edit; $this->view->mailExist = $this->mail->mailExist(); $this->view->mailConfig = $mailConfig; @@ -176,8 +170,6 @@ class mail extends control $this->session->set('mailConfig', ''); $this->view->title = $this->lang->mail->common . $this->lang->colon . $this->lang->mail->save; - $this->view->position[] = html::a(inlink('index'), $this->lang->mail->common); - $this->view->position[] = $this->lang->mail->save; $this->view->mailExist = $this->mail->mailExist(); $this->display(); @@ -227,8 +219,6 @@ class mail extends control } $this->view->title = $this->lang->mail->sendCloud; - $this->view->position[] = html::a(inlink('index'), $this->lang->mail->common); - $this->view->position[] = $this->lang->mail->sendCloud; $this->view->mailExist = $this->mail->mailExist(); $this->view->mailConfig = $mailConfig; @@ -276,8 +266,6 @@ class mail extends control } $this->view->title = $this->lang->mail->common . $this->lang->colon . $this->lang->mail->test; - $this->view->position[] = html::a(inlink('index'), $this->lang->mail->common); - $this->view->position[] = $this->lang->mail->test; $this->view->users = $this->dao->select('account, CONCAT(realname, " ", email) AS email' )->from(TABLE_USER)->where('email')->ne('')->andWhere('deleted')->eq(0)->orderBy('account')->fetchPairs(); $this->display(); } @@ -397,8 +385,6 @@ class mail extends control $pager = new pager($recTotal, $recPerPage, $pageID); $this->view->title = $this->lang->mail->browse; - $this->view->position[] = html::a(inlink('edit'), $this->lang->mail->common); - $this->view->position[] = $this->lang->mail->browse; $this->view->queueList = $this->mail->getQueue(null, $orderBy, $pager); $this->view->pager = $pager; @@ -491,8 +477,6 @@ class mail extends control } $this->view->title = $this->lang->mail->sendcloudUser; - $this->view->position[] = html::a(inlink('index'), $this->lang->mail->common); - $this->view->position[] = $this->lang->mail->sendcloudUser; $this->view->members = $this->mta->memberList(); $this->view->users = $this->loadModel('user')->getList(); @@ -526,8 +510,6 @@ class mail extends control } $this->view->title = $this->lang->mail->ztCloud; - $this->view->position[] = html::a(inlink('index'), $this->lang->mail->common); - $this->view->position[] = $this->lang->mail->ztCloud; if(!empty($this->config->mail->ztcloud->secretKey) and !empty($this->config->global->community)) { $mailConfig = new stdclass(); diff --git a/module/message/control.php b/module/message/control.php index ff6783963e..19afdd867b 100644 --- a/module/message/control.php +++ b/module/message/control.php @@ -65,8 +65,6 @@ class message extends control } $this->view->title = $this->lang->message->browser; - $this->view->position[] = $this->lang->message->common; - $this->view->position[] = $this->lang->message->browser; $this->view->browserConfig = $browserConfig; $this->display(); @@ -94,8 +92,6 @@ class message extends control $this->loadModel('action'); $this->view->title = $this->lang->message->setting; - $this->view->position[] = $this->lang->message->common; - $this->view->position[] = $this->lang->message->setting; $users = $this->loadModel('user')->getPairs('noletter,noclosed'); unset($users['']); diff --git a/module/my/control.php b/module/my/control.php index 829afd3954..4a3951fea7 100755 --- a/module/my/control.php +++ b/module/my/control.php @@ -56,7 +56,6 @@ class my extends control $this->view->user = $this->loadModel('user')->getById($this->app->user->account); $this->view->pager = $pager; $this->view->scores = $scores; - $this->view->position[] = $this->lang->score->record; $this->display(); } @@ -286,7 +285,6 @@ EOF; /* The title and position. */ $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->todo; - $this->view->position[] = $this->lang->my->todo; /* Append id for secend sort. */ $sort = common::appendOrder($orderBy); @@ -367,7 +365,6 @@ EOF; /* Assign. */ $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->story; - $this->view->position[] = $this->lang->my->story; $this->view->stories = $stories; $this->view->users = $this->user->getPairs('noletter'); $this->view->projects = $this->loadModel('project')->getPairsByProgram(); @@ -432,7 +429,6 @@ EOF; /* Assign. */ $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->story; - $this->view->position[] = $this->lang->my->story; $this->view->stories = $stories; $this->view->users = $this->user->getPairs('noletter'); $this->view->projects = $this->loadModel('project')->getPairsByProgram(); @@ -523,7 +519,6 @@ EOF; /* Assign. */ $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->task; - $this->view->position[] = $this->lang->my->task; $this->view->tabID = 'task'; $this->view->tasks = $tasks; $this->view->summary = $this->loadModel('execution')->summary($tasks); @@ -588,7 +583,6 @@ EOF; /* assign. */ $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->bug; - $this->view->position[] = $this->lang->my->bug; $this->view->bugs = $bugs; $this->view->users = $this->user->getPairs('noletter'); $this->view->memberPairs = $this->user->getPairs('noletter|nodeleted|noclosed'); @@ -637,7 +631,6 @@ EOF; $sort = common::appendOrder($orderBy); $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->myTestTask; - $this->view->position[] = $this->lang->my->myTestTask; $this->view->tasks = $this->loadModel('testtask')->getByUser($this->app->user->account, $pager, $sort, $type); $this->view->recTotal = $recTotal; @@ -699,7 +692,6 @@ EOF; /* Assign. */ $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->myTestCase; - $this->view->position[] = $this->lang->my->myTestCase; $this->view->cases = $cases; $this->view->users = $this->user->getPairs('noletter'); $this->view->tabID = 'test'; @@ -755,7 +747,6 @@ EOF; /* Assign. */ $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->doc; - $this->view->position[] = $this->lang->my->doc; $this->view->docs = $docs; $this->view->users = $this->user->getPairs('noletter'); $this->view->type = $type; @@ -803,7 +794,6 @@ EOF; $PMList = $this->user->getListByAccounts($accounts, 'account'); $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->project; - $this->view->position[] = $this->lang->my->project; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->projects = $projects; $this->view->PMList = $PMList; @@ -844,7 +834,6 @@ EOF; ->fetchGroup('parent', 'id'); $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->execution; - $this->view->position[] = $this->lang->my->execution; $this->view->tabID = 'project'; $this->view->executions = $executions; $this->view->parentGroup = $parentGroup; @@ -881,7 +870,6 @@ EOF; $this->app->session->set('issueList', $this->app->getURI(true), 'project'); $this->view->title = $this->lang->my->issue; - $this->view->position[] = $this->lang->my->issue; $this->view->mode = 'issue'; $this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter'); $this->view->orderBy = $orderBy; @@ -935,7 +923,6 @@ EOF; $this->app->session->set('riskList', $this->app->getURI(true), 'project'); $this->view->title = $this->lang->my->risk; - $this->view->position[] = $this->lang->my->risk; $this->view->risks = $risks; $this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter'); $this->view->orderBy = $orderBy; @@ -1070,7 +1057,6 @@ EOF; $this->session->set('ncIdList', isset($ncIdList) ? $ncIdList : ''); $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->nc; - $this->view->position[] = $this->lang->my->nc; $this->view->browseType = $browseType; $this->view->ncs = $ncList; $this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter'); @@ -1201,7 +1187,6 @@ EOF; $this->loadModel('search')->setSearchParams($this->config->feedback->search); $this->view->title = $this->lang->my->feedback; - $this->view->position[] = $this->lang->my->feedback; $this->view->mode = 'feedback'; $this->view->browseType = $browseType; $this->view->feedbacks = $feedbacks; @@ -1294,7 +1279,6 @@ EOF; foreach($users as $user) unset($user->password); // Remove passwd. $this->view->title = $this->lang->my->team; - $this->view->position[] = $this->lang->my->team; $this->view->users = $users; $this->view->deptID = $deptID; $this->view->orderBy = $orderBy; @@ -1331,7 +1315,6 @@ EOF; $userGroups = $this->loadModel('group')->getByAccount($this->app->user->account); $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->editProfile; - $this->view->position[] = $this->lang->my->editProfile; $this->view->user = $this->user->getById($this->app->user->account); $this->view->rand = $this->user->updateSessionRandom(); $this->view->userGroups = implode(',', array_keys($userGroups)); @@ -1358,7 +1341,6 @@ EOF; } $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->changePassword; - $this->view->position[] = $this->lang->my->changePassword; $this->view->user = $this->user->getById($this->app->user->account); $this->view->rand = $this->user->updateSessionRandom(); @@ -1440,12 +1422,10 @@ EOF; if($mode == 'new') { $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->user->contacts->createList; - $this->view->position[] = $this->lang->user->contacts->createList; } else { $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->user->contacts->manage; - $this->view->position[] = $this->lang->user->contacts->manage; $this->view->list = $this->user->getContactListByID($listID); } @@ -1513,7 +1493,6 @@ EOF; $user = $this->user->getById($this->app->user->account); $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->profile; - $this->view->position[] = $this->lang->my->profile; $this->view->user = $user; $this->view->groups = $this->loadModel('group')->getByAccount($this->app->user->account); $this->view->deptPath = $this->dept->getParents($user->dept); @@ -1542,7 +1521,6 @@ EOF; } $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->preference; - $this->view->position[] = $this->lang->my->preference; $this->view->showTip = $showTip; $this->view->URSRList = $this->loadModel('custom')->getURSRPairs(); @@ -1610,7 +1588,6 @@ EOF; /* The header and position. */ $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->dynamic; - $this->view->position[] = $this->lang->my->dynamic; $date = empty($date) ? '' : date('Y-m-d', $date); $actions = $this->loadModel('action')->getDynamic($this->app->user->account, $type, $orderBy, $pager, 'all', 'all', 'all', $date, $direction); diff --git a/module/personnel/control.php b/module/personnel/control.php index b18a3407c2..931664c839 100644 --- a/module/personnel/control.php +++ b/module/personnel/control.php @@ -47,7 +47,6 @@ class personnel extends control $this->personnel->buildSearchForm($queryID, $actionURL); $this->view->title = $this->lang->personnel->accessible; - $this->view->position[] = $this->lang->personnel->accessible; $this->view->deptID = $deptID; $this->view->programID = $programID; @@ -80,7 +79,6 @@ class personnel extends control $this->app->loadLang('user'); $this->view->title = $this->lang->personnel->invest; - $this->view->position[] = $this->lang->personnel->invest; $this->view->investList = $this->personnel->getInvest($programID); $this->view->programID = $programID; @@ -120,7 +118,6 @@ class personnel extends control if($from == 'programproject') $goback = $this->session->programProject ? $this->session->programProject : $this->createLink('program', 'project', "programID=$programID"); $this->view->title = $this->lang->personnel->whitelist; - $this->view->position[] = $this->lang->personnel->whitelist; $this->view->pager = $pager; $this->view->objectID = $objectID; @@ -190,7 +187,6 @@ class personnel extends control } $this->view->title = $this->lang->personnel->addWhitelist; - $this->view->position[] = $this->lang->personnel->addWhitelist; $this->view->objectID = $objectID; $this->view->objectType = $objectType; diff --git a/module/pivot/control.php b/module/pivot/control.php index 9b4a38acd7..259dd91122 100644 --- a/module/pivot/control.php +++ b/module/pivot/control.php @@ -103,7 +103,6 @@ class pivot extends control $end = date('Y-m-d', ($end ? strtotime($end) : time() + (date('t') - date('j')) * 24 * 3600)); $this->view->title = $this->lang->pivot->projectDeviation; - $this->view->position[] = $this->lang->pivot->projectDeviation; $this->view->executions = $this->pivot->getExecutions($begin, $end); $this->view->begin = $begin; @@ -127,7 +126,6 @@ class pivot extends control $this->session->set('productList', $this->app->getURI(true), 'product'); $this->view->title = $this->lang->pivot->productSummary; - $this->view->position[] = $this->lang->pivot->productSummary; $this->view->products = $this->pivot->getProducts($conditions); $this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed'); $this->view->submenu = 'product'; @@ -152,7 +150,6 @@ class pivot extends control $end = $end == 0 ? date('Y-m-d', strtotime('now')) : $end = date('Y-m-d', strtotime($end)); $this->view->title = $this->lang->pivot->bugCreate; - $this->view->position[] = $this->lang->pivot->bugCreate; $this->view->begin = $begin; $this->view->end = $end; $this->view->bugs = $this->pivot->getBugs($begin, $end, $product, $execution); @@ -176,7 +173,6 @@ class pivot extends control $this->session->set('productList', $this->app->getURI(true), 'product'); $this->view->title = $this->lang->pivot->bugAssign; - $this->view->position[] = $this->lang->pivot->bugAssign; $this->view->submenu = 'test'; $this->view->assigns = $this->pivot->getBugAssign(); $this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed'); @@ -234,7 +230,6 @@ class pivot extends control } $this->view->title = $this->lang->pivot->workload; - $this->view->position[] = $this->lang->pivot->workload; $this->view->workload = $this->pivot->getWorkload($dept, $assign); $this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed'); diff --git a/module/productplan/control.php b/module/productplan/control.php index 348853d7b0..96443f99cd 100644 --- a/module/productplan/control.php +++ b/module/productplan/control.php @@ -51,7 +51,6 @@ class productplan extends control $this->view->branch = $branch; $this->view->branchOption = $branchOption; $this->view->branchTagOption = $branchTagOption; - $this->view->position[] = html::a($this->createLink('product', 'browse', "productID={$productID}&branch=$branch"), $product->name); } /** @@ -108,8 +107,6 @@ class productplan extends control } $this->view->title = $this->view->product->name . $this->lang->colon . $this->lang->productplan->create; - $this->view->position[] = $this->lang->productplan->common; - $this->view->position[] = $this->lang->productplan->create; $this->view->productID = $productID; $this->view->lastPlan = $lastPlan; @@ -165,7 +162,6 @@ class productplan extends control $this->view->branchTagOption = $branchPairs; } $this->view->title = $this->view->product->name . $this->lang->colon . $this->lang->productplan->edit; - $this->view->position[] = $this->lang->productplan->edit; $this->view->productID = $plan->product; $this->view->oldBranch = $oldBranch; $this->view->plan = $plan; @@ -375,7 +371,6 @@ class productplan extends control } $this->view->title = $productName . $this->lang->colon . $this->lang->productplan->browse; - $this->view->position[] = $this->lang->productplan->browse; $this->view->productID = $productID; $this->view->branch = $branch; $this->view->branchStatusList = $branchStatusList; @@ -473,7 +468,6 @@ class productplan extends control $this->loadModel('datatable'); $this->view->modulePairs = $modulePairs; $this->view->title = "PLAN #$plan->id $plan->title/" . zget($products, $plan->product, ''); - $this->view->position[] = $this->lang->productplan->view; $this->view->planStories = $planStories; $this->view->planBugs = $this->loadModel('bug')->getPlanBugs($planID, 'all', $type == 'bug' ? $sort : 'id_desc', $bugPager); $this->view->products = $products; diff --git a/module/program/control.php b/module/program/control.php index e14ca73dd6..191f56f428 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -92,7 +92,6 @@ class program extends control $this->loadModel('search')->setSearchParams($this->config->program->search); $this->view->title = $this->lang->program->browse; - $this->view->position[] = $this->lang->program->browse; $this->view->programs = $programs; $this->view->status = $status; @@ -176,7 +175,6 @@ class program extends control $this->view->products = $this->product->getStats(array_keys($products), $orderBy, $pager, 'story', $programID); $this->view->title = $this->lang->program->product; - $this->view->position[] = $this->lang->program->product; $this->view->programID = $programID; $this->view->browseType = $browseType; $this->view->orderBy = $orderBy; @@ -215,7 +213,6 @@ class program extends control parse_str($extra, $output); $this->view->title = $this->lang->program->create; - $this->view->position[] = $this->lang->program->create; $this->view->gobackLink = (isset($output['from']) and $output['from'] == 'global') ? $this->createLink('program', 'browse') : ''; $this->view->pmUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst'); @@ -261,7 +258,6 @@ class program extends control foreach($children as $childID) unset($parents[$childID]); $this->view->title = $this->lang->program->edit; - $this->view->position[] = $this->lang->program->edit; $this->view->pmUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst', $program->PM); $this->view->poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst'); @@ -308,7 +304,6 @@ class program extends control } $this->view->title = $this->lang->program->close; - $this->view->position[] = $this->lang->program->close; $this->view->project = $program; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->actions = $this->action->getList('program', $programID); @@ -344,7 +339,6 @@ class program extends control } $this->view->title = $this->lang->program->start; - $this->view->position[] = $this->lang->program->start; $this->view->project = $this->project->getByID($programID, 'program'); $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->actions = $this->action->getList('program', $programID); @@ -381,7 +375,6 @@ class program extends control $newEnd = date('Y-m-d', strtotime($program->end) + $dateDiff * 24 * 3600); $this->view->title = $this->lang->program->activate; - $this->view->position[] = $this->lang->program->activate; $this->view->project = $program; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->actions = $this->action->getList('program', $programID); @@ -416,7 +409,6 @@ class program extends control } $this->view->title = $this->lang->program->suspend; - $this->view->position[] = $this->lang->program->suspend; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->actions = $this->action->getList('program', $programID); $this->view->project = $this->project->getByID($programID, 'program'); @@ -492,7 +484,6 @@ class program extends control $this->view->allProjectsNum = $allProjectsNum; $this->view->title = $this->lang->program->project; - $this->view->position[] = $this->lang->program->project; $this->view->projectStats = $projectStats; $this->view->pager = $pager; @@ -526,7 +517,6 @@ class program extends control $pager = new pager(0, $recPerPage, $pageID); $this->view->title = $this->lang->program->stakeholder; - $this->view->position[] = $this->lang->program->stakeholder; $this->view->stakeholders = $this->program->getStakeholders($programID, $orderBy, $pager); $this->view->pager = $pager; @@ -852,7 +842,6 @@ class program extends control $this->loadModel('search')->setSearchParams($this->config->program->search); $this->view->title = $this->lang->program->projectView; - $this->view->position[] = $this->lang->program->browse; $this->view->programs = $programs; $this->view->status = $status; @@ -920,7 +909,6 @@ class program extends control $this->product->buildProductSearchForm($param, $actionURL); $this->view->title = $this->lang->product->common; - $this->view->position[] = $this->lang->product->common; $this->view->recTotal = $pager->recTotal; $this->view->productStats = $productStats; $this->view->productStructure = $productStructure; diff --git a/module/programplan/zen.php b/module/programplan/zen.php index ee33bee024..6ac48638f4 100644 --- a/module/programplan/zen.php +++ b/module/programplan/zen.php @@ -38,8 +38,6 @@ class programplanZen extends programplan list($visibleFields, $requiredFields, $customFields, $showFields) = $this->computeFieldsCreateView($viewData->executionType); $this->view->title = $this->lang->programplan->create . $this->lang->colon . $viewData->project->name; - $this->view->position[] = html::a($this->createLink('programplan', 'browse', "projectID={$viewData->projectID}"), $viewData->project->name); - $this->view->position[] = $this->lang->programplan->create; $this->view->productList = $viewData->productList; $this->view->project = $viewData->project; $this->view->productID = $viewData->productID ?: key($viewData->productList); @@ -115,7 +113,6 @@ class programplanZen extends programplan $parentStage = $this->project->getByID($plan->parent, 'stage'); $this->view->title = $this->lang->programplan->edit; - $this->view->position[] = $this->lang->programplan->edit; $this->view->isCreateTask = $this->programplan->isCreateTask($plan->id); $this->view->plan = $plan; $this->view->parentStageList = $this->programplan->getParentStageList($this->session->project, $plan->id, $plan->product); diff --git a/module/project/control.php b/module/project/control.php index aefca28b2d..f77bed1ab0 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -328,7 +328,6 @@ class project extends control $this->view->pager = $pager; $this->view->title = $this->lang->project->common . $this->lang->colon . $this->lang->project->index; - $this->view->position[] = $this->lang->project->index; $this->view->project = $project; $this->view->userIdPairs = $this->loadModel('user')->getPairs('nodeleted|showid|all'); @@ -587,7 +586,6 @@ class project extends control $unauthorizedPrograms = $this->program->getPairsByList($unauthorizedIDList); $this->view->title = $this->lang->project->batchEdit; - $this->view->position[] = $this->lang->project->batchEdit; $this->view->projects = $projects; $this->view->programs = $programs; @@ -720,7 +718,6 @@ class project extends control } $this->view->title = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->create; - $this->view->position[] = $this->lang->group->create; $this->display('group', 'create'); } @@ -784,8 +781,6 @@ class project extends control /* The header and position. */ $project = $this->project->getByID($projectID); $this->view->title = $project->name . $this->lang->colon . $this->lang->project->dynamic; - $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name); - $this->view->position[] = $this->lang->project->dynamic; $this->view->userIdPairs = $this->loadModel('user')->getTeamMemberPairs($projectID, 'project'); $this->view->accountPairs = $this->user->getPairs('noletter|nodeleted'); @@ -842,7 +837,6 @@ class project extends control $this->view->allExecutionNum = empty($allExecution); $this->view->title = $this->lang->execution->allExecutions; - $this->view->position[] = $this->lang->execution->allExecutions; $executionStats = $this->execution->getStatData($projectID, $status, $productID, 0, $this->cookie->showTask, '', $orderBy, $pager); $showToggleIcon = false; @@ -1125,8 +1119,6 @@ class project extends control foreach($tasks as $key => $task) $productTasks[$task->product][] = $task; $this->view->title = $project->name . $this->lang->colon . $this->lang->project->common; - $this->view->position[] = html::a($this->createLink('project', 'testtask', "projectID=$projectID"), $project->name); - $this->view->position[] = $this->lang->testtask->common; $this->view->project = $project; $this->view->projectID = $projectID; $this->view->projectName = $project->name; @@ -1233,7 +1225,6 @@ class project extends control /* Header and position. */ $this->view->title = $project->name . $this->lang->colon . $this->lang->execution->build; - $this->view->position[] = $this->lang->execution->build; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->buildsTotal = count($builds); @@ -1294,8 +1285,6 @@ class project extends control $groupPrivs = $this->group->getPrivs($groupID); $this->view->title = $group->name . $this->lang->colon . $this->lang->group->managePriv; - $this->view->position[] = $group->name; - $this->view->position[] = $this->lang->group->managePriv; /* Join changelog when be equal or greater than this version.*/ $realVersion = str_replace('_', '.', $version); @@ -1470,7 +1459,6 @@ class project extends control $members2Import = $this->project->getMembers2Import($copyProjectID, array_keys($currentMembers)); $this->view->title = $this->lang->project->manageMembers . $this->lang->colon . $project->name; - $this->view->position[] = $this->lang->project->manageMembers; $this->view->project = $project; $this->view->users = $users; @@ -1564,7 +1552,6 @@ class project extends control } $this->view->title = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->copy; - $this->view->position[] = $this->lang->group->copy; $this->view->group = $this->group->getById($groupID); $this->display('group', 'copy'); diff --git a/module/project/zen.php b/module/project/zen.php index b8f2bef40c..fd020bb33f 100644 --- a/module/project/zen.php +++ b/module/project/zen.php @@ -336,7 +336,6 @@ class projectZen extends project } $this->view->title = $this->lang->project->edit; - $this->view->position[] = $this->lang->project->edit; $this->view->PMUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst', $project->PM); $this->view->users = $this->user->getPairs('noclosed|nodeleted'); diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php index 9d771ea3fe..db8953bd02 100644 --- a/module/projectrelease/control.php +++ b/module/projectrelease/control.php @@ -219,7 +219,6 @@ class projectrelease extends control $this->project->setMenu($this->session->project); $this->view->title = $this->view->product->name . $this->lang->colon . $this->lang->release->edit; - $this->view->position[] = $this->lang->release->edit; $this->view->release = $release; $this->view->builds = $builds; $this->view->users = $this->loadModel('user')->getPairs('noclosed'); @@ -310,7 +309,6 @@ class projectrelease extends control $this->executeHooks($releaseID); $this->view->title = "RELEASE #$release->id $release->name/" . $product->name; - $this->view->position[] = $this->lang->release->view; $this->view->release = $release; $this->view->stories = $stories; $this->view->bugs = $bugs; diff --git a/module/qa/control.php b/module/qa/control.php index f8535a34c5..f97e32268b 100644 --- a/module/qa/control.php +++ b/module/qa/control.php @@ -32,7 +32,6 @@ class qa extends control $this->qa->setMenu($products, $productID, $branch); $this->view->title = $this->lang->qa->index; - $this->view->position[] = $this->lang->qa->index; $this->view->products = $products; echo $this->fetch('block', 'dashboard', 'dashboard=qa'); } diff --git a/module/release/control.php b/module/release/control.php index f73111f54d..5a96112b56 100644 --- a/module/release/control.php +++ b/module/release/control.php @@ -28,7 +28,6 @@ class release extends control $this->view->product = $product; $this->view->branch = $branch; $this->view->branches = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($product->id); - $this->view->position[] = html::a($this->createLink('product', 'browse', "productID={$this->view->product->id}&branch=$branch"), $this->view->product->name); } /** @@ -62,7 +61,6 @@ class release extends control } $this->view->title = $this->view->product->name . $this->lang->colon . $this->lang->release->browse; - $this->view->position[] = $this->lang->release->browse; $this->view->releases = $releases; $this->view->type = $type; $this->view->pager = $pager; @@ -102,7 +100,6 @@ class release extends control $this->commonAction($productID, $branch); $this->view->title = $this->view->product->name . $this->lang->colon . $this->lang->release->create; - $this->view->position[] = $this->lang->release->create; $this->view->productID = $productID; $this->view->builds = $builds; $this->view->users = $this->loadModel('user')->getPairs('noclosed'); @@ -152,7 +149,6 @@ class release extends control } $this->view->title = $this->view->product->name . $this->lang->colon . $this->lang->release->edit; - $this->view->position[] = $this->lang->release->edit; $this->view->release = $release; $this->view->builds = $builds; $this->view->users = $this->loadModel('user')->getPairs('noclosed'); @@ -238,7 +234,6 @@ class release extends control $this->executeHooks($releaseID); $this->view->title = "RELEASE #$release->id $release->name/" . $product->name; - $this->view->position[] = $this->lang->release->view; $this->view->release = $release; $this->view->stories = $stories; $this->view->bugs = $bugs; diff --git a/module/repo/control.php b/module/repo/control.php index 5c44383c18..9fbb5354f1 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -99,8 +99,6 @@ class repo extends control $successJobs = $this->loadModel('compile')->getSuccessJobs($jobIDList); $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->browse; - $this->view->position[] = $this->lang->repo->common; - $this->view->position[] = $this->lang->repo->browse; $this->view->orderBy = $orderBy; $this->view->objectID = $objectID; @@ -149,7 +147,6 @@ class repo extends control } $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->create; - $this->view->position[] = $this->lang->repo->create; $this->view->groups = $this->loadModel('group')->getPairs(); $this->view->users = $this->loadModel('user')->getPairs('noletter|noempty|nodeleted|noclosed'); $this->view->products = $products; @@ -224,8 +221,6 @@ class repo extends control $this->view->relatedProjects = $this->repo->filterProject(explode(',', $repo->product), explode(',', $repo->projects)); $this->view->serviceHosts = array('' => '') + $this->loadModel('pipeline')->getPairs($repo->SCM); - $this->view->position[] = html::a(inlink('maintain'), $this->lang->repo->common); - $this->view->position[] = $this->lang->repo->edit; $this->display(); } @@ -513,8 +508,6 @@ class repo extends control $this->view->pathInfo = $pathInfo; $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->view; - $this->view->position[] = $this->lang->repo->common; - $this->view->position[] = $this->lang->repo->view; $this->display(); } @@ -823,8 +816,6 @@ class repo extends control $this->view->preAndNext = $this->repo->getPreAndNext($repo, $root, $revision, $type, 'revision'); $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->viewRevision; - $this->view->position[] = $this->lang->repo->common; - $this->view->position[] = $this->lang->repo->viewRevision; $this->display(); } @@ -999,8 +990,6 @@ class repo extends control $this->view->info = $info; $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->diff; - $this->view->position[] = $this->lang->repo->common; - $this->view->position[] = $this->lang->repo->diff; $this->display(); } @@ -1063,7 +1052,6 @@ class repo extends control if(is_string($this->config->repo->rules)) $this->config->repo->rules = json_decode($this->config->repo->rules, true); $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->setRules; - $this->view->position[] = $this->lang->repo->setRules; $this->display(); } @@ -1085,7 +1073,6 @@ class repo extends control if($branch) $branch = base64_decode(helper::safe64Decode($branch)); $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->showSyncCommit; - $this->view->position[] = $this->lang->repo->showSyncCommit; $latestInDB = $this->repo->getLatestCommit($repoID); $this->view->version = $latestInDB ? (int)$latestInDB->commit : 1; diff --git a/module/score/control.php b/module/score/control.php index 678f20f312..b18cffe279 100644 --- a/module/score/control.php +++ b/module/score/control.php @@ -34,7 +34,6 @@ class score extends control $this->app->loadLang('my'); $this->view->title = $this->lang->my->scoreRule; - $this->view->position[] = $this->lang->my->scoreRule; $this->display(); } diff --git a/module/stage/control.php b/module/stage/control.php index fe00fe1b34..e440267a12 100644 --- a/module/stage/control.php +++ b/module/stage/control.php @@ -29,8 +29,6 @@ class stage extends control $this->view->orderBy = $orderBy; $this->view->type = $type; $this->view->title = $this->lang->stage->common . $this->lang->colon . $this->lang->stage->browse; - $this->view->position[] = $this->lang->stage->common; - $this->view->position[] = $this->lang->stage->browse; $this->display(); } @@ -52,8 +50,6 @@ class stage extends control $this->view->orderBy = $orderBy; $this->view->type = $type; $this->view->title = $this->lang->stage->common . $this->lang->colon . $this->lang->stage->browse; - $this->view->position[] = $this->lang->stage->common; - $this->view->position[] = $this->lang->stage->browse; $this->display('stage', 'browse'); } @@ -88,8 +84,6 @@ class stage extends control } $this->view->title = $this->lang->stage->common . $this->lang->colon . $this->lang->stage->create; - $this->view->position[] = $this->lang->stage->common; - $this->view->position[] = $this->lang->stage->create; $this->display(); } @@ -122,8 +116,6 @@ class stage extends control } $this->view->title = $this->lang->stage->common . $this->lang->colon . $this->lang->stage->batchCreate; - $this->view->position[] = $this->lang->stage->common; - $this->view->position[] = $this->lang->stage->batchCreate; $this->display(); } @@ -159,8 +151,6 @@ class stage extends control } $this->view->title = $this->lang->stage->common . $this->lang->colon . $this->lang->stage->edit; - $this->view->position[] = $this->lang->stage->common; - $this->view->position[] = $this->lang->stage->edit; $this->view->stage = $stage; $this->display(); diff --git a/module/stakeholder/control.php b/module/stakeholder/control.php index b3400044e0..d3cec16792 100644 --- a/module/stakeholder/control.php +++ b/module/stakeholder/control.php @@ -23,7 +23,6 @@ class stakeholder extends control $stakeholders = $this->stakeholder->getStakeholders($projectID, $browseType, $orderBy, $pager); $this->view->title = $this->lang->stakeholder->browse; - $this->view->position[] = $this->lang->stakeholder->browse; $this->view->pager = $pager; $this->view->recTotal = $recTotal; @@ -89,7 +88,6 @@ class stakeholder extends control } $this->view->title = $this->lang->stakeholder->create; - $this->view->position[] = $this->lang->stakeholder->create; $this->view->companys = $this->loadModel('company')->getOutsideCompanies(); $this->view->programID = $this->app->tab == 'program' ? $objectID : 0; $this->view->projectID = $this->app->tab == 'project' ? $objectID : 0; @@ -131,7 +129,6 @@ class stakeholder extends control $deptUsers = $dept === '' ? array() : $this->dept->getDeptUserPairs($dept); $this->view->title = $this->lang->stakeholder->batchCreate; - $this->view->position[] = $this->lang->stakeholder->batchCreate; $this->view->project = $this->loadModel('project')->getByID($this->session->project); $this->view->users = $this->user->getPairs('all|nodeleted|noclosed'); @@ -187,7 +184,6 @@ class stakeholder extends control } $this->view->title = $this->lang->stakeholder->edit; - $this->view->position[] = $this->lang->stakeholder->edit; $this->view->stakeholder = $stakeholder; $this->view->users = $users; @@ -358,7 +354,6 @@ class stakeholder extends control $this->commonAction($userID, 'stakeholder'); $this->view->title = $this->lang->stakeholder->common . $this->lang->colon . $this->lang->stakeholder->view; - $this->view->position[] = $this->lang->stakeholder->view; $this->view->user = $user; $this->view->users = $this->loadModel('user')->getTeamMemberPairs($this->session->project, 'project', 'nodeleted'); @@ -385,7 +380,6 @@ class stakeholder extends control } $this->view->title = $this->lang->stakeholder->common . $this->lang->colon . $this->lang->stakeholder->communicate; - $this->view->position[] = $this->lang->stakeholder->view; $this->view->user = $this->stakeholder->getByID($userID); $this->view->users = $this->loadModel('user')->getTeamMemberPairs($this->session->project, 'project', 'nodeleted'); $this->display(); @@ -411,7 +405,6 @@ class stakeholder extends control } $this->view->title = $this->lang->stakeholder->common . $this->lang->colon . $this->lang->stakeholder->communicate; - $this->view->position[] = $this->lang->stakeholder->view; $this->view->user = $user; $this->display(); } @@ -441,7 +434,6 @@ class stakeholder extends control $stakeholder = $this->stakeholder->getByID($userID); $this->view->title = $this->lang->stakeholder->common . $this->lang->colon . $this->lang->stakeholder->communicate; - $this->view->position[] = $this->lang->stakeholder->view; $this->view->stakeholder = $stakeholder; $this->view->projectID = $stakeholder->objectID; diff --git a/module/story/control.php b/module/story/control.php index eff94f482e..8412bceed3 100755 --- a/module/story/control.php +++ b/module/story/control.php @@ -453,9 +453,6 @@ class story extends control $this->view->showFields = $this->config->story->custom->createFields; $this->view->title = $product->name . $this->lang->colon . $this->lang->story->create; - $this->view->position[] = html::a($this->createLink('product', 'browse', "product=$productID&branch=$branch"), $product->name); - $this->view->position[] = $this->lang->story->common; - $this->view->position[] = $this->lang->story->create; $this->view->gobackLink = (isset($output['from']) and $output['from'] == 'global') ? $this->createLink('product', 'browse', "productID=$productID") : ''; $this->view->products = $products; $this->view->users = $users; @@ -762,9 +759,6 @@ class story extends control $this->view->title = $product->name . $this->lang->colon . ($storyID ? $this->lang->story->subdivide : $this->lang->story->batchCreate); $this->view->productName = $product->name; - $this->view->position[] = html::a($this->createLink('product', 'browse', "product=$productID&branch=$branch"), $product->name); - $this->view->position[] = $this->lang->story->common; - $this->view->position[] = $storyID ? $this->lang->story->subdivide : $this->lang->story->batchCreate; $this->view->storyID = $storyID; $this->view->products = $products; $this->view->product = $product; @@ -824,8 +818,6 @@ class story extends control $this->story->replaceURLang($story->type); /* Assign. */ - $this->view->position[] = html::a($this->createLink('product', 'browse', "product=$product->id&branch=$story->branch"), $product->name); - $this->view->position[] = $this->lang->story->common; $this->view->product = $product; $this->view->products = $products; $this->view->story = $story; @@ -972,7 +964,6 @@ class story extends control if($story->type == 'requirement') $this->lang->story->notice->reviewerNotEmpty = str_replace($this->lang->SRCommon, $this->lang->URCommon, $this->lang->story->notice->reviewerNotEmpty); $this->view->title = $this->lang->story->edit . "STORY" . $this->lang->colon . $this->view->story->title; - $this->view->position[] = $this->lang->story->edit; $this->view->story = $story; $this->view->twins = empty($story->twins) ? array() : $this->story->getByList($story->twins); $this->view->stories = $stories; @@ -1323,7 +1314,6 @@ class story extends control $this->view->twins = empty($story->twins) ? array() : $this->story->getByList($story->twins); $this->view->branches = $this->loadModel('branch')->getPairs($story->product); $this->view->users = $this->user->getPairs('pofirst|nodeleted|noclosed', $this->view->story->assignedTo); - $this->view->position[] = $this->lang->story->change; $this->view->needReview = (($this->app->user->account == $this->view->product->PO or $this->config->story->needReview == 0 or !$this->story->checkForceReview()) and empty($reviewer)) ? "checked='checked'" : ""; $this->view->reviewer = implode(',', array_keys($reviewer)); $this->view->productReviewers = $this->user->getPairs('noclosed|nodeleted', $reviewer, 0, $productReviewers); @@ -1381,7 +1371,6 @@ class story extends control /* Assign. */ $this->view->title = $this->lang->story->activate . "STORY" . $this->lang->colon . $this->view->story->title; $this->view->users = $this->user->getPairs('pofirst|nodeleted|noclosed', $this->view->story->closedBy); - $this->view->position[] = $this->lang->story->activate; $this->display(); } @@ -1700,9 +1689,6 @@ class story extends control } $this->view->title = $this->lang->story->review . "STORY" . $this->lang->colon . $story->title; - $this->view->position[] = html::a($this->createLink('product', 'browse', "product=$product->id&branch=$story->branch"), $product->name); - $this->view->position[] = $this->lang->story->common; - $this->view->position[] = $this->lang->story->review; $this->view->product = $product; $this->view->story = $story; @@ -1932,9 +1918,6 @@ class story extends control $productStories = $this->story->getProductStoryPairs($story->product, $branch, 0, 'all', 'id_desc', 0, '', $storyType); $this->view->title = $this->lang->story->close . "STORY" . $this->lang->colon . $story->title; - $this->view->position[] = html::a($this->createLink('product', 'browse', "product=$product->id&branch=$story->branch"), $product->name); - $this->view->position[] = $this->lang->story->common; - $this->view->position[] = $this->lang->story->close; $this->view->product = $product; $this->view->story = $story; @@ -2038,7 +2021,6 @@ class story extends control { $this->product->setMenu($productID); $product = $this->product->getByID($productID); - $this->view->position[] = html::a($this->createLink('product', 'browse', "product=$product->id"), $product->name); $this->view->title = $product->name . $this->lang->colon . $this->lang->story->batchClose; } /* The stories of a execution. */ @@ -2048,7 +2030,6 @@ class story extends control $this->lang->story->menuOrder = $this->lang->execution->menuOrder; $this->execution->setMenu($executionID); $execution = $this->execution->getByID($executionID); - $this->view->position[] = html::a($this->createLink('execution', 'story', "executionID=$execution->id"), $execution->name); $this->view->title = $execution->name . $this->lang->colon . $this->lang->story->batchClose; } else @@ -2066,7 +2047,6 @@ class story extends control if($from == 'work') $this->lang->my->menu->work['subModule'] = 'story'; if($from == 'contribute') $this->lang->my->menu->contribute['subModule'] = 'story'; - $this->view->position[] = html::a($this->createLink('my', 'story'), $this->lang->my->story); $this->view->title = $this->lang->story->batchEdit; } } @@ -2078,8 +2058,6 @@ class story extends control unset($this->lang->story->reasonList['subdivided']); - $this->view->position[] = $this->lang->story->common; - $this->view->position[] = $this->lang->story->batchClose; $this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'story'); $this->view->plans = $this->loadModel('productplan')->getPairs($productID); $this->view->productID = $productID; @@ -2345,7 +2323,6 @@ class story extends control $product = $this->product->getById($story->product); $this->view->title = zget($products, $story->product, '') . $this->lang->colon . $this->lang->story->assign; - $this->view->position[] = $this->lang->story->assign; $this->view->story = $story; $this->view->storyType = $storyType; $this->view->actions = $this->action->getList('story', $storyID); @@ -2505,7 +2482,6 @@ class story extends control /* Assign. */ $this->view->title = $this->lang->story->linkStory . "STORY" . $this->lang->colon .$this->lang->story->linkStory; - $this->view->position[] = $this->lang->story->linkStory; $this->view->type = $type; $this->view->stories2Link = $stories2Link; $this->view->users = $this->loadModel('user')->getPairs('noletter'); @@ -2862,8 +2838,6 @@ class story extends control if($storyType != 'story') unset($this->lang->story->report->charts['storysPerStage']); $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->story->reportChart; - $this->view->position[] = $this->products[$productID]; - $this->view->position[] = $this->lang->story->reportChart; $this->view->productID = $productID; $this->view->branchID = $branchID; $this->view->browseType = $browseType; diff --git a/module/task/zen.php b/module/task/zen.php index a9ed4b3059..51b7194a34 100644 --- a/module/task/zen.php +++ b/module/task/zen.php @@ -171,8 +171,6 @@ class taskZen extends task } $this->view->title = $this->lang->task->edit . 'TASK' . $this->lang->colon . $this->view->task->name; - $this->view->position[] = $this->lang->task->common; - $this->view->position[] = $this->lang->task->edit; $this->view->stories = $this->story->getExecutionStoryPairs($this->view->execution->id, 0, 'all', '', 'full', 'active'); $this->view->tasks = $tasks; $this->view->taskMembers = $taskMembers; @@ -248,7 +246,6 @@ class taskZen extends task $modules = array('ditto' => $this->lang->task->ditto) + $modules; $this->view->title = $execution->name . $this->lang->colon . $this->lang->task->batchEdit; - $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$execution->id"), $execution->name); $this->view->execution = $execution; $this->view->modules = $modules; } @@ -259,7 +256,6 @@ class taskZen extends task $this->loadModel('my'); $this->lang->my->menu->work['subModule'] = 'task'; - $this->view->position[] = html::a($this->createLink('my', 'task'), $this->lang->my->task); $this->view->title = $this->lang->task->batchEdit; $this->view->users = $this->loadModel('user')->getPairs('noletter'); } @@ -300,8 +296,6 @@ class taskZen extends task $this->view->showFields = $this->config->task->custom->batchEditFields; /* Assign. */ - $this->view->position[] = $this->lang->task->common; - $this->view->position[] = $this->lang->task->batchEdit; $this->view->executionID = $executionID; $this->view->priList = array('0' => '', 'ditto' => $this->lang->task->ditto) + $this->lang->task->priList; $this->view->statusList = array('ditto' => $this->lang->task->ditto) + $this->lang->task->statusList; @@ -395,7 +389,6 @@ class taskZen extends task if(isset($members['closed']) || $task->status == 'closed') $members['closed'] = 'Closed'; $this->view->title = $this->view->execution->name . $this->lang->colon . $this->lang->task->assign; - $this->view->position[] = $this->lang->task->assign; $this->view->task = $task; $this->view->members = $members; $this->view->users = $this->loadModel('user')->getPairs(); diff --git a/module/testcase/control.php b/module/testcase/control.php index 10e6c7bcb9..539b9e791f 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -246,8 +246,6 @@ class testcase extends control /* Assign. */ $tree = $moduleID ? $this->tree->getByID($moduleID) : ''; $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->common; - $this->view->position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch"), $this->products[$productID]); - $this->view->position[] = $this->lang->testcase->common; $this->view->projectID = $projectID; $this->view->productID = $productID; $this->view->product = $product; @@ -332,8 +330,6 @@ class testcase extends control $this->app->loadLang('task'); $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->common; - $this->view->position[] = html::a($this->createLink('testcase', 'groupTask', "productID=$productID&groupBy=$groupBy"), $this->products[$productID]); - $this->view->position[] = $this->lang->testcase->common; $this->view->projectID = $projectID; $this->view->productID = $productID; $this->view->productName = $this->products[$productID]; @@ -751,9 +747,6 @@ class testcase extends control $this->view->showFields = $showFields; $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->batchCreate; - $this->view->position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch"), $this->products[$productID]); - $this->view->position[] = $this->lang->testcase->common; - $this->view->position[] = $this->lang->testcase->batchCreate; $this->view->product = $product; $this->view->productID = $productID; $this->view->story = $story; @@ -863,7 +856,6 @@ class testcase extends control $this->app->tab == 'project' ? $this->loadModel('project')->setMenu($this->session->project) : $this->caselib->setLibMenu($libraries, $case->lib); $this->view->title = "CASE #$case->id $case->title - " . $libraries[$case->lib]; - $this->view->position[] = html::a($this->createLink('caselib', 'browse', "libID=$case->lib"), $libraries[$case->lib]); $this->view->libName = $libraries[$case->lib]; } @@ -894,8 +886,6 @@ class testcase extends control $this->executeHooks($caseID); - $this->view->position[] = $this->lang->testcase->common; - $this->view->position[] = $this->lang->testcase->view; $this->view->case = $case; $this->view->from = $from; @@ -1151,7 +1141,6 @@ class testcase extends control $modules[$productID][$branch] = $this->tree->getOptionMenu($libID, 'caselib', 0, $branch); $this->view->title = $libraries[$libID] . $this->lang->colon . $this->lang->testcase->batchEdit; - $this->view->position[] = html::a($this->createLink('caselib', 'browse', "libID=$libID"), $libraries[$libID]); } else { @@ -1201,7 +1190,6 @@ class testcase extends control $this->lang->testcase->menu = $this->lang->my->menu->work; $this->lang->my->menu->work['subModule'] = 'testcase'; - $this->view->position[] = html::a($this->server->http_referer, $this->lang->my->myTestCase); $this->view->title = $this->lang->testcase->batchEdit; $productIdList = array(); @@ -1264,8 +1252,6 @@ class testcase extends control /* Assign. */ $this->view->scenePairs = $scenePairs; - $this->view->position[] = $this->lang->testcase->common; - $this->view->position[] = $this->lang->testcase->batchEdit; $this->view->caseIDList = $caseIDList; $this->view->productID = $productID; $this->view->branchProduct = $branchProduct; @@ -1526,9 +1512,6 @@ class testcase extends control /* Assign. */ $this->view->title = $case->title . $this->lang->colon . $this->lang->testcase->linkCases; - $this->view->position[] = html::a($this->createLink('product', 'view', "productID=$case->product"), zget($this->products, $case->product, '')); - $this->view->position[] = html::a($this->createLink('testcase', 'view', "caseID=$caseID"), $case->title); - $this->view->position[] = $this->lang->testcase->linkCases; $this->view->case = $case; $this->view->cases2Link = empty($cases2Link) ? $cases2Link : $cases2Link[$pageID - 1]; $this->view->users = $this->loadModel('user')->getPairs('noletter'); @@ -1583,7 +1566,6 @@ class testcase extends control $bugs2Link = array_chunk($bugs2Link, $pager->recPerPage); /* Assign. */ - $this->view->position[] = $this->lang->testcase->linkBugs; $this->view->case = $case; $this->view->bugs2Link = empty($bugs2Link) ? $bugs2Link : $bugs2Link[$pageID - 1]; $this->view->users = $this->loadModel('user')->getPairs('noletter'); @@ -2155,7 +2137,6 @@ class testcase extends control $pager = pager::init(0, $recPerPage, $pageID); $this->view->title = $this->lang->testcase->common . $this->lang->colon . $this->lang->testcase->importFromLib; - $this->view->position[] = $this->lang->testcase->importFromLib; $this->view->libraries = $libraries; $this->view->libID = $libID; @@ -2402,7 +2383,6 @@ class testcase extends control if($showSuhosinInfo) $this->view->suhosinInfo = extension_loaded('suhosin') ? sprintf($this->lang->suhosinInfo, $countInputVars) : sprintf($this->lang->maxVarsInfo, $countInputVars); $this->view->title = $this->lang->testcase->common . $this->lang->colon . $this->lang->testcase->showImport; - $this->view->position[] = $this->lang->testcase->showImport; $this->view->stories = $stories; $this->view->modules = $modules; diff --git a/module/testreport/control.php b/module/testreport/control.php index a6fc8af407..41ee018bf0 100644 --- a/module/testreport/control.php +++ b/module/testreport/control.php @@ -139,8 +139,6 @@ class testreport extends control if($tasks) $tasks = $this->dao->select('id,name')->from(TABLE_TESTTASK)->where('id')->in($tasks)->fetchPairs('id', 'name'); $this->view->title = $title . $this->lang->colon . $this->lang->testreport->common; - $this->view->position[] = html::a(inlink('browse', "objectID=$objectID&objectType=$objectType&extra=$extra"), $title); - $this->view->position[] = $this->lang->testreport->browse; $this->view->reports = $reports; $this->view->orderBy = $orderBy; @@ -240,8 +238,6 @@ class testreport extends control $this->setChartDatas($objectID); $this->view->title = $task->name . $this->lang->testreport->create; - $this->view->position[] = html::a(inlink('browse', "objectID=$productID&objectType=product&extra={$task->id}"), $task->name); - $this->view->position[] = $this->lang->testreport->create; $this->view->reportTitle = date('Y-m-d') . " TESTTASK#{$task->id} {$task->name} {$this->lang->testreport->common}"; } elseif($objectType == 'execution' or $objectType == 'project') @@ -376,8 +372,6 @@ class testreport extends control if($productID != $report->product) return print(js::error($this->lang->error->accessDenied) . js::locate('back')); $browseLink = inlink('browse', "objectID=$productID&objectType=product"); - $this->view->position[] = html::a($browseLink, $product->name); - $this->view->position[] = $this->lang->testreport->edit; } elseif($this->app->tab == 'execution' or $this->app->tab == 'project') { @@ -393,8 +387,6 @@ class testreport extends control } $browseLink = inlink('browse', "objectID=$objectID&objectType=execution"); - $this->view->position[] = html::a($browseLink, $execution->name); - $this->view->position[] = $this->lang->testreport->edit; } if($report->objectType == 'testtask') @@ -542,7 +534,6 @@ class testreport extends control $this->view->title = $report->title; $this->view->browseLink = $browseLink; - $this->view->position[] = $report->title; $this->view->tab = $tab; $this->view->pager = $pager; diff --git a/module/testsuite/control.php b/module/testsuite/control.php index 15fb81b198..e663ee597d 100644 --- a/module/testsuite/control.php +++ b/module/testsuite/control.php @@ -94,8 +94,6 @@ class testsuite extends control $summary = str_replace(array('%total%', '%public%', '%private%'), array($suitesNum, $publicNum, $privateNum), $this->lang->testsuite->summary); $this->view->title = $productName . $this->lang->testsuite->common; - $this->view->position[] = html::a($this->createLink('testsuite', 'browse', "productID=$productID"), $productName); - $this->view->position[] = $this->lang->testsuite->common; $this->view->productID = $productID; $this->view->productName = $productName; @@ -146,9 +144,6 @@ class testsuite extends control $this->loadModel('qa')->setMenu($this->products, $productID); $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testsuite->create; - $this->view->position[] = html::a($this->createLink('testsuite', 'browse', "productID=$productID"), $this->products[$productID]); - $this->view->position[] = $this->lang->testsuite->common; - $this->view->position[] = $this->lang->testsuite->create; $this->view->productID = $productID; $this->display(); @@ -191,9 +186,6 @@ class testsuite extends control $this->executeHooks($suiteID); $this->view->title = "SUITE #$suite->id $suite->name"; - $this->view->position[] = html::a($this->createLink('testsuite', 'browse', "productID=$productID")); - $this->view->position[] = $this->lang->testsuite->common; - $this->view->position[] = $this->lang->testsuite->view; $this->view->productID = $productID; $this->view->suite = $suite; @@ -251,9 +243,6 @@ class testsuite extends control $this->loadModel('qa')->setMenu($this->products, $productID); $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testsuite->edit; - $this->view->position[] = html::a($this->createLink('testsuite', 'browse', "productID=$productID")); - $this->view->position[] = $this->lang->testsuite->common; - $this->view->position[] = $this->lang->testsuite->edit; $this->view->suite = $suite; $this->display(); @@ -354,9 +343,6 @@ class testsuite extends control $this->loadModel('search')->setSearchParams($this->config->testcase->search); $this->view->title = $suite->name . $this->lang->colon . $this->lang->testsuite->linkCase; - $this->view->position[] = html::a($this->createLink('testsuite', 'browse', "productID=$productID")); - $this->view->position[] = $this->lang->testsuite->common; - $this->view->position[] = $this->lang->testsuite->linkCase; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->cases = $this->testsuite->getUnlinkedCases($suite, $param, $pager); diff --git a/module/testtask/control.php b/module/testtask/control.php index 5858581d1b..c791386a58 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -115,8 +115,6 @@ class testtask extends control $tasks = $this->testtask->getProductTasks($productID, $branch, $sort, $pager, $scopeAndStatus, $beginTime, $endTime); $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->common; - $this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]); - $this->view->position[] = $this->lang->testtask->common; $this->view->productID = $productID; $this->view->productName = $this->products[$productID]; @@ -185,8 +183,6 @@ class testtask extends control $sort = common::appendOrder($orderBy); $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->common; - $this->view->position[] = html::a($this->createLink('testtask', 'browseUnits', "productID=$productID"), $this->products[$productID]); - $this->view->position[] = $this->lang->testtask->common; $this->view->projectID = $projectID; $this->view->productID = $productID; $this->view->productName = $this->products[$productID]; @@ -262,9 +258,6 @@ class testtask extends control if($project && !$project->multiple) $this->view->noMultipleExecutionID = $this->loadModel('execution')->getNoMultipleID($project->id); $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->create; - $this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]); - $this->view->position[] = $this->lang->testtask->common; - $this->view->position[] = $this->lang->testtask->create; $this->view->product = $this->product->getByID($productID); $this->view->projectID = $projectID; @@ -428,8 +421,6 @@ class testtask extends control /* Assign. */ $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->common; - $this->view->position[] = html::a($this->createLink('testcase', 'browseUnits', "productID=$productID"), $this->products[$productID]); - $this->view->position[] = $this->lang->testcase->common; $this->view->productID = $productID; $this->view->task = $task; @@ -556,9 +547,6 @@ class testtask extends control $runs = $this->testcase->appendData($runs, 'run'); $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->cases; - $this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]); - $this->view->position[] = $this->lang->testtask->common; - $this->view->position[] = $this->lang->testtask->cases; $this->view->productID = $productID; $this->view->productName = $this->products[$productID]; @@ -642,8 +630,6 @@ class testtask extends control } $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->common . $this->lang->colon . $this->lang->testtask->reportChart; - $this->view->position[] = html::a($this->createLink('testtask', 'cases', "taskID=$taskID"), $this->products[$productID]); - $this->view->position[] = $this->lang->testtask->reportChart; $this->view->productID = $productID; $this->view->taskID = $taskID; $this->view->browseType = $browseType; @@ -732,9 +718,6 @@ class testtask extends control } $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->cases; - $this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]); - $this->view->position[] = $this->lang->testtask->common; - $this->view->position[] = $this->lang->testtask->cases; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->productID = $productID; @@ -873,8 +856,6 @@ class testtask extends control $this->view->testtask = $testtask; $this->view->title = $testtask->name . $this->lang->colon . $this->lang->testtask->start; - $this->view->position[] = $this->lang->testtask->common; - $this->view->position[] = $this->lang->testtask->start; $this->view->users = $this->loadModel('user')->getPairs('nodeleted', $testtask->owner); $this->view->actions = $this->loadModel('action')->getList('testtask', $taskID); $this->display(); @@ -916,8 +897,6 @@ class testtask extends control $this->view->testtask = $testtask; $this->view->title = $testtask->name . $this->lang->colon . $this->lang->testtask->start; - $this->view->position[] = $this->lang->testtask->common; - $this->view->position[] = $this->lang->testtask->activate; $this->view->users = $this->loadModel('user')->getPairs('nodeleted', $testtask->owner); $this->view->actions = $this->loadModel('action')->getList('testtask', $taskID); $this->display(); @@ -959,8 +938,6 @@ class testtask extends control $this->view->testtask = $this->testtask->getById($taskID); $this->view->title = $testtask->name . $this->lang->colon . $this->lang->close; - $this->view->position[] = $this->lang->testtask->common; - $this->view->position[] = $this->lang->close; $this->view->actions = $this->loadModel('action')->getList('testtask', $taskID); $this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted|qdfirst'); $this->view->contactLists = $this->user->getContactLists($this->app->user->account, 'withnote'); @@ -1003,8 +980,6 @@ class testtask extends control $this->view->testtask = $testtask; $this->view->title = $testtask->name . $this->lang->colon . $this->lang->testtask->start; - $this->view->position[] = $this->lang->testtask->common; - $this->view->position[] = $this->lang->testtask->block; $this->view->users = $this->loadModel('user')->getPairs('nodeleted', $testtask->owner); $this->view->actions = $this->loadModel('action')->getList('testtask', $taskID); $this->display(); @@ -1146,9 +1121,6 @@ class testtask extends control $this->loadModel('search')->setSearchParams($this->config->testcase->search); $this->view->title = $task->name . $this->lang->colon . $this->lang->testtask->linkCase; - $this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]); - $this->view->position[] = $this->lang->testtask->common; - $this->view->position[] = $this->lang->testtask->linkCase; $testTask = $this->testtask->getRelatedTestTasks($productID, $taskID); @@ -1436,8 +1408,6 @@ class testtask extends control $this->view->caseIDList = array_keys($cases); $this->view->productID = $productID; $this->view->title = $this->lang->testtask->batchRun; - $this->view->position[] = $this->lang->testtask->common; - $this->view->position[] = $this->lang->testtask->batchRun; $this->view->from = $from; $this->view->confirm = $confirm; $this->display(); @@ -1549,8 +1519,6 @@ class testtask extends control $builds = empty($productID) ? array() : $this->loadModel('build')->getBuildPairs($productID, 'all', 'notrunk', 0, 'execution', '', false); $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->importUnitResult; - $this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]); - $this->view->position[] = $this->lang->testtask->importUnitResult; $this->view->executions = $executions; $this->view->builds = $builds; diff --git a/module/todo/zen.php b/module/todo/zen.php index 24f1e90aee..05964279e3 100755 --- a/module/todo/zen.php +++ b/module/todo/zen.php @@ -47,8 +47,6 @@ class todoZen extends todo $this->view->showFields = $this->config->todo->custom->batchCreateFields; $this->view->title = $this->lang->todo->common . $this->lang->colon . $this->lang->todo->batchCreate; - $this->view->position[] = $this->lang->todo->common; - $this->view->position[] = $this->lang->todo->batchCreate; $this->view->date = (int)$date == 0 ? $date : date('Y-m-d', strtotime($date)); $this->view->times = date::buildTimeList($this->config->todo->times->begin, $this->config->todo->times->end, $this->config->todo->times->delta); $this->view->time = date::now(); @@ -629,7 +627,6 @@ class todoZen extends todo $this->view->user = $this->user->getByID((string)$todo->account); $this->view->users = $this->user->getPairs('noletter'); $this->view->actions = $this->loadModel('action')->getList('todo', (int)$todo->id); - $this->view->position[] = $this->lang->todo->view; $this->view->todo = $todo; $this->view->times = date::buildTimeList((int)$this->config->todo->times->begin, (int)$this->config->todo->times->end, 5); $this->view->from = $from; diff --git a/module/upgrade/control.php b/module/upgrade/control.php index 8bf4626259..d923fca4c1 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -97,7 +97,6 @@ class upgrade extends control } $this->view->title = $this->lang->upgrade->common . $this->lang->colon . $this->lang->upgrade->selectVersion; - $this->view->position[] = $this->lang->upgrade->common; $this->view->version = $version; $this->display(); } @@ -116,7 +115,6 @@ class upgrade extends control $this->session->set('step', ''); $this->view->title = $this->lang->upgrade->confirm; - $this->view->position[] = $this->lang->upgrade->common; $this->view->confirm = $confirmSql; $this->view->fromVersion = $this->post->fromVersion; /* When sql is empty then skip it. */ @@ -136,7 +134,6 @@ class upgrade extends control $this->session->set('step', ''); $this->view->title = $this->lang->upgrade->result; - $this->view->position[] = $this->lang->upgrade->common; $result = $this->upgrade->deleteFiles(); if($result) @@ -838,7 +835,6 @@ class upgrade extends control { $this->app->loadLang('install'); $this->view->title = $this->lang->upgrade->result; - $this->view->position[] = $this->lang->upgrade->common; $needProcess = $this->upgrade->checkProcess(); $this->view->needProcess = $needProcess; diff --git a/module/user/control.php b/module/user/control.php index dbc1c72280..a99891f29c 100755 --- a/module/user/control.php +++ b/module/user/control.php @@ -88,7 +88,6 @@ class user extends control $this->view->userList = $this->user->setUserList($users, $userID); $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->todo; - $this->view->position[] = $this->lang->user->todo; $this->view->tabID = 'todo'; $this->view->date = $date; $this->view->todos = $todos; @@ -133,7 +132,6 @@ class user extends control /* Assign. */ $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->story; - $this->view->position[] = $this->lang->user->story; $this->view->stories = $this->story->getUserStories($account, $type, $orderBy, $pager, $storyType, false, 'all'); $this->view->users = $this->user->getPairs('noletter'); $this->view->storyType = $storyType; @@ -176,7 +174,6 @@ class user extends control /* Assign. */ $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->task; - $this->view->position[] = $this->lang->user->task; $this->view->tabID = 'task'; $this->view->tasks = $this->loadModel('task')->getUserTasks($account, $type, 0, $pager, $orderBy); $this->view->type = $type; @@ -220,7 +217,6 @@ class user extends control $this->app->loadLang('bug'); $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->bug; - $this->view->position[] = $this->lang->user->bug; $this->view->tabID = 'bug'; $this->view->bugs = $this->loadModel('bug')->getUserBugs($account, $type, $orderBy, 0, $pager); $this->view->type = $type; @@ -267,7 +263,6 @@ class user extends control $sort = common::appendOrder($orderBy); $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->testTask; - $this->view->position[] = $this->lang->user->testTask; $this->view->tasks = $this->loadModel('testtask')->getByUser($account, $pager, $sort); $this->view->users = $this->user->getPairs('noletter'); $this->view->user = $user; @@ -327,7 +322,6 @@ class user extends control /* Assign. */ $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->testCase; - $this->view->position[] = $this->lang->user->testCase; $this->view->user = $user; $this->view->cases = $cases; $this->view->users = $this->user->getPairs('noletter'); @@ -372,7 +366,6 @@ class user extends control $this->view->userList = $this->user->setUserList($users, $userID); $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->execution; - $this->view->position[] = $this->lang->user->execution; $this->view->tabID = 'project'; $this->view->executions = $this->user->getObjects($account, 'execution', 'all', $orderBy, $pager); $this->view->user = $user; @@ -412,7 +405,6 @@ class user extends control $this->view->userList = $this->user->setUserList($users, $userID); $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->issue; - $this->view->position[] = $this->lang->user->issue; $this->view->issues = $this->loadModel('issue')->getUserIssues($type, 0, $account, $orderBy, $pager); $this->view->user = $user; $this->view->users = $this->loadModel('user')->getPairs('noletter'); @@ -453,7 +445,6 @@ class user extends control $this->view->userList = $this->user->setUserList($users, $userID); $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->risk; - $this->view->position[] = $this->lang->user->risk; $this->view->risks = $this->loadModel('risk')->getUserRisks($type, $account, $orderBy, $pager); $this->view->user = $user; $this->view->type = $type; @@ -480,8 +471,6 @@ class user extends control $users = $this->loadModel('dept')->getDeptUserPairs($deptID, 'id'); $this->view->title = "USER #$user->id $user->account/" . $this->lang->user->profile; - $this->view->position[] = $this->lang->user->common; - $this->view->position[] = $this->lang->user->profile; $this->view->user = $user; $this->view->groups = $this->loadModel('group')->getByAccount($account); $this->view->deptPath = $this->dept->getParents($user->dept); @@ -703,7 +692,6 @@ class user extends control $this->view->showFields = join(',', $showFields); $this->view->title = $this->lang->company->common . $this->lang->colon . $this->lang->user->batchEdit; - $this->view->position[] = $this->lang->user->batchEdit; $this->view->depts = $this->dept->getOptionMenu(); $this->view->rand = $this->user->updateSessionRandom(); $this->view->visionList = $this->user->getVisionList(); @@ -1244,7 +1232,6 @@ class user extends control $actions = $this->loadModel('action')->getDynamic($account, $period, $orderBy, $pager, 'all', 'all', 'all', $date, $direction); $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->dynamic; - $this->view->position[] = $this->lang->user->dynamic; /* Assign. */ $this->view->type = $period; diff --git a/module/webhook/control.php b/module/webhook/control.php index a23b4e0f4b..e4a84caed6 100644 --- a/module/webhook/control.php +++ b/module/webhook/control.php @@ -45,8 +45,6 @@ class webhook extends control $this->view->title = $this->lang->webhook->api . $this->lang->colon . $this->lang->webhook->list; $this->view->webhooks = $this->webhook->getList($orderBy, $pager); - $this->view->position[] = html::a(inlink('browse'), $this->lang->webhook->api); - $this->view->position[] = $this->lang->webhook->common; $this->view->orderBy = $orderBy; $this->view->pager = $pager; $this->display(); @@ -74,9 +72,6 @@ class webhook extends control $this->view->title = $this->lang->webhook->api . $this->lang->colon . $this->lang->webhook->create; $this->view->products = $this->loadModel('product')->getPairs(); $this->view->executions = $this->loadModel('execution')->getPairs(); - $this->view->position[] = html::a(inlink('browse'), $this->lang->webhook->api); - $this->view->position[] = html::a(inlink('browse'), $this->lang->webhook->common); - $this->view->position[] = $this->lang->webhook->create; $this->display(); } @@ -100,9 +95,6 @@ class webhook extends control $this->app->loadLang('action'); $this->view->title = $this->lang->webhook->edit . $this->lang->colon . $webhook->name; - $this->view->position[] = html::a(inlink('browse'), $this->lang->webhook->api); - $this->view->position[] = html::a(inlink('browse'), $this->lang->webhook->common); - $this->view->position[] = $this->lang->webhook->edit; $this->view->products = $this->loadModel('product')->getPairs(); $this->view->executions = $this->loadModel('execution')->getPairs(); $this->view->webhook = $webhook; @@ -159,9 +151,6 @@ class webhook extends control $webhook = $this->webhook->getByID($id); $this->view->title = $this->lang->webhook->log . $this->lang->colon . $webhook->name; $this->view->logs = $this->webhook->getLogList($id, $orderBy, $pager); - $this->view->position[] = html::a(inlink('browse'), $this->lang->webhook->api); - $this->view->position[] = html::a(inlink('browse'), $this->lang->webhook->common); - $this->view->position[] = $this->lang->webhook->log; $this->view->webhook = $webhook; $this->view->orderBy = $orderBy; $this->view->pager = $pager; @@ -254,8 +243,6 @@ class webhook extends control $users = $unbindUsers + $bindedUsers; $this->view->title = $this->lang->webhook->bind; - $this->view->position[] = html::a($this->createLink('webhook', 'browse'), $this->lang->webhook->common); - $this->view->position[] = $this->lang->webhook->bind; $this->view->webhook = $webhook; $this->view->oauthUsers = $oauthUsers; @@ -308,7 +295,6 @@ class webhook extends control } $this->view->title = $this->lang->webhook->chooseDept; - $this->view->position[] = $this->lang->webhook->chooseDept; $this->view->webhookType = $webhook->type; $this->view->deptTree = $response['data']; diff --git a/module/zahost/control.php b/module/zahost/control.php index 1af478abed..6a2f96ac09 100644 --- a/module/zahost/control.php +++ b/module/zahost/control.php @@ -76,8 +76,6 @@ class zahost extends control $zahost = $this->zahost->getById($id); $this->view->title = $this->lang->zahost->view; - $this->view->position[] = html::a($this->createLink('host', 'browse'), $this->lang->zahost->common); - $this->view->position[] = $this->lang->zahost->view; $this->view->zahost = $zahost; $this->view->orderBy = $orderBy;