From c4cca92379581c362ef9414b570068a84977a6fd Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Wed, 12 Sep 2018 10:04:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=85=8D=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=85=B3=E9=94=AE=E5=AD=97=E6=8D=A2=E8=A1=8C=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/cfg/app/appPolicySubList.jsp        |  4 +--
 .../views/cfg/av/voip/voipAccountList.jsp     |  4 +--
 .../WEB-INF/views/cfg/av/voip/voipList.jsp    |  2 +-
 .../basicprotocol/basicProtocolSubList.jsp    |  4 +--
 .../encrypedTunnelSubList.jsp                 |  4 +--
 .../cfg/fileTransfer/fileDigestSubList.jsp    |  4 +--
 .../views/cfg/fileTransfer/ftpSubList.jsp     | 12 ++++----
 .../views/cfg/fileTransfer/p2pSubList.jsp     | 22 ++++-----------
 .../views/cfg/intercept/interceptSubList.jsp  | 10 +++----
 .../WEB-INF/views/cfg/ipaddr/ipSubList.jsp    |  4 +--
 .../WEB-INF/views/cfg/mail/mailSubList.jsp    | 18 ++++++------
 .../WEB-INF/views/cfg/other/bgpSubList.jsp    |  8 +++---
 .../WEB-INF/views/cfg/other/xmppSubList.jsp   |  8 +++---
 .../cfg/proxy/control/httpRedirectSubList.jsp | 28 +++++++++----------
 .../WEB-INF/views/cfg/website/dnsSubList.jsp  | 12 ++++----
 .../WEB-INF/views/cfg/website/httpSubList.jsp | 28 +++++++++----------
 .../WEB-INF/views/cfg/website/sslSubList.jsp  |  8 +++---
 .../views/cfg/whitelist/domianSubList.jsp     | 10 +++----
 .../WEB-INF/views/cfg/whitelist/ipSubList.jsp |  4 +--
 .../webapp/static/global/scripts/common.js    |  4 ++-
 20 files changed, 92 insertions(+), 106 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp
index 2f71fdbbf..575b173f6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp
@@ -135,11 +135,11 @@
 		<c:if test="${region[0] eq 2 }">
 		<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label><label>
+								<label><spring:message code='keywords' />: 
 								${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
index 749c43e13..1f7fd7d38 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
@@ -105,7 +105,7 @@
 						html+="</div>";
 						//subscribe信息
 						if(data.subscribe.length > 0){
-							html+="<div  id='subscribeInfo"+index+"' class='content'>";
+							html+="<div  id='subscribeInfo"+index+"' class='content content2'>";
 							$.each(data.subscribe,function(index,item){
 								console.log(item.cfgKeywords);
 								html+="<div class='row'>";
@@ -229,7 +229,7 @@
 						} 
 						//account信息
 						if(data.account.length > 0){
-							html+="<div  id='accountInfo"+index+"' class='content' style='display:none'>";
+							html+="<div  id='accountInfo"+index+"' class='content content2' style='display:none'>";
 							$.each(data.account,function(index,item){
 								html+="<div class='row'>";
 								html+="<div class='col-md-4'>";
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 dae5934fa..1ccd43121 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
@@ -104,7 +104,7 @@
 						html+="</div>";
 						//subscribe信息
 						if(data.subscribe.length > 0){
-							html+="<div  id='subscribeInfo"+index+"' class='content'>";
+							html+="<div  id='subscribeInfo"+index+"' class='content content'>";
 							$.each(data.subscribe,function(index,item){
 								html+="<div class='row'>";
 								html+="<div class='col-md-4'>";
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp
index a7ca90877..3662682ef 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp
@@ -134,11 +134,11 @@
 		<c:if test="${region[0] eq 2 }">
 		<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label><label>
+								<label><spring:message code='keywords' />: 
 								${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp
index 2f71fdbbf..575b173f6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp
@@ -135,11 +135,11 @@
 		<c:if test="${region[0] eq 2 }">
 		<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label><label>
+								<label><spring:message code='keywords' />: 
 								${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp
index cc35726c1..2bb448e94 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp
@@ -36,11 +36,11 @@
 	<c:if test="${region[0] eq 2 }">
 			<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label><label>
+								<label><spring:message code='keywords' />: 
 								${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
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 a5655f218..4befce696 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp
@@ -115,7 +115,7 @@
 	<c:if test="${region[0] eq 2 }">
 		<c:forEach items="${_cfg.stringList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
@@ -128,7 +128,7 @@
 										<spring:message code="keywords" />
 									</c:otherwise>
 								</c:choose>
-								:</label><label>
+								: 
 								${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
@@ -230,11 +230,11 @@
 		<!-- subscribe_id-->
 		<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label><label>
+								<label><spring:message code='keywords' />: 
 								${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
@@ -338,11 +338,11 @@
 	<%-- <c:if test="${region[0] eq 5 }">
 		<c:forEach items="${_cfg.digestList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
-								<label><spring:message code='raw_len' />:</label><label>${cfg.rawLen }</label>
+								<label><spring:message code='raw_len' />: ${cfg.rawLen }</label>
 							</div>
 						</div>
 						<div class="col-md-4">
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pSubList.jsp
index ff6f5e8c7..2eba15834 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pSubList.jsp
@@ -36,8 +36,6 @@
 								</label>
 							</div>
 						</div>
-					</div>
-					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='ip_pattern'/>:</label>
@@ -58,8 +56,6 @@
 								</label>
 							</div>
 						</div>
-					</div>
-					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='port_pattern'/>:</label>
@@ -77,8 +73,6 @@
 								<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
@@ -91,8 +85,6 @@
 								<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
 							</div>
 						</div>
-					</div>
-					<div class="row">						
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='direction'/>:</label>
@@ -115,8 +107,6 @@
 								</label>
 							</div>
 						</div>
-					</div>
-					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='p2p_ip_config_type'/>:</label>
@@ -135,11 +125,11 @@
 	<c:if test="${region[0] eq 2 }">
 		<c:forEach items="${_cfg.p2pHashList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label><label>
+								<label><spring:message code='keywords' />: 
 								${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
@@ -252,11 +242,11 @@
 		
 		<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label><label>
+								<label><spring:message code='keywords' />: 
 								${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
@@ -358,11 +348,11 @@
 		
 		<c:forEach items="${_cfg.p2pKeywordList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label><label>
+								<label><spring:message code='keywords' />: 
 								${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp
index 7d9503ce9..25bc627a8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp
@@ -115,12 +115,11 @@
 	<c:if test="${region[0] eq 2 }">
 		<c:forEach items="${_cfg.interceptPktBinList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 						<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label>
-								<label>
+								<label><spring:message code='keywords' />: 
 									${fn:replace(cfg.cfgKeywords, "***and***", " ")}
 								</label>
 							</div>
@@ -222,12 +221,11 @@
 		</c:forEach>
 		<c:forEach items="${_cfg.httpUrlList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 						<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label>
-								<label>
+								<label><spring:message code='keywords' />: 
 									${fn:replace(cfg.cfgKeywords, "***and***", " ")}
 								</label>
 							</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp
index 9aa73d943..fa2b18727 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp
@@ -115,11 +115,11 @@
 	<c:if test="${(region[0] eq 2) && (fn:length(_cfg.ntcSubscribeIdCfgList) >0)}">
 		<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+								<label><spring:message code='keywords' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
 					</div>
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 6997d460f..7a3e7c84d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
@@ -124,20 +124,19 @@
 	<c:if test="${region[0] eq 3 }">
 		<c:forEach items="${_cfg.complexList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content3" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
-								<label><spring:message code='district' />:</label><label>${cfg.district }</label>
+								<label><spring:message code='district' />: ${cfg.district }</label>
 							</div>
 						</div>
 					</div>
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label>
-								<label>
-									${fn:replace(cfg.cfgKeywords, "***and***", " ")}
+								<label class="keyword-disinline"><spring:message code='keywords' />: 
+									 ${fn:replace(cfg.cfgKeywords, "***and***", " ")}
 								</label>
 							</div>
 						</div>
@@ -240,11 +239,11 @@
 	<c:if test="${region[0] eq 5 }">
 		<c:forEach items="${_cfg.digestList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content5" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
-								<label><spring:message code='raw_len' />:</label><label>${cfg.rawLen }</label>
+								<label><spring:message code='raw_len' />: ${cfg.rawLen }</label>
 							</div>
 						</div>
 					</div>
@@ -287,12 +286,11 @@
 	<c:if test="${region[0] eq 2 }">
 		<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label>
-								<label>
+								<label><spring:message code='keywords' />: 
 									${fn:replace(cfg.cfgKeywords, "***and***", " ")}
 								</label>
 							</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpSubList.jsp
index acad83ed3..8789fefe3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpSubList.jsp
@@ -115,11 +115,11 @@
 	<c:if test="${region[0] eq 2 }">
 		<c:forEach items="${_cfg.ntcBgpAsCfgList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label><label>
+								<label><spring:message code='keywords' />: 
 								${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
@@ -222,11 +222,11 @@
 	
 		<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label><label>
+								<label><spring:message code='keywords' />: 
 								${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp
index a1dc0740b..beb064486 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp
@@ -124,11 +124,11 @@
 	<c:if test="${region[0] eq 2 }">
 		<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label><label>
+								<label><spring:message code='keywords' />: 
 								${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
@@ -231,11 +231,11 @@
 	<c:if test="${region[0] eq 3 }">
 		<c:forEach items="${_cfg.domainList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content3" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
-								<label><spring:message code='district' />:</label><label>${cfg.district }</label>
+								<label><spring:message code='district' />: ${cfg.district }</label>
 							</div>
 						</div>
 						</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp
index a54182b14..f1e2b18b8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp
@@ -151,11 +151,11 @@
 </div>
 </c:forEach>
 <c:forEach items="${_cfg.httpUrlList}" var="cfg">
-<div id="urlInfo${index}" class="content" name="subCfg${index}">
+<div id="urlInfo${index}" class="content content2" name="subCfg${index}">
 	<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
-				<label><spring:message code='URL' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+				<label><spring:message code='URL' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
 		</div>
@@ -254,18 +254,18 @@
 
 </c:forEach>
 <c:forEach items="${_cfg.httpReqHdrList}" var="cfg">
-<div id="reqHdrInfo${index}" class="content" name="subCfg${index}">
+<div id="reqHdrInfo${index}" class="content content2" name="subCfg${index}">
 	<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
-				<label><spring:message code='district' />:</label><label>${cfg.district }</label>
+				<label><spring:message code='district' />: ${cfg.district }</label>
 			</div>
 		</div>
 		</div>
 		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
-				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+				<label class="keyword-disinline"><spring:message code='keywords' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
 		</div>
@@ -363,11 +363,11 @@
 	</div>
 </c:forEach>
 <c:forEach items="${_cfg.httpReqBodyList}" var="cfg">
-<div id="reqBodyInfo${index}" class="content" name="subCfg${index}">
+<div id="reqBodyInfo${index}" class="content content2" name="subCfg${index}">
 	<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
-				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+				<label><spring:message code='keywords' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
 		</div>
@@ -466,18 +466,18 @@
 
 </c:forEach>
 <c:forEach items="${_cfg.httpResHdrList}" var="cfg">
-<div id="resHdrInfo${index}" class="content" name="subCfg${index}">
+<div id="resHdrInfo${index}" class="content content2" name="subCfg${index}">
 	<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
-				<label><spring:message code='district' />:</label><label>${cfg.district }</label>
+				<label><spring:message code='district' />: ${cfg.district }</label>
 			</div>
 		</div>
 		</div>
 		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
-				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+				<label class="keyword-disinline"><spring:message code='keywords' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
 		</div>
@@ -576,11 +576,11 @@
 
 </c:forEach>
 <c:forEach items="${_cfg.httpResBodyList}" var="cfg">
-<div id="resBodyInfo${index}" class="content" name="subCfg${index}">
+<div id="resBodyInfo${index}" class="content content2" name="subCfg${index}">
 	<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
-				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+				<label><spring:message code='keywords' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
 		</div>
@@ -679,11 +679,11 @@
 
 </c:forEach>
 <c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
-<div id="subscribeIdInfo${index}" class="content" name="subCfg${index}">
+<div id="subscribeIdInfo${index}" class="content content2" name="subCfg${index}">
 	<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
-				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+				<label><spring:message code='keywords' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
 	</div>
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 afcc83cf5..f3c21e868 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
@@ -117,19 +117,18 @@
 	<c:if test="${region[0] eq 3 }">
 		<c:forEach items="${_cfg.domainList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content3" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
-								<label><spring:message code='district' />:</label><label>${cfg.district }</label>
+								<label><spring:message code='district' />: ${cfg.district }</label>
 							</div>
 						</div>
 						</div>
 						<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label>
-								<label>
+								<label class="keyword-disinline"><spring:message code='keywords' />: 
 									${fn:replace(cfg.cfgKeywords, "***and***", " ")}
 								</label>
 							</div>
@@ -233,12 +232,11 @@
 	<c:if test="${region[0] eq 2 }">
 		<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label>
-								<label>
+								<label><spring:message code='keywords' />: 
 									${fn:replace(cfg.cfgKeywords, "***and***", " ")}
 								</label>
 							</div>
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 469090953..f17ff9564 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
@@ -150,11 +150,11 @@
 </div>
 </c:forEach>
 <c:forEach items="${_cfg.httpUrlList}" var="cfg">
-<div id="urlInfo${index}" class="content" name="subCfg${index}">
+<div id="urlInfo${index}" class="content content2" name="subCfg${index}">
 	<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
-				<label><spring:message code='URL' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+				<label><spring:message code='URL' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
 		
@@ -254,18 +254,18 @@
 
 </c:forEach>
 <c:forEach items="${_cfg.httpReqHdrList}" var="cfg">
-<div id="reqHdrInfo${index}" class="content" name="subCfg${index}">
+<div id="reqHdrInfo${index}" class="content content2" name="subCfg${index}">
 	<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
-				<label><spring:message code='district' />:</label><label>${cfg.district }</label>
+				<label><spring:message code='district' />: ${cfg.district }</label>
 			</div>
 		</div>
 		</div>
 		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
-				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+				<label class="keyword-disinline"><spring:message code='keywords' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
 	</div>
@@ -363,11 +363,11 @@
 	</div>
 </c:forEach>
 <c:forEach items="${_cfg.httpReqBodyList}" var="cfg">
-<div id="reqBodyInfo${index}" class="content" name="subCfg${index}">
+<div id="reqBodyInfo${index}" class="content content2" name="subCfg${index}">
 	<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
-				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+				<label><spring:message code='keywords' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
 	</div>
@@ -466,18 +466,18 @@
 
 </c:forEach>
 <c:forEach items="${_cfg.httpResHdrList}" var="cfg">
-<div id="resHdrInfo${index}" class="content" name="subCfg${index}">
+<div id="resHdrInfo${index}" class="content content2" name="subCfg${index}">
 	<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
-				<label><spring:message code='district' />:</label><label>${cfg.district }</label>
+				<label><spring:message code='district' />: ${cfg.district }</label>
 			</div>
 		</div>
 		</div>
 		<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
-				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+				<label class="keyword-disinline"><spring:message code='keywords' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
 		
@@ -577,11 +577,11 @@
 
 </c:forEach>
 <c:forEach items="${_cfg.httpResBodyList}" var="cfg">
-<div id="resBodyInfo${index}" class="content" name="subCfg${index}">
+<div id="resBodyInfo${index}" class="content content2" name="subCfg${index}">
 	<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
-				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+				<label><spring:message code='keywords' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
 	</div>
@@ -680,11 +680,11 @@
 
 </c:forEach>
 <c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
-<div id="subscribeIdInfo${index}" class="content" name="subCfg${index}">
+<div id="subscribeIdInfo${index}" class="content content2" name="subCfg${index}">
 	<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
-				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+				<label><spring:message code='keywords' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</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 24b51acdc..dcbff92f1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp
@@ -123,11 +123,11 @@
 	<c:if test="${(region[0] eq 2) && (fn:length(_cfg.sslList) >0)}">
 		<c:forEach items="${_cfg.sslList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+								<label><spring:message code='keywords' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
 					</div>
@@ -229,11 +229,11 @@
 	<c:if test="${(region[0] eq 2) && (fn:length(_cfg.ntcSubscribeIdCfgList) >0)}">
 		<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+								<label><spring:message code='keywords' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
 					</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
index 97b81ab21..2ef7fb1ac 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
@@ -115,11 +115,11 @@
 	<c:if test="${(region[0] eq 2) && (fn:length(_cfg.httpUrlList) >0)}">
 		<c:forEach items="${_cfg.httpUrlList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='domain' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+								<label><spring:message code='domain' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
 					</div>
@@ -167,11 +167,11 @@
 	<c:if test="${(region[0] eq 2) && (fn:length(_cfg.ntcSubscribeIdCfgList) >0)}">
 		<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
-						<div class="col-md-8">
+						<div class="col-md-10">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+								<label><spring:message code='keywords' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
 					</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp
index eab4744cb..a0a11f898 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp
@@ -115,11 +115,11 @@
 	<c:if test="${(region[0] eq 2) && (fn:length(_cfg.ntcSubscribeIdCfgList) >0)}">
 		<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+				<div id="${region[1]}Info${index}" class="content content2" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+								<label><spring:message code='keywords' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
 					</div>
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index b72883542..0536664dd 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -468,7 +468,9 @@ $(function(){
 });
 window.onload=function(){
 	$("span[id^=open]").click(function(){
-		$("div[class='content']").find("label:lt(2)").addClass("keyword-disinline");//page.css 关键词换行
+		$("div[class='content content2']").find("label:lt(1)").addClass("keyword-disinline");//page.css 关键词换行
+		$("div[class='content content3']").find("label:lt(1)").addClass("keyword-disinline");//page.css 关键词换行
+		$("div[class='content content5']").find("label:lt(1)").addClass("keyword-disinline");//page.css 关键词换行
 	})
 	// 配置id的搜索下拉框选择切换
 	if ($("#searchForm #seltype").val() == 'compileId') {