From 1ab400d8a622bddd3c9efc31b5a5c21105bcb378 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Mon, 30 Jul 2018 13:32:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BA=E5=9F=9F=E7=94=9F?=
 =?UTF-8?q?=E6=95=88=E4=B8=8EHTTP=E5=A4=9A=E5=9F=9F=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=E6=A0=87=E9=A2=98=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhangwei <zhangwei@intranet.com>
---
 src/main/resources/messages/message_en.properties | 15 ++++++++-------
 src/main/webapp/WEB-INF/include/form/areaInfo.jsp | 14 +++++++-------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 9acd5abfd..4d0ef627f 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -593,12 +593,12 @@ ip_range=IP Range
 ip_subnet=IP Subnet
 district=Matching District
 keywords=Keyword
-http_ip_title=HTTP IP Configuration
-http_url_title=HTTP URL Configuration
-http_req_hdr_title=HTTP Request Header Configuration
-http_req_body_title=HTTP Request Body Configuration
-http_res_hdr_title=HTTP Response Header Configuration
-http_res_body_title=HTTP Response Body Configuration
+http_ip_title=IP
+http_url_title=URL
+http_req_hdr_title=Request Header
+http_req_body_title=Request Body
+http_res_hdr_title=Response Header
+http_res_body_title=Response Body
 ssl_ip=SSL IP Configuration
 ssl_sni=SSL SNI Keyword Configuration
 ssl_san=SSL SAN Keyword Configuration
@@ -1043,4 +1043,5 @@ website=Website
 #===============dashboard end===================================
 ratelimit_limit=Limit Rate must between 0 and 100
 Maintenance=Policy Objects
-Proxy=Proxy
\ No newline at end of file
+Proxy=Proxy
+selective=Selective
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/include/form/areaInfo.jsp b/src/main/webapp/WEB-INF/include/form/areaInfo.jsp
index 0eb3226b0..eff5ef248 100644
--- a/src/main/webapp/WEB-INF/include/form/areaInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/areaInfo.jsp
@@ -11,16 +11,16 @@ $(function(){
        <div class="form-group">
            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
            <div class="col-md-6">
+           <label class="radio-inline">
+           		<input type="radio" name="isAreaEffective" value="0" class="required areaControl"
+           			<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
+           		><spring:message code="all"/>
+           	</label>
            	<label class="radio-inline">
            		<input type="radio" name="isAreaEffective" value="1" class="required areaControl"
            			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
-           		><spring:message code="yes"/>
-           	</label>
-           	<label class="radio-inline">
-           		<input type="radio" name="isAreaEffective" value="0" class="required areaControl"
-           			<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
-           		><spring:message code="no"/>
-           	</label>
+           		><spring:message code="selective"/>
+           	</label>           	
            </div>
            <div for="isAreaEffective"></div>
        </div>