From 1b39b185ab85ac6df05b94d50009de5b91e1ccbc Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 31 Aug 2018 14:15:15 +0800
Subject: [PATCH] =?UTF-8?q?(1)ip=E7=99=BD=E5=90=8D=E5=8D=95=EF=BC=8Cip?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=EF=BC=8C=E9=BB=98=E8=AE=A4IP=E5=B1=95?=
 =?UTF-8?q?=E5=BC=80=20(2)ip=E5=9C=B0=E5=9D=80form=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=A4=84=E7=90=86IPtab=20=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties    |  2 +-
 src/main/resources/messages/message_zh_CN.properties |  2 +-
 src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp  | 12 ++++++++----
 .../webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp    |  2 ++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 839e9c313..61f2d0acf 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1026,7 +1026,7 @@ MM_AV_IP=AV IP
 MM_PIC_IP=Picture IP
 MM_PIC_URL=Picture URL
 MM_AV_URL=AV URL
-#INLINE_IP_CB=Series IP
+INLINE_IP_CB=IP Configuration
 MM_VOIP_IP=VoIP IP
 MM_VOIP_ACCOUNT=VoIP Account
 #=======================for import ip configuration=================
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index e17389a31..6398cffd9 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1024,7 +1024,7 @@ MM_AV_IP=\u97F3\u89C6\u9891IP
 MM_PIC_IP=\u56FE\u7247IP
 MM_PIC_URL=\u56FE\u7247URL
 MM_AV_URL=\u97F3\u89C6\u9891URL
-#INLINE_IP_CB=\u4E32\u8054IP
+INLINE_IP_CB=IP\u914D\u7F6E
 MM_VOIP_IP=VoIP IP
 MM_VOIP_ACCOUNT=VoIP\u8D26\u53F7
 #=======================for import ip configuration=================
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
index 381a2b760..0ace63f15 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
@@ -17,6 +17,8 @@
 						 $("#cancel").on("click", function() {
 							window.history.back();
 						});*/
+						$(".glyphicon-plus").first().click();
+						$(".ipPortList").find(".glyphicon-remove").addClass("hidden")
 						var action=$(".action:checked").val();
 						if(action==32||action==96){
 							$(".subscribeId").find(".glyphicon-remove").click();
@@ -41,18 +43,18 @@
 							var regioncode=$(this).attr("regioncode");
 							var hasRegioncode=false;
 							var arr=regioncode.split(',');
-							var cfgType,cfgRegionCode;
+							var cfgType,cfgRegionCode,i18nCode;
 							for(var re in arr){
 								if($("[id='cfgRegionCode"+arr[re]+"']")&&$("[id='cfgRegionCode"+arr[re]+"']").attr("regionType")==1){
 									regioncode=arr[re];
 									cfgType=$("[id='cfgType"+arr[re]+"']").val();
+									i18nCode=$("[id='cfgType"+arr[re]+"']").attr("i18nCode");
 									cfgRegionCode=$("[id='cfgRegionCode"+arr[re]+"']").val();
 									
 								}
 							}
 							$("h4[class*='ipPortListTitle']").each(function(){
-								var html="<spring:message code='"+cfgType+"'/>";
-								$(this).find(".ipPortTitle").html(html);
+								$(this).find(".ipPortTitle").html(i18nCode);
 							});
 							var tabInfo=$(".ipPortList");
 							if(tabInfo){
@@ -213,7 +215,9 @@
 							<input type="hidden" id="serviceId" name="serviceId"
 								value="${_cfg.serviceId}">
 							<c:forEach items="${regionList}" var="region">
-	                            <input type="hidden" id="cfgType${region.configRegionCode}" value="${region.configRegionValue}">
+	                            <input type="hidden" id="cfgType${region.configRegionCode}"
+	                            	i18nCode="<spring:message code='${region.configRegionValue}' />"
+	                             value="${region.configRegionValue}">
 		                   		<input type="hidden" id="cfgRegionCode${region.configRegionCode}"
 		                   		 isMaat="${region.isMaat}"
 		                   		 serviceType="${region.configServiceType}"
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
index 0a74979c8..f8e554d2d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
@@ -17,6 +17,8 @@
 						 $("#cancel").on("click", function() {
 							window.history.back();
 						});*/
+						$(".glyphicon-plus").first().click();
+						$(".boxSolid .glyphicon-remove").first().addClass("hidden");
 						$(".protocol").addClass("hidden");
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));