diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl index 385de430a..34911b22d 100644 --- a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl @@ -46,11 +46,11 @@ - -{** - * Upload fancybox - *}
 
@@ -98,10 +51,7 @@
- -{** - * Import fieldset - *} +{* Import fieldset *}
@@ -109,13 +59,19 @@ {l s='Import'} -
- +
+
{if count($files_to_import)} {/if} @@ -126,7 +82,7 @@
- -
+
-
+
-
+

@@ -180,21 +136,21 @@

-
+
{l s='e.g. '}"1; Ipod; 129.90; 5"
-
+
{l s='e.g. '}"Ipod; red.jpg, blue.jpg, green.jpg; 129.90"
-
+

@@ -202,7 +158,7 @@

-
+

@@ -210,7 +166,14 @@

-
+
+ +
+ +
+
+ +
-
-
+
+ +
+ {if empty($files_to_import)} -
-

{l s='You must upload a file in order to proceed to the next step'}

-
+
{l s='You must upload a file in order to proceed to the next step'}
{/if} -
+

{l s='Note that the category import does not support categories of the same name.'}

{l s='Note that you can have several products with the same reference.'}

@@ -260,74 +223,88 @@ {$available_fields}

{l s='* Required field'}

- -
- diff --git a/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl index 618d1a819..a7c20b5d8 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl @@ -22,20 +22,52 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - {extends file="helpers/view/view.tpl"} - {block name="override_tpl"}

{l s='View your data'}

- {l s='Save and load your configuration for importing files'} :

- -
{l s='Save'}

+ {l s='Save and load your configuration for importing files'} :

+ + {l s='Save'}

{l s='lines'} + {if $fields_value.truncate} @@ -72,49 +101,8 @@ {if $fields_value.match_ref} {/if} - - - - + +
@@ -123,7 +111,7 @@
- + {section name=nb_i start=0 loop=$nb_table step=1} @@ -132,12 +120,10 @@ {/section} - +
-
-{/block} - +{/block} \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl index de96912a4..f163eda13 100755 --- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -168,7 +168,7 @@ {l s='Customer information'} - {$customer->firstname} {$customer->lastname} + {$gender->name|escape:'htmlall':'UTF-8'} {$customer->firstname} {$customer->lastname} ({l s='#'}{$customer->id}) ({$customer->email}) {if ($customer->isGuest())} @@ -216,8 +216,6 @@ {hook h="displayAdminOrder" id_order=$order->id} - -
{l s='Orders'} : {if $previousOrder} diff --git a/admin-dev/themes/default/template/controllers/products/informations.tpl b/admin-dev/themes/default/template/controllers/products/informations.tpl index 62f3d5b3e..277faea3b 100644 --- a/admin-dev/themes/default/template/controllers/products/informations.tpl +++ b/admin-dev/themes/default/template/controllers/products/informations.tpl @@ -200,7 +200,7 @@