diff --git a/admin-dev/themes/default/css/import/toggle-switch.css b/admin-dev/themes/default/css/import/toggle-switch.css new file mode 100755 index 000000000..a7da2f19e --- /dev/null +++ b/admin-dev/themes/default/css/import/toggle-switch.css @@ -0,0 +1,437 @@ +/* ------------------------------------------ +CSS TOGGLE SWITCHES (Ionuț Colceriu) +Licensed under Unlicense +https://github.com/ghinda/css-toggle-switch +------------------------------------------ */ + +/* Hide by default */ + +.switch .slide-button, +.toggle p span { + display: none; +} + +.switch { + width: 120px; + background-color: #eee; + border-radius: 4px; +} + +.switch label { + padding: 0 +} + +/* Toggle Switches */ + +/* We can't test for a specific feature, + * so we only target browsers with support for media queries. + */ +@media only screen { + + /* Checkbox + */ + .toggle { + position: relative; + padding: 0; + margin-left: 100px; + } + + /* Position the label over all the elements, except the slide-button + * Clicking anywhere on the label will change the switch-state + */ + .toggle label { + position: relative; + z-index: 3; + + display: block; + width: 100%; + } + + /* Don't hide the input from screen-readers and keyboard access + */ + .toggle input { + position: absolute; + opacity: 0; + z-index: 5; + } + + .toggle p { + position: absolute; + left: -100px; + + width: 100%; + margin: 0; + padding-right: 100px; + + text-align: left; + } + + .toggle p span { + position: absolute; + top: 0; + left: 0; + z-index: 5; + + display: block; + width: 50%; + margin-left: 100px; + + text-align: center; + } + + .toggle p span:last-child { + left: 50%; + } + + .toggle .slide-button { + position: absolute; + right: 0; + top: 0; + z-index: 4; + + display: block; + width: 50%; + height: 100%; + padding: 0; + } + + /* Radio Switch + */ + .switch { + position: relative; + padding: 0; + } + + .switch input { + position: absolute; + opacity: 0; + } + + .switch label { + position: relative; + z-index: 2; + + float: left; + width: 50%; + height: 100%; + + margin: 0; + text-align: center; + } + + .switch .slide-button { + position: absolute; + top: 0; + left: 0; + padding: 0; + z-index: 1; + + width: 50%; + height: 100%; + } + + .switch input:last-of-type:checked ~ .slide-button { + left: 50%; + } + + /* Switch with 3 items */ + .switch.switch-three label, + .switch.switch-three .slide-button { + width: 33.3%; + } + + .switch.switch-three input:checked:nth-of-type(2) ~ .slide-button { + left: 33.3%; + } + + .switch.switch-three input:checked:last-of-type ~ .slide-button { + left: 66.6%; + } + + /* Switch with 4 items */ + .switch.switch-four label, + .switch.switch-four .slide-button { + width: 25%; + } + + .switch.switch-four input:checked:nth-of-type(2) ~ .slide-button { + left: 25%; + } + + .switch.switch-four input:checked:nth-of-type(3) ~ .slide-button { + left: 50%; + } + + .switch.switch-four input:checked:last-of-type ~ .slide-button { + left: 75%; + } + + /* Switch with 5 items */ + .switch.switch-five label, + .switch.switch-five .slide-button { + width: 20%; + } + + .switch.switch-five input:checked:nth-of-type(2) ~ .slide-button { + left: 20%; + } + + .switch.switch-five input:checked:nth-of-type(3) ~ .slide-button { + left: 40%; + } + + .switch.switch-five input:checked:nth-of-type(4) ~ .slide-button { + left: 60%; + } + + .switch.switch-five input:checked:last-of-type ~ .slide-button { + left: 80%; + } + + /* Shared */ + .toggle, + .switch { + display: block; + height: 30px; + } + + .switch *, + .toggle * { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + -o-box-sizing: border-box; + box-sizing: border-box; + } + + .switch .slide-button, + .toggle .slide-button { + display: block; + + -webkit-transition: all 0.3s ease-out; + -moz-transition: all 0.3s ease-out; + -ms-transition: all 0.3s ease-out; + -o-transition: all 0.3s ease-out; + transition: all 0.3s ease-out; + } + + .toggle label, + .toggle p, + .switch label { + line-height: 30px; + vertical-align: middle; + } + + .toggle input:checked ~ .slide-button { + right: 50%; + } + + /* Outline the toggles when the inputs are focused */ + .toggle input:focus ~ .slide-button, + .switch input:focus + label { + outline: 1px dotted #888; + } + + /* Bugfix for older Webkit, including mobile Webkit. Adapted from: + * http://css-tricks.com/webkit-sibling-bug/ + */ + .switch, .toggle { + -webkit-animation: bugfix infinite 1s; + } + + @-webkit-keyframes bugfix { from { position: relative; } to { position: relative; } } + + + /* Standalone Themes */ + + + /* Candy Theme + * Based on the "Sort Switches / Toggles (PSD)" by Ormal Clarck + * http://www.premiumpixels.com/freebies/sort-switches-toggles-psd/ + */ + + .candy { + background-color: #2d3035; + + color: #fff; + font-weight: bold; + text-align: center; + text-shadow: 1px 1px 1px #191b1e; + + border-radius: 3px; + + box-shadow: inset 0 2px 6px rgba(0, 0, 0, 0.3), 0 1px 0px rgba(255, 255, 255, 0.2); + } + + .candy input:checked + label { + color: #333; + text-shadow: 0 1px 0 rgba(255,255,255,0.5); + } + + .candy .slide-button { + border: 1px solid #333; + + background-color: #70c66b; + + background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0)); + background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0)); + background-image: -ms-linear-gradient(top, rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0)); + background-image: -o-linear-gradient(top, rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0)); + background-image: linear-gradient(top, rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0)); + + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2), inset 0 1px 1px rgba(255, 255, 255, 0.45); + + border-radius: 3px; + } + + .candy p { + color: #333; + + text-shadow: none; + } + + .candy span { + color: #fff; + } + + .candy.blue .slide-button { + background-color: #38a3d4; + } + + .candy.yellow .slide-button { + background-color: #f5e560; + } + + /* Android Theme + * Based on Holo + */ + + .android { + background-color: #b6b6b6; + + color: #fff; + } + + .android.toggle { + border: 2px solid #b6b6b6; + } + + .android.switch { + overflow: hidden; + } + + .android.switch .slide-button { + background-color: #279fca; + + -webkit-transform: skew(20deg) translateX(10px); + -moz-transform: skew(20deg) translateX(10px); + -ms-transform: skew(20deg) translateX(10px); + -o-transform: skew(20deg) translateX(10px); + transform: skew(20deg) translateX(10px); + } + + .android.toggle .slide-button { + border-radius: 2px; + + background-color: #848484; + } + + /* Selected ON toggle */ + .android.toggle input:first-of-type:checked ~ .slide-button { + background-color: #279fca; + } + + .android.switch input:first-of-type:checked ~ .slide-button { + -webkit-transform: skew(20deg) translateX(-10px); + -moz-transform: skew(20deg) translateX(-10px); + -ms-transform: skew(20deg) translateX(-10px); + -o-transform: skew(20deg) translateX(-10px); + transform: skew(20deg) translateX(-10px); + } + + .android p { + color: #333; + } + + .android span { + color: #fff; + } + + .android.switch, + .android span { + text-transform: uppercase; + } + + /* Fix Android/Holo Theme in firefox - force absolute position */ + .android.switch input { + top: 0; + left: 0; + } + + /* iOS Theme + * Similar to iOS but more accessible + */ + + .ios { + background: -webkit-linear-gradient(top, #cfcfcf, #efefef 50%, #f9f9f9 50%, #fefefe); + background: -moz-linear-gradient(top, #cfcfcf, #efefef 50%, #f9f9f9 50%, #fefefe); + background: -o-linear-gradient(top, #cfcfcf, #efefef 50%, #f9f9f9 50%, #fefefe); + background: -ms-linear-gradient(top, #cfcfcf, #efefef 50%, #f9f9f9 50%, #fefefe); + background: linear-gradient(top, #cfcfcf, #efefef 50%, #f9f9f9 50%, #fefefe); + + -webkit-box-shadow: inset 0 2px 2px #b6b6b6, inset 3px 0 3px #b6b6b6; + box-shadow: inset 0 2px 2px #b6b6b6, inset 3px 0 3px #b6b6b6; + + border: 1px solid #efefef; + border-radius: 3px; + + color: #7f7f7f; + font: bold 14px sans-serif; + text-align: center; + text-shadow: none; + } + + .ios.toggle .slide-button { + border: 1px solid #919191; + background: -webkit-linear-gradient(top, #cdcdcd, #fbfbfb); + background: -moz-linear-gradient(top, #cdcdcd, #fbfbfb); + background: -o-linear-gradient(top, #cdcdcd, #fbfbfb); + background: -ms-linear-gradient(top, #cdcdcd, #fbfbfb); + background: linear-gradient(top, #cdcdcd, #fbfbfb); + + border-radius: 3px; + + -webkit-box-shadow: inset 0 1px 0 #f0f0f0; + box-shadow: inset 0 1px 0 #f0f0f0; + } + + /* Selected ON toggle */ + .ios.toggle input:first-of-type:checked ~ p span:first-child, + .ios.switch input:checked + label { + color: #fff; + text-shadow: 0 -1px 0 #1b3b6f; + } + + .ios.toggle input:first-of-type:checked ~ .slide-button, + .ios.switch .slide-button { + background: -webkit-linear-gradient(top, #3672dc, #4085ec 50%, #4d8fef 50%, #76adfc); + background: -moz-linear-gradient(top, #3672dc, #4085ec 50%, #4d8fef 50%, #76adfc); + background: -o-linear-gradient(top, #3672dc, #4085ec 50%, #4d8fef 50%, #76adfc); + background: -ms-linear-gradient(top, #3672dc, #4085ec 50%, #4d8fef 50%, #76adfc); + background: linear-gradient(top, #3672dc, #4085ec 50%, #4d8fef 50%, #76adfc); + + border-radius: 3px; + border: 1px solid #1654b5; + + text-align: center; + color: #fff; + + font: bold 14px sans-serif; + text-shadow: 0 -1px 0 #1b3b6f; + } + + .ios.toggle p span { + color: #7f7f7f; + } + +} diff --git a/admin-dev/themes/default/css/ps-admin-bootstrap.css b/admin-dev/themes/default/css/ps-admin-bootstrap.css index 98de6fa87..20860e2e1 100644 --- a/admin-dev/themes/default/css/ps-admin-bootstrap.css +++ b/admin-dev/themes/default/css/ps-admin-bootstrap.css @@ -1,3 +1,4 @@ +@import url(import/toggle-switch.css); /* * Bootstrap v2.3.2 * @@ -5866,8 +5867,6 @@ body.fixed-top { .page-sidebar > ul > li.active > a { color: white; background-color: #2d94c9; } - .page-sidebar > ul > li.active > ul li a { - background-color: #d7e9f2; } .page-sidebar > ul > li > a { text-transform: uppercase; font-size: 12px; @@ -5889,22 +5888,27 @@ body.fixed-top { padding: 3px 5px 3px 20px; border: none; border-bottom: 1px solid #f6f6f6; } + .page-sidebar > ul > li ul li a:hover { + background-color: #d7e9f2; + text-decoration: none; } + .page-sidebar > ul > li ul li.active a { + background-color: #d7e9f2; } .page-sidebar > ul li:not(.active) ul { display: none; } .page-sidebar > ul li.expanded ul { display: block !important; } - -.page-sidebar > ul > li > ul.sub-menu { - display: none; - list-style: none; - clear: both; - margin: 8px 0px 8px 0px; } + .page-sidebar > ul > li > ul.sub-menu { + display: none; + list-style: none; + clear: both; + margin: 8px 0px 8px 0px; } .page-content { margin-left: 225px; margin-top: 0px; min-height: 860px; - padding-top: 20px; } + padding-top: 20px; + margin-bottom: 90px; } #footer { width: 100%; @@ -5937,57 +5941,55 @@ body.fixed-top { .table td.center, .table th.center { text-align: center; } -.icon-AdminCatalog { - background-color: #7a0928; +#menu .maintab > a [class^="icon-"], #menu .maintab > a [class*=" icon-"] { + font-size: 18px; + border-radius: 35px; + height: 30px; + width: 30px; color: white; - padding: 6px; } + display: inline-block; + text-align: center; + line-height: 30px; } + +label span.label-tooltip { + color: #647858; + text-decoration: none; + border-bottom: dashed 1px #647858; } + +label.required:before { + content: "*"; + color: red; + font-size: 14px; } + +.icon-AdminCatalog { + background-color: #7a0928; } .icon-AdminParentCustomer { - background-color: #c4004e; - color: white; - padding: 6px; } + background-color: #c4004e; } .icon-AdminParentLocalization { - background-color: #1c6dee; - color: white; - padding: 6px; } + background-color: #1c6dee; } .icon-AdminParentModules { - background-color: #00c337; - color: white; - padding: 6px; } + background-color: #00c337; } .icon-AdminParentOrders { - background-color: #004888; - color: white; - padding: 6px; } + background-color: #004888; } .icon-AdminParentPreferences { - background-color: #009a00; - color: white; - padding: 6px; } + background-color: #009a00; } .icon-AdminParentShipping { - background-color: #4ec3ff; - color: white; - padding: 6px; } + background-color: #4ec3ff; } .icon-AdminParentStats { - background-color: #00a5a6; - color: white; - padding: 6px; } + background-color: #00a5a6; } .icon-AdminPriceRule { - background-color: #7400af; - color: white; - padding: 6px; } + background-color: #7400af; } .icon-AdminTools { - background-color: #af0d3a; - color: white; - padding: 6px; } + background-color: #af0d3a; } .icon-AdminAdmin { - background-color: #1c6dee; - color: white; - padding: 6px; } + background-color: #1c6dee; } diff --git a/admin-dev/themes/default/sass/ps-admin-bootstrap.sass b/admin-dev/themes/default/sass/ps-admin-bootstrap.sass index 9beb3eabc..d535fa081 100755 --- a/admin-dev/themes/default/sass/ps-admin-bootstrap.sass +++ b/admin-dev/themes/default/sass/ps-admin-bootstrap.sass @@ -1,4 +1,5 @@ @import "bootstrap/bootstrap" +@import "import/toggle-switch.css" html, body height: 100% @@ -22,9 +23,6 @@ body.fixed-top > a color: white background-color: #2D94C9 - > ul li a - background-color: #D7E9F2 - > a text-transform: uppercase font-size: 12px @@ -47,16 +45,23 @@ body.fixed-top padding: 3px 5px 3px 20px border: none border-bottom: 1px solid #F6F6F6 + &:hover + background-color: #D7E9F2 + text-decoration: none + &.active + a + background-color: #D7E9F2 + li:not(.active) ul display: none li.expanded ul display: block !important -.page-sidebar > ul > li > ul.sub-menu - display: none - list-style: none - clear: both - margin: 8px 0px 8px 0px + > ul > li > ul.sub-menu + display: none + list-style: none + clear: both + margin: 8px 0px 8px 0px .page-content @@ -64,6 +69,7 @@ body.fixed-top margin-top: 0px min-height: 860px padding-top: 20px + margin-bottom: 90px #footer width: 100% @@ -98,70 +104,68 @@ body.fixed-top tr:hover background-color +#menu .maintab > a [class^="icon-"], #menu .maintab > a [class*=" icon-"] + font-size: 18px + border-radius: 35px + height: 30px + width: 30px + color: white + display: inline-block + text-align: center + line-height: 30px + +label span.label-tooltip + color: #647858 + text-decoration: none + border-bottom: dashed 1px #647858 + +label.required:before + content: '*' + color: red + font-size: 14px + + + .icon-AdminCatalog @extend .icon-book background-color: #7A0928 - color: white - padding: 6px .icon-AdminParentCustomer @extend .icon-group background-color: #C4004E - color: white - padding: 6px .icon-AdminParentLocalization @extend .icon-globe background-color: #1C6DEE - color: white - padding: 6px .icon-AdminParentModules @extend .icon-puzzle-piece background-color: #00C337 - color: white - padding: 6px .icon-AdminParentOrders @extend .icon-credit-card background-color: #004888 - color: white - padding: 6px .icon-AdminParentPreferences @extend .icon-wrench background-color: #009A00 - color: white - padding: 6px .icon-AdminParentShipping @extend .icon-truck background-color: #4EC3FF - color: white - padding: 6px .icon-AdminParentStats @extend .icon-bar-chart background-color: #00A5A6 - color: white - padding: 6px .icon-AdminPriceRule @extend .icon-tags background-color: #7400AF - color: white - padding: 6px .icon-AdminTools @extend .icon-cogs background-color: #AF0D3A - color: white - padding: 6px .icon-AdminAdmin @extend .icon-cog background-color: #1C6DEE - color: white - padding: 6px - - diff --git a/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl b/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl index 5fc644668..056e9b712 100644 --- a/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl +++ b/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl @@ -75,7 +75,7 @@
-
{l s='The Combinations Generator is a tool that allows you to easily create a series of combinations by selecting the related attributes. For example, if you\'re selling t-shirts in three different sizes and two different colors, the generator will create six combinations for you.'}
+
{l s='The Combinations Generator is a tool that allows you to easily create a series of combinations by selecting the related attributes. For example, if you\'re selling t-shirts in three different sizes and two different colors, the generator will create six combinations for you.'}

{l s='You\'re currently generating combinations for the following product:'} {$product_name|escape:'htmlall':'UTF-8'}

{l s='Step 1: On the left side, select the attributes you want to use (Hold down the "Ctrl" key on your keyboard and validate by clicking on "Add")'}

diff --git a/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl index 3f193b55a..f6c0b398f 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl @@ -122,6 +122,6 @@
- + \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl b/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl index dd873dd90..f1c55aeaa 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl @@ -1,9 +1,14 @@
- +
+ {foreach from=$languages item=language}
- - +
+ {/foreach} +
{foreach from=$languages item=language}
- *
{/foreach}
- {l s='This will be displayed in the cart summary, as well as on the invoice.'}
- -
- - {l s='For your eyes only. This will never be displayed to the customer.'} -
-
- -
- -
- - {l s='Click to generate random code'} - {l s='Caution! The rule will automatically be applied if you leave this field blank.'} -
-
- -
- -
- - - - {l s='If the voucher is not yet in the cart, it will be displayed in the cart summary.'} +
-
- -
- +
- - - - {l s='Only applicable if the voucher value is greater than the cart total.'}
- {l s='If you do not allow partial use, the voucher value will be lowered to the total order amount. If you allow partial use, however, a new voucher will be created with the remainder.'} - +
- + +
+ + {l s='Generate random code'} +
+
+ +
+ +
+ getFieldValue($currentObject, 'highlight')|intval}checked="checked"{/if}/> + + getFieldValue($currentObject, 'highlight')|intval}checked="checked"{/if} /> + + +
+
+ +
+ +
+ getFieldValue($currentObject, 'partial_use')|intval}checked="checked"{/if} /> + + getFieldValue($currentObject, 'partial_use')|intval}checked="checked"{/if} /> + + +
+
+ +
+
- {l s='Cart rules are applied by priority. A cart rule with a priority of "1" will be processed before a cart rule with a priority of "2".'}
-
- - +
+ getFieldValue($currentObject, 'active')|intval}checked="checked"{/if} /> + + getFieldValue($currentObject, 'active')|intval}checked="checked"{/if} /> + +
-
\ No newline at end of file +
+
\ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl index cfc2cf8df..f95c88e63 100644 --- a/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl @@ -32,7 +32,7 @@ {$fields_value.image}

{l s='File size'} {$fields_value.size}kb

{if $shared_category} -

{l s='If you delete this picture, it will be deleted in all of your shared shops!'}

+

{l s='If you delete this picture, it will be deleted in all of your shared shops!'}

{/if}
@@ -42,7 +42,7 @@ {/if} {/if} - {if !empty($input.hint)}{$input.hint} {/if} + {if !empty($input.hint)}{$input.hint} {/if} {else} {$smarty.block.parent} {/if} @@ -64,7 +64,7 @@ {block name="description"} {$smarty.block.parent} {if ($input.name == 'groupBox')} -

+

{$input.info_introduction}
{$input.unidentified}
{$input.guest}
diff --git a/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl index 60f8494ae..0dc19117c 100644 --- a/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl @@ -44,7 +44,7 @@ {if isset($delete_category) && $delete_category}

-
+

{if $need_delete_mode} {l s='Do you want to delete the products too?'} diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl index 39fec4f95..00f4f30b3 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl @@ -36,7 +36,7 @@ {block name=leadin} {if isset($delete_customer) && $delete_customer} -
+

{l s='How do you want to delete these customer(s)?'}

{l s='There are two ways of deleting a customer. Please choose your preferred method.'}

    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 acb52c2e8..ac15782bd 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 @@ -185,7 +185,7 @@ {l s='Caution: The discount applied to a category does not stack with the overall reduction but instead replaces it.'}
{$categoryTreeView} -
{l s='Only products that have this category as the default category will be affected.'}
+
{l s='Only products that have this category as the default category will be affected.'}
 
diff --git a/admin-dev/themes/default/template/controllers/images/content.tpl b/admin-dev/themes/default/template/controllers/images/content.tpl index 2e8e0ea65..9ad86cfb7 100644 --- a/admin-dev/themes/default/template/controllers/images/content.tpl +++ b/admin-dev/themes/default/template/controllers/images/content.tpl @@ -29,7 +29,7 @@

{l s='Regenerate thumbnails'}

{l s='Regenerates thumbnails for all existing images'}

-
+
{l s='Please be patient. This can take several minutes.'}
{l s='Be careful! Manually uploaded thumbnails will be erased and replaced by automatically generated thumbnails.'}
@@ -81,7 +81,7 @@ {l s='PrestaShop now uses a new storage system for product images. It offers better performance if your shop has a large number of products.'}

{if $safe_mode} -
+
{l s='PrestaShop has detected that your server configuration is not compatible with the new storage system (directive "safe_mode" is activated). You should therefore continue to use the existing system.'}
{else} @@ -91,7 +91,7 @@ {l s='You can choose to keep your images stored in the previous system. There\'s nothing wrong with that.'}
{l s='You can also decide to move your images to the new storage system. In this case, click on the "Move images" button below. Please be patient. This can take several minutes.'}

-
  +
  {l s='After moving all of your product images, set the "Use the legacy image filesystem" option above to "No" for best performance.'}
diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl index 7f270fa20..97673bf34 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl @@ -192,15 +192,15 @@ {if empty($files_to_import)}{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.'}

-