gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改app策略与隧道行为表单的doLog参数位置；

Browse Source 
2.修改p2p表单的doLog默认选中；
3.修改主页的音视频样例剪切工具国际化与帮助信息页面的国际化链接
This commit is contained in:
zhangwei
2019-01-13 11:11:23 +06:00
parent 331e7f31ef
commit cc0b7dc86c
5 changed files with 92 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
View File

@@ -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" />

75
src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
View File

@@ -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" />

4
src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
View File

@@ -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">

4
src/main/webapp/WEB-INF/views/help.jsp
View File

@@ -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);
}

2
src/main/webapp/WEB-INF/views/home.jsp
View File

@@ -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>