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

增加菜单、角色管理提示信息国际化

Browse Source 
修改匹配方式默认为子串匹配
This commit is contained in:
duandongmei
2018-07-04 10:41:45 +08:00
parent 69f3fa964e
commit ec78647436
8 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/WEB-INF/include/form/stringInfo.jsp
View File

@@ -53,7 +53,7 @@
<div class="col-md-6">
<select name="matchMethod" class="selectpicker select2 form-control required" >
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
<option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==0)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
</c:forEach>
</select>
</div>

2
src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
View File

@@ -226,7 +226,7 @@ var delContent=function(contentClassName,addBtnClassName){
<div class="col-md-6">
<select name="voipAccounts[${status.index }].matchMethod" class="selectpicker select2 form-control required" >
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<option value="${matchMethodC.itemCode}" <c:if test="${voipAccount.matchMethod==matchMethodC.itemCode || (voipAccount.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
<option value="${matchMethodC.itemCode}" <c:if test="${voipAccount.matchMethod==matchMethodC.itemCode || (voipAccount.matchMethod==null && matchMethodC.itemCode==1)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
</c:forEach>
</select>
</div>

6
src/main/webapp/WEB-INF/views/sys/menuForm.jsp
View File

@@ -46,12 +46,6 @@
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i><spring:message code="menu"/><shiro:hasPermission name="sys:menu:edit">${not empty menu.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit"><spring:message code="show"/></shiro:lacksPermission></div>
<div class="tools">
<a href="javascript:;" class="collapse"> </a>
<a href="#portlet-config" data-toggle="modal" class="config"> </a>
<a href="javascript:;" class="reload"> </a>
<a href="javascript:;" class="remove"> </a>
</div>
</div>
<div class="portlet-body form">

14
src/main/webapp/WEB-INF/views/sys/roleForm.jsp
View File

@@ -16,7 +16,7 @@
name: {remote: "${ctx}/sys/role/checkName?oldName=" + encodeURIComponent("${role.name}")}
},
messages: {
name: {remote: "角色名已存在"}
name: {remote: "<spring:message code='role_unique'/>"}
},
submitHandler: function(form){
var ids = [], nodes = tree.getCheckedNodes(true);
@@ -25,12 +25,12 @@
}
$("#menuIds").val(ids);
loading('正在提交，请稍等...');
loading('onloading...');
form.submit();
},
errorContainer: "#messageBox",
errorPlacement: function(error, element) {
$("#messageBox").text("输入有误，请先更正。");
$("#messageBox").text("<spring:message code='role_error_info'/>");
if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
error.appendTo(element.parent().parent());
} else {
@@ -78,7 +78,7 @@
<h3 class="page-title">
<spring:message code="menuManage"/>
<spring:message code="roleManage"/>
</h3>
<div class="row">
@@ -87,12 +87,6 @@
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i><shiro:hasPermission name="sys:role:edit"><c:if test="${not empty role.id}"><spring:message code="edit"/></c:if><c:if test="${empty role.id}"><spring:message code="add"/></c:if></shiro:hasPermission><shiro:lacksPermission name="sys:role:edit"><spring:message code="show"/></shiro:lacksPermission></div>
<div class="tools">
<a href="javascript:;" class="collapse"> </a>
<a href="#portlet-config" data-toggle="modal" class="config"> </a>
<a href="javascript:;" class="reload"> </a>
<a href="javascript:;" class="remove"> </a>
</div>
</div>
<div class="portlet-body form">

11
src/main/webapp/WEB-INF/views/sys/roleList.jsp
View File

@@ -9,7 +9,6 @@
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default">&nbsp;<spring:message code="refresh"/>&nbsp;</button>
<shiro:hasPermission name="sys:role:edit">
<button type="button" class="btn btn-primary"
@@ -29,14 +28,6 @@
<div class="caption">
<i class="fa fa-cogs"></i><spring:message code="date_list"/>
</div>
<div class="tools">
<a href="javascript:;" class="collapse" data-original-title=""
title=""> </a> <a href="#portlet-config" data-toggle="modal"
class="config" data-original-title="" title=""> </a> <a
href="javascript:;" class="reload" data-original-title=""
title=""> </a> <a href="javascript:;" class="remove"
data-original-title="" title=""> </a>
</div>
</div>
<div class="portlet-body">
@@ -56,7 +47,7 @@
<td>${fns:getDictLabel('SYS_DATA_SCOPE',role.dataScope,'无')}</td>
<td title="${role.remark}">${fns:abbr(role.remark,30)}</td>
<shiro:hasPermission name="sys:role:edit"><td>
<a href="${ctx}/sys/role/assign?id=${role.id}"><spring:message code="allot"/></a>
<%--<a href="${ctx}/sys/role/assign?id=${role.id}"><spring:message code="allot"/></a> --%>
<a href="${ctx}/sys/role/form?id=${role.id}"><spring:message code="edit"/></a>
<a href="${ctx}/sys/role/delete?id=${role.id}" onclick="return confirmx('<spring:message code="sure_delete"/>？', this.href)"><spring:message code="delete"/></a>
</td></shiro:hasPermission>