diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 5f4827eac..ce98b65a4 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -592,3 +592,4 @@ dns_domain=DNS\u57DF\u540D\u914D\u7F6E has_prohibit_delete=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u5220\u9664 has_prohibit_nopass=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u672A\u901A\u8FC7\u5BA1\u6838 has_prohibit_pass=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u4EE5\u5BA1\u6838\u901A\u8FC7 +multiple_keywords_tip=\u53EF\u540C\u65F6\u8F93\u5165\u591A\u6761\u5173\u952E\u5B57\uFF0C\u8BF7\u4EE5\u82F1\u6587\u9017\u53F7\u6216\u8005\u56DE\u8F66\u952E\u9694\u5F00\u3002 diff --git a/src/main/webapp/WEB-INF/include/header.jsp b/src/main/webapp/WEB-INF/include/header.jsp index 6122a94df..eb3e9262d 100644 --- a/src/main/webapp/WEB-INF/include/header.jsp +++ b/src/main/webapp/WEB-INF/include/header.jsp @@ -87,4 +87,4 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp index 77db266ac..e64867f91 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp @@ -5,16 +5,16 @@ - +<%-- + and regionValue eq regionDistrict.configRegionValue}"> --%> - - - - + + +<%-- + --%>
@@ -30,16 +30,11 @@
diff --git a/src/main/webapp/WEB-INF/views/cfg/digestCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/digestCfgForm.jsp index 87c287277..7ab47a57b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/digestCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/digestCfgForm.jsp @@ -5,16 +5,16 @@ - - + + and regionValue eq regionDistrict.configRegionValue}"> --%> - - - - + + + <%-- + --%>
@@ -40,7 +40,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp index 08b160310..10a96ceef 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp @@ -106,6 +106,7 @@ +
@@ -181,7 +182,7 @@ onClick="addContent(this,'${tabName}')" title="add"> - + <%-- --%> @@ -211,7 +212,7 @@ onClick="addContent(this,'${tabName}')" title="add"> - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp index aa14f5812..980aaba1c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp @@ -339,8 +339,8 @@ - - + + diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp index 0c4e70d0d..893750004 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp @@ -9,14 +9,14 @@ $(function(){ }); - +<%-- + test="${ipPort.functionId eq regionDistrict.functionId and regionDistrict.regionType eq 1}"> --%> - - - - + + + <%-- + --%>
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp index be2ecca1a..4fbd92ca3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp @@ -112,6 +112,7 @@ +
@@ -188,7 +189,7 @@ onClick="addContent(this,'${tabName}')" title="add"> - + <%-- --%> @@ -218,7 +219,7 @@ onClick="addContent(this,'${tabName}')" title="add"> - + <%-- --%> @@ -257,7 +258,7 @@ onClick="addContent(this,'${tabName}')" title="add"> - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp index d65a0da10..fc615d31b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp @@ -340,7 +340,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp index 627641ebc..b21abaa57 100644 --- a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp @@ -9,16 +9,16 @@ $(function(){ }); - +<%-- + and regionValue eq regionDistrict.configRegionValue}"> --%> - - - - + + + <%-- + --%>
+
@@ -181,7 +182,7 @@ onClick="addContent(this,'${tabName}')" title="add"> - + <%-- --%> @@ -211,7 +212,7 @@ onClick="addContent(this,'${tabName}')" title="add"> - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp index a49975fed..5c6088b0f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp @@ -339,7 +339,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp index f835a86a3..46d92033b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp @@ -127,6 +127,7 @@ +
@@ -209,168 +210,144 @@
+ + + +
+ +

+ + +

+ + + +
+ <%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%> +
+ +
+
+ +
- -
- -

- - -

- - - - -
- - <%-- - - - - - --%> - <%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%> -
-
-
- - -
- -

- - -

- - - - -
- - <%-- - - - - - --%> - <%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%> -
-
-
- - -
- -

- - -

- - - - -
- - <%-- - - - - - --%> - <%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%> -
-
-
- - -
- -

- - -

- - - - -
- <%-- - - - - - --%> - <%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%> -
-
-
- - -
- -

- - -

- - - - -
- - <%-- - - - - - --%> - <%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%> -
-
-
- -
- -

- - -

- - - -
- - - <%-- - - - - --%> - <%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%> -
- -
-
- -
+ + + +
+ +

+ + +

+ + <%-- --%> + + +
+ <%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%> +
+
+
+ +
+ + +
+ +

+ + +

+ + <%-- --%> + + +
+ <%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%> +
+
+
+ +
+ + +
+ +

+ + +

+ + <%-- --%> + + +
+ <%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%> +
+
+
+
+
+ + + +
+ +

+ + +

+ + <%-- --%> + + +
+ <%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%> +
+
+
+ +
+ + +
+ +

+ + +

+ <%-- --%> + + +
+ + <%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%> +
+
+
+ +
+
+
<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
<%@include file="/WEB-INF/include/form/basicInfo.jsp"%> diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp index d96af87be..741ebb25a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp @@ -340,7 +340,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp index 47ca023e4..f3211c11e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp @@ -97,6 +97,7 @@ +
@@ -172,7 +173,7 @@ onClick="addContent(this,'${tabName}')" title="add"> - + <%-- --%> @@ -202,7 +203,7 @@ onClick="addContent(this,'${tabName}')" title="add"> - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp index 0ffc2f29d..1c8d1dbf4 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp @@ -339,7 +339,7 @@ - + diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 8829ea0ba..20be3dae3 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -242,7 +242,7 @@ $(function(){ trigger:"hover", title:"", content:function(){ - var content = "可同时输入多条关键字,请以英文逗号或者回车键隔开。"; + var content = $("#tagsinputTip").text(); return content; } });