From cc0b7dc86c9c45d559412f6d45f3069cbfde613a Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Sun, 13 Jan 2019 11:11:23 +0600
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9app=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E4=B8=8E=E9=9A=A7=E9=81=93=E8=A1=8C=E4=B8=BA=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84doLog=E5=8F=82=E6=95=B0=E4=BD=8D=E7=BD=AE=EF=BC=9B=202?=
 =?UTF-8?q?.=E4=BF=AE=E6=94=B9p2p=E8=A1=A8=E5=8D=95=E7=9A=84doLog=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=80=89=E4=B8=AD=EF=BC=9B=203.=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E7=9A=84=E9=9F=B3=E8=A7=86=E9=A2=91=E6=A0=B7?=
 =?UTF-8?q?=E4=BE=8B=E5=89=AA=E5=88=87=E5=B7=A5=E5=85=B7=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E4=B8=8E=E5=B8=AE=E5=8A=A9=E4=BF=A1=E6=81=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/cfg/app/appPolicyCfgForm.jsp        | 96 ++++++++++---------
 .../views/cfg/encryptedtunnelbehav/form.jsp   | 75 ++++++++-------
 .../views/cfg/fileTransfer/p2pForm.jsp        |  4 +-
 src/main/webapp/WEB-INF/views/help.jsp        |  4 +-
 src/main/webapp/WEB-INF/views/home.jsp        |  2 +-
 5 files changed, 92 insertions(+), 89 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
index 36c222a17..d87764e0d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
@@ -243,52 +243,32 @@ var delContent = function(contentClassName, addBtnClassName) {
 									            </div>
 									        </div>
 									    </div>
-									    <!-- doLog -->
-									    <div class="row doLog">
-										 <div class="col-md-6">
-											<div class="form-group">
-												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
-												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-													<c:choose>
-														<c:when test="${dict.itemCode eq _cfg.doLog}">
-															<label class="radio-inline">
-																<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
-															</label>
-														</c:when>
-														<c:otherwise>
-															<label class="radio-inline">
-																<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
-															</label>
-														</c:otherwise>
-													</c:choose>
+									 
+	                              		<div class="col-md-6">
+									        <div class="form-group">
+									        	<c:forEach items="${fns:getDictList('IS_SHOW_BUSINESS_TYPE') }" var="showBusinessType">
+														<c:if test="${showBusinessType.itemCode==1 }">
+														<c:set var="isShowBusinessType" value="true"/>
+														</c:if>
+														<c:if test="${showBusinessType.itemCode!=1 }">
+														<c:set var="isShowBusinessType" value="false"/>
+														</c:if>
 												</c:forEach>
-											</div>
-										</div>
-                   					 </div>
+									        	 <c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="social_app"/></label>
+									            <div class="col-md-6">
+											       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
+													 labelName="parent.specServiceName" notAllowSelectParent="true" enableSearch="true"
+													 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
+													 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1&specific=${!isShowBusinessType}" extId="0"
+													notAllowSelectRoot="true" cssClass="form-control required"/>
+									            </div>
+									            <div for="parent.specServiceName"></div>
+									        </div>
+									    </div>
+										      
                    					</div>
 									 <div class="row">
-		                              		<div class="col-md-6">
-										        <div class="form-group">
-										        	<c:forEach items="${fns:getDictList('IS_SHOW_BUSINESS_TYPE') }" var="showBusinessType">
-															<c:if test="${showBusinessType.itemCode==1 }">
-															<c:set var="isShowBusinessType" value="true"/>
-															</c:if>
-															<c:if test="${showBusinessType.itemCode!=1 }">
-															<c:set var="isShowBusinessType" value="false"/>
-															</c:if>
-													</c:forEach>
-										        	 <c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
-										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="social_app"/></label>
-										            <div class="col-md-6">
-												       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
-														 labelName="parent.specServiceName" notAllowSelectParent="true" enableSearch="true"
-														 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1&specific=${!isShowBusinessType}" extId="0"
-														notAllowSelectRoot="true" cssClass="form-control required"/>
-										            </div>
-										            <div for="parent.specServiceName"></div>
-										        </div>
-										    </div>
 										    <div class="col-md-6">
 										    	<div class="form-group">
 										    	 	<label class="control-label col-md-3"><spring:message code="behaviour_type"/></label>
@@ -299,8 +279,7 @@ var delContent = function(contentClassName, addBtnClassName) {
 										    	 	 </div>
 										    	</div>
 										    </div>
-									</div>
-									<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="action"/></label>
@@ -327,7 +306,30 @@ var delContent = function(contentClassName, addBtnClassName) {
 										            <div for="action"></div>
 										       </div>
 										   </div>
-										   <div class="col-md-6 dnsIpSpoofing hidden">
+										</div>
+									<div class="row">
+									    <div class="doLog">
+										 <div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+													<c:choose>
+														<c:when test="${dict.itemCode eq _cfg.doLog}">
+															<label class="radio-inline">
+																<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+															</label>
+														</c:when>
+														<c:otherwise>
+															<label class="radio-inline">
+																<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+															</label>
+														</c:otherwise>
+													</c:choose>
+												</c:forEach>
+											</div>
+										</div>
+                   					 </div>
+                   					  <div class="col-md-6 dnsIpSpoofing hidden">
 										        <div class="form-group">
 										            <label class="control-label col-md-3">
 										           		 <spring:message code="block_by_app_server_ip"/>
@@ -340,7 +342,7 @@ var delContent = function(contentClassName, addBtnClassName) {
 										            <div for="userRegion4"></div>
 										       </div>
 										   </div>
-										  </div> 
+                   				   </div>
 								   <div class="row ratelimitAction hidden">
 											<h4 class="form-section">
 														<spring:message code="action_region" />
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
index 886936e22..93237770e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
@@ -226,9 +226,42 @@ var switchRateLimitType=function(){
 									            </div>
 									        </div>
 									    </div>
+									     <div class="col-md-6">
+										        <div class="form-group">
+										        	<c:forEach items="${fns:getDictList('IS_SHOW_BUSINESS_TYPE') }" var="showBusinessType">
+															<c:if test="${showBusinessType.itemCode==1 }">
+															<c:set var="isShowBusinessType" value="true"/>
+															</c:if>
+															<c:if test="${showBusinessType.itemCode!=1 }">
+															<c:set var="isShowBusinessType" value="false"/>
+															</c:if>
+													</c:forEach>
+										            <c:set var="spec_service_id"><spring:message code="encrypted_tunnel_behavior"/></c:set>
+										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="encrypted_tunnel_behavior"/></label>
+										            <div class="col-md-6">
+												       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
+														 labelName="parent.specServiceName" enableSearch="true"
+														 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
+														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=2&specific=${!isShowBusinessType}" extId="0"
+														notAllowSelectRoot="true" cssClass="form-control required"/>
+										            </div>
+										            <div for="parent.specServiceName"></div>
+										        </div>
+										    </div>
                    					</div>
-									 <div class="row">
-									 <div class="col-md-6">
+                   					<div class="row">
+										   
+										    <div class="col-md-6">
+										    	<div class="form-group">
+										    	 	<label class="control-label col-md-3"><spring:message code="behaviour_type"/></label>
+										    	 	 <div class="col-md-6" id="behaviour">
+										    	 	 <select name="behavCode" data-live-search="true" class="selectpicker form-control">
+										    	 	 <option value=""><spring:message code="select"/></option>
+										    	 	 </select>
+										    	 	 </div>
+										    	</div>
+										    </div>
+									 		<div class="col-md-6">
 										        <div class="form-group">
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="action"/></label>
 										            <div class="col-md-6">
@@ -255,6 +288,8 @@ var switchRateLimitType=function(){
 										            <div for="action"></div>
 										       </div>
 										   </div>
+										</div>
+										 <div class="row"> 
 										   <div class="col-md-6 doLog">
 											<div class="form-group">
 												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
@@ -289,41 +324,7 @@ var switchRateLimitType=function(){
 										   </div> --%>
 		                              		
 									</div>
-									<div class="row">
-										    <div class="col-md-6">
-										        <div class="form-group">
-										        	<c:forEach items="${fns:getDictList('IS_SHOW_BUSINESS_TYPE') }" var="showBusinessType">
-															<c:if test="${showBusinessType.itemCode==1 }">
-															<c:set var="isShowBusinessType" value="true"/>
-															</c:if>
-															<c:if test="${showBusinessType.itemCode!=1 }">
-															<c:set var="isShowBusinessType" value="false"/>
-															</c:if>
-													</c:forEach>
-										            <c:set var="spec_service_id"><spring:message code="encrypted_tunnel_behavior"/></c:set>
-										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="encrypted_tunnel_behavior"/></label>
-										            <div class="col-md-6">
-												       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
-														 labelName="parent.specServiceName" enableSearch="true"
-														 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=2&specific=${!isShowBusinessType}" extId="0"
-														notAllowSelectRoot="true" cssClass="form-control required"/>
-										            </div>
-										            <div for="parent.specServiceName"></div>
-										        </div>
-										    </div>
-										    <div class="col-md-6">
-										    	<div class="form-group">
-										    	 	<label class="control-label col-md-3"><spring:message code="behaviour_type"/></label>
-										    	 	 <div class="col-md-6" id="behaviour">
-										    	 	 <select name="behavCode" data-live-search="true" class="selectpicker form-control">
-										    	 	 <option value=""><spring:message code="select"/></option>
-										    	 	 </select>
-										    	 	 </div>
-										    	</div>
-										    </div>
-										   
-									</div>
+									
 									<div class="row ratelimitAction hidden">
 											<h4 class="form-section">
 														<spring:message code="action_region" />
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
index f91bdfafb..4b17b8ed6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
@@ -193,8 +193,8 @@
 										</div>
 									</div>
 								</div>
-								<div class="row doLog">
-									<div class="col-md-6">
+								<div class="row">
+									<div class="col-md-6 doLog">
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
 											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
diff --git a/src/main/webapp/WEB-INF/views/help.jsp b/src/main/webapp/WEB-INF/views/help.jsp
index 9bdeaa1c3..7faea12a9 100644
--- a/src/main/webapp/WEB-INF/views/help.jsp
+++ b/src/main/webapp/WEB-INF/views/help.jsp
@@ -45,9 +45,9 @@ function showHelp(helpHref) {
 	    if(lang=="" || lang.indexOf("en")!=-1) {
 	    	helpHref += ".html";
 		}else if(lang.indexOf("cn")!=-1) {
-			helpHref += "_zh_CN.html";
+			helpHref += ".html";
 		}else if(lang.indexOf("ru")!=-1) {
-			helpHref += "_ru.html";
+			helpHref += ".html";
 		}
 	    $(".help").load("${pageContext.request.contextPath}"+helpHref);
 	 }
diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp
index 68c7ac16c..1df800b3a 100644
--- a/src/main/webapp/WEB-INF/views/home.jsp
+++ b/src/main/webapp/WEB-INF/views/home.jsp
@@ -371,7 +371,7 @@ background:#3d3d3d;
                          <a href="${pageContext.request.contextPath}/static/PotPlayerSetup64.exe" id="helpHref"  target="_self" >
                          	<i class="fa fa-cloud-download"></i>
                          	<span class="username username-hide-on-mobile" id="help">  
-                         		<spring:message code="cut sample tool" />
+                         		<spring:message code="cut_sample_tool" />
                          	</span>
                          </a>
                      </li>