diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index f718da49d7..194b507e46 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -134,6 +134,7 @@ $lang->bug->legendSteps = 'Repro Steps'; $lang->bug->legendComment = 'Note'; $lang->bug->legendLife = 'Lifecycle'; $lang->bug->legendMisc = 'Misc'; +$lang->bug->legendRelated = 'Related Info'; /* 功能按钮。*/ $lang->bug->buttonConfirm = 'Confirm'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 9e646824f0..fb9df16213 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -134,6 +134,7 @@ $lang->bug->legendSteps = '重现步骤'; $lang->bug->legendComment = '备注'; $lang->bug->legendLife = 'BUG的一生'; $lang->bug->legendMisc = '其他相关'; +$lang->bug->legendRelated = '其他信息'; /* 功能按钮。*/ $lang->bug->buttonConfirm = '确认'; diff --git a/module/custom/config.php b/module/custom/config.php index 8b25e07949..1b04fa8303 100644 --- a/module/custom/config.php +++ b/module/custom/config.php @@ -8,9 +8,3 @@ $config->custom->canAdd['testtask'] = 'priList'; $config->custom->canAdd['todo'] = 'priList,typeList'; $config->custom->canAdd['user'] = 'roleList'; $config->custom->canAdd['block'] = ''; - -$config->custom->moblieHidden['main'] = array('repo'); -$config->custom->moblieHidden['product'] = array('branch', 'module', 'create'); -$config->custom->moblieHidden['project'] = array('create', 'effort', 'product'); -$config->custom->moblieHidden['my'] = array('effort', 'changePassword', 'manageContacts', 'profile'); -$config->custom->moblieHidden['company'] = array('dept', 'todo', 'effort', 'browseGroup', 'addGroup', 'batchAddUser', 'addUser'); diff --git a/module/project/control.php b/module/project/control.php index e5d3c640b4..4d1a950ae3 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -52,7 +52,7 @@ class project extends control if($homepage == 'browse' and $locate == 'auto') $locate = 'yes'; if($locate == 'yes') $this->locate($this->createLink('project', 'task')); - unset($this->lang->project->menu->index); + if($this->app->viewType != 'mhtml') unset($this->lang->project->menu->index); $this->commonAction($projectID); //$this->project->setMenu($this->projects, key($this->projects)); diff --git a/module/testcase/control.php b/module/testcase/control.php index a41da64252..2bcb91aaac 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -187,6 +187,7 @@ class testcase extends control $this->view->suiteList = $this->loadModel('testsuite')->getSuites($productID); $this->view->suiteID = 0; $this->view->moduleID = 0; + $this->view->branch = $branch; $this->display(); } diff --git a/module/testcase/view/groupcase.html.php b/module/testcase/view/groupcase.html.php index 919d866952..90ac7b82ae 100644 --- a/module/testcase/view/groupcase.html.php +++ b/module/testcase/view/groupcase.html.php @@ -39,8 +39,7 @@ - createLink('case','view',"caseID=$case->id"); ?> - +  id . $lang->colon; if(!common::printLink('testcase', 'view', "case=$case->id", $case->title)) echo $case->title;?> testcase->priList, $case->pri, $case->pri)?>'>testcase->priList, $case->pri, $case->pri);?> diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index 127f9b3947..86e6d80ac5 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -42,7 +42,7 @@ $lang->testtask->totalStatus = "全部"; $lang->testtask->all = "全部产品"; $lang->testtask->id = '编号'; -$lang->testtask->common = '测试视图版本'; +$lang->testtask->common = '测试版本'; $lang->testtask->product = '所属' . $lang->productCommon; $lang->testtask->project = '所属' . $lang->projectCommon; $lang->testtask->build = '版本'; diff --git a/tools/minifyfront.php b/tools/minifyfront.php index b97889736c..d8eaa75ead 100755 --- a/tools/minifyfront.php +++ b/tools/minifyfront.php @@ -29,21 +29,6 @@ file_put_contents($allJSFile, $jsCode); /* Compress it. */ `java -jar ~/bin/yuicompressor/build/yuicompressor.jar --type js $allJSFile -o $allJSFile`; -/* Set mobile js files to combined. */ -$mobileJsFiles[] = $jqueryRoot . 'mobile/jquery-1.10.1.min.js'; -$mobileJsFiles[] = $jsRoot . 'm.my.full.js'; -$mobileJsFiles[] = $jqueryRoot . 'mobile/jquery.mobile.min.js'; -$mobileJsFiles[] = $jqueryRoot . 'jquery.pjax.js'; - -/* Combine these js files. */ -$allJSFile = $jsRoot . 'm.all.js'; -$jsCode = ''; -foreach($mobileJsFiles as $jsFile) $jsCode .= "\n". file_get_contents($jsFile); -file_put_contents($allJSFile, $jsCode); - -/* Compress it. */ -`java -jar ~/bin/yuicompressor/build/yuicompressor.jar --type js $allJSFile -o $allJSFile`; - //-------------------------------- PROCESS CSS FILES ------------------------------ // /* Define the themeRoot. */ @@ -87,21 +72,3 @@ foreach($langs as $lang) `java -jar ~/bin/yuicompressor/build/yuicompressor.jar --type css $cssFile -o $cssFile`; } } - -/* Create css files for every them and every lang. */ -foreach($langs as $lang) -{ - /* Common css files. */ - $cssCode = file_get_contents($themeRoot . 'default/jquery.mobile.css'); - $cssCode .= file_get_contents($themeRoot . 'default/m.style.css'); - - /* Css file for current lang and current them. */ - $cssCode .= file_get_contents($themeRoot . "lang/$lang.css"); - - /* Combine them. */ - $cssFile = $themeRoot . "default/m.$lang.default.css"; - file_put_contents($cssFile, $cssCode); - - /* Compress it. */ - `java -jar ~/bin/yuicompressor/build/yuicompressor.jar --type css $cssFile -o $cssFile`; -}