Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/client/templates/resellers_list.htm

@@ -4,26 +4,26 @@
<p><tmpl_var name="list_desc_txt"></p>


        <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="client/reseller_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="client_id_txt"></th>
                        <th><tmpl_var name="company_name_txt"></th>
                        <th><tmpl_var name="contact_name_txt"></th>
                  <th><tmpl_var name="customer_no_txt"></th>
                        <th><tmpl_var name="username_txt"></th>
                        <th><tmpl_var name="city_txt"></th>
                        <th><tmpl_var name="country_txt"></th>
                        <th class="small-col">{tmpl_var name='search_limit'}</th>
                        <th class="small-col" data-column="client_id"><tmpl_var name="client_id_txt"></th>
                        <th data-column="company_name"><tmpl_var name="company_name_txt"></th>
                        <th data-column="contact_name"><tmpl_var name="contact_name_txt"></th>
                  <th data-column="customer_no"><tmpl_var name="customer_no_txt"></th>
                        <th data-column="username"><tmpl_var name="username_txt"></th>
                        <th data-column="city"><tmpl_var name="city_txt"></th>
                        <th data-column="country"><tmpl_var name="country_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_client_id" value="{tmpl_var name='search_client_id'}" /></td>
@@ -33,8 +33,8 @@
                        <td><input class="form-control" type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
                        <td><input class="form-control" type="text" name="search_city" value="{tmpl_var name='search_city'}" /></td>
                        <td><select class="form-control" name="search_country">{tmpl_var name='search_country'}</select></td>
                        <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','client/reseller_list.php');"><span class="icon icon-filter"></span></button>
                        <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="client/reseller_list.php"><span class="icon icon-filter"></span></button>
                        </td>
                    </tr>
                </thead>
@@ -45,12 +45,12 @@
                            <td><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}">{tmpl_var name="company_name"}</a></td>
                            <td><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}">{tmpl_var name="contact_name"}</a></td>
                     <td><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}">{tmpl_var name="customer_no"}</a></td>
                            <td><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}">{tmpl_var name="username"}</a></td>
                            <td><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='username'}">{tmpl_var name="username"}</a></td>
                            <td><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}">{tmpl_var name="city"}</a></td>
                            <td><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}"><div class="country-{tmpl_var name="countryiso"}" style="float:left"></div>{tmpl_var name="country"}</a></td>
                            <td>
                                <a class="btn btn-default formbutton-success formbutton-narrow" data-load-content="login/login_as.php?cid={tmpl_var name='id'}"><span class="icon icon-loginas"></span></button>
                                <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('client/reseller_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><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}"><span class="flags flag-{tmpl_var name="countryiso"}">{tmpl_var name="country"}</span></a></td>
                            <td class="text-right">
                                <a class="btn btn-default formbutton-success formbutton-narrow" data-load-content="login/login_as.php?cid={tmpl_var name='id'}"><span class="icon icon-loginas"></span></a>
                                <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('client/reseller_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>
@@ -67,5 +67,3 @@
                </tfoot>
            </table>
</div>