diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index e6d604b2f..1fad46a2b 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -817,7 +817,7 @@ const en = { filter:'User filter', filterTip: 'The possible options are: (cn or uid or sAMAccountName=%(user)s)', map:'Attribute mapping', - mapTip: 'Attribute mapping represents how to map NEZHA user attributes to jumpserver users; username,email are the attributes of jumpserver', + mapTip: 'Attribute mapping represents how to map LDAP user attributes to NEZHA users; username,email are the attributes of NEZHA', active:'LDAP authentication' }, link: { diff --git a/nezha-fronted/src/components/page/config/system.vue b/nezha-fronted/src/components/page/config/system.vue index a449b8968..680c068bf 100644 --- a/nezha-fronted/src/components/page/config/system.vue +++ b/nezha-fronted/src/components/page/config/system.vue @@ -71,31 +71,33 @@ autocomplete="off" - + -
{{$t('config.system.email.pwdTip')}}
+
{{$t("config.system.email.pwdTip")}}
- + -
{{$t('config.system.email.sendAccountTip')}}
+
{{$t("config.system.email.sendAccountTip")}}
- + -
{{$t('config.system.email.testAccountTip')}}
+
{{$t("config.system.email.testAccountTip")}}
-
{{$t('config.system.email.sslTip')}}
+
+
{{$t("config.system.email.sslTip")}}
- {{$t('config.system.email.tlsTip')}} + +
{{$t("config.system.email.tlsTip")}}
- + @@ -1123,22 +1125,23 @@ padding: 0; } .el-form-item__tip { - color: #aaa !important; + color: #999 !important; position: absolute; font-size: 12px; + margin-top: 5px; line-height: 12px; } .el-form-item__tip + .el-form-item__error { - margin-top: 16px; + margin-top: 20px; } .el-form-item__tip.el-form-item__tip--two-row + .el-form-item__error { - margin-top: 28px; + margin-top: 34px; } .el-form-item.has-tip { margin-bottom: 34px; } .el-form-item.has-tip--two-row { - margin-bottom: 46px; + margin-bottom: 54px; }