From 6fc12968b87ace6cbf88c0a1d787531f9b4e4972 Mon Sep 17 00:00:00 2001
From: Jerome Nadaud <jerome.nadaud@prestashop.com>
Date: Mon, 7 Oct 2013 12:03:37 +0200
Subject: [PATCH] // Fix missing module configuration bar #PSCSX-3

---
 .../controllers/modules/configuration_bar.tpl | 47 +++++++++++++++++++
 controllers/admin/AdminModulesController.php  | 27 ++++++-----
 2 files changed, 62 insertions(+), 12 deletions(-)
 create mode 100644 admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl

diff --git a/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl b/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl
new file mode 100644
index 000000000..e60e7b21f
--- /dev/null
+++ b/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl
@@ -0,0 +1,47 @@
+{*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<fieldset>
+	<h3><i class="icon-cogs"></i> {l s='Configuration'}</h3>
+	<div class="row">
+		<div class="input-group">
+			<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
+				{l s='Manage translations'}
+				<span class="caret"></span>
+			</button>
+			<ul class="dropdown-menu">
+				{foreach from=$module_languages item=language}
+				<li><a href="{$tradlink}{$language['iso_code']}#{$module_name}"><img src="{$theme_language_dir}{$language['id_lang']}.jpg" alt=""> {$language.name}</a></li>
+				{/foreach}
+			</ul>
+		</div>
+	</div>
+	{if isset($display_multishop_checkbox) && $display_multishop_checkbox}
+	<div class="row">
+		<input type="checkbox" name="activateModule" value="1"{if $module->active} checked="checked"{/if} 
+			onclick="location.href = '{$current_url}&enable='+(($(this).attr('checked')) ? 1 : 0)" />
+			{l s='Activate module for '}{$shop_context}
+	</div>
+	{/if}
+</fieldset>
\ No newline at end of file
diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index 187bcfe31..c7bb1feb5 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -700,32 +700,34 @@ class AdminModulesControllerCore extends AdminController
 							$hooklink = 'index.php?tab=AdminModulesPositions&token='.Tools::getAdminTokenLite('AdminModulesPositions').'&show_modules='.(int)$module->id;
 							$tradlink = 'index.php?tab=AdminTranslations&token='.Tools::getAdminTokenLite('AdminTranslations').'&type=modules&lang=';
 
-							$mlanguage = '';
-							foreach (Language::getLanguages(false) as $language)
-								$mlanguage .= '<a href="'.$tradlink.$language['iso_code'].'#'.$module->name.'" ><img src="'._THEME_LANG_DIR_.$language['id_lang'].'.jpg" alt="'.$language['iso_code'].'" title="'.$language['iso_code'].'" /></a>';
-
-
 							$this->context->smarty->assign(array(
 								'module_name' => $module->name,
 								'backlink' => $backlink,
 								'module_hooklink' => $hooklink,
-								'module_language' => $mlanguage
+								'tradlink' => $tradlink,
+								'module_languages' => Language::getLanguages(false),
+								'theme_language_dir' => _THEME_LANG_DIR_
 							));
 							
 							// Display checkbox in toolbar if multishop
 							if (Shop::isFeatureActive())
 							{
-								$activateOnclick = 'onclick="location.href = \''.$this->getCurrentUrl('enable').'&enable=\'+(($(this).attr(\'checked\')) ? 1 : 0)"';
-								$multishop = '<input type="checkbox" name="activateModule" value="1" '.(($module->active) ? 'checked="checked"' : '').' '.$activateOnclick.' /> '.$this->l('Activate module for').' ';
 								if (Shop::getContext() == Shop::CONTEXT_SHOP)
-									$toolbar .= 'shop <b>'.$this->context->shop->name.'</b>';
+									$shop_context = 'shop <strong>'.$this->context->shop->name.'</strong>';
 								elseif (Shop::getContext() == Shop::CONTEXT_GROUP)
 								{
 									$shop_group = new ShopGroup((int)Shop::getContextShopGroupID());
-									$multishop .= 'all shops of group shop <b>'.$shop_group->name.'</b>';
+									$shop_context = 'all shops of group shop <strong>'.$shop_group->name.'</strong>';
 								}
 								else
-									$multishop .= 'all shops';
+									$shop_context = 'all shops';
+
+								$this->context->smarty->assign(array(
+									'module' => $module,
+									'display_multishop_checkbox' => true,
+									'current_url' => $this->getCurrentUrl('enable'),
+									'shop_context' => $shop_context
+								));
 							}
 
 
@@ -736,7 +738,8 @@ class AdminModulesControllerCore extends AdminController
 							}
 							// Display module configuration
 							$header = $this->context->smarty->fetch('controllers/modules/configure.tpl');
-							$this->context->smarty->assign('module_content', $header.$echo );
+							$configuration_bar = $this->context->smarty->fetch('controllers/modules/configuration_bar.tpl');
+							$this->context->smarty->assign('module_content', $header.$configuration_bar.$echo );
 						}
 						elseif ($echo === true)
 						{