Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver

This commit is contained in:
guanghongwei
2015-03-07 18:07:04 +08:00

View File

@@ -1,9 +1,4 @@
<div class="row">
<div class="col-sm-6">
<input type="button" id="del_button" class="btn btn-danger btn-sm" name="del_button" value="删除" onclick="del('contents_form')" />
<input type="button" id="alter_button" class="btn btn-warning btn-sm" name="alter_button" value="修改" onclick="alter('contents_form')" />
</div>
<div class="col-sm-6">
<div class="col-sm-6">
<div class="dataTables_paginate paging_simple_numbers" id="editable_paginate">
<ul class="pagination" style="margin-top: 0; float: right">
@@ -40,5 +35,4 @@
{% endif %}
</ul>
</div>
</div>
</div>