diff --git a/module/dev/css/langitem.css b/module/dev/css/langitem.css index e7387a17dd..ff8ca82ccd 100644 --- a/module/dev/css/langitem.css +++ b/module/dev/css/langitem.css @@ -8,7 +8,7 @@ .flex-center {display: flex; justify-content: center; align-items: center;} /* menu-tree */ -.menu-tree {flex: 0 0 200px; background: #fff; padding: 10px 10px;} +.menu-tree {flex: 0 0 200px; background: #fff; padding: 10px 10px; overflow: hidden;} .menu-tree > .tree {padding-top: 20px;} .tree ul {margin-bottom: 0;} #menuTree > li.has-list > ul > li {padding-left: 10px;} @@ -36,6 +36,7 @@ .form-item-content.hover-color-primary > .form-item.active .form-control {border-color: blue;} .form-item-content.border-color-primary > .form-item .form-control {border: 1px solid blue;} +#menuTree > li > a, #menuTree > li > ul > li > a {white-space: nowrap; text-overflow: clip; overflow: hidden;} /* bottom-btn */ .bottom-btn {display: flex; align-items: center; background: #fff; padding-left: 150px; padding-bottom: 20px;} diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js index 9b94ba3d02..9579807ba8 100644 --- a/module/dev/js/langitem.js +++ b/module/dev/js/langitem.js @@ -114,7 +114,7 @@ $(function() initialState: 'active', itemCreator: function($li, item) { - $li.append('' + item.title + ''); + $li.append('' + item.title + ''); if (item.active) $li.addClass('active open in'); } }); diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php index 2bffeedf42..0f756da39c 100644 --- a/module/dev/lang/de.php +++ b/module/dev/lang/de.php @@ -197,7 +197,7 @@ $lang->dev->featureBar['langItem']['third'] = 'Third Menu'; $lang->dev->featureBar['langItem']['tag'] = 'Search Tag'; $lang->dev->projectMenu['project'] = "{$lang->projectCommon} Common"; -$lang->dev->projectMenu['scrum'] = "Scrum {$lang->projectCommon}"; -$lang->dev->projectMenu['waterfall'] = "Waterfall {$lang->projectCommon}"; +$lang->dev->projectMenu['scrum'] = "Scrum / Scrum + {$lang->projectCommon}"; +$lang->dev->projectMenu['waterfall'] = "Waterfall / Waterfall + {$lang->projectCommon}"; $lang->dev->projectMenu['kanbanProject'] = "Kanban {$lang->projectCommon}"; if($config->vision == 'lite') $lang->dev->projectMenu['kanbanProject'] = $lang->projectCommon; diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php index 59eff282a3..d6d66dece7 100644 --- a/module/dev/lang/en.php +++ b/module/dev/lang/en.php @@ -197,7 +197,7 @@ $lang->dev->featureBar['langItem']['third'] = 'Third Menu'; $lang->dev->featureBar['langItem']['tag'] = 'Search Tag'; $lang->dev->projectMenu['project'] = "{$lang->projectCommon} Common"; -$lang->dev->projectMenu['scrum'] = "Scrum {$lang->projectCommon}"; -$lang->dev->projectMenu['waterfall'] = "Waterfall {$lang->projectCommon}"; +$lang->dev->projectMenu['scrum'] = "Scrum / Scrum + {$lang->projectCommon}"; +$lang->dev->projectMenu['waterfall'] = "Waterfall / Waterfall + {$lang->projectCommon}"; $lang->dev->projectMenu['kanbanProject'] = "Kanban {$lang->projectCommon}"; if($config->vision == 'lite') $lang->dev->projectMenu['kanbanProject'] = $lang->projectCommon; diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php index 59eff282a3..d6d66dece7 100644 --- a/module/dev/lang/fr.php +++ b/module/dev/lang/fr.php @@ -197,7 +197,7 @@ $lang->dev->featureBar['langItem']['third'] = 'Third Menu'; $lang->dev->featureBar['langItem']['tag'] = 'Search Tag'; $lang->dev->projectMenu['project'] = "{$lang->projectCommon} Common"; -$lang->dev->projectMenu['scrum'] = "Scrum {$lang->projectCommon}"; -$lang->dev->projectMenu['waterfall'] = "Waterfall {$lang->projectCommon}"; +$lang->dev->projectMenu['scrum'] = "Scrum / Scrum + {$lang->projectCommon}"; +$lang->dev->projectMenu['waterfall'] = "Waterfall / Waterfall + {$lang->projectCommon}"; $lang->dev->projectMenu['kanbanProject'] = "Kanban {$lang->projectCommon}"; if($config->vision == 'lite') $lang->dev->projectMenu['kanbanProject'] = $lang->projectCommon; diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php index 64292ec0cd..7fe54b8e42 100644 --- a/module/dev/lang/zh-cn.php +++ b/module/dev/lang/zh-cn.php @@ -200,7 +200,7 @@ $lang->dev->featureBar['langItem']['third'] = '三级菜单'; $lang->dev->featureBar['langItem']['tag'] = '检索标签'; $lang->dev->projectMenu['project'] = "{$lang->projectCommon}通用"; -$lang->dev->projectMenu['scrum'] = "敏捷{$lang->projectCommon}"; -$lang->dev->projectMenu['waterfall'] = "瀑布{$lang->projectCommon}"; +$lang->dev->projectMenu['scrum'] = "敏捷 / 融合敏捷{$lang->projectCommon}"; +$lang->dev->projectMenu['waterfall'] = "瀑布 / 融合瀑布{$lang->projectCommon}"; $lang->dev->projectMenu['kanbanProject'] = "看板{$lang->projectCommon}"; if($config->vision == 'lite') $lang->dev->projectMenu['kanbanProject'] = $lang->projectCommon;