diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 7440c2c76..1f1997f01 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1482,13 +1482,16 @@ intercep_domain_required_tip=Domain is required packets=packets GByte=GByte #\u5B9A\u65F6\u5668\u53C2\u6570 -interval=Interval -month=Month -day=Day +interval=Recure every +month=Months +day=Days +week=weeks startTime=Start Time endTime=End Time -single=Single -everyDay=Every Day -everyWeek=Every Week -everyMonth=Every Month -validate_error=Unexpected error occurred while validating \ No newline at end of file +single=One Time +everyDay=Daily +everyWeek=Weekly +everyMonth=Monthly +on=On +validate_error=Unexpected error occurred while validating +is_schduler=Scheduler \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 996fd4054..4fe92900a 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1490,10 +1490,13 @@ GByte=GByte interval=\u041F\u0440\u043E\u043C\u0435\u0436\u0443\u0442\u043E\u043A month=\u041C\u0435\u0441\u044F\u0446\u044B day=\u0414\u043D\u0438 +week=weeks startTime=\u041D\u0430\u0447\u0430\u0442\u044C endTime=\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044C single=\u041E\u0434\u043D\u043E\u043A\u0440\u0430\u0442\u043D\u043E everyDay=\u0415\u0436\u0435\u0434\u043D\u0435\u0432\u043D\u043E everyWeek=\u0415\u0436\u0435\u043D\u0435\u0434\u0435\u043B\u044C\u043D\u043E everyMonth=\u0415\u0436\u0435\u043C\u0435\u0441\u044F\u0447\u043D\u043E +on=On +is_schduler=Scheduler validate_error=Unexpected error occurred while validating \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp index 9c977be73..2af5c1188 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp @@ -481,6 +481,8 @@ var delContent = function(contentClassName, addBtnClassName) { <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> +
+ <%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp index dc86168ad..bfe9d0160 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp @@ -36,7 +36,13 @@
- + +
+ + +
+
@@ -240,4 +246,10 @@ + + +
+ <%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%> +
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contSubList.jsp index bcb73ceb1..530f3cc07 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contSubList.jsp @@ -18,7 +18,13 @@ - + +
+ + +
+
@@ -325,4 +331,10 @@ + + +
+ <%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%> +
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp index 8b3bac4e8..0c105a652 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp @@ -359,6 +359,8 @@ <%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
<%@include file="/WEB-INF/include/form/basicInfo.jsp"%> +
+ <%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp index e3a580387..e835c98ce 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp @@ -382,6 +382,8 @@ <%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
<%@include file="/WEB-INF/include/form/basicInfo.jsp"%> +
+ <%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipSubList.jsp index 383a36eb5..d707b2fd6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipSubList.jsp @@ -19,6 +19,13 @@
+ +
+ + +
+
@@ -327,4 +334,10 @@ + + +
+ <%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%> +
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp index 4adbf8a99..79f02f9b8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp @@ -36,7 +36,13 @@
- + +
+ + +
+
@@ -239,4 +245,10 @@ + + +
+ <%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%> +
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp index e5a078a4d..ce256091d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp @@ -430,6 +430,8 @@ var switchRateLimitType=function(){ <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> +
+ <%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp index dc86168ad..bfe9d0160 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp @@ -36,7 +36,13 @@
- + +
+ + +
+
@@ -240,4 +246,10 @@ + + +
+ <%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%> +
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp index ca66ac2d9..e82e9ed12 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp @@ -462,6 +462,8 @@ var switchRateLimitType=function(){ <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> +
+ <%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>
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 41229617f..08ec2ebd3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp @@ -4,7 +4,7 @@ <spring:message code="${cfgName}"></spring:message> -