From 4c6ed6b34fc4eb11b451fec7bafc57ad8b9a3dfa Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@nismail.iie.ac.cn>
Date: Thu, 25 Oct 2018 10:41:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E9=A1=B5=E9=9D=A2=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=8C=E6=94=BE=E4=BA=8EIP=E7=B1=BB=E5=9E=8B=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/cfg/ipCfgForm.jsp    | 54 ++++++++++---------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
index 92faec061..77d0bc3b2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
@@ -32,6 +32,24 @@
 	</div>
 </div>
 <br>
+<c:if test="${region.configRegionValue eq 'NTC_P2P_IP'}">
+	<div class="row">
+		<div class="col-md-6">
+			<div class="form-group">
+				<label class="control-label col-md-3"><font color="red">*</font><spring:message code="p2p_ip_config_type"/></label>
+				<div class="col-md-6">
+					<select name=userRegion1 class="selectpicker show-tick form-control required">
+					<option value=""><spring:message code="select"/></option>
+					<c:forEach items="${fns:getDictList('P2P_IP_TYPE')}" var="ipType">
+							<option value="${ipType.itemCode}" <c:if test="${_cfg.ipPortList[0].userRegion1==ipType.itemCode}">selected</c:if> ><spring:message code="${ipType.itemValue}"/></option>
+					</c:forEach>
+					</select>
+				</div>
+				<div for="userRegion1"></div>
+			 </div>
+		</div>
+	</div>
+</c:if>
 <div class="row">
 	<div class="col-md-6">
 		<div class="form-group">
@@ -48,22 +66,21 @@
 			<div for="${cfgName}.ipType"></div>
 		</div>
 	</div>
-	<c:if test="${region.configRegionValue eq 'NTC_P2P_IP'}">
 	<div class="col-md-6">
-		<div class="form-group">
-			<label class="control-label col-md-3"><font color="red">*</font><spring:message code="p2p_ip_config_type"/></label>
+		<div class="form-group ">
+			<label class="control-label col-md-3"><font color="red">*</font>
+				<spring:message code="protocol" /></label>
 			<div class="col-md-6">
-				<select name=userRegion1 class="selectpicker show-tick form-control required">
-				<option value=""><spring:message code="select"/></option>
-				<c:forEach items="${fns:getDictList('P2P_IP_TYPE')}" var="ipType">
-						<option value="${ipType.itemCode}" <c:if test="${_cfg.ipPortList[0].userRegion1==ipType.itemCode}">selected</c:if> ><spring:message code="${ipType.itemValue}"/></option>
-				</c:forEach>
+				<select name="${cfgName}.protocol"
+					class="selectpicker show-tick form-control required">
+					<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+						<option value="${protocolC.itemCode}" <c:if test="${ipPort.protocol==protocolC.itemCode || (ipPort.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
+					</c:forEach>
 				</select>
 			</div>
-			<div for="userRegion1"></div>
-		 </div>
+			<div for="${cfgName}.protocol"></div>
+		</div>
 	</div>
-	</c:if>
 </div>
 <div class="row ip">
 	<div class="col-md-6">
@@ -150,21 +167,6 @@
 	</div>
 </div>
 <div class="row  hidden protocol">
-	<div class="col-md-6">
-		<div class="form-group ">
-			<label class="control-label col-md-3"><font color="red">*</font>
-				<spring:message code="protocol" /></label>
-			<div class="col-md-6">
-				<select name="${cfgName}.protocol"
-					class="selectpicker show-tick form-control required">
-					<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
-						<option value="${protocolC.itemCode}" <c:if test="${ipPort.protocol==protocolC.itemCode || (ipPort.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
-					</c:forEach>
-				</select>
-			</div>
-			<div for="${cfgName}.protocol"></div>
-		</div>
-	</div>
 	<div class="col-md-6">
 		<div class="form-group">
 			<label class="control-label col-md-3"><font color="red">*</font>