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

1、修改多域sub界面中的表达式国际化code

Browse Source 
2、去掉菜单中Control和管控关键词
This commit is contained in:
duandongmei
2018-07-14 14:54:32 +08:00
parent bc7bd0fdff
commit c577d9f156
14 changed files with 184 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
View File

@@ -158,12 +158,12 @@ $(function(){
name="exprType" value="1"
class="required"
<c:if test="${_cfg.exprType==1}">checked</c:if>> <spring:message
code="and" />
code="and_expression" />
</label> <label class="radio-inline"> <input type="radio"
name="exprType" value="0"
class="required"
<c:if test="${_cfg.exprType==0 || _cfg.exprType==null}">checked</c:if>>
<spring:message code="null" />
<spring:message code="null_expression" />
</label>
</div>
<div for="exprType"></div>

4
src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
View File

@@ -158,12 +158,12 @@ $(function(){
name="exprType" value="1"
class="required"
<c:if test="${_cfg.exprType==1}">checked</c:if>> <spring:message
code="and" />
code="and_expression" />
</label> <label class="radio-inline"> <input type="radio"
name="exprType" value="0"
class="required"
<c:if test="${_cfg.exprType==0 || _cfg.exprType==null}">checked</c:if>>
<spring:message code="null" />
<spring:message code="null_expression" />
</label>
</div>
<div for="exprType"></div>

4
src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
View File

@@ -180,12 +180,12 @@ $(function(){
name="exprType" value="1"
class="required"
<c:if test="${_cfg.exprType==1}">checked</c:if>> <spring:message
code="and" />
code="and_expression" />
</label> <label class="radio-inline"> <input type="radio"
name="exprType" value="0"
class="required"
<c:if test="${_cfg.exprType==0 || _cfg.exprType==null}">checked</c:if>>
<spring:message code="null" />
<spring:message code="null_expression" />
</label>
</div>
<div for="exprType"></div>

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

@@ -65,12 +65,12 @@
name="${cfgName}.exprType" value="1"
class="required"
<c:if test="${complexCfg.exprType==1}">checked</c:if>> <spring:message
code="and" />
code="and_expression" />
</label> <label class="radio-inline"> <input type="radio"
name="${cfgName}.exprType" value="0"
class="required"
<c:if test="${complexCfg.exprType==0 || complexCfg.exprType==null}">checked</c:if>>
<spring:message code="null" />
<spring:message code="null_expression" />
</label>
</div>
<div for="${cfgName}.exprType"></div>

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

@@ -126,8 +126,8 @@
<label><spring:message code='expression_type' />:</label>
<label>
<c:choose>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null'/></c:when>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
</c:choose>
</label>
</div>

4
src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
View File

@@ -134,8 +134,8 @@
<label><spring:message code='expression_type' />:</label>
<label>
<c:choose>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null'/></c:when>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
</c:choose>
</label>
</div>

4
src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp
View File

@@ -131,8 +131,8 @@
<label><spring:message code='expression_type' />:</label>
<label>
<c:choose>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null'/></c:when>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
</c:choose>
</label>
</div>

20
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp
View File

@@ -151,8 +151,8 @@
<label><spring:message code='expression_type' />:</label>
<label>
<c:choose>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null'/></c:when>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
</c:choose>
</label>
</div>
@@ -206,8 +206,8 @@
<label><spring:message code='expression_type' />:</label>
<label>
<c:choose>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null'/></c:when>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
</c:choose>
</label>
</div>
@@ -255,8 +255,8 @@
<label><spring:message code='expression_type' />:</label>
<label>
<c:choose>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null'/></c:when>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
</c:choose>
</label>
</div>
@@ -310,8 +310,8 @@
<label><spring:message code='expression_type' />:</label>
<label>
<c:choose>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null'/></c:when>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
</c:choose>
</label>
</div>
@@ -361,8 +361,8 @@
<label><spring:message code='expression_type' />:</label>
<label>
<c:choose>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null'/></c:when>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
</c:choose>
</label>
</div>

4
src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
View File

@@ -133,8 +133,8 @@
<label><spring:message code='expression_type' />:</label>
<label>
<c:choose>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null'/></c:when>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
</c:choose>
</label>
</div>

20
src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
View File

@@ -154,8 +154,8 @@
<label><spring:message code='expression_type' />:</label>
<label>
<c:choose>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null'/></c:when>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
</c:choose>
</label>
</div>
@@ -204,8 +204,8 @@
<label><spring:message code='expression_type' />:</label>
<label>
<c:choose>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null'/></c:when>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
</c:choose>
</label>
</div>
@@ -249,8 +249,8 @@
<label><spring:message code='expression_type' />:</label>
<label>
<c:choose>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null'/></c:when>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
</c:choose>
</label>
</div>
@@ -300,8 +300,8 @@
<label><spring:message code='expression_type' />:</label>
<label>
<c:choose>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null'/></c:when>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
</c:choose>
</label>
</div>
@@ -345,8 +345,8 @@
<label><spring:message code='expression_type' />:</label>
<label>
<c:choose>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null'/></c:when>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
</c:choose>
</label>
</div>

4
src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp
View File

@@ -125,8 +125,8 @@
<label><spring:message code='expression_type' />:</label>
<label>
<c:choose>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null'/></c:when>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
</c:choose>
</label>
</div>