修改界面delete按钮样式
Conflicts: src/main/webapp/WEB-INF/tags/sys/delRow.tag
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
<c:choose>
|
||||
<c:when test="${label eq 'delete'}">
|
||||
<a href="javascript:void(0);" class="btn btn-default" onclick="del('${url}')" data-toggle="tooltip" data-placement="top">
|
||||
<i class="fa fa-trash"> <spring:message code="delete"/></i>
|
||||
<i class="fa fa-trash"></i> <spring:message code="delete"/>
|
||||
</a>
|
||||
</c:when>
|
||||
<c:when test="${label eq 'update'}">
|
||||
@@ -27,27 +27,27 @@
|
||||
</c:when>
|
||||
<c:when test="${label eq 'cfg_excel'}">
|
||||
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}','cfg')" data-toggle="tooltip" data-placement="top">
|
||||
<i class="fa fa-download"> <spring:message code="Excel"/></i>
|
||||
<i class="fa fa-download"></i> <spring:message code="Excel"/>
|
||||
</a>
|
||||
</c:when>
|
||||
<c:when test="${label eq 'export'}">
|
||||
<a href="javascript:void(0);" class="btn btn-default" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}','cfg')" data-toggle="tooltip" data-placement="top">
|
||||
<i class="fa fa-download"> <spring:message code="Excel"/></i>
|
||||
<i class="fa fa-download"></i> <spring:message code="Excel"/>
|
||||
</a>
|
||||
</c:when>
|
||||
<c:when test="${label eq 'cfg_csv'}">
|
||||
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}','cfg')" data-toggle="tooltip" data-placement="top">
|
||||
<i class="fa fa-download"> <spring:message code="CSV"/></i>
|
||||
<i class="fa fa-download"></i> <spring:message code="CSV"/>
|
||||
</a>
|
||||
</c:when>
|
||||
<c:when test="${label eq 'excel'}">
|
||||
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxLogExportSize',2000)},'${searchUrl}','log')" data-toggle="tooltip" data-placement="top">
|
||||
<i class="fa fa-download"> <spring:message code="Excel"/></i>
|
||||
<i class="fa fa-download"></i> <spring:message code="Excel"/>
|
||||
</a>
|
||||
</c:when>
|
||||
<c:when test="${label eq 'csv'}">
|
||||
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxLogExportSize',2000)},'${searchUrl}','log')" data-toggle="tooltip" data-placement="top">
|
||||
<i class="fa fa-download"> <spring:message code="CSV"/></i>
|
||||
<i class="fa fa-download"></i> <spring:message code="CSV"/>
|
||||
</a>
|
||||
</c:when>
|
||||
</c:choose>
|
||||
@@ -119,10 +119,10 @@ function update(url){
|
||||
if(cked.val()==1){
|
||||
top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}else if(cked.val()==3){
|
||||
/* top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
|
||||
return; */
|
||||
}
|
||||
}/*else if(cked.val()==3){
|
||||
top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}*/
|
||||
//处理asnIp,asn组下发过的ip配置不允许修改
|
||||
if(cked.attr("asnGroup")&&cked.attr("isValid")){
|
||||
var asnGroup=cked.attr("asnGroup");
|
||||
@@ -486,7 +486,6 @@ function cancelPassOpt(url){
|
||||
url+="&hColumns="+hColumn.toString();
|
||||
}
|
||||
var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
|
||||
|
||||
//导出选中数据
|
||||
if($(checkboxes).filter(":checked").length>0){
|
||||
doAll(checkboxes,url);
|
||||
@@ -500,7 +499,6 @@ function cancelPassOpt(url){
|
||||
$("#searchForm").attr("action",url);
|
||||
$("#searchForm").submit();
|
||||
closeTip();
|
||||
$("#searchForm").attr("action",searchUrl);
|
||||
}
|
||||
},{buttonsFocus:1});
|
||||
top.$('.jbox-body .jbox-icon').css('top','55px');
|
||||
|
||||
Reference in New Issue
Block a user