Merge remote-tracking branch 'origin/development' into development

admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl

@@ -40,7 +40,7 @@
 					</td>
 					{foreach from=$ranges key=r item=range}
 						<td class="center">
-							<input name="fees[{$zone.id_zone|intval}][{$range.id_range|intval}]" type="text" 
+							<input name="fees[{$zone.id_zone|intval}][{$range.id_range|intval}]" type="text"
 							{if !isset($fields_value['zones'][$zone.id_zone]) || (isset($fields_value['zones'][$zone.id_zone]) && !$fields_value['zones'][$zone.id_zone])} disabled="disabled"{/if} {if isset($price_by_range[$range.id_range][$zone.id_zone]) && $price_by_range[$range.id_range][$zone.id_zone] && isset($fields_value['zones'][$zone.id_zone]) && $fields_value['zones'][$zone.id_zone]} value="{$price_by_range[$range.id_range][$zone.id_zone]|string_format:'%.6f'}" {else} value="" {/if} /> &nbsp; {$currency_sign}
 						</td>
 					{/foreach}
@@ -53,7 +53,7 @@
 						{if $smarty.foreach.ranges.first}
 							<td class="center">&nbsp;</td>
 						{else}
-							<td class="center"><button class="button">{l s='Delete'}</button</td>
+							<td class="center"><button class="button">{l s='Delete'}</button></td>
 						{/if}
 					{/foreach}
 				</tr>

classes/controller/Controller.php

@@ -334,12 +334,14 @@ abstract class ControllerCore
 			}
 		}
 		else
+		{
 			$plugin_path = Media::getJqueryPluginPath($name, $folder);
 
 		if(!empty($plugin_path['css']))
 			$this->addCSS($plugin_path['css']);
 		if(!empty($plugin_path['js']))
 			$this->addJS($plugin_path['js']);
+		}
 	}
 
 	/**

controllers/front/OrderDetailController.php

@@ -26,6 +26,8 @@
 
 class OrderDetailControllerCore extends FrontController
 {
+	public $php_self = 'order-detail';
+	
 	public $auth = true;
 	public $authRedirection = 'history';
 	public $ssl = true;

install-dev/langs/pl/install.php

@@ -82,7 +82,7 @@ return array(
 		'You must enter a database login' => 'Podaj login dla bazy danych',
 		'Tables prefix is invalid' => 'Prefiks tebeli jest niepoprawny ',
 		'Wrong engine chosen for MySQL' => 'Silnik dla MySQL jest niepoprawny',
-		'Cannot convert database data to utf-8' => 'Nie można przekonwertowąć bazy danych na utf-8',
+		'Cannot convert database data to utf-8' => 'Nie można przekonwertować bazy danych na utf-8',
 		'At least one table with same prefix was already found, please change your prefix or drop your database' => 'Co najmniej jedna tabela z tym samym prefiksem została znaleziona - proszę zmienić aktualny prefiks lub usunąć istniejące tabele.',
 		'Database Server is not found. Please verify the login, password and server fields' => 'Nie można połączyć się z serwerem bazy danych. Sprawdź swój login i hasło.',
 		'Connection to MySQL server succeeded, but database "%s" not found' => 'Połączenie do serwera MySQL odbyło się poprawnie lecz baza danych "%is" nie została znaleziona.',

js/retro-compat.js.php

@@ -3,7 +3,8 @@
 include('../config/config.inc.php');
 header('content-type: application/x-javascript');
 
-$plugins_folder = __DIR__.'/jquery/plugins/';
+$jquery_folder = dirname(__FILE__).'/jquery/';
+$plugins_folder = $jquery_folder.'plugins/';
 
 $plugins = array(
 				'ajaxfileupload.js' => 
@@ -51,7 +52,7 @@ $plugins = array(
 				'jquery.hoverIntent.minified.js' => 
 					array('new_file' => $plugins_folder.'jquery.hoverIntent.js', 'name' => 'hoverIntent'),
 				'jquery-ui-1.8.10.custom.min.js' =>
-					array('new_file' => __DIR__.'/jquery/jquery-ui.will.be.removed.in.1.6.js', 'name' => ''),
+					array('new_file' => $jquery_folder.'jquery-ui.will.be.removed.in.1.6.js', 'name' => ''),
 				'jquery.treeview.async.js' =>
 					array('new_file' => $plugins_folder.'treeview-categories/jquery.treeview-categories.async.js', 'name' => 'treeview-categories.async'),
 				'jquery.treeview.edit.js' =>