Merge branch 'release' into development

admin-dev/themes/default/template/controllers/modules/content.tpl

@@ -23,7 +23,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-
 {if isset($module_content)}
 	{$module_content}
 {else}

admin-dev/themes/default/template/controllers/modules/filters.tpl

@@ -25,36 +25,26 @@
 
 {if $add_permission eq '1'}
 	{if isset($logged_on_addons)}
-
 			<!--start addons login-->
 			<div class="filter-module" id="addons_login_div">
-		
 				<p>{l s='You are logged into PrestaShop Addons.'}</p>
-				
 				<div style="float:right">				
 					<label><img src="themes/default/img/module-profile.png" /> {l s='Welcome'} {$username_addons}</label>
 					<label>|</label>
 					<label><a href="#" id="addons_logout_button"><img src="themes/default/img/module-logout.png" /> {l s='Log out from PrestaShop Addons.'}</a></label>
 				</div>
-
 			</div>
 			<!--end addons login-->
-
 	{else}
-
 		{if $check_url_fopen eq 'ko'  OR $check_openssl eq 'ko'}
-			
 			<div class="warn">
 				<b>{l s='If you want to be able to fully use the AdminModules panel and have free modules available, you should enable the following configuration on your server:'}</b><br />
 				{if $check_url_fopen eq 'ko'}- {l s='Enable allow_url_fopen'}<br />{/if}
 				{if $check_openssl eq 'ko'}- {l s='Enable php openSSL extension'}<br />{/if}
 			</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='Login to Addons'} :</label> <input type="text" value="" id="username_addons" autocomplete="off" class="ac_input">
@@ -62,13 +52,11 @@
 					<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>
 			<!--end addons login-->
-
 		{/if}
-
 	{/if}
+	<div class="clear">&nbsp;</div>
 {/if}
 
 <!--start filter module-->
@@ -78,9 +66,7 @@
 		<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>
 
@@ -114,15 +100,11 @@
 					<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>
-
 	</form>
-
 </div>
 <!--end filter module-->

admin-dev/themes/default/template/controllers/modules/header.tpl

@@ -25,7 +25,6 @@
 
 <div class="toolbar-placeholder">
 	<div class="toolbarBox toolbarHead">
-	
 		<ul class="cc_button">
 			{if $add_permission eq '1'}
 			<li>
@@ -36,12 +35,9 @@
 			</li>
 			{/if}
 		</ul>
-
-
 		<div class="pageTitle">
 			<h3><span id="current_obj" style="font-weight: normal;"><span class="breadcrumb item-0">Module</span> : <span class="breadcrumb item-1">{l s='List of modules'}</span></span></h3>
 		</div>
-
 	</div>
 </div>
 

admin-dev/themes/default/template/controllers/modules/js.tpl

@@ -121,17 +121,11 @@
 						controller : "AdminModules",
 						action : "reloadModulesList"
 					},
- 						beforeSend: function(xhr)
+					beforeSend: function(xhr){
-						{
 						$('#moduleContainer').html('<img src="../img/loader.gif" alt="" border="0" />');
 					},
-						success : function(data)
+					success: function(data){
-						{
 						$('#moduleContainer').html(data);
-						},
-						error: function(res,textStatus,jqXHR)
-						{
-							//jAlert("TECHNICAL ERROR"+res);
 					}
 				});
 			}
@@ -153,15 +147,9 @@
 					controller : "AdminModules",
 					action : "refreshModuleList"
 				},
-				success : function(data)
+				success: function(data){
-				{
-					// res.status  = cache or refresh
 					if (data == '{"status":"refresh"}')
 						window.location.href = window.location.href;
-				},
-				error: function(res,textStatus,jqXHR)
-				{
-					//jAlert("TECHNICAL ERROR"+res);
 				}
 			});
 		}
@@ -186,13 +174,10 @@
 						username_addons : username_addons,
 						password_addons : password_addons
 					},
- 						beforeSend: function(xhr)
+					beforeSend: function(xhr){
-						{
 						$('#addons_loading').html('<img src="../img/loader.gif" alt="" border="0" />');
 					},
-						success : function(data)
+					success : function(data){
-						{
-							// res.status  = cache or refresh
 						if (data == 'OK')
 						{
 							$('#addons_loading').html('');
@@ -201,10 +186,6 @@
 						}
 						else
 							$('#addons_loading').html(errorLogin);
-						},
-						error: function(res,textStatus,jqXHR)
-						{
-							//jAlert("TECHNICAL ERROR"+res);
 					}
 				});
 			}
@@ -227,13 +208,10 @@
 						controller : "AdminModules",
 						action : "logOutAddonsWebservices"
 					},
- 						beforeSend: function(xhr)
+					beforeSend: function(xhr){
-						{
 						$('#addons_loading').html('<img src="../img/loader.gif" alt="" border="0" />');
 					},
-						success : function(data)
+					success: function(data) {
-						{
-							// res.status  = cache or refresh
 						if (data == 'OK')
 						{
 							$('#addons_loading').html('');
@@ -242,10 +220,6 @@
 						}
 						else
 							$('#addons_loading').html(errorLogin);
-						},
-						error: function(res,textStatus,jqXHR)
-						{
-							//jAlert("TECHNICAL ERROR"+res);
 					}
 				});
 			}
@@ -277,15 +251,9 @@
 						country_module_value : country_module_value,
 						filterModules : 'Filter'
 					},
-						success : function(data)
+					success : function(data){
-						{
-							// res.status  = cache or refresh
 						if (data == 'OK')
 							window.location.href = currentIndexWithToken;
-						},
-						error: function(res,textStatus,jqXHR)
-						{
-							//jAlert("TECHNICAL ERROR"+res);
 					}
 				});
 			}
@@ -297,7 +265,6 @@
 		$('#module_status_filter').change(function() { setFilter(); });
 		$('#country_module_value_filter').change(function() { setFilter(); });
 
-		
 		$('.moduleTabPreferencesChoise').change(function()
 		{			
 			var value_pref = $(this).val();
@@ -316,17 +283,10 @@
 					module_pref : module_pref,
 					value_pref : value_pref
 				},
-				success : function(data)
+				success : function(data){
-				{
-					// res.status  = cache or refresh
 					if (data == 'OK')
 						$('#r_' + module_pref).html(confirmPreferencesSaved);
-				},
-				error: function(res,textStatus,jqXHR)
-				{
-					//jAlert("TECHNICAL ERROR"+res);
 				}
-
 			});
 		});
 		
@@ -352,15 +312,9 @@
 						module_pref : module_pref,
 						value_pref : value_pref
 					},
-						success : function(data)
+					success : function(data){
-						{
-							// res.status  = cache or refresh
 						if (data == 'OK')
 							$('#r_' + module_pref).html(confirmPreferencesSaved);
-						},
-						error: function(res,textStatus,jqXHR)
-						{
-							//jAlert("TECHNICAL ERROR"+res);
 					}
 				});
 			}

admin-dev/themes/default/template/controllers/modules/list.tpl

@@ -24,13 +24,7 @@
 *}
 
 {if count($modules)}
-
 	<table cellspacing="0" cellpadding="0" style="width: 100%; margin-bottom:10px;" class="table" id="">
-					<col width="20px">
-					<col width="40px">
-					<col>
-					<col width="150px">
-					</colgroup>
 		<thead>
 			<tr class="nodrag nodrop">
 				<th class="center">
@@ -119,4 +113,3 @@
 {else}
 	<div style="margin-top: 12px;color: #585A69;font-size: 16px;"><p align="center">{l s='No modules available in this section.'}</p></div>
 {/if}
-

admin-dev/themes/default/template/controllers/modules/page.tpl

@@ -24,14 +24,12 @@
 *}
 
 <div id="productBox">
-
 	{include file='controllers/modules/header.tpl'}
 	{include file='controllers/modules/filters.tpl'}
 
 	<ul class="view-modules">
 		<li class="button normal-view-disabled"><img src="themes/default/img/modules_view_layout_sidebar.png" alt="{l s='Normal view'}" border="0" /><span>{l s='Normal view'}</span></li>
 		<li class="button favorites-view"><a  href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}&select=favorites"><img src="themes/default/img/modules_view_table_select_row.png" alt="{l s='Favorites view'}" border="0" /><span>{l s='Favorites view'}</span></a></li>
-	
 	</ul>
 
 	<div id="container">
@@ -58,10 +56,8 @@
 				</ul>
 			</div>
 		</div>
-
 		<div id="moduleContainer">
 			{include file='controllers/modules/list.tpl'}
 		</div>
 	</div>
-
 </div>

classes/Translate.php

@@ -51,6 +51,8 @@ class TranslateCore
 		if ($_LANGADM == null)
 		{
 			$iso = Context::getContext()->language->iso_code;
+			if (empty($iso))
+				$iso = Language::getIsoById((int)(Configuration::get('PS_LANG_DEFAULT')));			
 			include_once(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');
 		}
 

classes/module/Module.php

@@ -1164,10 +1164,10 @@ abstract class ModuleCore
 							$item->active = 0;
 							if (isset($modaddons->img))
 							{
-								if (!file_exists('../img/tmp/'.md5($modaddons->name).'.jpg'))
+								if (!file_exists(_PS_TMP_IMG_DIR_.md5($modaddons->name).'.jpg'))
-									if (!@copy($modaddons->img, '../img/tmp/'.md5($modaddons->name).'.jpg'))
+									if (!file_put_contents(_PS_TMP_IMG_DIR_.md5($modaddons->name).'.jpg', Tools::file_get_contents($modaddons->img)))
-										@copy('../img/404.gif', '../img/tmp/'.md5($modaddons->name).'.jpg');
+										copy(_PS_IMG_DIR_.'404.gif', _PS_TMP_IMG_DIR_.md5($modaddons->name).'.jpg');
-								if (file_exists('../img/tmp/'.md5($modaddons->name).'.jpg'))
+								if (file_exists(_PS_TMP_IMG_DIR_.md5($modaddons->name).'.jpg'))
 									$item->image = '../img/tmp/'.md5($modaddons->name).'.jpg';
 							}
 							if ($item->type == 'addonsMustHave')

controllers/admin/AdminModulesController.php

@@ -26,7 +26,6 @@
 
 class AdminModulesControllerCore extends AdminController
 {
-
 	/*
 	** @var array map with $_GET keywords and their callback
 	*/

install-dev/langs/br/install.php

@@ -5,11 +5,12 @@ return array(
 		'support' => 'http://support.prestashop.com/en/',
 	),
 	'translations' => array(
-		'menu_welcome' => 'Bem-vindo !',
+		'menu_welcome' => 'Escolha seu idioma',
+		'menu_license' => 'Acordo de licenciamento',
 		'menu_system' => 'Compatibilidade do Sistema',
 		'menu_database' => 'Configuração do Sistema',
-		'menu_configure' => 'Configuração da loja',
+		'menu_configure' => 'Informação da Loja',
-		'menu_process' => 'Instalação',
+		'menu_process' => 'Instalação da Loja',
 		'Choose the installer language:' => 'Escolha a língua para instalação :',
 		'Field required' => 'Campos requeridos',
 		'Invalid shop name' => 'Nome da loja inválido',

install-dev/langs/de/install.php

@@ -4,11 +4,12 @@ return array(
 		'phone' => '+33 (0)1.40.18.30.04',
 	),
 	'translations' => array(
-		'menu_welcome' => 'Willkommen!',
+		'menu_welcome' => 'Sprachauswahl',
+		'menu_license' => 'Annahme von Lizenzen',
 		'menu_system' => 'Systemkompatibilität',
-		'menu_database' => 'Datenbank Konfiguration',
+		'menu_database' => ' Systemkonfiguration',
-		'menu_configure' => 'Shop-Konfiguration',
+		'menu_configure' => 'Shopinstallation',
-		'menu_process' => 'Installation',
+		'menu_process' => 'Installation von Shop',
 		'Choose the installer language:' => 'Bitte wählen Sie Ihre Sprache',
 		'Field required' => 'Pflichtfeld',
 		'Invalid shop name' => 'Ungültiger Shopname',

install-dev/langs/es/install.php

@@ -4,11 +4,12 @@ return array(
 		'phone' => '+1 (888) 947-6543',
 	),
 	'translations' => array(
-		'menu_welcome' => '¡Bienvenido!',
+		'menu_welcome' => 'Elegir el idioma',
-		'menu_system' => 'Compatibilidad sistema',
+		'menu_license' => 'Aceptar las licencias',
-		'menu_database' => 'Configuración de base de datos',
+		'menu_system' => 'Compatibilidad del sistema',
-		'menu_configure' => 'Configuración de la tienda',
+		'menu_database' => 'Configuración del sistema',
-		'menu_process' => 'Instalación',
+		'menu_configure' => 'Información de la tienda',
+		'menu_process' => 'Instalación de la tienda',
 		'Choose the installer language:' => '',
 		'Field required' => 'Campos requeridos',
 		'Invalid shop name' => 'Nombre de la tienda no válido',

install-dev/langs/it/install.php

@@ -4,11 +4,12 @@ return array(
 		'phone' => '+33 (0)1.40.18.30.04',
 	),
 	'translations' => array(
-		'menu_welcome' => 'Benvenuto!',
+		'menu_welcome' => 'Scelta della lingua',
+		'menu_license' => 'Accettazione licenze',
 		'menu_system' => 'Compatibilità sistema',
-		'menu_database' => 'Database',
+		'menu_database' => 'Configurazione sistema',
-		'menu_configure' => 'Configurazione negozio',
+		'menu_configure' => 'Informazioni negozio',
-		'menu_process' => 'Installazione',
+		'menu_process' => 'Installazione del negozio',
 		'Choose the installer language:' => 'Scegli la lingua di installazione',
 		'Field required' => 'Campo richiesto',
 		'Invalid shop name' => 'nome negozio non valido',

themes/live_edit.tpl

@@ -28,7 +28,7 @@
 	{/if}
 	var lastMove = '';
 	var saveOK = '{l s='Module position saved' js=1}';
-	var confirmClose = '{l s='Are you sure? If you close this window, its position won\'t be saved'  js=1}';
+	var confirmClose = "{l s="Are you sure? If you close this window, its position won't be saved"  js=1}";
 	var close = '{l s='Close' js=1}';
 	var cancel = '{l s='Cancel' js=1}';
 	var confirm = '{l s='Confirm' js=1}';