From b8c9b8819692b75461a591bc7cd3bbacba604be0 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@zdjizhi.com>
Date: Fri, 22 Feb 2019 10:41:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4dns=E3=80=81url=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=95=8C=E9=9D=A2=E5=88=86=E7=BB=84=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=9A=84=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/website/dnsForm.jsp     |  2 +-
 .../views/cfg/whitelist/domainForm.jsp        | 27 ++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
index 37048d1c4..42f2ba5ba 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
@@ -278,7 +278,7 @@
 											<small> <span class="glyphicon glyphicon-plus dnsGroupAdd"
 											onClick="addContent(this,'dnsGroup')" title="add"></span></small>
 								</h4>
-								<div class="row boxSolid dnsGroup0 hidden" >
+								<div class="row boxSolid dnsGroup0" >
 									<%@include file="/WEB-INF/views/cfg/dnsGroupForm.jsp"%>
 								</div>
 
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
index 073d252fc..a7d4ef380 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
@@ -245,9 +245,21 @@
 											</div>
 										</div>
                    					 </div>
+                   					 
+                   					 
+                   					 	<!-- url组 tabName写死为 urlGroup -->
+								<h4 class="form-section">
+											<spring:message code="urlGroup" />
+											<small> <span class="glyphicon glyphicon-plus urlGroupAdd"
+											onClick="addContent(this,'urlGroup')" title="add"></span></small>
+								</h4>
+								<div class="row boxSolid urlGroup0" >
+									<%@include file="/WEB-INF/views/cfg/urlGroupForm.jsp"%>
+								</div>
+								
 								<h4 class="form-section">
 											<spring:message code="http_url_title" />
-											<small> <span class="glyphicon glyphicon-plus httpUrlTabAdd hidden"
+											<small> <span class="glyphicon glyphicon-plus httpUrlTabAdd"
 											onClick="addContent(this,'httpUrlTab')" title="add"></span></small>
 								</h4>
 								<c:set var="strCfgIndex" value="0"></c:set>
@@ -284,7 +296,7 @@
 																	<c:forEach items="${_cfg.httpUrlList}" var="cfg"
 																	varStatus="status">
 																		<c:set var="cfgName" value="httpUrlList[${status.index}]"></c:set>
-																		<div class="row boxSolid ${tabName}${status.index}" >
+																		<div class="row boxSolid ${tabName}${status.index} hidden" >
 																			<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 																		</div>
 																		<input type="hidden" name="${cfgName}.sourceCompileId" value="${cfg.sourceCompileId }">
@@ -341,16 +353,7 @@
 									</c:if> --%>
 								</c:forEach>
 								
-								<!-- url组 tabName写死为 urlGroup -->
-								<h4 class="form-section">
-											<spring:message code="urlGroup" />
-											<small> <span class="glyphicon glyphicon-plus urlGroupAdd"
-											onClick="addContent(this,'urlGroup')" title="add"></span></small>
-								</h4>
-								<div class="row boxSolid urlGroup0 hidden" >
-									<%@include file="/WEB-INF/views/cfg/urlGroupForm.jsp"%>
-								</div>
-								
+							
 								
 								<br>
 								<%@include file="/WEB-INF/include/form/areaInfo.jsp" %>