From c554c4f383f992b3783749a8401cf367237b2a62 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Wed, 14 Jan 2015 04:56:37 -0500
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
---
interface/web/client/templates/resellers_list.htm | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/interface/web/client/templates/resellers_list.htm b/interface/web/client/templates/resellers_list.htm
index 26654cc..0bb6afa 100644
--- a/interface/web/client/templates/resellers_list.htm
+++ b/interface/web/client/templates/resellers_list.htm
@@ -16,13 +16,13 @@
<table class="table">
<thead class="dark form-group-sm">
<tr>
- <th class="small-col"><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>
@@ -50,7 +50,7 @@
<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-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></button>
</td>
</tr>
</tmpl_loop>
--
Gitblit v1.9.1