diff --git a/module/bug/lang/de.php b/module/bug/lang/de.php index 6925197c5b..92c7f5d4fb 100644 --- a/module/bug/lang/de.php +++ b/module/bug/lang/de.php @@ -187,10 +187,11 @@ $lang->bug->allUsers = 'Alle Benutzer laden'; $lang->bug->allBuilds = 'Alle'; $lang->bug->createBuild = 'Neu'; -/* Legend list。*/ +global $config; +/* Legend list. */ $lang->bug->legendBasicInfo = 'Basis Info'; $lang->bug->legendAttatch = 'Anlagen'; -$lang->bug->legendPRJExecStoryTask = 'Project/' . $lang->executionCommon . '/Story/Task'; +$lang->bug->legendPRJExecStoryTask = $config->systemMode == 'new' ? 'Project/' . $lang->executionCommon . '/Story/Task' : $lang->executionCommon . '/Story/Task'; $lang->bug->legendExecStoryTask = $lang->executionCommon . '/Story/Task'; $lang->bug->lblTypeAndSeverity = 'Typ/Schwere'; $lang->bug->lblSystemBrowserAndHardware = 'System/Browser'; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 8a14403c90..439690a04f 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -187,10 +187,11 @@ $lang->bug->allUsers = 'Load All Users'; $lang->bug->allBuilds = 'All Builds'; $lang->bug->createBuild = 'New'; -/* Legend list。*/ +global $config; +/* Legend list. */ $lang->bug->legendBasicInfo = 'Basic Info'; $lang->bug->legendAttatch = 'Files'; -$lang->bug->legendPRJExecStoryTask = 'Project/' . $lang->executionCommon . '/Story/Task'; +$lang->bug->legendPRJExecStoryTask = $config->systemMode == 'new' ? 'Project/' . $lang->executionCommon . '/Story/Task' : $lang->executionCommon . '/Story/Task'; $lang->bug->legendExecStoryTask = $lang->executionCommon . '/Story/Task'; $lang->bug->lblTypeAndSeverity = 'Type/Severity'; $lang->bug->lblSystemBrowserAndHardware = 'System/Browser'; diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php index f23542c7ef..de0bfd7c05 100644 --- a/module/bug/lang/fr.php +++ b/module/bug/lang/fr.php @@ -187,10 +187,11 @@ $lang->bug->allUsers = 'Charger Tous'; $lang->bug->allBuilds = 'Tous les Builds'; $lang->bug->createBuild = 'Nouveau'; -/* Legend list。*/ +global $config; +/* Legend list. */ $lang->bug->legendBasicInfo = 'Infos de Base'; $lang->bug->legendAttatch = 'Fichiers'; -$lang->bug->legendPRJExecStoryTask = 'Project/' . $lang->executionCommon . '/Story/Task'; +$lang->bug->legendPRJExecStoryTask = $config->systemMode == 'new' ? 'Project/' . $lang->executionCommon . '/Story/Task' : $lang->executionCommon . '/Story/Task'; $lang->bug->legendExecStoryTask = $lang->executionCommon . '/Story/Tâche'; $lang->bug->lblTypeAndSeverity = 'Type/Severité'; $lang->bug->lblSystemBrowserAndHardware = 'Système/Browser'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 719ba107c1..cab71d93d5 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -187,10 +187,11 @@ $lang->bug->allUsers = '加载所有用户'; $lang->bug->allBuilds = '所有'; $lang->bug->createBuild = '创建'; +global $config; /* legend列表。*/ $lang->bug->legendBasicInfo = '基本信息'; $lang->bug->legendAttatch = '附件'; -$lang->bug->legendPRJExecStoryTask = "项目/" . $lang->executionCommon . "/{$lang->SRCommon}/任务"; +$lang->bug->legendPRJExecStoryTask = $config->systemMode == 'new' ? "项目/" . $lang->executionCommon . "/{$lang->SRCommon}/任务" : $lang->executionCommon . "/{$lang->SRCommon}/任务"; $lang->bug->legendExecStoryTask = $lang->executionCommon . "/{$lang->SRCommon}/任务"; $lang->bug->lblTypeAndSeverity = '类型/严重程度'; $lang->bug->lblSystemBrowserAndHardware = '系统/浏览器'; diff --git a/module/doc/css/createbasicinfo.css b/module/doc/css/createbasicinfo.css index a6a00155ce..0c0e796ae6 100644 --- a/module/doc/css/createbasicinfo.css +++ b/module/doc/css/createbasicinfo.css @@ -1 +1,2 @@ #whiteListBox .input-group:last-child {margin-top: 10px;} +#module_chosen.chosen-container .chosen-results {max-height: 200px;} diff --git a/module/doc/css/tablecontents.css b/module/doc/css/tablecontents.css index 01fc3e2ab6..8e12dc7d0f 100644 --- a/module/doc/css/tablecontents.css +++ b/module/doc/css/tablecontents.css @@ -9,7 +9,7 @@ .no-content-button a:nth-child(2) {margin-left: 20px;} .cell .detail .detail-title {padding-left: 5px; list-style: none;} -.menu-actions {position: relative; float: right; top: -34px; right: -15px; padding: 7px 8px;} +.menu-actions {position: absolute; top: 7px; right: 45px; padding: 7px 8px;} .detail ul {position: relative;} .tail-info {position: absolute; right: 0; padding-left: 10px; padding-top: 1px;} .tail-info, .doc-title, span.item {background: #fff;} diff --git a/module/doc/view/createbasicinfo.html.php b/module/doc/view/createbasicinfo.html.php index 165e6ce5b0..31a1fa7736 100644 --- a/module/doc/view/createbasicinfo.html.php +++ b/module/doc/view/createbasicinfo.html.php @@ -31,7 +31,7 @@ doc->module;?> - + diff --git a/module/task/js/create.js b/module/task/js/create.js index 0a65fc34c3..839ac331ed 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -97,7 +97,7 @@ function loadExecutionMembers(executionID) */ function loadExecutionStories(executionID) { - $.get(createLink('story', 'ajaxGetExecutionStories', 'executionID=' + executionID + '&productID=0&branch=0&moduleID=0&storyID=' + $('#story').val()), function(data) + $.get(createLink('story', 'ajaxGetExecutionStories', 'executionID=' + executionID + '&productID=0&branch=0&moduleID=0&storyID=' + $('#story').val() + '&number=&type=full&status=active'), function(data) { $('#story_chosen').remove(); $('#story').next('.picker').remove();