From a84ff46ff8c731a321ae87bea0e05d3fef3aceae Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 09 Oct 2012 07:29:34 -0400
Subject: [PATCH] Bugfix: removed some columns from being sortable
---
interface/web/sites/templates/database_list.htm | 4 ++--
interface/web/client/templates/resellers_list.htm | 2 +-
interface/web/sites/templates/aps_packages_list.htm | 2 +-
interface/web/mail/templates/user_quota_stats_list.htm | 2 +-
interface/web/sites/templates/user_quota_stats_list.htm | 8 ++++----
interface/web/themes/default/templates/main.tpl.htm | 2 +-
interface/web/sites/templates/database_admin_list.htm | 2 +-
interface/web/client/templates/client_circle_list.htm | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/interface/web/client/templates/client_circle_list.htm b/interface/web/client/templates/client_circle_list.htm
index c7869d3..036f38d 100644
--- a/interface/web/client/templates/client_circle_list.htm
+++ b/interface/web/client/templates/client_circle_list.htm
@@ -18,7 +18,7 @@
<table class="list">
<thead>
<tr class="caption">
- <th class="tbl_col_circle_pid" scope="col"><tmpl_var name="circle_id_txt"></th>
+ <th class="tbl_col_circle_id" scope="col"><tmpl_var name="circle_id_txt"></th>
<th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
<th class="tbl_col_circle_name" scope="col"><tmpl_var name="circle_name_txt"></th>
<th class="tbl_col_description" scope="col"><tmpl_var name="description_txt"></th>
diff --git a/interface/web/client/templates/resellers_list.htm b/interface/web/client/templates/resellers_list.htm
index 0a08e2d..e223bf2 100644
--- a/interface/web/client/templates/resellers_list.htm
+++ b/interface/web/client/templates/resellers_list.htm
@@ -18,7 +18,7 @@
<table class="list">
<thead>
<tr class="caption">
- <th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
+ <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
<th class="tbl_col_company_name" scope="col"><tmpl_var name="company_name_txt"></th>
<th class="tbl_col_contact_name" scope="col"><tmpl_var name="contact_name_txt"></th>
<th class="tbl_col_city" scope="col"><tmpl_var name="city_txt"></th>
diff --git a/interface/web/mail/templates/user_quota_stats_list.htm b/interface/web/mail/templates/user_quota_stats_list.htm
index e9485f0..da5facb 100644
--- a/interface/web/mail/templates/user_quota_stats_list.htm
+++ b/interface/web/mail/templates/user_quota_stats_list.htm
@@ -9,7 +9,7 @@
<tr class="caption">
<th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
<th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
- <th class="tbl_col_used" scope="col"><tmpl_var name="used_txt"></th>
+ <th class="tbl_col_used tbl_col_nosort" scope="col"><tmpl_var name="used_txt"></th>
<th class="tbl_col_quota" scope="col"><tmpl_var name="quota_txt"></th>
<th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
</tr>
diff --git a/interface/web/sites/templates/aps_packages_list.htm b/interface/web/sites/templates/aps_packages_list.htm
index 819bba0..6a6b7d4 100644
--- a/interface/web/sites/templates/aps_packages_list.htm
+++ b/interface/web/sites/templates/aps_packages_list.htm
@@ -11,7 +11,7 @@
<th class="tbl_col_version" scope="col">{tmpl_var name='version_txt'}</th>
<th class="tbl_col_category" scope="col">{tmpl_var name='category_txt'}</th>
<tmpl_if name='is_admin'>
- <th class="tbl_col_status" scope="col">{tmpl_var name='status_txt'}</th>
+ <th class="tbl_col_package_status" scope="col">{tmpl_var name='status_txt'}</th>
</tmpl_if>
<th class="tbl_col_limit" scope="col"> </th>
</tr>
diff --git a/interface/web/sites/templates/database_admin_list.htm b/interface/web/sites/templates/database_admin_list.htm
index e66aa51..b517367 100644
--- a/interface/web/sites/templates/database_admin_list.htm
+++ b/interface/web/sites/templates/database_admin_list.htm
@@ -21,7 +21,7 @@
<th class="tbl_col_remote_access" scope="col"><tmpl_var name="remote_access_txt"></th>
<th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
<th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_database_user" scope="col"><tmpl_var name="database_user_txt"></th>
+ <th class="tbl_col_database_user_id" scope="col"><tmpl_var name="database_user_txt"></th>
<th class="tbl_col_database_name" scope="col"><tmpl_var name="database_name_txt"></th>
<th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
</tr>
diff --git a/interface/web/sites/templates/database_list.htm b/interface/web/sites/templates/database_list.htm
index 5fec212..bcd9209 100644
--- a/interface/web/sites/templates/database_list.htm
+++ b/interface/web/sites/templates/database_list.htm
@@ -21,7 +21,7 @@
<th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
<th class="tbl_col_remote_access" scope="col"><tmpl_var name="remote_access_txt"></th>
<th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_database_user" scope="col"><tmpl_var name="database_user_txt"></th>
+ <th class="tbl_col_database_user_id" scope="col"><tmpl_var name="database_user_txt"></th>
<th class="tbl_col_database_name" scope="col"><tmpl_var name="database_name_txt"></th>
<th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
</tr>
@@ -29,7 +29,7 @@
<td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
<td class="tbl_col_remote_access"><select name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
<td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_database_user"><select name="search_database_user_id">{tmpl_var name='search_database_user_id'}</select></td>
+ <td class="tbl_col_database_user_id"><select name="search_database_user_id">{tmpl_var name='search_database_user_id'}</select></td>
<td class="tbl_col_database_name"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}"/></td>
<td class="tbl_col_buttons">
<button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
diff --git a/interface/web/sites/templates/user_quota_stats_list.htm b/interface/web/sites/templates/user_quota_stats_list.htm
index ad303c1..35df591 100644
--- a/interface/web/sites/templates/user_quota_stats_list.htm
+++ b/interface/web/sites/templates/user_quota_stats_list.htm
@@ -9,10 +9,10 @@
<tr class="caption">
<th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
<th class="tbl_col_system_user" scope="col"><tmpl_var name="system_user_txt"></th>
- <th class="tbl_col_used" scope="col"><tmpl_var name="used_txt"></th>
- <th class="tbl_col_soft" scope="col"><tmpl_var name="soft_txt"></th>
- <th class="tbl_col_hard" scope="col"><tmpl_var name="hard_txt"></th>
- <th class="tbl_col_files" scope="col"><tmpl_var name="files_txt"></th>
+ <th class="tbl_col_used tbl_col_nosort" scope="col"><tmpl_var name="used_txt"></th>
+ <th class="tbl_col_soft tbl_col_nosort" scope="col"><tmpl_var name="soft_txt"></th>
+ <th class="tbl_col_hard tbl_col_nosort" scope="col"><tmpl_var name="hard_txt"></th>
+ <th class="tbl_col_files tbl_col_nosort" scope="col"><tmpl_var name="files_txt"></th>
<th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
</tr>
<tr class="filter">
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index cd15899..ce74406 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -76,7 +76,7 @@
});
jQuery(document).delegate('.pnl_listarea th', 'click', function(event) {
- if(jQuery(this).attr('class').length > 0 && jQuery(".panel #Filter").length > 0) {
+ if(jQuery(this).attr('class').length > 0 && jQuery(".panel #Filter").length > 0 && jQuery(this).hasClass('tbl_col_buttons') == false && jQuery(this).hasClass('tbl_col_limit') == false && jQuery(this).hasClass('tbl_col_nosort') == false) {
event.preventDefault();
var clickevent = jQuery('#Filter').attr('onclick');
var element = jQuery(this).attr('class');
--
Gitblit v1.9.1