diff --git a/module/bug/model.php b/module/bug/model.php index 2a7e37010e..4ec513e36a 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -87,8 +87,8 @@ class bugModel extends model } $pageNav .= $selectHtml; - $this->lang->modulePageNav = $pageNav; - $this->lang->modulePageActions = $pageActions; + $this->lang->modulePageNav = $pageNav; + $this->lang->TRActions = $pageActions; foreach($this->lang->bug->menu as $key => $menu) { if($this->config->global->flow == 'full') $this->loadModel('qa')->setSubMenu('bug', $key, $productID); diff --git a/module/caselib/model.php b/module/caselib/model.php index c8965bac3a..36b29ffcf9 100644 --- a/module/caselib/model.php +++ b/module/caselib/model.php @@ -114,8 +114,8 @@ class caselibModel extends model } $pageNav .= $selectHtml; - $this->lang->modulePageNav = $pageNav; - $this->lang->modulePageActions = $pageActions; + $this->lang->modulePageNav = $pageNav; + $this->lang->TRActions = $pageActions; foreach($this->lang->caselib->menu as $key => $value) { if($this->config->global->flow == 'full') $this->loadModel('qa')->setSubMenu('caselib', $key, $libID); diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php index 6f490a4a87..c4acc966d0 100755 --- a/module/common/view/header.html.php +++ b/module/common/view/header.html.php @@ -29,7 +29,7 @@ include 'chosen.html.php';
-
modulePageActions)) echo $lang->modulePageActions;?>
+
TRActions)) echo $lang->TRActions;?>
app->loadClass('pager', $static = true); $pager = new pager(0, 5, 1); - $this->lang->modulePageActions = $this->doc->setFastMenu($this->lang->doc->fast); - $this->lang->modulePageActions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : ''; - $this->lang->modulePageActions .= common::hasPriv('doc', 'create') ? $this->doc->buildCreateButton4Doc() : ''; + $this->lang->TRActions = $this->doc->setFastMenu($this->lang->doc->fast); + $this->lang->TRActions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : ''; + $this->lang->TRActions .= common::hasPriv('doc', 'create') ? $this->doc->buildCreateButton4Doc() : ''; $actionURL = $this->createLink('doc', 'browse', "lib=0&browseType=bySearch&queryID=myQueryID"); $this->doc->buildSearchForm(0, array(), 0, $actionURL, 'index'); @@ -341,7 +341,7 @@ class doc extends control $this->product->setMenu($this->product->getPairs(), $lib->product); $this->lang->set('menugroup.doc', 'product'); - $this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : ''; + $this->lang->TRActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : ''; } elseif($this->from == 'project') { @@ -350,7 +350,7 @@ class doc extends control $this->project->setMenu($this->project->getPairs('nocode'), $lib->project); $this->lang->set('menugroup.doc', 'project'); - $this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : ''; + $this->lang->TRActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : ''; } else { diff --git a/module/doc/model.php b/module/doc/model.php index b171f67109..4c14f661d1 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -110,7 +110,7 @@ class docModel extends model $actions = $this->setFastMenu($fastLib); $actions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib', "type={$type}&objectID={$currentLib}"), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe'") : ''; - $this->lang->modulePageActions = $actions; + $this->lang->TRActions = $actions; } //$selectHtml .= $crumb ? $crumb : $this->getCrumbs($libID, $moduleID); diff --git a/module/jenkins/control.php b/module/jenkins/control.php index 67658f061f..ea52501ccb 100644 --- a/module/jenkins/control.php +++ b/module/jenkins/control.php @@ -35,7 +35,7 @@ class jenkins extends control */ public function browse($orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { - if(common::hasPriv('jenkins', 'create')) $this->lang->modulePageActions = html::a(helper::createLink('jenkins', 'create'), " " . $this->lang->jenkins->create, '', "class='btn btn-primary'"); + if(common::hasPriv('jenkins', 'create')) $this->lang->TRActions = html::a(helper::createLink('jenkins', 'create'), " " . $this->lang->jenkins->create, '', "class='btn btn-primary'"); $this->app->loadClass('pager', $static = true); $pager = new pager($recTotal, $recPerPage, $pageID); diff --git a/module/product/control.php b/module/product/control.php index 2deb012b25..16386b0d63 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -57,7 +57,7 @@ class product extends control $branch = (int)$this->cookie->preBranch; $this->product->setMenu($this->products, $productID, $branch); - if(common::hasPriv('product', 'create')) $this->lang->modulePageActions = html::a($this->createLink('product', 'create'), " " . $this->lang->product->create, '', "class='btn btn-primary'"); + if(common::hasPriv('product', 'create')) $this->lang->TRActions = html::a($this->createLink('product', 'create'), " " . $this->lang->product->create, '', "class='btn btn-primary'"); $this->view->title = $this->lang->product->index; $this->view->position[] = $this->lang->product->index; diff --git a/module/product/model.php b/module/product/model.php index 7258d1655e..57a35ac831 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -87,8 +87,8 @@ class productModel extends model } } - $this->lang->modulePageNav = $pageNav; - $this->lang->modulePageActions = $pageActions; + $this->lang->modulePageNav = $pageNav; + $this->lang->TRActions = $pageActions; foreach($this->lang->product->menu as $key => $menu) { $replace = $productID; diff --git a/module/project/control.php b/module/project/control.php index e3303d3f37..f19f48adf6 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -45,7 +45,7 @@ class project extends control if($this->app->viewType != 'mhtml') unset($this->lang->project->menu->index); $this->commonAction($projectID); - if(common::hasPriv('project', 'create')) $this->lang->modulePageActions = html::a($this->createLink('project', 'create'), " " . $this->lang->project->create, '', "class='btn btn-primary'"); + if(common::hasPriv('project', 'create')) $this->lang->TRActions = html::a($this->createLink('project', 'create'), " " . $this->lang->project->create, '', "class='btn btn-primary'"); $this->view->title = $this->lang->project->index; $this->view->position[] = $this->lang->project->index; @@ -969,7 +969,7 @@ class project extends control $this->view->chartData = $chartData; $this->view->dayList = array('full' => $this->lang->project->interval . '1' . $this->lang->day) + $dayList; - unset($this->lang->modulePageActions); + unset($this->lang->TRActions); $this->display(); } diff --git a/module/repo/control.php b/module/repo/control.php index a94f998c27..203408eca5 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -49,7 +49,7 @@ class repo extends control { $repoID = $this->session->repoID; $this->repo->setMenu($this->repos, $repoID, false); - if(common::hasPriv('repo', 'create')) $this->lang->modulePageActions = html::a(helper::createLink('repo', 'create'), " " . $this->lang->repo->create, '', "class='btn btn-primary'"); + if(common::hasPriv('repo', 'create')) $this->lang->TRActions = html::a(helper::createLink('repo', 'create'), " " . $this->lang->repo->create, '', "class='btn btn-primary'"); $this->app->loadClass('pager', $static = true); $pager = new pager($recTotal, $recPerPage, $pageID); diff --git a/module/testcase/model.php b/module/testcase/model.php index 4919ac725a..44fc6a65f9 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -108,8 +108,8 @@ class testcaseModel extends model } $pageNav .= $selectHtml; - $this->lang->modulePageNav = $pageNav; - $this->lang->modulePageActions = $pageActions; + $this->lang->modulePageNav = $pageNav; + $this->lang->TRActions = $pageActions; foreach($this->lang->testcase->menu as $key => $menu) { if($this->config->global->flow == 'full') $this->loadModel('qa')->setSubMenu('testcase', $key, $productID); diff --git a/module/testreport/model.php b/module/testreport/model.php index 31b097dd97..66ba19a7ce 100644 --- a/module/testreport/model.php +++ b/module/testreport/model.php @@ -45,8 +45,8 @@ class testreportModel extends model } $pageNav .= $selectHtml; - $this->lang->modulePageNav = $pageNav; - $this->lang->modulePageActions = $pageActions; + $this->lang->modulePageNav = $pageNav; + $this->lang->TRActions = $pageActions; foreach($this->lang->testtask->menu as $key => $value) { if($this->config->global->flow == 'full') $this->loadModel('qa')->setSubMenu('testreport', $key, $productID); diff --git a/module/testsuite/model.php b/module/testsuite/model.php index 9081fdeff0..bd4c7b7bcd 100644 --- a/module/testsuite/model.php +++ b/module/testsuite/model.php @@ -53,8 +53,8 @@ class testsuiteModel extends model } $pageNav .= $selectHtml; - $this->lang->modulePageNav = $pageNav; - $this->lang->modulePageActions = $pageActions; + $this->lang->modulePageNav = $pageNav; + $this->lang->TRActions = $pageActions; foreach($this->lang->testsuite->menu as $key => $value) { if($this->config->global->flow == 'full') $this->loadModel('qa')->setSubMenu('testsuite', $key, $productID); diff --git a/module/testtask/model.php b/module/testtask/model.php index 7074579c6c..31c5bff47f 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -40,9 +40,9 @@ class testtaskModel extends model $selectHtml .= ""; $selectHtml .= ""; - $this->lang->modulePageActions = ''; - if(common::hasPriv('testtask', 'view')) $this->lang->modulePageActions .= html::a(helper::createLink('testtask', 'view', "taskID={$testtask->id}"), " " . $this->lang->testtask->view, '', "class='btn'"); - if(common::hasPriv('testreport', 'browse')) $this->lang->modulePageActions .= html::a(helper::createLink('testreport', 'browse', "objectID=$productID&objectType=product&extra={$testtask->id}"), " " . $this->lang->testtask->reportField, '', "class='btn'"); + $this->lang->TRActions = ''; + if(common::hasPriv('testtask', 'view')) $this->lang->TRActions .= html::a(helper::createLink('testtask', 'view', "taskID={$testtask->id}"), " " . $this->lang->testtask->view, '', "class='btn'"); + if(common::hasPriv('testreport', 'browse')) $this->lang->TRActions .= html::a(helper::createLink('testreport', 'browse', "objectID=$productID&objectType=product&extra={$testtask->id}"), " " . $this->lang->testtask->reportField, '', "class='btn'"); } $this->app->loadLang('qa'); @@ -75,8 +75,8 @@ class testtaskModel extends model } $pageNav .= $selectHtml; - $this->lang->modulePageNav = $pageNav; - $this->lang->modulePageActions = $pageActions; + $this->lang->modulePageNav = $pageNav; + $this->lang->TRActions = $pageActions; foreach($this->lang->testtask->menu as $key => $value) { if($this->config->global->flow == 'full') $this->loadModel('qa')->setSubMenu('testtask', $key, $productID); @@ -167,8 +167,8 @@ class testtaskModel extends model } $pageNav .= $selectHtml; - $this->lang->modulePageNav = $pageNav; - $this->lang->modulePageActions = $pageActions; + $this->lang->modulePageNav = $pageNav; + $this->lang->TRActions = $pageActions; if($this->config->global->flow != 'full') $this->lang->testtask->menu = new stdclass(); foreach($this->lang->testtask->menu as $key => $value) {