From cb1235fb6a27b8fb2bba802423f66c2880a4473f Mon Sep 17 00:00:00 2001
From: fSerny <fabien.serny@prestashop.com>
Date: Wed, 29 Feb 2012 14:25:29 +0000
Subject: [PATCH] [*] BO : Filters are highlighted when used in AdminModules

---
 .../default/template/controllers/modules/filters.tpl   | 10 +++++-----
 .../themes/default/template/controllers/modules/js.tpl |  9 +++++----
 cache/class_index.php                                  |  1 -
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/modules/filters.tpl b/admin-dev/themes/default/template/controllers/modules/filters.tpl
index 37215147b..ec9648b2f 100644
--- a/admin-dev/themes/default/template/controllers/modules/filters.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/filters.tpl
@@ -85,7 +85,7 @@
 			<div class="select-filter">
 				<label class="search-filter">{l s='Sort by'}:</label>
 
-					<select name="module_type" id="module_type_filter">
+					<select name="module_type" id="module_type_filter" {if $showTypeModules ne 'allModules'}style="background-color:#49B2FF;color:white;"{/if}>
 						<option value="allModules" {if $showTypeModules eq 'allModules'}selected="selected"{/if}>{l s='All Modules'}</option>
 						<option value="nativeModules" {if $showTypeModules eq 'nativeModules'}selected="selected"{/if}>{l s='Native Modules'}</option>
 						<option value="partnerModules" {if $showTypeModules eq 'partnerModules'}selected="selected"{/if}>{l s='Partners Modules'}</option>
@@ -98,19 +98,19 @@
 						<option value="otherModules" {if $showTypeModules eq 'otherModules'}selected="selected"{/if}>{l s='Others Modules'}</option>
 					</select>
 					&nbsp;
-					<select name="module_install" id="module_install_filter">
+					<select name="module_install" id="module_install_filter" {if $showInstalledModules ne 'installedUninstalled'}style="background-color:#49B2FF;color:white;"{/if}>
 						<option value="installedUninstalled" {if $showInstalledModules eq 'installedUninstalled'}selected="selected"{/if}>{l s='Installed & Uninstalled'}</option>
 						<option value="installed" {if $showInstalledModules eq 'installed'}selected="selected"{/if}>{l s='Installed Modules'}</option>
 						<option value="uninstalled" {if $showInstalledModules eq 'uninstalled'}selected="selected"{/if}>{l s='Uninstalled Modules'}</option>
 					</select>
 					&nbsp;
-					<select name="module_status" id="module_status_filter">
+					<select name="module_status" id="module_status_filter" {if $showEnabledModules ne 'enabledDisabled'}style="background-color:#49B2FF;color:white;"{/if}>
 						<option value="enabledDisabled" {if $showEnabledModules eq 'enabledDisabled'}selected="selected"{/if}>{l s='Enabled & Disabled'}</option>
 						<option value="enabled" {if $showEnabledModules eq 'enabled'}selected="selected"{/if}>{l s='Enabled Modules'}</option>
 						<option value="disabled" {if $showEnabledModules eq 'disabled'}selected="selected"{/if}>{l s='Disabled Modules'}</option>
 					</select>
 					&nbsp;
-					<select name="country_module_value" id="country_module_value_filter">
+					<select name="country_module_value" id="country_module_value_filter" {if $showCountryModules eq 1}style="background-color:#49B2FF;color:white;"{/if}>
 						<option value="0" >{l s='All countries'}</option>
 						<option value="1" {if $showCountryModules eq 1}selected="selected"{/if}>{l s='Current country:'} {$nameCountryDefault}</option>
 					</select>
@@ -119,7 +119,7 @@
 
 			<div class="button-filter">
 				<input type="submit" value="{l s='Reset'}" name="resetFilterModules" class="button" />
-				<input type="submit" value="{l s='Filter'}" name="filterModules" class="button" />
+				<input type="submit" value="{l s='Filter'}" id="filterModulesButton" name="filterModules" class="button" />
 			</div>
 
 		</form>
diff --git a/admin-dev/themes/default/template/controllers/modules/js.tpl b/admin-dev/themes/default/template/controllers/modules/js.tpl
index cf8db8080..e64c954ad 100644
--- a/admin-dev/themes/default/template/controllers/modules/js.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/js.tpl
@@ -32,6 +32,7 @@
 <script type="text/javascript">
 	var token = '{$token}';
 	var currentIndex = '{$currentIndex}';
+	var currentIndexWithToken = '{$currentIndex}&token={$token}';
 	var dirNameCurrentIndex = '{$dirNameCurrentIndex}';
 	var ajaxCurrentIndex = '{$ajaxCurrentIndex}';
 	var by = '{l s='by'}';
@@ -175,7 +176,7 @@
 				{
 					// res.status  = cache or refresh
 					if (data == '{"status":"refresh"}')
-						window.location.href = window.location.href;
+						window.location.href = currentIndexWithToken;
 				},
 				error: function(res,textStatus,jqXHR)
 				{
@@ -217,7 +218,7 @@
 							{
 								$('#addons_loading').html('');
 								$('#addons_login_div').fadeOut();
-								window.location.href = window.location.href;
+								window.location.href = currentIndexWithToken;
 							}
 							else
 								$('#addons_loading').html(errorLogin);
@@ -259,7 +260,7 @@
 							{
 								$('#addons_loading').html('');
 								$('#addons_login_div').fadeOut();
-								window.location.href = window.location.href;
+								window.location.href = currentIndexWithToken;
 							}
 							else
 								$('#addons_loading').html(errorLogin);
@@ -303,7 +304,7 @@
 						{
 							// res.status  = cache or refresh
 							if (data == 'OK')
-								window.location.href = window.location.href;
+								window.location.href = currentIndexWithToken;
 						},
 						error: function(res,textStatus,jqXHR)
 						{
diff --git a/cache/class_index.php b/cache/class_index.php
index 3ba7bc932..927841ff2 100644
--- a/cache/class_index.php
+++ b/cache/class_index.php
@@ -120,7 +120,6 @@
   'AdminPaymentController' => 'override/controllers/admin/AdminPaymentController.php',
   'AdminPaymentControllerCore' => 'controllers/admin/AdminPaymentController.php',
   'AdminPdfController' => 'override/controllers/admin/AdminPdfController.php',
-  'AdminPdfControllerCore' => 'controllers/admin/AdminPdfController.php',
   'AdminPerformanceController' => 'override/controllers/admin/AdminPerformanceController.php',
   'AdminPerformanceControllerCore' => 'controllers/admin/AdminPerformanceController.php',
   'AdminPreferencesController' => 'override/controllers/admin/AdminPreferencesController.php',