Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/mail/templates/mail_user_list.htm

@@ -20,46 +20,46 @@
            </div><br />
        </div>
        </tmpl_if>
        <p>{tmpl_var name="toolsarea_head_txt"}</p>
        <p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
            
                <button class="btn btn-default formbutton-success" type="button" data-load-content="mail/mail_user_edit.php">{tmpl_var name="add_new_record_txt"}</button>
            
        

    
        <p><tmpl_var name="list_head_txt"></p>
        <p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
            <div class="table-wrapper marginTop15">
<table class="table">
                <thead class="dark form-group-sm">
                    <tr>
                        <th><tmpl_var name="email_txt"></th>
                <tmpl_if name="enable_custom_login"><th><tmpl_var name="login_txt"></th></tmpl_if>
                <th><tmpl_var name="name_txt"></th>
                        <th><tmpl_var name="autoresponder_txt"></th>
                        <th><tmpl_var name="postfix_txt"></th>
                        <th><tmpl_var name="disablesmtp_txt"></th>
                        <th><tmpl_var name="disableimap_txt"></th>
                        <th><tmpl_var name="disablepop3_txt"></th>
                        <th>{tmpl_var name='search_limit'}</th>
                        <th data-column="email"><tmpl_var name="email_txt"></th>
                <tmpl_if name="enable_custom_login"><th data-column="login"><tmpl_var name="login_txt"></th></tmpl_if>
                <th data-column="name"><tmpl_var name="name_txt"></th>
                        <th class="tiny-col" data-column="autoresponder"><tmpl_var name="autoresponder_txt"></th>
                        <th class="tiny-col" data-column="postfix"><tmpl_var name="postfix_txt"></th>
                        <th class="tiny-col" data-column="disablesmtp"><tmpl_var name="disablesmtp_txt"></th>
                        <th class="tiny-col" data-column="disableimap"><tmpl_var name="disableimap_txt"></th>
                        <th class="tiny-col" data-column="disablepop3"><tmpl_var name="disablepop3_txt"></th>
                        <th class="small-col text-right">{tmpl_var name='search_limit'}</th>
                    </tr>
                    <tr>
                        <td><input class="form-control" type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
            <tmpl_if name="enable_custom_login"><td><input class="form-control" type="text" name="search_login" value="{tmpl_var name='search_login'}" /></td></tmpl_if>
                        <td><input class="form-control" type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
                        <td><select class="form-control" name="search_autoresponder">{tmpl_var name='search_autoresponder'}</select></td>
                        <td><div class="col-sm-9"><select class="form-control" name="search_postfix">{tmpl_var name='search_postfix'}</select></div></th>
                        <td><div class="col-sm-9"><select class="form-control" name="search_disablesmtp">{tmpl_var name='search_disablesmtp'}</select></div></th>
                        <td><div class="col-sm-9"><select class="form-control" name="search_disableimap">{tmpl_var name='search_disableimap'}</select></div></th>
                        <td><div class="col-sm-9"><select class="form-control" name="search_disablepop3">{tmpl_var name='search_disablepop3'}</select></div></th>
                        <td>
                            <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_user_list.php');"><span class="icon icon-filter"></span></button>
                        <td><select class="form-control" name="search_postfix">{tmpl_var name='search_postfix'}</select></td>
                        <td><select class="form-control" name="search_disablesmtp">{tmpl_var name='search_disablesmtp'}</select></td>
                        <td><select class="form-control" name="search_disableimap">{tmpl_var name='search_disableimap'}</select></td>
                        <td><select class="form-control" name="search_disablepop3">{tmpl_var name='search_disablepop3'}</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"}" data-submit-form="pageForm" data-form-action="mail/mail_user_list.php"><span class="icon icon-filter"></span></button>
                        </td>
                    </tr>
                </thead>
                <tbody>
                <tmpl_loop name="records">
                    <tr>
                        <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="email"}</a></td>
                        <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='email'}">{tmpl_var name="email"}</a></td>
                        <tmpl_if name="enable_custom_login">
                            <td>
                                <a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="login"}</a>
@@ -71,11 +71,11 @@
                        <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="disablesmtp"}</a></td>
                        <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="disableimap"}</a></td>
                        <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="disablepop3"}</a></td>
                        <td>
                        <td class="text-right">
                            <tmpl_if name="mailboxlist_webmail_link">
                                <a class="btn btn-default formbutton-default" href="mail/webmailer.php?id={tmpl_var name='id'}" target="webmail">{tmpl_var name="webmail_txt"}</button>
                                <a class="btn btn-default formbutton-default formbutton-narrow" href="mail/webmailer.php?id={tmpl_var name='id'}" target="webmail"><span class="icon icon-mail"></span></a>
                            </tmpl_if>
                            <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/mail_user_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('mail/mail_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
                        </td>
                    </tr>
                </tmpl_loop>
@@ -92,5 +92,3 @@
                </tfoot>
            </table>
</div>