Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
This commit is contained in:
duandongmei
@@ -94,7 +94,7 @@
|
||||
});
|
||||
$(".protocol_code").html('<font color="red">*</font><spring:message code="app_code"/>:');
|
||||
$(".protocol_name").html('<font color="red">*</font><spring:message code="app_name"/>:');
|
||||
$(".protocol_desc").html('<font color="red">*</font><spring:message code="app_desc"/>:');
|
||||
$(".protocol_desc").html('<spring:message code="app_desc"/>:');
|
||||
}else{
|
||||
$(".cfgType").each(function(){
|
||||
if($(this).attr("cfgType")!=$("[name='cfgType']").val()){
|
||||
@@ -109,15 +109,15 @@
|
||||
if($("[name='cfgType']").val()==1){
|
||||
$(".protocol_code").html('<font color="red">*</font><spring:message code="app_code"/>:');
|
||||
$(".protocol_name").html('<font color="red">*</font><spring:message code="app_name"/>:');
|
||||
$(".protocol_desc").html('<font color="red">*</font><spring:message code="app_desc"/>:');
|
||||
$(".protocol_desc").html('<spring:message code="app_desc"/>:');
|
||||
}else if($("[name='cfgType']").val()==2){
|
||||
$(".protocol_code").html('<font color="red">*</font><spring:message code="tunnel_code"/>:');
|
||||
$(".protocol_name").html('<font color="red">*</font><spring:message code="tunnel_name"/>:');
|
||||
$(".protocol_desc").html('<font color="red">*</font><spring:message code="tunnel_desc"/>:');
|
||||
$(".protocol_desc").html('<spring:message code="tunnel_desc"/>:');
|
||||
}else{
|
||||
$(".protocol_code").html('<font color="red">*</font><spring:message code="protocol_code"/>:');
|
||||
$(".protocol_name").html('<font color="red">*</font><spring:message code="protocol_name"/>:');
|
||||
$(".protocol_desc").html('<font color="red">*</font><spring:message code="protocol_desc"/>:');
|
||||
$(".protocol_desc").html('<spring:message code="protocol_desc"/>:');
|
||||
}
|
||||
}
|
||||
$(".tabs-left li").on("click",function(){
|
||||
@@ -136,15 +136,15 @@
|
||||
if(cfgType==1){
|
||||
$(".protocol_code").html('<font color="red">*</font><spring:message code="app_code"/>:');
|
||||
$(".protocol_name").html('<font color="red">*</font><spring:message code="app_name"/>:');
|
||||
$(".protocol_desc").html('<font color="red">*</font><spring:message code="app_desc"/>:');
|
||||
$(".protocol_desc").html('<spring:message code="app_desc"/>:');
|
||||
}else if(cfgType==2){
|
||||
$(".protocol_code").html('<font color="red">*</font><spring:message code="tunnel_code"/>:');
|
||||
$(".protocol_name").html('<font color="red">*</font><spring:message code="tunnel_name"/>:');
|
||||
$(".protocol_desc").html('<font color="red">*</font><spring:message code="tunnel_desc"/>:');
|
||||
$(".protocol_desc").html('<spring:message code="tunnel_desc"/>:');
|
||||
}else{
|
||||
$(".protocol_code").html('<font color="red">*</font><spring:message code="protocol_code"/>:');
|
||||
$(".protocol_name").html('<font color="red">*</font><spring:message code="protocol_name"/>:');
|
||||
$(".protocol_desc").html('<font color="red">*</font><spring:message code="protocol_desc"/>:');
|
||||
$(".protocol_desc").html('<spring:message code="protocol_desc"/>:');
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
@@ -272,7 +272,7 @@
|
||||
<tr id="${specificServiceCfg.specServiceId}" pId="${specificServiceCfg.parent.specServiceId ne 0?specificServiceCfg.parent.specServiceId:0}">
|
||||
<td><input type="checkbox" class="ckbox" name="check" value="${specificServiceCfg.specServiceId}"></td>
|
||||
<%-- <td>${specificServiceCfg.showSequence}</td> --%>
|
||||
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/specific/specificServiceCfg/form?specServiceId=${specificServiceCfg.specServiceId}&doAction=0">${specificServiceCfg.specServiceCode}</a></td>
|
||||
<td nowrap><i class="icon-icon-tablet"></i><%--<a href="${ctx}/specific/specificServiceCfg/form?specServiceId=${specificServiceCfg.specServiceId}&doAction=0">--%>${specificServiceCfg.specServiceCode}<%--</a>--%></td>
|
||||
<td title="${specificServiceCfg.specServiceName}">${specificServiceCfg.specServiceName}</td>
|
||||
<td title="${specificServiceCfg.specServiceDesc}">${fns:abbr(specificServiceCfg.specServiceDesc,15)}</td>
|
||||
<%-- <td>${specificServiceCfg.groupId }</td> --%>
|
||||
|
||||
@@ -41,21 +41,21 @@
|
||||
portMaskRange:"Port and mask must between 0 and 65535.The correct pattern is \"port/mask\".",
|
||||
chooseAreaOrIsp:"The region and the oprater must choose one",
|
||||
areaControl:"Action drop and loop do not need area control",
|
||||
ip_type: "ip type",
|
||||
ip_pattern: "ip Pattern",
|
||||
area: "area",
|
||||
isp: "isp",
|
||||
close_info: "close",
|
||||
client_ip: "client ip",
|
||||
ipv4: "ipv4",
|
||||
ipv6: "ipv6",
|
||||
ip_type: "IP type",
|
||||
ip_pattern: "IP Pattern",
|
||||
area: "Area",
|
||||
isp: "ISP",
|
||||
close_info: "Close",
|
||||
client_ip: "Client IP",
|
||||
ipv4: "IPv4",
|
||||
ipv6: "IPv6",
|
||||
over6: "4over6",
|
||||
over4: "6over4",
|
||||
ipv4v6:"Please enter a correct IPv4(0.0.0.0) or IPv6(::)",
|
||||
all: "all",
|
||||
ip_subnet: "Subnet",
|
||||
ip_range: "ip Range",
|
||||
timeout:"timeout",
|
||||
all: "All",
|
||||
ip_subnet: "IP/Subnet mask",
|
||||
ip_range: "IP Range",
|
||||
timeout:"Timeout",
|
||||
areaIpPrefix:"Forbiden value: ",
|
||||
domainCheck:"Please enter a valid domain.",
|
||||
checkParent:"Configuration Type must match it's parent.",
|
||||
|
||||
@@ -27,18 +27,17 @@
|
||||
ipMask:"请填写正确的IP地址/掩码",
|
||||
ipPart:"IP部分格式错误",
|
||||
ipv6MaskPart:"掩码为不大于128的2的指数幂",
|
||||
portCheck:"请填写正确的端口",
|
||||
notStartZero:"请填写正确的数值",
|
||||
ipMaskRange:"掩码范围0到32",
|
||||
srcIpNotEqDestIp:"源IP和目的IP不能相同",
|
||||
ipRange:"IP范围格式错误或者起始IP与结束IP不在同一网段",
|
||||
ipRange1:"起始IP值应小于结束IP值",
|
||||
portRange:"端口应小于65536，非0数字不能以0开头",
|
||||
srcIpIsNotValue:"源IP不能为 ",
|
||||
destIpIsNotValue:"目的IP不能为",
|
||||
ipMaskRange:"IP掩码介于0到32",
|
||||
srcIpNotEqDestIp:"源IP ",
|
||||
destIpNotEqDestIp:" 与目的IP ",
|
||||
IpNotEqDestIp:" 不能相同",
|
||||
srcIpIsNotValue:"源IP不能为 ",
|
||||
destIpIsNotValue:"目的IP不能为",
|
||||
ipRange:"IP范围格式错误或者起始IP与结束IP不在同一网段",
|
||||
ipRange1:"起始IP值应小于结束IP值",
|
||||
portCheck:"请填写正确的端口",
|
||||
notStartZero:"请填写正确的数值",
|
||||
portRange:"端口应小于65536，非0数字不能以0开头",
|
||||
portMaskRange:"端口以及掩码范围0-65535，非0数字不能以0开头。格式为\"端口/掩码\"",
|
||||
chooseAreaOrIsp:"区域和运营商必选一个",
|
||||
areaControl:"丢弃和回流动作不能区域管控",
|
||||
@@ -48,15 +47,14 @@
|
||||
isp: "运营商",
|
||||
close_info: "关闭",
|
||||
client_ip: "源IP",
|
||||
ipv4: "ipv4",
|
||||
ipv6: "ipv6",
|
||||
ipv4: "IPv4",
|
||||
ipv6: "IPv6",
|
||||
over6: "4over6",
|
||||
over4: "6over4",
|
||||
ipv4v6:"请输入合法的IP地址如IPv4(0.0.0.0)或IPv6(::)",
|
||||
all: "全部",
|
||||
ip_subnet: "Subnet",
|
||||
ip_subnet: "Subnet",
|
||||
ip_range: "ip Range",
|
||||
ip_subnet: "IP/子网掩码",
|
||||
ip_range: "IP范围",
|
||||
timeout:"超时",
|
||||
areaIpPrefix:"禁止使用的值: ",
|
||||
domainCheck:"请输入有效的域名",
|
||||
|
||||
Reference in New Issue
Block a user