diff --git a/module/bug/model.php b/module/bug/model.php index 17354c1295..7ac0442c9d 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -32,47 +32,56 @@ class bugModel extends model $pageNav = ''; $pageActions = ''; - if($this->config->global->flow == 'full') + $isMobile = $this->app->viewType == 'mhtml'; + if($isMobile) { $this->app->loadLang('qa'); - $pageNav = '
' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '
'; + $pageNav = html::a(helper::createLink('qa', 'index'), $this->lang->qa->index) . $this->lang->colon; } else { - if(common::hasPriv('bug', 'report')) + if($this->config->global->flow == 'full') { - $link = helper::createLink('bug', 'report', "productID=$productID&browseType=$browseType&branchID=$branch&moduleID=$moduleID"); - $pageActions .= html::a($link, " " . $this->lang->bug->report->common . '', '', "class='btn btn-link'"); - } - if(common::hasPriv('bug', 'export')) - { - $link = helper::createLink('bug', 'export', "productID=$productID&orderBy=$orderBy"); - $pageActions .= "
"; - $pageActions .= ""; - $pageActions .= ''; - $pageActions .= "'; - $pageActions .= '
'; - } - if(common::hasPriv('bug', 'batchCreate')) - { - $link = helper::createLink('bug', 'batchCreate', "productID=$productID&branch=$branch&projectID=0&moduleID=$moduleID"); - $pageActions .= html::a($link, "" . $this->lang->bug->batchCreate, '', "class='btn btn-secondary'"); - } - if(commonModel::isTutorialMode()) - { - $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&extra=moduleID=$moduleID"); - $link = helper::createLink('tutorial', 'wizard', "module=bug&method=create¶ms=$wizardParams"); - $pageActions .= html::a($link, "" . $this->lang->bug->create, '', "class='btn btn-primary btn-bug-create'"); + $this->app->loadLang('qa'); + $pageNav = '
' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '
'; } else { - if(common::hasPriv('bug', 'create')) + if(common::hasPriv('bug', 'report')) { - $link = helper::createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID"); - $pageActions .= html::a($link, "" . $this->lang->bug->create, '', "class='btn btn-primary'"); + $link = helper::createLink('bug', 'report', "productID=$productID&browseType=$browseType&branchID=$branch&moduleID=$moduleID"); + $pageActions .= html::a($link, " " . $this->lang->bug->report->common . '', '', "class='btn btn-link'"); + } + if(common::hasPriv('bug', 'export')) + { + $link = helper::createLink('bug', 'export', "productID=$productID&orderBy=$orderBy"); + $pageActions .= "
"; + $pageActions .= ""; + $pageActions .= ''; + $pageActions .= "'; + $pageActions .= '
'; + } + if(common::hasPriv('bug', 'batchCreate')) + { + $link = helper::createLink('bug', 'batchCreate', "productID=$productID&branch=$branch&projectID=0&moduleID=$moduleID"); + $pageActions .= html::a($link, "" . $this->lang->bug->batchCreate, '', "class='btn btn-secondary'"); + } + if(commonModel::isTutorialMode()) + { + $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&extra=moduleID=$moduleID"); + $link = helper::createLink('tutorial', 'wizard', "module=bug&method=create¶ms=$wizardParams"); + $pageActions .= html::a($link, "" . $this->lang->bug->create, '', "class='btn btn-primary btn-bug-create'"); + } + else + { + if(common::hasPriv('bug', 'create')) + { + $link = helper::createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID"); + $pageActions .= html::a($link, "" . $this->lang->bug->create, '', "class='btn btn-primary'"); + } } } } diff --git a/module/product/model.php b/module/product/model.php index 9b5314afc5..ffe6b04235 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -56,22 +56,32 @@ class productModel extends model if($currentModule == 'product' && $currentMethod == 'all') $label = $this->lang->product->all; if($currentModule == 'product' && $currentMethod == 'create') $label = $this->lang->product->create; - $pageNav = '
'; - $pageNav .= '
'; - $pageNav .= $selectHtml; $pageActions = ''; if($this->config->global->flow != 'full') diff --git a/module/project/model.php b/module/project/model.php index 4437c32e68..35b4560e49 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -107,24 +107,34 @@ class projectModel extends model if($moduleName == 'project' && $methodName == 'all') $label = $this->lang->project->allProjects; if($moduleName == 'project' && $methodName == 'create') $label = $this->lang->project->create; - $projectIndex = '
'; - $projectIndex .= '
'; + $projectIndex .= $selectHtml; + } $this->lang->modulePageNav = $projectIndex; if($moduleName != 'project') $this->lang->$moduleName->dividerMenu = $this->lang->project->dividerMenu; diff --git a/module/qa/model.php b/module/qa/model.php index a71fe80576..8c4cefeefd 100644 --- a/module/qa/model.php +++ b/module/qa/model.php @@ -25,8 +25,18 @@ class qaModel extends model $this->loadModel('product')->setMenu($products, $productID, $branch); $selectHtml = $this->product->select($products, $productID, 'qa', 'index', '', $branch); - $productIndex = '
' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '
'; - $productIndex .= $selectHtml; + $productIndex = ''; + $isMobile = $this->app->viewType == 'mhtml'; + if($isMobile) + { + $productIndex = html::a(helper::createLink('qa', 'index'), $this->lang->qa->index) . $this->lang->colon; + $productIndex .= $selectHtml; + } + else + { + $productIndex = '
' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '
'; + $productIndex .= $selectHtml; + } $this->lang->modulePageNav = $productIndex; foreach($this->lang->qa->menu as $key => $menu) diff --git a/module/testcase/model.php b/module/testcase/model.php index 3f5c0c1c10..ec8ba3c063 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -32,69 +32,78 @@ class testcaseModel extends model $pageNav = ''; $pageActions = ''; - if($this->config->global->flow == 'full') + $isMobile = $this->app->viewType == 'mhtml'; + if($isMobile) { $this->app->loadLang('qa'); - $pageNav = '
' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '
'; + $pageNav = html::a(helper::createLink('qa', 'index'), $this->lang->qa->index) . $this->lang->colon; } else { - $exportPriv = common::hasPriv('testcase', 'export'); - $exportTempletPriv = common::hasPriv('testcase', 'exportTemplet'); - $importPriv = common::hasPriv('testcase', 'import'); - $importFromLibPriv = common::hasPriv('testcase', 'importFromLib'); - if($exportPriv or $exportTempletPriv) + if($this->config->global->flow == 'full') { - $pageActions .= "
"; - $pageActions .= "'; - $pageActions .= "'; - $pageActions .= '
'; - + $this->app->loadLang('qa'); + $pageNav = '
' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '
'; } - if($importPriv or $importFromLibPriv) + else { - $pageActions .= "
"; - $pageActions .= ""; - $pageActions .= "'; - $pageActions .= '
'; - } - $initModule = isset($moduleID) ? (int)$moduleID : 0; + $initModule = isset($moduleID) ? (int)$moduleID : 0; - if(common::hasPriv('testcase', 'batchCreate')) - { - $link = helper::createLink('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule"); - $pageActions .= html::a($link, " " . $this->lang->testcase->batchCreate, '', "class='btn btn-secondary'"); - } + if(common::hasPriv('testcase', 'batchCreate')) + { + $link = helper::createLink('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule"); + $pageActions .= html::a($link, " " . $this->lang->testcase->batchCreate, '', "class='btn btn-secondary'"); + } - if(common::hasPriv('testcase', 'create')) - { - $link = helper::createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule"); - $pageActions .= html::a($link, " " . $this->lang->testcase->create, '', "class='btn btn-primary'"); + if(common::hasPriv('testcase', 'create')) + { + $link = helper::createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule"); + $pageActions .= html::a($link, " " . $this->lang->testcase->create, '', "class='btn btn-primary'"); + } } } $pageNav .= $selectHtml; diff --git a/module/testsuite/model.php b/module/testsuite/model.php index b23d323f19..af4b4c8ad4 100644 --- a/module/testsuite/model.php +++ b/module/testsuite/model.php @@ -29,17 +29,26 @@ class testsuiteModel extends model $pageNav = ''; $pageActions = ''; - if($this->config->global->flow == 'full') + $isMobile = $this->app->viewType == 'mhtml'; + if($isMobile) { $this->app->loadLang('qa'); - $pageNav = '
' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '
'; + $pageNav = html::a(helper::createLink('qa', 'index'), $this->lang->qa->index) . $this->lang->colon; } else { - if(common::hasPriv('testsuite', 'create')) + if($this->config->global->flow == 'full') { - $link = helper::createLink('testsuite', 'create', "productID=$productID"); - $pageActions .= html::a($link, " {$this->lang->testsuite->create}", '', "class='btn btn-primary'"); + $this->app->loadLang('qa'); + $pageNav = '
' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '
'; + } + else + { + if(common::hasPriv('testsuite', 'create')) + { + $link = helper::createLink('testsuite', 'create', "productID=$productID"); + $pageActions .= html::a($link, " {$this->lang->testsuite->create}", '', "class='btn btn-primary'"); + } } } $pageNav .= $selectHtml; @@ -102,17 +111,24 @@ class testsuiteModel extends model { $currentLibName = zget($libraries, $libID, ''); $selectHtml = ''; + $isMobile = $this->app->viewType == 'mhtml'; if(!empty($libraries)) { - $dropMenuLink = helper::createLink('testsuite', 'ajaxGetDropMenu', "objectID=$libID&module=testsuite&method=library"); - $selectHtml = "
"; + if($isMobile) + { + $selectHtml = "{$currentLibName} "; + } + else + { + $dropMenuLink = helper::createLink('testsuite', 'ajaxGetDropMenu', "objectID=$libID&module=testsuite&method=library"); + $selectHtml = "
"; + } } if($this->config->global->flow == 'onlyTest') { - $isMobile = $this->app->viewType == 'mhtml'; $modules = $this->loadModel('tree')->getModulePairs($libID, 'caselib'); $moduleName = ($moduleID && isset($modules[$moduleID])) ? $modules[$moduleID] : $this->lang->tree->all; @@ -128,51 +144,59 @@ class testsuiteModel extends model $selectHtml .= "{$moduleName} "; } } - $selectHtml .= '
'; setCookie("lastCaseLib", $libID, $this->config->cookieLife, $this->config->webRoot); $pageNav = ''; $pageActions = ''; - if($this->config->global->flow == 'full') + $isMobile = $this->app->viewType == 'mhtml'; + if($isMobile) { $this->app->loadLang('qa'); - $pageNav .= '
'; - $pageNav .= '
'; - - if(common::hasPriv('testsuite', 'libView')) - { - $link = helper::createLink('testsuite', 'libView', "libID=$libID"); - $pageActions .= html::a($link, " " . $this->lang->testsuite->view, '', "class='btn'"); - } + $pageNav = html::a(helper::createLink('qa', 'index'), $this->lang->qa->index) . $this->lang->colon; } else { - $this->app->loadLang('testcase'); - $pageActions .= "
"; - if(common::hasPriv('testsuite', 'exportTemplet')) + if($this->config->global->flow == 'full') { - $link = helper::createLink('testsuite', 'exportTemplet', "libID=$libID"); - $pageActions .= html::a($link, " " . $this->lang->testsuite->exportTemplet, '', "class='btn btn-link export'"); + $this->app->loadLang('qa'); + $pageNav .= '
'; + $pageNav .= '
'; + + if(common::hasPriv('testsuite', 'libView')) + { + $link = helper::createLink('testsuite', 'libView', "libID=$libID"); + $pageActions .= html::a($link, " " . $this->lang->testsuite->view, '', "class='btn'"); + } } - if(common::hasPriv('testsuite', 'import')) + else { - $link = helper::createLink('testsuite', 'import', "libID=$libID"); - $pageActions .= html::a($link, " " . $this->lang->testcase->importFile, '', "class='btn btn-link export'"); - } - $pageActions .= '
'; - $params = "libID=$libID&moduleID=" . (isset($moduleID) ? $moduleID : 0); - if(common::hasPriv('testsuite', 'batchCreateCase')) - { - $link = helper::createLink('testsuite', 'batchCreateCase', $params); - $pageActions .= html::a($link, "" . $this->lang->testcase->batchCreate, '', "class='btn btn-secondary'"); - } - if(common::hasPriv('testsuite', 'createCase')) - { - $link = helper::createLink('testsuite', 'createCase', $params); - $pageActions .= html::a($link, "" . $this->lang->testcase->create, '', "class='btn btn-primary'"); + $this->app->loadLang('testcase'); + $pageActions .= "
"; + if(common::hasPriv('testsuite', 'exportTemplet')) + { + $link = helper::createLink('testsuite', 'exportTemplet', "libID=$libID"); + $pageActions .= html::a($link, " " . $this->lang->testsuite->exportTemplet, '', "class='btn btn-link export'"); + } + if(common::hasPriv('testsuite', 'import')) + { + $link = helper::createLink('testsuite', 'import', "libID=$libID"); + $pageActions .= html::a($link, " " . $this->lang->testcase->importFile, '', "class='btn btn-link export'"); + } + $pageActions .= '
'; + $params = "libID=$libID&moduleID=" . (isset($moduleID) ? $moduleID : 0); + if(common::hasPriv('testsuite', 'batchCreateCase')) + { + $link = helper::createLink('testsuite', 'batchCreateCase', $params); + $pageActions .= html::a($link, "" . $this->lang->testcase->batchCreate, '', "class='btn btn-secondary'"); + } + if(common::hasPriv('testsuite', 'createCase')) + { + $link = helper::createLink('testsuite', 'createCase', $params); + $pageActions .= html::a($link, "" . $this->lang->testcase->create, '', "class='btn btn-primary'"); + } } } $pageNav .= $selectHtml; diff --git a/module/testtask/model.php b/module/testtask/model.php index 496b74e077..a39828be99 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -46,17 +46,26 @@ class testtaskModel extends model $pageNav = ''; $pageActions = ''; - if($this->config->global->flow == 'full') + $isMobile = $this->app->viewType == 'mhtml'; + if($isMobile) { $this->app->loadLang('qa'); - $pageNav = '
' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '
'; + $pageNav = html::a(helper::createLink('qa', 'index'), $this->lang->qa->index) . $this->lang->colon; } else { - if(common::hasPriv('testtask', 'create')) + if($this->config->global->flow == 'full') { - $link = helper::createLink('testtask', 'create', "productID=$productID"); - $pageActions .= html::a($link, " {$this->lang->testtask->create}", '', "class='btn btn-primary'"); + $this->app->loadLang('qa'); + $pageNav = '
' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '
'; + } + else + { + if(common::hasPriv('testtask', 'create')) + { + $link = helper::createLink('testtask', 'create', "productID=$productID"); + $pageActions .= html::a($link, " {$this->lang->testtask->create}", '', "class='btn btn-primary'"); + } } } $pageNav .= $selectHtml;