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

Florian Schaal

2015-01-14 c554c4f383f992b3783749a8401cf367237b2a62

 interface/web/admin/templates/users_list.htm

@@ -17,10 +17,10 @@
<table class="table">
                <thead class="dark form-group-sm">
                    <tr>
                        <th class="small-col"><tmpl_var name="client_id_txt"></th>
                        <th class="tiny-col"><tmpl_var name="active_txt"></th>
                        <th><tmpl_var name="username_txt"></th>
                        <th><tmpl_var name="groups_txt"></th>
                        <th class="small-col" data-column="client_id"><tmpl_var name="client_id_txt"></th>
                        <th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th>
                        <th data-column="username"><tmpl_var name="username_txt"></th>
                        <th data-column="groups"><tmpl_var name="groups_txt"></th>
                        <th class="small-col text-right">{tmpl_var name='search_limit'}</th>
                    </tr>
                    <tr>
@@ -29,7 +29,7 @@
                        <td><input class="form-control" type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
                        <td><select class="form-control" name="search_groups">{tmpl_var name='search_groups'}</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/users_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/users_list.php"><span class="icon icon-filter"></span></button>
                        </td>
                    </tr>
                </thead>
@@ -43,7 +43,7 @@
                            <td class="text-right">
                                <tmpl_if name="username" op="!=" value="admin">
                                    <a class="btn btn-default formbutton-success formbutton-narrow" data-load-content="login/login_as.php?cid={tmpl_var name='client_id'}"><span class="icon icon-loginas"></span></button>
                                    <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('admin/users_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/users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
                                </tmpl_if>
                            </td>
                        </tr>