Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 interface/web/admin/templates/server_list.htm

@@ -9,7 +9,7 @@
<table class="table">
                <thead class="dark form-group-sm">
                    <tr>
                        <th data-column="server_name"><tmpl_var name="server_name_txt"></th>
                        <th data-column="server_name" width="20%"><tmpl_var name="server_name_txt"></th>
                        <th data-column="mail_server"><tmpl_var name="mail_server_txt"></th>
                        <th data-column="web_server"><tmpl_var name="web_server_txt"></th>
                        <th data-column="dns_server"><tmpl_var name="dns_server_txt"></th>
@@ -51,13 +51,13 @@
                    </tmpl_loop>
                    <tmpl_unless name="records">
                        <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                            <td colspan="8">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
                            <td colspan="7">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
                        </tr>
                    </tmpl_unless>
                </tbody>
                <tfoot>
                    <tr>
                        <td colspan="8"><tmpl_var name="paging"></td>
                        <td colspan="7"><tmpl_var name="paging"></td>
                    </tr>
                </tfoot>
            </table>