diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index 146e329ed..b2277df8a 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -3167,7 +3167,7 @@ a.link-social:hover { text-decoration: none; } .bootstrap .alert.alert-info:before, .bootstrap #carrier_wizard .alert-info.wizard_error:before { position: absolute; top: 0; left: 10px; display: block; min-height: 25px; min-width: 25px; font-family: FontAwesome; font-weight: normal; font-style: normal; font-size: 35px; text-decoration: inherit; -webkit-font-smoothing: antialiased; content: "\F05A"; } .bootstrap .overflow-y { max-height: 200px; margin-bottom: 15px; overflow-y: auto; } .bootstrap .table { border-collapse: separate; border-spacing: 0 2px 0 0; margin-bottom: 5px; } -.bootstrap .table thead > tr > th { border: none; font-weight: normal; vertical-align: top; border-bottom: solid 1px #8bc6e7; } +.bootstrap .table thead > tr > th { border: none; font-weight: normal; vertical-align: top; background: white; border-bottom: solid 1px #8bc6e7; } .bootstrap .table thead > tr > th span.title_box { color: black; font-size: 1.1em; font-weight: bold; display: block; word-wrap: nowrap; white-space: nowrap; } .bootstrap .table thead > tr > th span.title_box.active { font-weight: bold; } .bootstrap .table thead > tr > th span.title_box a { text-decoration: none; } @@ -3246,47 +3246,50 @@ a.link-social:hover { text-decoration: none; } .bootstrap .data_chart line { stroke: black; } .bootstrap .data_chart .area { fill: rgba(255, 255, 255, 0.3); stroke-width: 0; } .bootstrap .icon-big { font-size: 4em; color: #c5c5c5; } -.bootstrap .switch .slide-button, .bootstrap .toggle p span { display: none; } -.bootstrap .switch { background-color: #e9e9e9; border-radius: 3px; } -.bootstrap .switch label { padding: 0; cursor: pointer; } -@media only screen { .bootstrap .toggle { position: relative; padding: 0; margin-left: 100px; } - .bootstrap .toggle label { position: relative; z-index: 3; display: block; width: 100%; } - .bootstrap .toggle input { position: absolute; opacity: 0; z-index: 5; } - .bootstrap .toggle p { position: absolute; left: -100px; width: 100%; margin: 0; padding-right: 100px; text-align: left; } - .bootstrap .toggle p span { position: absolute; top: 0; left: 0; z-index: 5; display: block; width: 50%; margin-left: 100px; text-align: center; } - .bootstrap .toggle:last-child { left: 50%; } - .bootstrap .toggle .slide-button { position: absolute; right: 0; top: 0; z-index: 4; display: block; width: 50%; height: 100%; padding: 0; } - .bootstrap .switch { position: relative; padding: 0; } +.bootstrap .switch a, .bootstrap .switch-light span span { display: none; } +@media only screen { .bootstrap .switch-light { display: block; height: 26px; position: relative; overflow: visible; padding: 0; } + .bootstrap .switch-light * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } + .bootstrap .switch-light a { display: block; -webkit-transition: all 0.3s ease-out; transition: all 0.3s ease-out; } + .bootstrap .switch-light label, .bootstrap .switch-light > span { line-height: 26px; vertical-align: middle; } + .bootstrap .switch-light label { position: relative; z-index: 3; display: block; width: 100%; } + .bootstrap .switch-light input { position: absolute; opacity: 0; z-index: 5; } + .bootstrap .switch-light input:checked ~ a { left: 0%; } + .bootstrap .switch-light > span { position: absolute; left: 0; width: 100%; margin: 0; text-align: left; } + .bootstrap .switch-light > span span { position: absolute; top: 0; left: 0; z-index: 5; display: block; width: 50%; text-align: center; } + .bootstrap .switch-light > span span:last-child { left: 50%; } + .bootstrap .switch-light a { position: absolute; left: 50%; top: 0; z-index: 4; display: block; width: 50%; height: 100%; padding: 0; } + .bootstrap .switch { display: block; height: 26px; position: relative; padding: 0 !important; } + .bootstrap .switch * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } + .bootstrap .switch a { display: block; -webkit-transition: all 0.3s ease-out; transition: all 0.3s ease-out; } + .bootstrap .switch label, .bootstrap .switch > span { line-height: 26px; vertical-align: middle; } .bootstrap .switch input { position: absolute; opacity: 0; } .bootstrap .switch label { position: relative; z-index: 2; float: left; width: 50%; height: 100%; margin: 0; text-align: center; } - .bootstrap .switch .slide-button { position: absolute; top: 0; left: 0; padding: 0; z-index: 1; width: 50%; height: 100%; } - .bootstrap .switch input:last-of-type:checked ~ .slide-button { left: 50%; } - .bootstrap .switch.switch-three label, .bootstrap .switch.switch-three .slide-button { width: 33.3%; } - .bootstrap .switch.switch-three input:checked:nth-of-type(2) ~ .slide-button { left: 33.3%; } - .bootstrap .switch.switch-three input:checked:last-of-type ~ .slide-button { left: 66.6%; } - .bootstrap .switch.switch-four label, .bootstrap .switch.switch-four .slide-button { width: 25%; } - .bootstrap .switch.switch-four input:checked:nth-of-type(2) ~ .slide-button { left: 25%; } - .bootstrap .switch.switch-four input:checked:nth-of-type(3) ~ .slide-button { left: 50%; } - .bootstrap .switch.switch-four input:checked:last-of-type ~ .slide-button { left: 75%; } - .bootstrap .switch.switch-five label, .bootstrap .switch.switch-five .slide-button { width: 20%; } - .bootstrap .switch.switch-five input:checked:nth-of-type(2) ~ .slide-button { left: 20%; } - .bootstrap .switch.switch-five input:checked:nth-of-type(3) ~ .slide-button { left: 40%; } - .bootstrap .switch.switch-five input:checked:nth-of-type(4) ~ .slide-button { left: 60%; } - .bootstrap .switch.switch-five input:checked:last-of-type ~ .slide-button { left: 80%; } - .bootstrap .toggle, .bootstrap .switch { display: block; height: 27px; } - .bootstrap .switch *, .bootstrap .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; } - .bootstrap .switch .slide-button, .bootstrap .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; } - .bootstrap .toggle label, .bootstrap .toggle p, .bootstrap .switch label { line-height: 27px; vertical-align: middle; } - .bootstrap .toggle input:checked ~ .slide-button { right: 50%; } - .bootstrap .toggle input:focus ~ .slide-button, .bootstrap .switch input:focus + label { outline: 1px dotted #888888; } - .bootstrap .switch, .bootstrap .toggle { -webkit-animation: bugfix infinite 1s; } - .bootstrap .prestashop-switch { min-width: 150px; color: #999999; text-align: center; border-radius: 3px; -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 2px 5px 1px inset; box-shadow: rgba(0, 0, 0, 0.2) 0 2px 5px 1px inset; } - .bootstrap .prestashop-switch label { padding-top: 0 !important; font-weight: 500; } - .bootstrap .prestashop-switch input:checked + label { color: #333333 !important; text-shadow: rgba(255, 255, 255, 0.7) 1px 1px 0; } + .bootstrap .switch a { position: absolute; top: 0; left: 0; padding: 0; z-index: 1; width: 50%; height: 100%; } + .bootstrap .switch input:last-of-type:checked ~ a { left: 50%; } + .bootstrap .switch.switch-3 label, .bootstrap .switch.switch-3 a { width: 33.33333%; } + .bootstrap .switch.switch-3 input:checked:nth-of-type(2) ~ a { left: 33.33333%; } + .bootstrap .switch.switch-3 input:checked:last-of-type ~ a { left: 66.66667%; } + .bootstrap .switch.switch-4 label, .bootstrap .switch.switch-4 a { width: 25%; } + .bootstrap .switch.switch-4 input:checked:nth-of-type(2) ~ a { left: 25%; } + .bootstrap .switch.switch-4 input:checked:nth-of-type(3) ~ a { left: 50%; } + .bootstrap .switch.switch-4 input:checked:last-of-type ~ a { left: 75%; } + .bootstrap .switch.switch-5 label, .bootstrap .switch.switch-5 a { width: 20%; } + .bootstrap .switch.switch-5 input:checked:nth-of-type(2) ~ a { left: 20%; } + .bootstrap .switch.switch-5 input:checked:nth-of-type(3) ~ a { left: 40%; } + .bootstrap .switch.switch-5 input:checked:nth-of-type(4) ~ a { left: 60%; } + .bootstrap .switch.switch-5 input:checked:last-of-type ~ a { left: 80%; } + .bootstrap .prestashop-switch { min-width: 150px; background-color: #eeeeee; border-radius: 3px; color: #333333; text-align: center; font-weight: 400; -webkit-box-shadow: rgba(0, 0, 0, 0.15) 0 1px 3px 1px inset; box-shadow: rgba(0, 0, 0, 0.15) 0 1px 3px 1px inset; } + .bootstrap .prestashop-switch * { outline: 0 !important; } + .bootstrap .prestashop-switch label { text-transform: uppercase; color: #bbbbbb; font-weight: 400; cursor: pointer; -webkit-transition: color 0.2s ease-out; transition: color 0.2s ease-out; } + .bootstrap .prestashop-switch input:checked + label { color: #666666; } .bootstrap .prestashop-switch input:not(:checked) + label i { color: #999999 !important; } - .bootstrap .prestashop-switch .slide-button { position: relative; margin-right: 3px; color: white; } - .bootstrap .prestashop-switch p { color: #333333; } - .bootstrap .prestashop-switch span { color: white; } } + .bootstrap .prestashop-switch > span { color: #666666; text-transform: uppercase; cursor: pointer; } + .bootstrap .prestashop-switch.switch-light input:checked ~ a { border: solid 1px #5cb85c; background-color: #80c780; -webkit-box-shadow: #5cb85c 0 -1px 0 inset; box-shadow: #5cb85c 0 -1px 0 inset; } + .bootstrap .prestashop-switch.switch-light input:checked ~ span span:first-of-type { color: white; } + .bootstrap .prestashop-switch.switch-light input:checked ~ span span:last-of-type { color: #cccccc; } + .bootstrap .prestashop-switch.switch-light input ~ a { border: solid 1px #d9534f; background-color: #e27c79; -webkit-box-shadow: #d9534f 0 -1px 0 inset; box-shadow: #d9534f 0 -1px 0 inset; } + .bootstrap .prestashop-switch.switch-light input ~ span span:first-of-type { color: #cccccc; } + .bootstrap .prestashop-switch.switch-light input ~ span span:last-of-type { color: white; } } .bootstrap .page-head { width: 100%; height: 55px; padding: 0 10px 0 0; margin: 0; border-bottom: 4px solid #75a139; position: fixed; top: 36px; left: 0px; z-index: 499; background-color: #8fc04d; -webkit-box-shadow: rgba(0, 0, 0, 0.15) 0 7px 0; box-shadow: rgba(0, 0, 0, 0.15) 0 7px 0; } .bootstrap .page-head h2.page-title { padding: 0 0 0 260px; font-size: 18px; color: white; text-transform: uppercase; } @media (max-width: 768px) { .bootstrap .page-head h2.page-title { padding: 0 0 0 20px; } } diff --git a/admin-dev/themes/default/scss/admin-theme/_admin-switch.sass b/admin-dev/themes/default/scss/admin-theme/_admin-switch.sass index 73c75aa46..f0c8309b0 100755 --- a/admin-dev/themes/default/scss/admin-theme/_admin-switch.sass +++ b/admin-dev/themes/default/scss/admin-theme/_admin-switch.sass @@ -2,166 +2,161 @@ // Licensed under Unlicense // https://github.com/ghinda/css-toggle-switch -//Hide by default -.switch .slide-button, .toggle p span - display: none -.switch - background-color: #E9E9E9 - border-radius: 3px - label - padding: 0 - cursor: pointer -//Toggle Switches -//We can't test for a specific feature, so we only target browsers with support for media queries. -//Position the label over all the elements, except the slide-button -//Clicking anywhere on the label will change the switch-state -// Don't hide the input from screen-readers and keyboard access -@media only screen - // Checkbox - .toggle - position: relative - padding: 0 - margin-left: 100px - label - position: relative - z-index: 3 - display: block - width: 100% - input - position: absolute - opacity: 0 - z-index: 5 - p - position: absolute - left: -100px - width: 100% - margin: 0 - padding-right: 100px - text-align: left - p span - position: absolute - top: 0 - left: 0 - z-index: 5 - display: block - width: 50% - margin-left: 100px - text-align: center - &:last-child - left: 50% - .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 - input - position: absolute - opacity: 0 - label - position: relative - z-index: 2 - float: left - width: 50% - height: 100% - margin: 0 - text-align: center - .slide-button - position: absolute - top: 0 - left: 0 - padding: 0 - z-index: 1 - width: 50% - height: 100% - input:last-of-type:checked ~ .slide-button - left: 50% - // Switch with 3 items - &.switch-three label, &.switch-three .slide-button - width: 33.3% - &.switch-three input:checked:nth-of-type(2) ~ .slide-button - left: 33.3% - &.switch-three input:checked:last-of-type ~ .slide-button - left: 66.6% - // Switch with 4 items - &.switch-four label, &.switch-four .slide-button - width: 25% - &.switch-four input:checked:nth-of-type(2) ~ .slide-button - left: 25% - &.switch-four input:checked:nth-of-type(3) ~ .slide-button - left: 50% - &.switch-four input:checked:last-of-type ~ .slide-button - left: 75% - // Switch with 5 items - &.switch-five label, &.switch-five .slide-button - width: 20% - &.switch-five input:checked:nth-of-type(2) ~ .slide-button - left: 20% - &.switch-five input:checked:nth-of-type(3) ~ .slide-button - left: 40% - &.switch-five input:checked:nth-of-type(4) ~ .slide-button - left: 60% - &.switch-five input:checked:last-of-type ~ .slide-button - left: 80% - // Shared - .toggle, .switch +@mixin switch-shared() + display: block + height: 26px + * + @include box-sizing(border-box) + a display: block - height: $input-height-base - .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: $input-height-base + @include transition(all 0.3s ease-out) + label, + > span + line-height: 26px 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; } } - // Prestashop Theme +@mixin switch-light() + @include switch-shared() + position: relative + overflow: visible + padding: 0 + // Position the label over all the elements, except the slide-button () + // Clicking anywhere on the label will change the switch-state + label + position: relative + z-index: 3 + display: block + width: 100% + // Don't hide the input from screen-readers and keyboard access + input + position: absolute + opacity: 0 + z-index: 5 + &:checked ~ a + left: 0% + > span + position: absolute + left: 0 + width: 100% + margin: 0 + text-align: left + span + position: absolute + top: 0 + left: 0 + z-index: 5 + display: block + width: 50% + text-align: center + &:last-child + left: 50% + a + position: absolute + left: 50% + top: 0 + z-index: 4 + display: block + width: 50% + height: 100% + padding: 0 + + +// Radio Switch +@mixin switch-toggle() + @include switch-shared() + position: relative + // For callout panels in foundation + padding: 0 !important + input + position: absolute + opacity: 0 + label + position: relative + z-index: 2 + float: left + width: 50% + height: 100% + margin: 0 + text-align: center + a + position: absolute + top: 0 + left: 0 + padding: 0 + z-index: 1 + width: 50% + height: 100% + input:last-of-type:checked ~ a + left: 50% + //Generate styles for the multiple states + @for $i from 1 through 3 + $state: $i + 2 + $width: 100 / ($i + 2) + &.switch-#{$state} + label, + a + width: $width * 1% + @for $j from 2 through ($i + 1) + &.switch-#{$state} input:checked:nth-of-type(#{$j}) ~ a + left: $width * ($j - 1) * 1% + &.switch-#{$state} input:checked:last-of-type ~ a + left: 100 - $width * 1% + + +.switch a, +.switch-light span span + display: none + +@media only screen + .switch-light + @include switch-light() + + .switch + @include switch-toggle() + .prestashop-switch min-width: 150px - color: #999 - text-align: center + background-color: #eee border-radius: 3px - @include box-shadow(rgba(black,0.2) 0 2px 5px 1px inset) + color: #333 + text-align: center + font-weight: 400 + @include box-shadow(rgba(black,0.15) 0 1px 3px 1px inset) + * + outline: 0!important label - padding-top: 0!important - font-weight: 500 + text-transform: uppercase + color: #bbb + font-weight: 400 + cursor: pointer + @include transition(color 0.2s ease-out) input:checked + label - color: #333!important - @include text-shadow(rgba(white,0.7) 1px 1px 0) + color: #666 input:not(:checked) + label i color: #999!important - .slide-button - position: relative - margin-right: 3px - color: lighten($bg-content-color,50%) - p - color: #333 - span - color: #fff \ No newline at end of file + > span + color: #666 + text-transform: uppercase + cursor: pointer + &.switch-light input:checked + ~ a + border: solid 1px $brand-success + background-color: lighten($brand-success,10%) + @include box-shadow($brand-success 0 -1px 0 inset) + ~ span span + &:first-of-type + color: white + &:last-of-type + color: #ccc + &.switch-light input + ~ a + border: solid 1px $brand-danger + background-color: lighten($brand-danger,10%) + @include box-shadow($brand-danger 0 -1px 0 inset) + ~ span span + &:first-of-type + color: #ccc + &:last-of-type + color: white diff --git a/admin-dev/themes/default/scss/admin-theme/_admin-tables.sass b/admin-dev/themes/default/scss/admin-theme/_admin-tables.sass index 172a37dd2..1a412ae07 100644 --- a/admin-dev/themes/default/scss/admin-theme/_admin-tables.sass +++ b/admin-dev/themes/default/scss/admin-theme/_admin-tables.sass @@ -6,6 +6,7 @@ border: none font-weight: normal vertical-align: top + background: white border-bottom: solid 1px darken(#CAE5F4,15%) span.title_box color: black 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 d10943c4a..070a110d1 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl @@ -10,7 +10,7 @@ - + @@ -123,7 +123,7 @@ - + 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 6ce846465..9bb1bf040 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl @@ -73,7 +73,7 @@ getFieldValue($currentObject, 'highlight')|intval}checked="checked"{/if} /> - + @@ -92,7 +92,7 @@ getFieldValue($currentObject, 'partial_use')|intval}checked="checked"{/if} /> - + @@ -117,7 +117,7 @@ getFieldValue($currentObject, 'active')|intval}checked="checked"{/if} /> - + diff --git a/admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl index ddeec6ef9..bd93729fa 100644 --- a/admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl @@ -70,7 +70,7 @@ - + diff --git a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl index 90ab4b49f..dd7ff85a1 100644 --- a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl @@ -140,7 +140,7 @@ - + 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 a85972979..0af0a7b0d 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 @@ -189,7 +189,7 @@ - + @@ -204,7 +204,7 @@ - + diff --git a/admin-dev/themes/default/template/controllers/images/content.tpl b/admin-dev/themes/default/template/controllers/images/content.tpl index 0d549a2e3..d246f3036 100644 --- a/admin-dev/themes/default/template/controllers/images/content.tpl +++ b/admin-dev/themes/default/template/controllers/images/content.tpl @@ -113,7 +113,7 @@ - + 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 f060b857c..432c137ce 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 @@ -30,10 +30,9 @@ {/if} diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl index f5fead589..c6d1881b6 100644 --- a/admin-dev/themes/default/template/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/helpers/options/options.tpl @@ -72,7 +72,7 @@ - +
@@ -148,7 +148,7 @@ - +
diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php index 1372e1379..342cee783 100644 --- a/controllers/admin/AdminCartRulesController.php +++ b/controllers/admin/AdminCartRulesController.php @@ -35,7 +35,7 @@ class AdminCartRulesControllerCore extends AdminController $this->addRowAction('edit'); $this->addRowAction('delete'); - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); + $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'),'icon' => 'icon-trash', 'confirm' => $this->l('Delete selected items?'))); $this->fields_list = array( 'id_cart_rule' => array('title' => $this->l('ID'), 'align' => 'center', 'class' => 'fixed-width-xs'), diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index a78b13e07..65dc985b0 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -625,21 +625,20 @@ class AdminImportControllerCore extends AdminController protected function generateContentTable($current_table, $nb_column, $handle, $glue) { - $html = ' - '; + $html = ' + '; // Header for ($i = 0; $i < $nb_column; $i++) if (MAX_COLUMNS * (int)$current_table <= $i && (int)$i < MAX_COLUMNS * ((int)$current_table + 1)) - $html .= ''; - $html .= ''; + $html .= ''; AdminImportController::setLocale(); for ($current_line = 0; $current_line < 10 && $line = fgetcsv($handle, MAX_LINE_SIZE, $glue); $current_line++) @@ -647,13 +646,13 @@ class AdminImportControllerCore extends AdminController /* UTF-8 conversion */ if (Tools::getValue('convert')) $line = $this->utf8EncodeArray($line); - $html .= ''; + $html .= ''; foreach ($line as $nb_c => $column) if ((MAX_COLUMNS * (int)$current_table <= $nb_c) && ((int)$nb_c < MAX_COLUMNS * ((int)$current_table + 1))) $html .= ''; $html .= ''; } - $html .= ''; + $html .= ''; AdminImportController::rewindBomAware($handle); return $html; } @@ -783,13 +782,13 @@ class AdminImportControllerCore extends AdminController if ($k === 'no') continue; if ($k === 'price_tin') - $fields[$i - 1] = '
'.$this->available_fields[$keys[$i - 1]]['label'].' '.$this->l('or').' '.$field['label'].'
'; + $fields[$i - 1] = '
'.$this->available_fields[$keys[$i - 1]]['label'].' '.$this->l('or').' '.$field['label'].'
'; else { if (isset($field['help'])) $html = ' '; else - $html = ''; + $html = ''; $fields[] = '
'.$field['label'].$html.'
'; } ++$i; diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php index 87cc36a68..5bba0bbe3 100644 --- a/modules/blocklayered/blocklayered.php +++ b/modules/blocklayered/blocklayered.php @@ -920,7 +920,7 @@ class BlockLayered extends Module - + @@ -1033,7 +1033,7 @@ class BlockLayered extends Module - + @@ -2139,7 +2139,7 @@ class BlockLayered extends Module - + @@ -2159,7 +2159,7 @@ class BlockLayered extends Module - + @@ -2179,7 +2179,7 @@ class BlockLayered extends Module - + @@ -2205,7 +2205,7 @@ class BlockLayered extends Module - + @@ -2225,7 +2225,7 @@ class BlockLayered extends Module - + @@ -2245,7 +2245,7 @@ class BlockLayered extends Module - + @@ -2265,7 +2265,7 @@ class BlockLayered extends Module - + @@ -2285,7 +2285,7 @@ class BlockLayered extends Module - +