From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/client/templates/resellers_list.htm | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/interface/web/client/templates/resellers_list.htm b/interface/web/client/templates/resellers_list.htm
index 176445d..50a9ec2 100644
--- a/interface/web/client/templates/resellers_list.htm
+++ b/interface/web/client/templates/resellers_list.htm
@@ -4,25 +4,25 @@
<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" 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>
@@ -34,7 +34,7 @@
<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 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','client/reseller_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="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'}"><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></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>
+ <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>
-
-
\ No newline at end of file
--
Gitblit v1.9.1