diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php index c46f62f023..653733efd9 100644 --- a/module/common/lang/menuOrder.php +++ b/module/common/lang/menuOrder.php @@ -111,9 +111,10 @@ $lang->admin->menuOrder[10] = 'extension'; $lang->admin->menuOrder[15] = 'custom'; $lang->admin->menuOrder[20] = 'editor'; $lang->admin->menuOrder[25] = 'mail'; -$lang->admin->menuOrder[30] = 'sso'; -$lang->admin->menuOrder[35] = 'convert'; -$lang->admin->menuOrder[40] = 'trashes'; +$lang->admin->menuOrder[30] = 'custom'; +$lang->admin->menuOrder[35] = 'sso'; +$lang->admin->menuOrder[40] = 'convert'; +$lang->admin->menuOrder[45] = 'trashes'; $lang->convert->menuOrder = $lang->admin->menuOrder; $lang->upgrade->menuOrder = $lang->admin->menuOrder; $lang->action->menuOrder = $lang->admin->menuOrder; @@ -121,4 +122,5 @@ $lang->extension->menuOrder = $lang->admin->menuOrder; $lang->custom->menuOrder = $lang->admin->menuOrder; $lang->editor->menuOrder = $lang->admin->menuOrder; $lang->mail->menuOrder = $lang->admin->menuOrder; +$lang->custom->menuOrder = $lang->admin->menuOrder; $lang->sso->menuOrder = $lang->admin->menuOrder; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index d16d99fb9a..de0d6594bf 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -272,7 +272,7 @@ $lang->admin = new stdclass(); $lang->admin->menu = new stdclass(); $lang->admin->menu->index = array('link' => '首页|admin|index'); $lang->admin->menu->extension = array('link' => '扩展|extension|browse', 'subModule' => 'extension,editor'); -$lang->admin->menu->custom = array('link' => '自定义配置|custom|index', 'subModule' => 'custom'); +$lang->admin->menu->custom = array('link' => '自定义|custom|index', 'subModule' => 'custom'); $lang->admin->menu->mail = array('link' => '发信|mail|index', 'subModule' => 'mail'); $lang->admin->menu->clearData = array('link' => '清除数据|admin|cleardata'); $lang->admin->menu->convert = array('link' => '导入|convert|index', 'subModule' => 'convert'); @@ -316,6 +316,7 @@ $lang->menugroup->dept = 'company'; $lang->menugroup->todo = 'my'; $lang->menugroup->action = 'admin'; $lang->menugroup->extension = 'admin'; +$lang->menugroup->custom = 'admin'; $lang->menugroup->editor = 'admin'; $lang->menugroup->mail = 'admin'; $lang->menugroup->sso = 'admin'; diff --git a/module/custom/js/setcustom.js b/module/custom/js/setcustom.js new file mode 100644 index 0000000000..fc82613a9e --- /dev/null +++ b/module/custom/js/setcustom.js @@ -0,0 +1,16 @@ +function addItem(clickedButton) +{ + $(clickedButton).parent().parent().after(itemRow); +} + +function delItem(clickedButton) +{ + $(clickedButton).parent().parent().remove(); +} + +$(function() +{ + $('#' + module + 'Tab').addClass('active'); + $('#' + field + 'Tab').addClass('active'); +}) + diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index a577464f86..080b658e2f 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -1,8 +1,10 @@ custom->common = 'Custom'; -$lang->custom->custom = 'Custom'; -$lang->custom->key = 'Key'; -$lang->custom->value = 'Value'; +$lang->custom->common = 'Custom'; +$lang->custom->index = 'Index'; +$lang->custom->setCustom = 'Set custom'; +$lang->custom->restore = 'restore'; +$lang->custom->key = 'Key'; +$lang->custom->value = 'Value'; $lang->custom->story = 'Story'; $lang->custom->task = 'Task'; @@ -12,5 +14,4 @@ $lang->custom->testtask = 'Test task'; $lang->custom->todo = 'Todo'; $lang->custom->user = 'User'; -$lang->custom->restore = 'restore'; $lang->custom->confirmRestore = 'Are you sure to restore the default lang setting?'; diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index 9667bf7ba6..bc56aa91ea 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -1,8 +1,10 @@ custom->common = '自定义配置'; -$lang->custom->custom = '自定义配置'; -$lang->custom->key = '键'; -$lang->custom->value = '值'; +$lang->custom->common = '自定义'; +$lang->custom->index = '首页'; +$lang->custom->setCustom = '自定义配置'; +$lang->custom->restore = '恢复默认'; +$lang->custom->key = '键'; +$lang->custom->value = '值'; $lang->custom->story = '需求'; $lang->custom->task = '任务'; @@ -12,5 +14,4 @@ $lang->custom->testtask = '测试任务'; $lang->custom->todo = '待办'; $lang->custom->user = '用户'; -$lang->custom->restore = '恢复默认'; $lang->custom->confirmRestore = '是否要恢复默认语言配置？'; diff --git a/module/custom/view/header.html.php b/module/custom/view/header.html.php deleted file mode 100755 index 6bf5f36a39..0000000000 --- a/module/custom/view/header.html.php +++ /dev/null @@ -1,15 +0,0 @@ - -
-
- "; common::printLink('custom', 'index', "module=story", $lang->custom->story); echo ''; - echo ""; common::printLink('custom', 'index', "module=task", $lang->custom->task); echo ''; - echo ""; common::printLink('custom', 'index', "module=bug", $lang->custom->bug); echo ''; - echo ""; common::printLink('custom', 'index', "module=testcase", $lang->custom->testcase); echo ''; - echo ""; common::printLink('custom', 'index', "module=testtask", $lang->custom->testtask); echo ''; - echo ""; common::printLink('custom', 'index', "module=todo", $lang->custom->todo); echo '' ; - echo ""; common::printLink('custom', 'index', "module=user", $lang->custom->user); echo ''; - echo ""; - ?> -
-
diff --git a/module/custom/view/setcustom.html.php b/module/custom/view/setcustom.html.php index 074586eda5..896ee7e1ed 100644 --- a/module/custom/view/setcustom.html.php +++ b/module/custom/view/setcustom.html.php @@ -11,22 +11,9 @@ */ ?> -
-
- "; common::printLink('custom', 'setCustom', "module=story", $lang->custom->story); echo ''; - echo ""; common::printLink('custom', 'setCustom', "module=task", $lang->custom->task); echo ''; - echo ""; common::printLink('custom', 'setCustom', "module=bug", $lang->custom->bug); echo ''; - echo ""; common::printLink('custom', 'setCustom', "module=testcase", $lang->custom->testcase); echo ''; - echo ""; common::printLink('custom', 'setCustom', "module=testtask", $lang->custom->testtask); echo ''; - echo ""; common::printLink('custom', 'setCustom', "module=todo", $lang->custom->todo); echo '' ; - echo ""; common::printLink('custom', 'setCustom', "module=user", $lang->custom->user); echo ''; - echo ""; - ?> -
-
+ @@ -42,50 +29,66 @@ EOT; ?> - + + +
- custom->{$module}->fields as $key => $value) - { - echo "" . html::a(inlink('setCustom', "module=$module&field=$key"), $value) . ""; - } + "; common::printLink('custom', 'setCustom', "module=story", $lang->custom->story); echo ''; + echo ""; common::printLink('custom', 'setCustom', "module=task", $lang->custom->task); echo ''; + echo ""; common::printLink('custom', 'setCustom', "module=bug", $lang->custom->bug); echo ''; + echo ""; common::printLink('custom', 'setCustom', "module=testcase", $lang->custom->testcase); echo ''; + echo ""; common::printLink('custom', 'setCustom', "module=testtask", $lang->custom->testtask); echo ''; + echo ""; common::printLink('custom', 'setCustom', "module=todo", $lang->custom->todo); echo '' ; + echo ""; common::printLink('custom', 'setCustom', "module=user", $lang->custom->user); echo ''; ?>
-
- - - - - - - $value):?> - - system : 1;?> - - - - - - - - -
custom->key;?>custom->value;?>
- - - - -
custom->restore, inlink('restore', "modult=$modult&field=$field"), 'hiddenwin')?>
-
- + + + + + + +
+
custom->$module?>
+
+
    + custom->{$module}->fields as $key => $value) + { + echo "
  • " . html::a(inlink('setCustom', "module=$module&field=$key"), $value) . "
    • "; + } + ?> +
+
+ 		+
+ + + + + + + + $value):?> + + system : 1;?> + + + + + + + + +
custom->$module . ' >> ' . $config->custom->$module->fields[$field]?>
custom->key;?>custom->value;?>
+ + + + +
custom->restore, inlink('restore', "module=$module&field=$field"), 'hiddenwin')?>
+
+
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index b04e4137db..611087db2a 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -39,20 +39,20 @@ $lang->moduleOrder[95] = 'user'; $lang->moduleOrder[100] = 'admin'; $lang->moduleOrder[105] = 'extension'; -$lang->moduleOrder[105] = 'extension'; -$lang->moduleOrder[110] = 'editor'; -$lang->moduleOrder[115] = 'convert'; -$lang->moduleOrder[120] = 'action'; +$lang->moduleOrder[110] = 'custom'; +$lang->moduleOrder[115] = 'editor'; +$lang->moduleOrder[120] = 'convert'; +$lang->moduleOrder[125] = 'action'; -$lang->moduleOrder[125] = 'mail'; -$lang->moduleOrder[130] = 'svn'; -$lang->moduleOrder[135] = 'search'; -$lang->moduleOrder[140] = 'tree'; -$lang->moduleOrder[145] = 'api'; -$lang->moduleOrder[150] = 'file'; -$lang->moduleOrder[155] = 'misc'; -$lang->moduleOrder[160] = 'sso'; -$lang->moduleOrder[165] = 'webapp'; +$lang->moduleOrder[130] = 'mail'; +$lang->moduleOrder[135] = 'svn'; +$lang->moduleOrder[140] = 'search'; +$lang->moduleOrder[145] = 'tree'; +$lang->moduleOrder[150] = 'api'; +$lang->moduleOrder[155] = 'file'; +$lang->moduleOrder[160] = 'misc'; +$lang->moduleOrder[165] = 'sso'; +$lang->moduleOrder[170] = 'webapp'; $lang->resource = new stdclass(); @@ -489,6 +489,16 @@ $lang->mail->methodOrder[20] = 'save'; $lang->mail->methodOrder[25] = 'test'; $lang->mail->methodOrder[30] = 'reset'; +/* custom. */ +$lang->resource->custom = new stdclass(); +$lang->resource->custom->index = 'index'; +$lang->resource->custom->setCustom = 'setCustom'; +$lang->resource->custom->restore = 'restore'; + +$lang->custom->methodOrder[5] = 'index'; +$lang->custom->methodOrder[10] = 'setCustom'; +$lang->custom->methodOrder[15] = 'restore'; + /* Subversion. */ $lang->resource->svn = new stdclass(); $lang->resource->svn->diff = 'diff'; diff --git a/module/testcase/css/batchedit.css b/module/testcase/css/batchedit.css index 10b4561986..b78baac20e 100755 --- a/module/testcase/css/batchedit.css +++ b/module/testcase/css/batchedit.css @@ -1 +1,2 @@ .w-340px {width:340px} +.chosen {z-index:99} diff --git a/module/testcase/js/batchedit.js b/module/testcase/js/batchedit.js new file mode 100644 index 0000000000..8bf7fc4fff --- /dev/null +++ b/module/testcase/js/batchedit.js @@ -0,0 +1,4 @@ +$(function() +{ + $(".chosen").chosen({no_results_text:noResultsMatch}); +}) diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 5b2a8a9d42..78d1723562 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -135,13 +135,6 @@ $lang->testcase->stageList['system'] = 'System testing'; $lang->testcase->stageList['smoke'] = 'Smoking testing'; $lang->testcase->stageList['bvt'] = 'BVT testing'; -$lang->testcase->stageListAB['unittest'] = 'Unit'; -$lang->testcase->stageListAB['feature'] = 'Feature'; -$lang->testcase->stageListAB['intergrate'] = 'Integrate'; -$lang->testcase->stageListAB['system'] = 'System'; -$lang->testcase->stageListAB['smoke'] = 'Smoking'; -$lang->testcase->stageListAB['bvt'] = 'BVT'; - $lang->testcase->statusList[''] = ''; $lang->testcase->statusList['normal'] = 'Normal'; $lang->testcase->statusList['blocked'] = 'Blocked'; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index a99ed5e829..70ae7811fd 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -135,13 +135,6 @@ $lang->testcase->stageList['system'] = '系统测试阶段'; $lang->testcase->stageList['smoke'] = '冒烟测试阶段'; $lang->testcase->stageList['bvt'] = '版本验证阶段'; -$lang->testcase->stageListAB['unittest'] = '单元'; -$lang->testcase->stageListAB['feature'] = '功能'; -$lang->testcase->stageListAB['intergrate'] = '集成'; -$lang->testcase->stageListAB['system'] = '系统'; -$lang->testcase->stageListAB['smoke'] = '冒烟'; -$lang->testcase->stageListAB['bvt'] = '版本'; - $lang->testcase->statusList[''] = ''; $lang->testcase->statusList['normal'] = '正常'; $lang->testcase->statusList['blocked'] = '被阻塞'; diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php index bc69532211..d26bef31bd 100644 --- a/module/testcase/view/batchedit.html.php +++ b/module/testcase/view/batchedit.html.php @@ -32,21 +32,7 @@ module, "class='select-1'");?> title, 'class=text-1'); echo "*";?> testcase->typeList, $cases[$caseID]->type, 'class=select-1');?> - - testcase->stageListAB as $key => $stage) - { - if(in_array($key, explode(',', $cases[$caseID]->stage))) - { - echo "$stage "; - } - else - { - echo "$stage "; - } - } - ?> - + testcase->stageList, $cases[$caseID]->stage, "class='select-1 chosen' multiple data-placeholder='{$lang->testcase->stage}'");?>