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

This commit is contained in:
zhangwenqing
2018-07-03 18:37:02 +08:00
8 changed files with 95 additions and 13 deletions

View File

@@ -2,7 +2,7 @@
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<title><spring:message code="domain_intercept"></spring:message></title>
<title><spring:message code="${cfgName}"></spring:message></title>
<script type="text/javascript">
$(function() {
if ($("input[name='action']:checked").val() == 0x20
@@ -42,10 +42,10 @@
$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
},
submitHandler: function(form){
loading('onloading...');
loading('<spring:message code="onloading"/>');
form.submit();
},
errorContainer: "#messageBox",
errorContainer: "#messageBox"
});
});
@@ -60,7 +60,7 @@
<div class="page-content">
<h3 class="page-title">
<spring:message code="domain_intercept"></spring:message>
<spring:message code="${cfgName}"></spring:message>
</h3>
<div class="row">
@@ -79,8 +79,7 @@
</div>
<div class="portlet-body form">
<!-- BEGIN FORM-->
<form id="cfgFrom"
action="${ctx}${urlPrefix}/saveOrUpdate" method="post"
<form id="cfgFrom" action="${ctx}${urlPrefix}/saveOrUpdate" method="post"
class="form-horizontal">
<input type="hidden" name="cfgName" value="${cfgName}">
<input type="hidden" name="cfgId" value="${_cfg.cfgId}">

View File

@@ -45,10 +45,10 @@ $(function(){
$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());
$("#cfgType").val($("#cfgTypeMaat").val());
}
loading('onloading...');
loading('<spring:message code="onloading"/>');
form.submit();
},
errorContainer: "#messageBox",
errorContainer: "#messageBox"
});
});
</script>

View File

@@ -45,7 +45,7 @@ $(function(){
$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
},
submitHandler: function(form){
loading('onloading...');
loading('<spring:message code="onloading"/>');
form.submit();
},
errorContainer: "#messageBox",

View File

@@ -56,7 +56,7 @@ $(function(){
$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
},
submitHandler: function(form){
loading('onloading...');
loading('<spring:message code="onloading"/>');
form.submit();
},
errorContainer: "#messageBox",