Merge branch 'master' of git.ispconfig.org:renky/ispconfig3

Dominik

2015-01-21 83aa23b76fbdca327c52bd14fc1a1bc62aa5b3ee

 interface/web/admin/templates/server_list.htm

@@ -9,13 +9,13 @@
<table class="table">
                <thead class="dark form-group-sm">
                    <tr>
                        <th><tmpl_var name="server_name_txt"></th>
                        <th><tmpl_var name="mail_server_txt"></th>
                        <th><tmpl_var name="web_server_txt"></th>
                        <th><tmpl_var name="dns_server_txt"></th>
                        <th><tmpl_var name="file_server_txt"></th>
                        <th><tmpl_var name="db_server_txt"></th>
                        <th><tmpl_var name="vserver_server_txt"></th>
                        <th data-column="server_name"><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>
                        <th data-column="file_server"><tmpl_var name="file_server_txt"></th>
                        <th data-column="db_server"><tmpl_var name="db_server_txt"></th>
                        <th data-column="vserver_server"><tmpl_var name="vserver_server_txt"></th>
                        <th class="small-col text-right">{tmpl_var name='search_limit'}</th>
                    </tr>
                    <tr>
@@ -27,7 +27,7 @@
                        <td><select class="form-control" name="search_active">{tmpl_var name='search_db_server'}</select></td>
                        <td><select class="form-control" name="search_active">{tmpl_var name='search_vserver_server'}</select></td>
                        <td class="text-right">
                            <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/server_list.php');"><span class="icon icon-filter"></span></button>
                            <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="admin/server_list.php"><span class="icon icon-filter"></span></button>
                        </td>
                    </tr>
                </thead>
@@ -42,7 +42,7 @@
                            <td>{tmpl_var name="db_server"}</td>
                            <td>{tmpl_var name="vserver_server"}</td>
                            <td class="text-right">
                                <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('admin/server_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
                                <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('admin/server_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
                            </td>
                        </tr>
                    </tmpl_loop>