From f847c821eded2c66a7056b429ec958dc3b3ae4af Mon Sep 17 00:00:00 2001
From: sLorenzini <sarah.lorenzini@prestashop.com>
Date: Wed, 10 Jul 2013 18:19:03 +0200
Subject: [PATCH] // update tab modules bootsrap

---
 .../template/controllers/modules/filters.tpl  | 145 ++++++++++++------
 controllers/admin/AdminModulesController.php  |   1 +
 2 files changed, 95 insertions(+), 51 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/modules/filters.tpl b/admin-dev/themes/default/template/controllers/modules/filters.tpl
index 414d52d2b..083751e35 100644
--- a/admin-dev/themes/default/template/controllers/modules/filters.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/filters.tpl
@@ -44,14 +44,40 @@
 			</div>
 		{else}
 			<!--start addons login-->
-			<div class="filter-module" id="addons_login_div">
-				<p>{l s='Do you have a %s account?' sprintf='<a href="http://addons.prestashop.com/">PrestaShop Addons</a>'}</p>
-				<form id="addons_login_form" method="post">
-					<label>{l s='Addons Login'} :</label> <input type="text" value="" id="username_addons" autocomplete="off" class="ac_input">
-					<label>{l s= 'Password Addons'} :</label> <input type="password" value="" id="password_addons" autocomplete="off" class="ac_input">
-					<input type="submit" class="button" id="addons_login_button" value="{l s='Log in'}">
-					<br /><span id="addons_loading" style="color:red"></span>
-				</form>
+			<div id="addons_login_div">
+				<div class="row">
+					<div class="col-12 col-lg-12">
+						<p>{l s='Do you have a %s account?' sprintf='<a href="http://addons.prestashop.com/">PrestaShop Addons</a>'}</p>
+						<form id="addons_login_form" method="post" class="form-horizontal">
+							<div class="row">
+								<div class="col-lg-10 col-offset-2">
+									<div id="addons_loading">
+										<div class="alert"></div>
+									</div>
+								</div>
+							</div>
+							<div class="row">
+								<label class="col-lg-2 control-label">{l s='Addons Login'} :</label> 
+								<div class="col-lg-5">
+									<input type="text" value="" id="username_addons" autocomplete="off" class="ac_input">
+								</div>
+							</div>
+							<div class="row">
+								<label class="col-lg-2 control-label">{l s= 'Password Addons'} :</label>
+								<div class="col-lg-5"> 
+									<input type="password" value="" id="password_addons" autocomplete="off" class="ac_input">
+								</div>
+							</div>
+							<div class="row">
+								<div class="col-lg-10 col-offset-2">
+									<button class="btn btn-default btn-small" id="addons_login_button" type="submit">
+										{l s='Log in'}
+									</button>
+								</div>
+							</div>
+						</form>
+					</div>
+				</div>
 			</div>
 			<!--end addons login-->
 		{/if}
@@ -60,51 +86,68 @@
 {/if}
 
 <!--start filter module-->
-<style>.ac_results { border:1px solid #C2C4D9; }</style>
-<div class="filter-module">
-	<form id="filternameForm" method="post">
-		<input type="text" value="" name="filtername" autocomplete="off" class="ac_input">
-		<input type="submit" class="button" value="{l s='Search'}">
-	</form>
-	<form method="post">
-		<div class="select-filter">
-			<label class="search-filter">{l s='Sort by'}:</label>
 
-				<select name="module_type" id="module_type_filter" {if $showTypeModules ne 'allModules' && $showTypeModules ne ''}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='Free Modules'}</option>
-					<option value="partnerModules" {if $showTypeModules eq 'partnerModules'}selected="selected"{/if}>{l s='Partner Modules (Free)'}</option>
-					<option value="mustHaveModules" {if $showTypeModules eq 'mustHaveModules'}selected="selected"{/if}>{l s='Must Have'}</option>
-					{if isset($logged_on_addons)}<option value="addonsModules" {if $showTypeModules eq 'addonsModules'}selected="selected"{/if}>{l s='Modules purchased on Addons'}</option>{/if}
-					<optgroup label="{l s='Authors'}">
-						{foreach from=$list_modules_authors key=module_author item=status}
-							<option value="authorModules[{$module_author}]" {if $status eq "selected"}selected{/if}>{$module_author|truncate:20:'...'}</option>
-						{/foreach}
-					</optgroup>
-					<option value="otherModules" {if $showTypeModules eq 'otherModules'}selected="selected"{/if}>{l s='Other Modules'}</option>
-				</select>
-				&nbsp;
-				<select name="module_install" id="module_install_filter" {if $showInstalledModules ne 'installedUninstalled' && $showInstalledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
-					<option value="installedUninstalled" {if $showInstalledModules eq 'installedUninstalled'}selected="selected"{/if}>{l s='Installed & Not Installed'}</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='Modules Not Installed '}</option>
-				</select>
-				&nbsp;
-				<select name="module_status" id="module_status_filter" {if $showEnabledModules ne 'enabledDisabled' && $showEnabledModules ne ''}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" {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>
-		</div>
-		<div class="button-filter">
-			<input type="submit" value="{l s='Reset'}" name="resetFilterModules" class="button" />
-			<input type="submit" value="{l s='Filter'}" id="filterModulesButton" name="filterModules" class="button" />
+
+<div class="well">
+	<form id="filternameForm" method="post" class="form-horizontal">
+		<div class="row">
+			<div class="input-group col-lg-4">
+				<input type="text" value="" name="filtername" autocomplete="off" class="ac_input">
+				<span class="input-group-btn">
+					<button class="btn btn-default" type="submit">
+						{l s='Search'}
+					</button>
+				</span>
+			</div>
 		</div>
 	</form>
+	<form method="post" class="form-inline">
+		<label>{l s='Sort by'}:</label>
+		<span>
+			<select class="filter fixed-width-XL" name="module_type" id="module_type_filter" {if $showTypeModules ne 'allModules' && $showTypeModules ne ''}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='Free Modules'}</option>
+				<option value="partnerModules" {if $showTypeModules eq 'partnerModules'}selected="selected"{/if}>{l s='Partner Modules (Free)'}</option>
+				<option value="mustHaveModules" {if $showTypeModules eq 'mustHaveModules'}selected="selected"{/if}>{l s='Must Have'}</option>
+				{if isset($logged_on_addons)}<option value="addonsModules" {if $showTypeModules eq 'addonsModules'}selected="selected"{/if}>{l s='Modules purchased on Addons'}</option>{/if}
+				<optgroup label="{l s='Authors'}">
+					{foreach from=$list_modules_authors key=module_author item=status}
+						<option value="authorModules[{$module_author}]" {if $status eq "selected"}selected{/if}>{$module_author|truncate:20:'...'}</option>
+					{/foreach}
+				</optgroup>
+				<option value="otherModules" {if $showTypeModules eq 'otherModules'}selected="selected"{/if}>{l s='Other Modules'}</option>
+			</select>
+		</span>
+		<span>
+			<select class="filter fixed-width-XL" name="module_install" id="module_install_filter" {if $showInstalledModules ne 'installedUninstalled' && $showInstalledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
+				<option value="installedUninstalled" {if $showInstalledModules eq 'installedUninstalled'}selected="selected"{/if}>{l s='Installed & Not Installed'}</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='Modules Not Installed '}</option>
+			</select>
+		</span>
+		<span>
+			<select class="filter fixed-width-XL" name="module_status" id="module_status_filter" {if $showEnabledModules ne 'enabledDisabled' && $showEnabledModules ne ''}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>
+		</span>
+		<span>
+			<select class="filter fixed-width-XL" 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>
+		</span>
+		<span class="pull-right">
+			<button class="btn btn-small" type="submit" name="resetFilterModules">
+				<i class="icon-eraser"></i>
+				{l s='Reset'} 
+			</button>
+			<button class="btn btn-default btn-small" name="filterModules" id="filterModulesButton" type="submit">
+				<i class="icon-filter"></i> 
+				{l s='Filter'}
+			</button>
+		</span>
+	</form>
 </div>
 <!--end filter module-->
diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index c457c4496..3df6c3eda 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -65,6 +65,7 @@ class AdminModulesControllerCore extends AdminController
 
 	public function __construct()
 	{
+		$this->bootstrap = true;
 		parent::__construct();
 
 		register_shutdown_function('displayFatalError');