Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust for pro.

Browse Source
This commit is contained in:
wangyidong
2017-04-14 16:35:22 +08:00
parent d82b31871c
commit 794a09bc04
8 changed files with 6 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/bug/lang/en.php
View File

@@ -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';

1
module/bug/lang/zh-cn.php
View File

@@ -134,6 +134,7 @@ $lang->bug->legendSteps = '重现步骤';
$lang->bug->legendComment = '备注';
$lang->bug->legendLife = 'BUG的一生';
$lang->bug->legendMisc = '其他相关';
$lang->bug->legendRelated = '其他信息';
/* 功能按钮。*/
$lang->bug->buttonConfirm = '确认';

6
module/custom/config.php
View File

@@ -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');

2
module/project/control.php
View File

@@ -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));

1
module/testcase/control.php
View File

@@ -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();
}

3
module/testcase/view/groupcase.html.php
View File

@@ -39,8 +39,7 @@
<td colspan='11' class='text-left'><?php if($groupByList) echo $groupByList[$groupKey];?></td>
</tr>
<?php foreach($groupTasks as $case):?>
<?php $caseLink = $this->createLink('case','view',"caseID=$case->id"); ?>
<tr id='<?php echo $case->id;?>' class='a-center child-of-node-<?php echo $groupKey;?>'>
<tr id='<?php echo $case->id;?>' class='text-center child-of-node-<?php echo $groupKey;?>'>
<td class='<?php echo $groupClass;?>'></td>
<td class='text-left'>&nbsp;<?php echo $case->id . $lang->colon; if(!common::printLink('testcase', 'view', "case=$case->id", $case->title)) echo $case->title;?></td>
<td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $case->pri, $case->pri)?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri);?></span></td>

2
module/testtask/lang/zh-cn.php
View File

@@ -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 = '版本';

33
tools/minifyfront.php
View File

@@ -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`;
}