From a291a25ed2b3a8d0b956209f2dab583561e42479 Mon Sep 17 00:00:00 2001 From: duandongmei Date: Thu, 12 Jul 2018 11:38:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9tabInfo=E8=87=AA=E9=80=82?= =?UTF-8?q?=E5=BA=94css=20=E4=BF=AE=E6=94=B9=E9=9F=B3=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E3=80=81=E6=96=87=E4=BB=B6=E6=91=98=E8=A6=81=E3=80=81bgp?= =?UTF-8?q?=E3=80=81http=E6=9B=BF=E6=8D=A2=E3=80=81dnsresstrategy=E3=80=81?= =?UTF-8?q?dns=20fake=20ip=E7=9A=84action=E5=8F=96=E5=80=BC=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/messages/message_en.properties | 32 +-- .../WEB-INF/include/form/complexIpInfo.jsp | 195 ++++++++++++++++++ .../views/cfg/av/contIp/contIpForm.jsp | 28 +-- .../views/cfg/av/contUrl/contUrlForm.jsp | 28 +-- .../WEB-INF/views/cfg/av/picIp/picIpForm.jsp | 28 +-- .../views/cfg/av/picUrl/picUrlForm.jsp | 28 +-- .../WEB-INF/views/cfg/av/voip/voipForm.jsp | 28 +-- .../WEB-INF/views/cfg/av/voip/voipList.jsp | 6 +- .../webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp | 30 +-- .../views/cfg/fileTransfer/fileDigestForm.jsp | 30 +-- .../cfg/maintenance/dnsResStrategy/form.jsp | 27 ++- .../WEB-INF/views/cfg/other/bgpForm.jsp | 28 +-- .../cfg/proxy/control/httpReqReplaceForm.jsp | 28 +-- .../cfg/proxy/control/httpResReplaceForm.jsp | 28 +-- .../webapp/static/global/css/components.css | 6 +- 15 files changed, 395 insertions(+), 155 deletions(-) create mode 100644 src/main/webapp/WEB-INF/include/form/complexIpInfo.jsp diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index cdcfb0d7c..2c081c9bb 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -121,7 +121,7 @@ subject_monitor=Subject Monit mail_keyword_monitor=Mail Content Monit mail_attachment_name_monitor=Mail Attachment Name Monit mail_attachment_content_monitor=Mail Attachment Content Monit -specific_service_cfg=Specific Service Management +specific_service_cfg=Specific Service file_transfer_monitor=File Transfer Monit ftp_address_monitor=FTP URL Monit encryption_monitor=Encypted Content Monit @@ -328,7 +328,7 @@ attribute=Attribute area=Area isp=ISP scope=Feature Scope -valid_identifier=Valid Intentifier +valid_identifier=Effective Identification is_audit=Confirmation State creator=Creator config_time=Create Time @@ -358,8 +358,8 @@ block_url=Block Url configuration=Configuration direction=Direction protocol=Protocol -#oneway=\u5355\u5411 -#twoway=\u53CC\u5411 +oneway=single +twoway=two-way arbitrary=Arbitrarily basic_config=Basic Configuration block_config=Configuration Info @@ -856,8 +856,8 @@ file_upload_type_error=%s file type is incorrect,Allow uploaded files type conta file_upload_error=File upload failure! #=============multipart upload error info================= #=============function_service_dict==>service_name================= -audio_sample_reject=Audio and video sample control -audio_sample_monit=Audio and video sample monitoring +audio_sample_reject=Multimedia sample control +audio_sample_monit=Multimedia sample monitoring video_sample_reject=Video sample control video_sample_monit=Video sample monitoring pic_sample_reject=Picture sample control @@ -871,24 +871,24 @@ video_pornography_sample_monit=Video pornography monitoring ip_white_monit=IP address white list monitoring ip_white_reject=IP address white list control ip_white_whitelist=IP address white list -av_voip_ip_reject=Audio and video VoIp control -av_voip_ip_monit=Audio and video VoIp monitoring +av_voip_ip_reject=Multimedia VoIp control +av_voip_ip_monit=Multimedia VoIp monitoring website_http_reject=Web site http control website_http_monit=Web site http monitoring domain_white_whitelist=Global domain name white list -av_content_ip_reject=Audio and video content IP control -av_content_ip_monit=Audio and video content IP monitoring +av_content_ip_reject=Multimedia content IP control +av_content_ip_monit=Multimedia content IP monitoring ip_reject=IP configure control ip_monit=IP configure monitoring ip_drop=IP configure drop ssl_monit=SSL monitoring ssl_reject=SSL control -av_pic_ip_reject=Audio and video picture IP control -av_pic_ip_monit=Audio and video picture IP monitoring -av_content_url_reject=Audio and video content url control -av_content_url_monit=Audio and video content url monitoring -av_pic_url_reject=Audio and video picture url control -av_pic_url_monit=Audio and video picture url monitoring +av_pic_ip_reject=Multimedia picture IP control +av_pic_ip_monit=Multimedia picture IP monitoring +av_content_url_reject=Multimedia content url control +av_content_url_monit=Multimedia content url monitoring +av_pic_url_reject=Multimedia picture url control +av_pic_url_monit=Multimedia picture url monitoring ip_loop=IP configure backflow website_dns_reject=Web sit dns control website_dns_monit=Web sit dns monitoring diff --git a/src/main/webapp/WEB-INF/include/form/complexIpInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexIpInfo.jsp new file mode 100644 index 000000000..d6f4f39a1 --- /dev/null +++ b/src/main/webapp/WEB-INF/include/form/complexIpInfo.jsp @@ -0,0 +1,195 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> +

+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+
+ + + + + +
+ +<%-- + + + + + + +
+
+
+ +
+ +
+
+
+
+
+
+ +
+ + +
+
+
+
+
+ + + + +
+
+
+ +
+ + +
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+ +
+ + + + + +
+
+
+
+ +
+ + --%> + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp index 38d4660ae..1d561ac65 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp @@ -76,18 +76,22 @@ $(function(){
- - + varStatus="satus"> + +
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 fafd0c0c2..cbd956359 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 @@ -100,18 +100,22 @@ $(function(){
- - + varStatus="satus"> + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp index 1a728fb38..8a42a2e83 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp @@ -76,18 +76,22 @@ $(function(){
- - + varStatus="satus"> + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp index 0bebd7a01..2e696437c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp @@ -92,18 +92,22 @@ $(function(){
- - + varStatus="satus"> + +
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 17df2e780..ed54574e1 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 @@ -129,18 +129,22 @@ var delContent=function(contentClassName,addBtnClassName){
- - + varStatus="satus"> + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp index 4f1e7bfc6..0480e00ec 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp @@ -135,10 +135,10 @@ html+=""; html+=""; html+=""; @@ -270,7 +270,7 @@ html+="" } if(item.direction==1){ - html+="" + html+="" } if(item.direction==2){ html+="" diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp index a81d4dd3d..b267b1b62 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp @@ -89,25 +89,29 @@ $(function(){
- - + varStatus="satus"> + +
- <%@include file="/WEB-INF/include/form/ipInfo.jsp" %> + <%@include file="/WEB-INF/include/form/complexIpInfo.jsp" %> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp index 666e61b9f..5d05a7500 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp @@ -85,19 +85,23 @@ $(function(){
- - - + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp index bed288ea1..ce2bb9bdf 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp @@ -122,17 +122,22 @@ $(function(){
- - + varStatus="satus"> + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp index ff664d1b3..a07f0f488 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp @@ -146,18 +146,22 @@ code="action" />
- - + varStatus="satus"> + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp index 3a53703cc..906598bbc 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp @@ -98,18 +98,22 @@ $(function(){
- - + varStatus="satus"> + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp index bcba20614..4b5adfc2f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp @@ -98,18 +98,22 @@ $(function(){
- - + varStatus="satus"> + +
diff --git a/src/main/webapp/static/global/css/components.css b/src/main/webapp/static/global/css/components.css index 8e0b3089a..67d0d96a1 100644 --- a/src/main/webapp/static/global/css/components.css +++ b/src/main/webapp/static/global/css/components.css @@ -22264,7 +22264,7 @@ Color library demo -/*������ʽ*/ +/*锟斤拷锟斤拷锟斤拷式*/ .sort-column { @@ -22538,13 +22538,13 @@ transition: background-color .1s ease-in-out; /* END SHOW MORE CSS**/ -/**子配置选项卡样式**/ +/**瀛愰厤缃�夐」鍗℃牱寮�**/ .tabInfo { - width: 150px; border: 1px solid #c2cad8; padding: 5px; border-bottom: 0px; cursor:pointer; + display: inline; } .content { width: 80%;