From e299fa310203867ec910cbc22d9e01e96f32fb16 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Sat, 30 Jun 2018 15:55:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=9F=9F=E9=85=8D=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?=E5=AD=90=E9=85=8D=E7=BD=AE=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhangwei <zhangwei@intranet.com>
---
 .../views/cfg/fileTransfer/ftpSubList.jsp     | 12 +--
 .../WEB-INF/views/cfg/mail/mailSubList.jsp    | 40 ++++----
 .../WEB-INF/views/cfg/website/dnsSubList.jsp  | 12 +--
 .../WEB-INF/views/cfg/website/httpSubList.jsp | 95 +++++++------------
 .../WEB-INF/views/cfg/website/sslSubList.jsp  | 11 +--
 5 files changed, 62 insertions(+), 108 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp
index 6e5c92aa5..9a943f31d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp
@@ -113,12 +113,14 @@
 			<c:if test="${region[1] eq cfg.cfgType }">
 				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
 					<div class="row">
-						<div class="col-md-4">
+						<div class="col-md-8">
 							<div class="form-group">
 								<label><spring:message code='keywords' />:</label><label>
 								${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='expression_type' />:</label>
@@ -130,9 +132,6 @@
 								</label>
 							</div>
 						</div>
-						
-					</div>
-					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='match_method' />:</label>
@@ -153,11 +152,6 @@
 								</label>
 							</div>
 						</div>
-						<div class="col-md-4">
-							<div class="form-group">
-								<label></label><label></label>
-							</div>
-						</div>
 					</div>
 				</div>
 			</c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
index 4cec4c381..c79a099fe 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
@@ -27,7 +27,7 @@
 			<c:if test="${region[1] eq cfg.cfgType }">
 				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
 					<div class="row">
-						<div class="col-md-8">
+						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='ip_type'/>:</label>
 								<label>
@@ -37,7 +37,7 @@
 								</label>
 							</div>
 						</div>
-						<div class="col-md-8">
+						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='ip_pattern'/>:</label>
 								<label>
@@ -47,7 +47,7 @@
 								</label>
 							</div>
 						</div>
-						<div class="col-md-8">
+						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_ip'/>:</label>
 								<label>
@@ -57,7 +57,7 @@
 						</div>
 					</div>
 					<div class="row">
-						<div class="col-md-8">
+						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='port_pattern'/>:</label>
 								<label>
@@ -67,24 +67,24 @@
 								</label>
 							</div>
 						</div>
-						<div class="col-md-8">
+						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
 							</div>
 						</div>
-						<div class="col-md-8">
+						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
 							</div>
 						</div>
 					</div>
 					<div class="row">
-						<div class="col-md-8">
+						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
 							</div>
 						</div>
-						<div class="col-md-8">
+						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='direction'/>:</label>
 								<label>
@@ -94,7 +94,7 @@
 								</label>
 							</div>
 						</div>
-						<div class="col-md-8">
+						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='protocol'/>:</label>
 								<label>
@@ -114,7 +114,7 @@
 			<c:if test="${region[1] eq cfg.cfgType }">
 				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
 					<div class="row">
-						<div class="col-md-8">
+						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='district' />:</label><label>${cfg.district }</label>
 							</div>
@@ -127,7 +127,9 @@
 								</label>
 							</div>
 						</div>
-						<div class="col-md-8">
+					</div>
+					<div class="row">
+						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='expression_type' />:</label>
 								<label>
@@ -138,10 +140,7 @@
 								</label>
 							</div>
 						</div>
-						
-					</div>
-					<div class="row">
-						<div class="col-md-8">
+						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='match_method' />:</label>
 								<label>
@@ -151,7 +150,7 @@
 								</label>
 							</div>
 						</div>
-						<div class="col-md-8">
+						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='whether_hexbinary' />:</label>
 								<label>
@@ -161,11 +160,6 @@
 								</label>
 							</div>
 						</div>
-						<div class="col-md-8">
-							<div class="form-group">
-								<label></label><label></label>
-							</div>
-						</div>
 					</div>
 				</div>
 			</c:if>
@@ -176,12 +170,12 @@
 			<c:if test="${region[1] eq cfg.cfgType }">
 				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
 					<div class="row">
-						<div class="col-md-8">
+						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='raw_len' />:</label><label>${cfg.rawLen }</label>
 							</div>
 						</div>
-						<div class="col-md-8">
+						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='cfds_level' />:</label>
 								<label>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
index f6a465667..b3fab8021 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
@@ -118,7 +118,7 @@
 								<label><spring:message code='district' />:</label><label>${cfg.district }</label>
 							</div>
 						</div>
-						<div class="col-md-4">
+						<div class="col-md-8">
 							<div class="form-group">
 								<label><spring:message code='keywords' />:</label>
 								<label>
@@ -126,6 +126,8 @@
 								</label>
 							</div>
 						</div>
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='expression_type' />:</label>
@@ -137,9 +139,6 @@
 								</label>
 							</div>
 						</div>
-						
-					</div>
-					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='match_method' />:</label>
@@ -160,11 +159,6 @@
 								</label>
 							</div>
 						</div>
-						<div class="col-md-4">
-							<div class="form-group">
-								<label></label><label></label>
-							</div>
-						</div>
 					</div>
 				</div>
 			</c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
index d9e5d22c9..2bf98f8ef 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
@@ -58,7 +58,7 @@
 <c:forEach items="${_cfg.ipPortList}" var="cfg">
 <div id="ipInfo${index}" class="content" name="subCfg${index}">
 	<div class="row">
-		<div class="col-md-8">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='ip_type'/>:</label>
 				<label>
@@ -68,7 +68,7 @@
 				</label>
 			</div>
 		</div>
-		<div class="col-md-8">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='ip_pattern'/>:</label>
 				<label>
@@ -78,7 +78,7 @@
 				</label>
 			</div>
 		</div>
-		<div class="col-md-8">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='client_ip'/>:</label>
 				<label>
@@ -88,7 +88,7 @@
 		</div>
 	</div>
 	<div class="row">
-		<div class="col-md-8">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='port_pattern'/>:</label>
 				<label>
@@ -98,24 +98,24 @@
 				</label>
 			</div>
 		</div>
-		<div class="col-md-8">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
 			</div>
 		</div>
-		<div class="col-md-8">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
 			</div>
 		</div>
 	</div>
 	<div class="row">
-		<div class="col-md-8">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
 			</div>
 		</div>
-		<div class="col-md-8">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='direction'/>:</label>
 				<label>
@@ -125,7 +125,7 @@
 				</label>
 			</div>
 		</div>
-		<div class="col-md-8">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='protocol'/>:</label>
 				<label>
@@ -146,7 +146,10 @@
 				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
-		<div class="col-md-8">
+		
+	</div>
+	<div class="row">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='expression_type' />:</label>
 				<label>
@@ -157,7 +160,7 @@
 				</label>
 			</div>
 		</div>
-		<div class="col-md-8">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='match_method' />:</label>
 				<label>
@@ -167,9 +170,7 @@
 				</label>
 			</div>
 		</div>
-	</div>
-	<div class="row">
-		<div class="col-md-8">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='whether_hexbinary' />:</label>
 				<label>
@@ -179,11 +180,6 @@
 				</label>
 			</div>
 		</div>
-		<div class="col-md-8">
-			<div class="form-group">
-				<label></label><label></label>
-			</div>
-		</div>
 	</div>
 </div>
 
@@ -191,7 +187,7 @@
 <c:forEach items="${_cfg.httpReqHdrList}" var="cfg">
 <div id="reqHdrInfo${index}" class="content" name="subCfg${index}">
 	<div class="row">
-		<div class="col-md-8">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='district' />:</label><label>${cfg.district }</label>
 			</div>
@@ -201,6 +197,8 @@
 				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
+	</div>
+	<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='expression_type' />:</label>
@@ -212,8 +210,7 @@
 				</label>
 			</div>
 		</div>
-	</div>
-	<div class="row">
+		
 		<div class="col-md-8">
 			<div class="form-group">
 				<label><spring:message code='match_method' />:</label>
@@ -234,11 +231,6 @@
 				</label>
 			</div>
 		</div>
-		<div class="col-md-8">
-			<div class="form-group">
-				<label></label><label></label>
-			</div>
-		</div>
 	</div>
 	</div>
 </c:forEach>
@@ -250,7 +242,9 @@
 				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
-		<div class="col-md-8">
+	</div>
+	<div class="row">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='expression_type' />:</label>
 				<label>
@@ -261,7 +255,7 @@
 				</label>
 			</div>
 		</div>
-		<div class="col-md-8">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='match_method' />:</label>
 				<label>
@@ -271,9 +265,7 @@
 				</label>
 			</div>
 		</div>
-	</div>
-	<div class="row">
-		<div class="col-md-8">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='whether_hexbinary' />:</label>
 				<label>
@@ -283,11 +275,6 @@
 				</label>
 			</div>
 		</div>
-		<div class="col-md-8">
-			<div class="form-group">
-				<label></label><label></label>
-			</div>
-		</div>
 	</div>
 	</div>
 
@@ -295,7 +282,7 @@
 <c:forEach items="${_cfg.httpResHdrList}" var="cfg">
 <div id="resHdrInfo${index}" class="content" name="subCfg${index}">
 	<div class="row">
-		<div class="col-md-8">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='district' />:</label><label>${cfg.district }</label>
 			</div>
@@ -305,7 +292,10 @@
 				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
-		<div class="col-md-8">
+		
+	</div>
+	<div class="row">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='expression_type' />:</label>
 				<label>
@@ -316,9 +306,7 @@
 				</label>
 			</div>
 		</div>
-	</div>
-	<div class="row">
-		<div class="col-md-8">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='match_method' />:</label>
 				<label>
@@ -328,7 +316,7 @@
 				</label>
 			</div>
 		</div>
-		<div class="col-md-8">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='whether_hexbinary' />:</label>
 				<label>
@@ -338,11 +326,6 @@
 				</label>
 			</div>
 		</div>
-		<div class="col-md-8">
-			<div class="form-group">
-				<label></label><label></label>
-			</div>
-		</div>
 	</div>
 	</div>
 
@@ -355,8 +338,9 @@
 				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
-
-		<div class="col-md-8">
+	</div>
+	<div class="row">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='expression_type' />:</label>
 				<label>
@@ -367,7 +351,7 @@
 				</label>
 			</div>
 		</div>
-		<div class="col-md-8">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='match_method' />:</label>
 				<label>
@@ -377,9 +361,7 @@
 				</label>
 			</div>
 		</div>
-	</div>
-	<div class="row">
-		<div class="col-md-8">
+		<div class="col-md-4">
 			<div class="form-group">
 				<label><spring:message code='whether_hexbinary' />:</label>
 				<label>
@@ -389,11 +371,6 @@
 				</label>
 			</div>
 		</div>
-		<div class="col-md-8">
-			<div class="form-group">
-				<label></label><label></label>
-			</div>
-		</div>
 	</div>
 	</div>
 
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp
index 31ae9abab..3ab5aacf5 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp
@@ -113,11 +113,13 @@
 			<c:if test="${region[1] eq cfg.cfgType }">
 				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
 					<div class="row">
-						<div class="col-md-4">
+						<div class="col-md-8">
 							<div class="form-group">
 								<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='expression_type' />:</label>
@@ -139,8 +141,6 @@
 								</label>
 							</div>
 						</div>
-					</div>
-					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='whether_hexbinary' />:</label>
@@ -151,11 +151,6 @@
 								</label>
 							</div>
 						</div>
-						<div class="col-md-4">
-							<div class="form-group">
-								<label></label><label></label>
-							</div>
-						</div>
 					</div>
 				</div>
 			</c:if>