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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
leijun
2018-09-18 15:27:44 +08:00
parent ae97d72a8c 66bf0be104
commit 03b6d13293
8 changed files with 121 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
View File

@@ -62,7 +62,12 @@ $(function(){
<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<h3 class="page-title">
<spring:message code="app_header_config"></spring:message>
<%-- <spring:message code="app_header_config"></spring:message> --%>
<c:forEach items="${regionList}" var="region">
<c:if test="${_cfg.functionId eq region.functionId}">
<spring:message code="${region.configRegionValue}"></spring:message>
</c:if>
</c:forEach>
</h3>
<div class="row">
<div class="col-md-12">
@@ -154,7 +159,7 @@ $(function(){
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="layer" /></label>
<spring:message code="district" /></label>
<div class="col-md-6">
<select name="district"
class="selectpicker show-tick form-control required district" onchange="changeDistrict($(this))">
@@ -186,7 +191,7 @@ $(function(){
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="header" /></label>
<spring:message code="Keywords" /></label>
<!-- 此配置的关键词可以输入多个关键词 -->
<c:if test="${region.configMultiKeywords eq 1}">
<div class="col-md-6">

13
src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
View File

@@ -57,7 +57,12 @@
</div>
<h3 class="page-title">
<spring:message code="app_header_config"></spring:message>
<%-- <spring:message code="app_header_config"></spring:message> --%>
<c:forEach items="${regionList}" var="region">
<c:if test="${cfg.functionId eq region.functionId}">
<spring:message code="${region.configRegionValue}"></spring:message>
</c:if>
</c:forEach>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">
@@ -99,7 +104,7 @@
<div class="input-group-btn">
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="cfgKeywords"><spring:message code="header"></spring:message></form:option>
<form:option value="cfgKeywords"><spring:message code="Keywords"></spring:message></form:option>
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
@@ -279,8 +284,8 @@
<th class="sort-column r.compile_id" style="display: none;"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="social_app"/></th>
<th><spring:message code="layer"/></th>
<th><spring:message code="header"/></th>
<th><spring:message code="district"/></th>
<th><spring:message code="Keywords"/></th>
<th><spring:message code="is_hex"/></th>
<th><spring:message code="is_case_insenstive"/></th>
<th><spring:message code="expression_type"/></th>