diff --git a/themes/default-bootstrap/css/global.css b/themes/default-bootstrap/css/global.css index c5766fe7a..62b6a02b4 100644 --- a/themes/default-bootstrap/css/global.css +++ b/themes/default-bootstrap/css/global.css @@ -228,37 +228,6 @@ span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large, border: none; } -/* input button */ -input.button_mini, input.button_small, input.button, input.button_large, -input.button_mini_disabled, input.button_small_disabled, input.button_disabled, input.button_large_disabled, -input.exclusive_mini, input.exclusive_small, input.exclusive, input.exclusive_large, -input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled { - /*padding-bottom: 2px*/ -} - -/* disabled button */ -input.button_mini_disabled, input.button_small_disabled, input.button_disabled, input.button_large_disabled, -input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled, -span.button_mini, span.button_small, span.button, span.button_large, -span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large, span.exclusive_large_disabled { - /*background-position: left -36px; - cursor: default; - color: #888!important*/ -} - -/* exclusive button */ -input.exclusive_mini, input.exclusive_small, input.exclusive, input.exclusive_large, -input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled, -a.exclusive_mini, a.exclusive_small, a.exclusive, a.exclusive_large, -span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large, span.exclusive_large_disabled { - /*color: white!important*/ -} - -/* exclusive disabled button */ -input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled, span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large { - /*color: #488c40!important*/ -} - /* hover button */ input.button_mini:hover, input.button_small:hover, input.button:hover, input.button_large:hover, input.exclusive_mini:hover, input.exclusive_small:hover, input.exclusive:hover, input.exclusive_large:hover, @@ -268,11 +237,6 @@ a.exclusive_mini:hover, a.exclusive_small:hover, a.exclusive:hover, a.exclusive_ background-position: left -50px; } -/* exclusive hover button */ -input.exclusive_mini:hover, input.exclusive_small:hover, input.exclusive:hover, input.exclusive_large:hover, a.exclusive_mini:hover, a.exclusive_small:hover, a.exclusive:hover, a.exclusive_large:hover { - /*color: white!important*/ -} - /* active button */ input.button_mini:active, input.button_small:active, input.button:active, input.button_large:active, input.exclusive_mini:active, input.exclusive_small:active, input.exclusive:active, input.exclusive_large:active, @@ -281,17 +245,6 @@ a.exclusive_mini:active, a.exclusive_small:active, a.exclusive:active, a.exclusi background-position: left -100px; } -/* classic buttons */ -input.button_mini, input.button_mini_disabled, input.exclusive_mini, input.exclusive_mini_disabled, a.button_mini, a.exclusive_mini, span.button_mini, span.exclusive_mini { - /*width: 30px; - background-image: url('../img/button-mini.png')*/ -} - -input.button_small, input.button_small_disabled, input.exclusive_small, input.exclusive_small_disabled, a.button_small, a.exclusive_small, span.button_small, span.exclusive_small { - /*width: 60px; - background-image: url('../img/button-small.png')*/ -} - input.button_disabled, input.exclusive_disabled, span.exclusive { border: 1px solid #ccc; color: #999; @@ -299,11 +252,6 @@ input.button_disabled, input.exclusive_disabled, span.exclusive { cursor: default; } -input.button_large, input.button_large_disabled, input.exclusive_large, input.exclusive_large_disabled, a.button_large, a.exclusive_large, span.button_large, span.exclusive_large, span.exclusive_large_disabled { - /*width: 180px; - background-image: url('../img/button-large.png')*/ -} - .btn.disabled, .btn[disabled]:hover { opacity: 0.3; } @@ -2972,14 +2920,6 @@ p.cheque-indent { #manufacturer .bottom-pagination-content, #manufacturer .top-pagination-content, #supplier .bottom-pagination-content, #supplier .top-pagination-content { min-height: 69px; } -#manufacturer .bottom-pagination-content #pagination .showall, #manufacturer .top-pagination-content #pagination .showall, #supplier .bottom-pagination-content #pagination .showall, #supplier .top-pagination-content #pagination .showall { - margin-right: 0; -} -@media (min-width: 1200px) { - #manufacturer .bottom-pagination-content #pagination .showall, #manufacturer .top-pagination-content #pagination .showall, #supplier .bottom-pagination-content #pagination .showall, #supplier .top-pagination-content #pagination .showall { - margin-right: 201px; - } -} #manufacturer .top-pagination-content.bottom-line, #supplier .top-pagination-content.bottom-line { border-bottom: 1px solid #d6d4d4; } diff --git a/themes/default-bootstrap/css/jquery/footable.core.css b/themes/default-bootstrap/css/jquery/footable.core.css index b5991721f..13d0471d2 100644 --- a/themes/default-bootstrap/css/jquery/footable.core.css +++ b/themes/default-bootstrap/css/jquery/footable.core.css @@ -59,3 +59,16 @@ .footable .footable-row-detail-value { display: table-cell; } +.footable .footable-sortable .footable-sort-indicator:after { + float: right; + margin: 0px 0px 0 0; + content: ""; + font-family: "FontAwesome"; + display: block; +} +.footable .footable-sortable.footable-sorted .footable-sort-indicator:after { + content: ""; +} +.footable .footable-sortable.footable-sorted-desc .footable-sort-indicator:after { + content: ""; +} diff --git a/themes/default-bootstrap/css/modules/tmhtmlcontent/views/css/hooks.css b/themes/default-bootstrap/css/modules/themeconfigurator/views/css/hooks.css similarity index 93% rename from themes/default-bootstrap/css/modules/tmhtmlcontent/views/css/hooks.css rename to themes/default-bootstrap/css/modules/themeconfigurator/views/css/hooks.css index e851709ae..164fdf309 100644 --- a/themes/default-bootstrap/css/modules/tmhtmlcontent/views/css/hooks.css +++ b/themes/default-bootstrap/css/modules/themeconfigurator/views/css/hooks.css @@ -20,11 +20,11 @@ min-width: 100%; } } -#htmlcontent_home ul li.htmlcontent-item-4 { +#htmlcontent_home ul li.htmlcontent-item-5 { width: 66.6667%; } @media (max-width: 479px) { - #htmlcontent_home ul li.htmlcontent-item-4 { + #htmlcontent_home ul li.htmlcontent-item-5 { width: 100%; } } diff --git a/themes/default-bootstrap/discount.tpl b/themes/default-bootstrap/discount.tpl index 8eab5219c..69ec11003 100644 --- a/themes/default-bootstrap/discount.tpl +++ b/themes/default-bootstrap/discount.tpl @@ -30,12 +30,12 @@ - - + + - + - + @@ -44,7 +44,7 @@ - + - - + {/foreach} diff --git a/themes/default-bootstrap/header.tpl b/themes/default-bootstrap/header.tpl index 0ac3eaa11..7017fce5a 100644 --- a/themes/default-bootstrap/header.tpl +++ b/themes/default-bootstrap/header.tpl @@ -88,6 +88,7 @@ + {$HOOK_HEADER} diff --git a/themes/default-bootstrap/history.tpl b/themes/default-bootstrap/history.tpl index 30a8ac5c0..c293cd4b0 100644 --- a/themes/default-bootstrap/history.tpl +++ b/themes/default-bootstrap/history.tpl @@ -36,13 +36,13 @@
{l s='Code'}{l s='Description'}{l s='Code'}{l s='Description'} {l s='Quantity'}{l s='Value'}*{l s='Value'}* {l s='Minimum'}{l s='Cumulative'}{l s='Cumulative'} {l s='Expiration date'}
{$discountDetail.code} {$discountDetail.name}{$discountDetail.quantity_for_user}{$discountDetail.quantity_for_user} {if $discountDetail.id_discount_type == 1} {$discountDetail.value|escape:'htmlall':'UTF-8'}% @@ -56,7 +56,7 @@ - {/if} + {if $discountDetail.minimal == 0} {l s='None'} {else} @@ -70,7 +70,7 @@ {l s='No'} {/if} {dateFormat date=$discountDetail.date_to}{dateFormat date=$discountDetail.date_to}
- + - + - - + + @@ -52,10 +52,10 @@ {if isset($order.invoice) && $order.invoice && isset($order.virtual) && $order.virtual}{l s='Products to download'}{/if} {Order::getUniqReferenceOf($order.id_order)} - - + + - +
{l s='Order reference'}{l s='Order reference'} {l s='Date'} {l s='Total price'}{l s='Payment'}{l s='Payment'} {l s='Status'}{l s='Invoice'} {l s='Invoice'} 
{dateFormat date=$order.date_add full=0}{displayPrice price=$order.total_paid currency=$order.id_currency no_utf8=false convert=false}{dateFormat date=$order.date_add full=0}{displayPrice price=$order.total_paid currency=$order.id_currency no_utf8=false convert=false} {$order.payment|escape:'htmlall':'UTF-8'}{if isset($order.order_state)}{$order.order_state|escape:'htmlall':'UTF-8'}{/if}{if isset($order.order_state)}{$order.order_state|escape:'htmlall':'UTF-8'}{/if} {if (isset($order.invoice) && $order.invoice && isset($order.invoice_number) && $order.invoice_number) && isset($invoiceAllowed) && $invoiceAllowed == true} {l s='PDF'} @@ -75,6 +75,21 @@ {/foreach}
+
 
{else}

{l s='You have not placed any orders.'}

diff --git a/themes/default-bootstrap/img/address_alias_full_width.gif b/themes/default-bootstrap/img/address_alias_full_width.gif deleted file mode 100644 index 60718e51e..000000000 Binary files a/themes/default-bootstrap/img/address_alias_full_width.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/address_alias_left.gif b/themes/default-bootstrap/img/address_alias_left.gif deleted file mode 100644 index df0d6399d..000000000 Binary files a/themes/default-bootstrap/img/address_alias_left.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/address_alias_right.gif b/themes/default-bootstrap/img/address_alias_right.gif deleted file mode 100644 index a0c0779cb..000000000 Binary files a/themes/default-bootstrap/img/address_alias_right.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/arrow_right_1.png b/themes/default-bootstrap/img/arrow_right_1.png deleted file mode 100644 index 7c3d29b62..000000000 Binary files a/themes/default-bootstrap/img/arrow_right_1.png and /dev/null differ diff --git a/themes/default-bootstrap/img/arrow_right_2.png b/themes/default-bootstrap/img/arrow_right_2.png deleted file mode 100644 index c970f18ef..000000000 Binary files a/themes/default-bootstrap/img/arrow_right_2.png and /dev/null differ diff --git a/themes/default-bootstrap/img/arrow_rotate_anticlockwise.png b/themes/default-bootstrap/img/arrow_rotate_anticlockwise.png deleted file mode 100644 index 46c75aa85..000000000 Binary files a/themes/default-bootstrap/img/arrow_rotate_anticlockwise.png and /dev/null differ diff --git a/themes/default-bootstrap/img/bg_404.png b/themes/default-bootstrap/img/bg_404.png deleted file mode 100644 index dfc910816..000000000 Binary files a/themes/default-bootstrap/img/bg_404.png and /dev/null differ diff --git a/themes/default-bootstrap/img/bg_account.jpg b/themes/default-bootstrap/img/bg_account.jpg deleted file mode 100644 index 5c1f1ff51..000000000 Binary files a/themes/default-bootstrap/img/bg_account.jpg and /dev/null differ diff --git a/themes/default-bootstrap/img/bg_address_title.png b/themes/default-bootstrap/img/bg_address_title.png deleted file mode 100644 index 1c79acaae..000000000 Binary files a/themes/default-bootstrap/img/bg_address_title.png and /dev/null differ diff --git a/themes/default-bootstrap/img/bg_bt_newsletter_ok.png b/themes/default-bootstrap/img/bg_bt_newsletter_ok.png deleted file mode 100644 index 1462a19d2..000000000 Binary files a/themes/default-bootstrap/img/bg_bt_newsletter_ok.png and /dev/null differ diff --git a/themes/default-bootstrap/img/bg_cart_voucher_submit.png b/themes/default-bootstrap/img/bg_cart_voucher_submit.png deleted file mode 100644 index 413dd4279..000000000 Binary files a/themes/default-bootstrap/img/bg_cart_voucher_submit.png and /dev/null differ diff --git a/themes/default-bootstrap/img/bg_discount_name.png b/themes/default-bootstrap/img/bg_discount_name.png deleted file mode 100644 index 4cade69d9..000000000 Binary files a/themes/default-bootstrap/img/bg_discount_name.png and /dev/null differ diff --git a/themes/default-bootstrap/img/bg_form_h3.png b/themes/default-bootstrap/img/bg_form_h3.png deleted file mode 100644 index e8e3561f1..000000000 Binary files a/themes/default-bootstrap/img/bg_form_h3.png and /dev/null differ diff --git a/themes/default-bootstrap/img/bg_gif.gif b/themes/default-bootstrap/img/bg_gif.gif deleted file mode 100644 index 7e2ffe5ec..000000000 Binary files a/themes/default-bootstrap/img/bg_gif.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/bg_li_idTabs.png b/themes/default-bootstrap/img/bg_li_idTabs.png deleted file mode 100644 index 04aa8b832..000000000 Binary files a/themes/default-bootstrap/img/bg_li_idTabs.png and /dev/null differ diff --git a/themes/default-bootstrap/img/bg_reduction.png b/themes/default-bootstrap/img/bg_reduction.png deleted file mode 100644 index 2a1cbd914..000000000 Binary files a/themes/default-bootstrap/img/bg_reduction.png and /dev/null differ diff --git a/themes/default-bootstrap/img/bg_search_input.png b/themes/default-bootstrap/img/bg_search_input.png deleted file mode 100644 index 92db89ad4..000000000 Binary files a/themes/default-bootstrap/img/bg_search_input.png and /dev/null differ diff --git a/themes/default-bootstrap/img/bg_search_submit.png b/themes/default-bootstrap/img/bg_search_submit.png deleted file mode 100644 index 4a44d039a..000000000 Binary files a/themes/default-bootstrap/img/bg_search_submit.png and /dev/null differ diff --git a/themes/default-bootstrap/img/block_bg.jpg b/themes/default-bootstrap/img/block_bg.jpg deleted file mode 100644 index 12d87c9d8..000000000 Binary files a/themes/default-bootstrap/img/block_bg.jpg and /dev/null differ diff --git a/themes/default-bootstrap/img/block_bg_myaccount.jpg b/themes/default-bootstrap/img/block_bg_myaccount.jpg deleted file mode 100644 index 5ec840993..000000000 Binary files a/themes/default-bootstrap/img/block_bg_myaccount.jpg and /dev/null differ diff --git a/themes/default-bootstrap/img/block_category_item_bg.jpg b/themes/default-bootstrap/img/block_category_item_bg.jpg deleted file mode 100644 index cd1d8bfb6..000000000 Binary files a/themes/default-bootstrap/img/block_category_item_bg.jpg and /dev/null differ diff --git a/themes/default-bootstrap/img/block_exclusive_bg.jpg b/themes/default-bootstrap/img/block_exclusive_bg.jpg deleted file mode 100644 index 0c2ee9f6d..000000000 Binary files a/themes/default-bootstrap/img/block_exclusive_bg.jpg and /dev/null differ diff --git a/themes/default-bootstrap/img/block_exclusive_footer.jpg b/themes/default-bootstrap/img/block_exclusive_footer.jpg deleted file mode 100644 index d6891ddd5..000000000 Binary files a/themes/default-bootstrap/img/block_exclusive_footer.jpg and /dev/null differ diff --git a/themes/default-bootstrap/img/block_footer.gif b/themes/default-bootstrap/img/block_footer.gif deleted file mode 100644 index 47c8de4ff..000000000 Binary files a/themes/default-bootstrap/img/block_footer.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/block_footer.png b/themes/default-bootstrap/img/block_footer.png deleted file mode 100644 index dc055ece1..000000000 Binary files a/themes/default-bootstrap/img/block_footer.png and /dev/null differ diff --git a/themes/default-bootstrap/img/block_footer_myaccount.jpg b/themes/default-bootstrap/img/block_footer_myaccount.jpg deleted file mode 100644 index 84df35ea9..000000000 Binary files a/themes/default-bootstrap/img/block_footer_myaccount.jpg and /dev/null differ diff --git a/themes/default-bootstrap/img/block_footer_page.gif b/themes/default-bootstrap/img/block_footer_page.gif deleted file mode 100644 index f0e8c1aef..000000000 Binary files a/themes/default-bootstrap/img/block_footer_page.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/block_footer_page_footer.png b/themes/default-bootstrap/img/block_footer_page_footer.png deleted file mode 100644 index 349400770..000000000 Binary files a/themes/default-bootstrap/img/block_footer_page_footer.png and /dev/null differ diff --git a/themes/default-bootstrap/img/block_header.gif b/themes/default-bootstrap/img/block_header.gif deleted file mode 100644 index 98a450a5b..000000000 Binary files a/themes/default-bootstrap/img/block_header.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/block_header.png b/themes/default-bootstrap/img/block_header.png deleted file mode 100644 index 3dbdc2c56..000000000 Binary files a/themes/default-bootstrap/img/block_header.png and /dev/null differ diff --git a/themes/default-bootstrap/img/block_header_exclusive.gif b/themes/default-bootstrap/img/block_header_exclusive.gif deleted file mode 100644 index da1bacdd4..000000000 Binary files a/themes/default-bootstrap/img/block_header_exclusive.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/block_header_exclusive.png b/themes/default-bootstrap/img/block_header_exclusive.png deleted file mode 100644 index c19ec41e7..000000000 Binary files a/themes/default-bootstrap/img/block_header_exclusive.png and /dev/null differ diff --git a/themes/default-bootstrap/img/block_header_exclusive_cart.gif b/themes/default-bootstrap/img/block_header_exclusive_cart.gif deleted file mode 100644 index 8315b8c31..000000000 Binary files a/themes/default-bootstrap/img/block_header_exclusive_cart.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/block_header_exclusive_cart.png b/themes/default-bootstrap/img/block_header_exclusive_cart.png deleted file mode 100644 index 26add9ea2..000000000 Binary files a/themes/default-bootstrap/img/block_header_exclusive_cart.png and /dev/null differ diff --git a/themes/default-bootstrap/img/block_header_large.gif b/themes/default-bootstrap/img/block_header_large.gif deleted file mode 100644 index cb40b7427..000000000 Binary files a/themes/default-bootstrap/img/block_header_large.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/block_header_large.png b/themes/default-bootstrap/img/block_header_large.png deleted file mode 100644 index b0d5701ea..000000000 Binary files a/themes/default-bootstrap/img/block_header_large.png and /dev/null differ diff --git a/themes/default-bootstrap/img/block_header_myaccount.jpg b/themes/default-bootstrap/img/block_header_myaccount.jpg deleted file mode 100644 index 9af1a82a2..000000000 Binary files a/themes/default-bootstrap/img/block_header_myaccount.jpg and /dev/null differ diff --git a/themes/default-bootstrap/img/block_languages_top_p_bg.png b/themes/default-bootstrap/img/block_languages_top_p_bg.png deleted file mode 100644 index 8f6d152a5..000000000 Binary files a/themes/default-bootstrap/img/block_languages_top_p_bg.png and /dev/null differ diff --git a/themes/default-bootstrap/img/block_myaccount_header_large.gif b/themes/default-bootstrap/img/block_myaccount_header_large.gif deleted file mode 100644 index 298636eac..000000000 Binary files a/themes/default-bootstrap/img/block_myaccount_header_large.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/block_search_bg.jpg b/themes/default-bootstrap/img/block_search_bg.jpg deleted file mode 100644 index b496335c7..000000000 Binary files a/themes/default-bootstrap/img/block_search_bg.jpg and /dev/null differ diff --git a/themes/default-bootstrap/img/bullet.gif b/themes/default-bootstrap/img/bullet.gif deleted file mode 100644 index e8aaa9e10..000000000 Binary files a/themes/default-bootstrap/img/bullet.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/bullet_alt.jpg b/themes/default-bootstrap/img/bullet_alt.jpg deleted file mode 100644 index 99fb424b1..000000000 Binary files a/themes/default-bootstrap/img/bullet_alt.jpg and /dev/null differ diff --git a/themes/default-bootstrap/img/bullet_myaccount.gif b/themes/default-bootstrap/img/bullet_myaccount.gif deleted file mode 100644 index e7f9e25e4..000000000 Binary files a/themes/default-bootstrap/img/bullet_myaccount.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/bullet_price.gif b/themes/default-bootstrap/img/bullet_price.gif deleted file mode 100644 index b4a0ef353..000000000 Binary files a/themes/default-bootstrap/img/bullet_price.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/button-account-large.gif b/themes/default-bootstrap/img/button-account-large.gif deleted file mode 100644 index ffb311741..000000000 Binary files a/themes/default-bootstrap/img/button-account-large.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/button-account-mini.gif b/themes/default-bootstrap/img/button-account-mini.gif deleted file mode 100644 index 97cc17325..000000000 Binary files a/themes/default-bootstrap/img/button-account-mini.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/button-account-small.gif b/themes/default-bootstrap/img/button-account-small.gif deleted file mode 100644 index aa6aa735f..000000000 Binary files a/themes/default-bootstrap/img/button-account-small.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/button-account.gif b/themes/default-bootstrap/img/button-account.gif deleted file mode 100644 index 8b4239486..000000000 Binary files a/themes/default-bootstrap/img/button-account.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/button-large.gif b/themes/default-bootstrap/img/button-large.gif deleted file mode 100644 index b1a2bcda0..000000000 Binary files a/themes/default-bootstrap/img/button-large.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/button-large.png b/themes/default-bootstrap/img/button-large.png deleted file mode 100644 index cdc6cb673..000000000 Binary files a/themes/default-bootstrap/img/button-large.png and /dev/null differ diff --git a/themes/default-bootstrap/img/button-large_exclusive.gif b/themes/default-bootstrap/img/button-large_exclusive.gif deleted file mode 100644 index ba5cc309c..000000000 Binary files a/themes/default-bootstrap/img/button-large_exclusive.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/button-medium.gif b/themes/default-bootstrap/img/button-medium.gif deleted file mode 100644 index cf429515f..000000000 Binary files a/themes/default-bootstrap/img/button-medium.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/button-medium.png b/themes/default-bootstrap/img/button-medium.png deleted file mode 100644 index 061df6085..000000000 Binary files a/themes/default-bootstrap/img/button-medium.png and /dev/null differ diff --git a/themes/default-bootstrap/img/button-medium_exclusive.gif b/themes/default-bootstrap/img/button-medium_exclusive.gif deleted file mode 100644 index ebe67091f..000000000 Binary files a/themes/default-bootstrap/img/button-medium_exclusive.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/button-medium_exclusive.png b/themes/default-bootstrap/img/button-medium_exclusive.png deleted file mode 100644 index 372681e1b..000000000 Binary files a/themes/default-bootstrap/img/button-medium_exclusive.png and /dev/null differ diff --git a/themes/default-bootstrap/img/button-mini.gif b/themes/default-bootstrap/img/button-mini.gif deleted file mode 100644 index 53cc95649..000000000 Binary files a/themes/default-bootstrap/img/button-mini.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/button-mini.png b/themes/default-bootstrap/img/button-mini.png deleted file mode 100644 index 8035b7f2a..000000000 Binary files a/themes/default-bootstrap/img/button-mini.png and /dev/null differ diff --git a/themes/default-bootstrap/img/button-mini_exclusive.gif b/themes/default-bootstrap/img/button-mini_exclusive.gif deleted file mode 100644 index e7988886f..000000000 Binary files a/themes/default-bootstrap/img/button-mini_exclusive.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/button-small.gif b/themes/default-bootstrap/img/button-small.gif deleted file mode 100644 index 998f601ca..000000000 Binary files a/themes/default-bootstrap/img/button-small.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/button-small.png b/themes/default-bootstrap/img/button-small.png deleted file mode 100644 index 16f58d0bb..000000000 Binary files a/themes/default-bootstrap/img/button-small.png and /dev/null differ diff --git a/themes/default-bootstrap/img/button-small_exclusive.gif b/themes/default-bootstrap/img/button-small_exclusive.gif deleted file mode 100644 index c56c23361..000000000 Binary files a/themes/default-bootstrap/img/button-small_exclusive.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/flag_new_bg.jpg b/themes/default-bootstrap/img/flag_new_bg.jpg deleted file mode 100644 index 7a5e68457..000000000 Binary files a/themes/default-bootstrap/img/flag_new_bg.jpg and /dev/null differ diff --git a/themes/default-bootstrap/img/footer_account.gif b/themes/default-bootstrap/img/footer_account.gif deleted file mode 100644 index f8126d010..000000000 Binary files a/themes/default-bootstrap/img/footer_account.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/form-input-bg.gif b/themes/default-bootstrap/img/form-input-bg.gif deleted file mode 100644 index 5aca1c724..000000000 Binary files a/themes/default-bootstrap/img/form-input-bg.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/form_bg.jpg b/themes/default-bootstrap/img/form_bg.jpg deleted file mode 100644 index 98085963a..000000000 Binary files a/themes/default-bootstrap/img/form_bg.jpg and /dev/null differ diff --git a/themes/default-bootstrap/img/header-bg.gif b/themes/default-bootstrap/img/header-bg.gif deleted file mode 100644 index 36bd2dd56..000000000 Binary files a/themes/default-bootstrap/img/header-bg.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/header_account.gif b/themes/default-bootstrap/img/header_account.gif deleted file mode 100644 index 082590bfc..000000000 Binary files a/themes/default-bootstrap/img/header_account.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/add.gif b/themes/default-bootstrap/img/icon/add.gif deleted file mode 100644 index df08c0b6b..000000000 Binary files a/themes/default-bootstrap/img/icon/add.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/addrbook.gif b/themes/default-bootstrap/img/icon/addrbook.gif deleted file mode 100644 index bc332c92c..000000000 Binary files a/themes/default-bootstrap/img/icon/addrbook.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/available.gif b/themes/default-bootstrap/img/icon/available.gif deleted file mode 100644 index 3f93c6a3f..000000000 Binary files a/themes/default-bootstrap/img/icon/available.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/bg_header_user_info_a.gif b/themes/default-bootstrap/img/icon/bg_header_user_info_a.gif deleted file mode 100644 index 5ded482f1..000000000 Binary files a/themes/default-bootstrap/img/icon/bg_header_user_info_a.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/cancel.gif b/themes/default-bootstrap/img/icon/cancel.gif deleted file mode 100644 index fc4c2ce83..000000000 Binary files a/themes/default-bootstrap/img/icon/cancel.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/cancel_11x13.gif b/themes/default-bootstrap/img/icon/cancel_11x13.gif deleted file mode 100644 index 12af567aa..000000000 Binary files a/themes/default-bootstrap/img/icon/cancel_11x13.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/cancel_16x18.gif b/themes/default-bootstrap/img/icon/cancel_16x18.gif deleted file mode 100644 index 64a59b287..000000000 Binary files a/themes/default-bootstrap/img/icon/cancel_16x18.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/cart.gif b/themes/default-bootstrap/img/icon/cart.gif deleted file mode 100644 index d9b4976bf..000000000 Binary files a/themes/default-bootstrap/img/icon/cart.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/contact.gif b/themes/default-bootstrap/img/icon/contact.gif deleted file mode 100644 index 72f1de6e6..000000000 Binary files a/themes/default-bootstrap/img/icon/contact.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/error.gif b/themes/default-bootstrap/img/icon/error.gif deleted file mode 100644 index 816705815..000000000 Binary files a/themes/default-bootstrap/img/icon/error.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/gift.gif b/themes/default-bootstrap/img/icon/gift.gif deleted file mode 100644 index d1908313f..000000000 Binary files a/themes/default-bootstrap/img/icon/gift.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/home.gif b/themes/default-bootstrap/img/icon/home.gif deleted file mode 100644 index 082621095..000000000 Binary files a/themes/default-bootstrap/img/icon/home.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/info.png b/themes/default-bootstrap/img/icon/info.png deleted file mode 100644 index 733ab319f..000000000 Binary files a/themes/default-bootstrap/img/icon/info.png and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/less.gif b/themes/default-bootstrap/img/icon/less.gif deleted file mode 100644 index 52928a267..000000000 Binary files a/themes/default-bootstrap/img/icon/less.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/login.gif b/themes/default-bootstrap/img/icon/login.gif deleted file mode 100644 index 5ded482f1..000000000 Binary files a/themes/default-bootstrap/img/icon/login.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/logo.gif b/themes/default-bootstrap/img/icon/logo.gif deleted file mode 100644 index 15471afd4..000000000 Binary files a/themes/default-bootstrap/img/icon/logo.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/logout.png b/themes/default-bootstrap/img/icon/logout.png deleted file mode 100644 index 9141841c7..000000000 Binary files a/themes/default-bootstrap/img/icon/logout.png and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/magnify.gif b/themes/default-bootstrap/img/icon/magnify.gif deleted file mode 100644 index 7bf707784..000000000 Binary files a/themes/default-bootstrap/img/icon/magnify.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/more.gif b/themes/default-bootstrap/img/icon/more.gif deleted file mode 100644 index 072e49dfd..000000000 Binary files a/themes/default-bootstrap/img/icon/more.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/my-account.gif b/themes/default-bootstrap/img/icon/my-account.gif deleted file mode 100644 index 537bb5994..000000000 Binary files a/themes/default-bootstrap/img/icon/my-account.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/newsletter.png b/themes/default-bootstrap/img/icon/newsletter.png deleted file mode 100644 index 2901122b8..000000000 Binary files a/themes/default-bootstrap/img/icon/newsletter.png and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/next.gif b/themes/default-bootstrap/img/icon/next.gif deleted file mode 100644 index a4e084641..000000000 Binary files a/themes/default-bootstrap/img/icon/next.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/no.gif b/themes/default-bootstrap/img/icon/no.gif deleted file mode 100644 index 3fdeb6365..000000000 Binary files a/themes/default-bootstrap/img/icon/no.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/order.gif b/themes/default-bootstrap/img/icon/order.gif deleted file mode 100644 index 42bc90940..000000000 Binary files a/themes/default-bootstrap/img/icon/order.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/pdf.gif b/themes/default-bootstrap/img/icon/pdf.gif deleted file mode 100644 index d5d9488f3..000000000 Binary files a/themes/default-bootstrap/img/icon/pdf.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/pict_add_cart.png b/themes/default-bootstrap/img/icon/pict_add_cart.png deleted file mode 100644 index 10f70f8ba..000000000 Binary files a/themes/default-bootstrap/img/icon/pict_add_cart.png and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/pict_add_wishlist.png b/themes/default-bootstrap/img/icon/pict_add_wishlist.png deleted file mode 100644 index 924368eac..000000000 Binary files a/themes/default-bootstrap/img/icon/pict_add_wishlist.png and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/picto_fb.png b/themes/default-bootstrap/img/icon/picto_fb.png deleted file mode 100644 index 30028f594..000000000 Binary files a/themes/default-bootstrap/img/icon/picto_fb.png and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/previous.gif b/themes/default-bootstrap/img/icon/previous.gif deleted file mode 100644 index aa59060c9..000000000 Binary files a/themes/default-bootstrap/img/icon/previous.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/print.gif b/themes/default-bootstrap/img/icon/print.gif deleted file mode 100644 index 20c449b17..000000000 Binary files a/themes/default-bootstrap/img/icon/print.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/recyclable.gif b/themes/default-bootstrap/img/icon/recyclable.gif deleted file mode 100644 index 1d5dcd2fd..000000000 Binary files a/themes/default-bootstrap/img/icon/recyclable.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/return.gif b/themes/default-bootstrap/img/icon/return.gif deleted file mode 100644 index 84cb65339..000000000 Binary files a/themes/default-bootstrap/img/icon/return.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/search.gif b/themes/default-bootstrap/img/icon/search.gif deleted file mode 100644 index e32a989f1..000000000 Binary files a/themes/default-bootstrap/img/icon/search.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/send_friend.gif b/themes/default-bootstrap/img/icon/send_friend.gif deleted file mode 100644 index 96ffb0783..000000000 Binary files a/themes/default-bootstrap/img/icon/send_friend.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/sitemap.gif b/themes/default-bootstrap/img/icon/sitemap.gif deleted file mode 100644 index 594afa56e..000000000 Binary files a/themes/default-bootstrap/img/icon/sitemap.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/slip.gif b/themes/default-bootstrap/img/icon/slip.gif deleted file mode 100644 index 13419123c..000000000 Binary files a/themes/default-bootstrap/img/icon/slip.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/sort_asc.gif b/themes/default-bootstrap/img/icon/sort_asc.gif deleted file mode 100644 index 67345103c..000000000 Binary files a/themes/default-bootstrap/img/icon/sort_asc.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/sort_asc_disabled.gif b/themes/default-bootstrap/img/icon/sort_asc_disabled.gif deleted file mode 100644 index c86a9a635..000000000 Binary files a/themes/default-bootstrap/img/icon/sort_asc_disabled.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/sort_asc_white.gif b/themes/default-bootstrap/img/icon/sort_asc_white.gif deleted file mode 100644 index 9768c8638..000000000 Binary files a/themes/default-bootstrap/img/icon/sort_asc_white.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/sort_asc_white.png b/themes/default-bootstrap/img/icon/sort_asc_white.png deleted file mode 100644 index d73f00a21..000000000 Binary files a/themes/default-bootstrap/img/icon/sort_asc_white.png and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/sort_desc.gif b/themes/default-bootstrap/img/icon/sort_desc.gif deleted file mode 100644 index f806d8534..000000000 Binary files a/themes/default-bootstrap/img/icon/sort_desc.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/sort_desc_disabled.gif b/themes/default-bootstrap/img/icon/sort_desc_disabled.gif deleted file mode 100644 index 6ddb4ab14..000000000 Binary files a/themes/default-bootstrap/img/icon/sort_desc_disabled.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/sort_desc_white.gif b/themes/default-bootstrap/img/icon/sort_desc_white.gif deleted file mode 100644 index 8c00b93e4..000000000 Binary files a/themes/default-bootstrap/img/icon/sort_desc_white.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/sort_desc_white.png b/themes/default-bootstrap/img/icon/sort_desc_white.png deleted file mode 100644 index 12b1a2a95..000000000 Binary files a/themes/default-bootstrap/img/icon/sort_desc_white.png and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/star.gif b/themes/default-bootstrap/img/icon/star.gif deleted file mode 100644 index 6d647b432..000000000 Binary files a/themes/default-bootstrap/img/icon/star.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/unavailable.gif b/themes/default-bootstrap/img/icon/unavailable.gif deleted file mode 100644 index 4356d4fd7..000000000 Binary files a/themes/default-bootstrap/img/icon/unavailable.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/update.gif b/themes/default-bootstrap/img/icon/update.gif deleted file mode 100644 index a2c05ee2c..000000000 Binary files a/themes/default-bootstrap/img/icon/update.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/voucher.gif b/themes/default-bootstrap/img/icon/voucher.gif deleted file mode 100644 index e8ce3b50e..000000000 Binary files a/themes/default-bootstrap/img/icon/voucher.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/yes.gif b/themes/default-bootstrap/img/icon/yes.gif deleted file mode 100644 index 7902938e9..000000000 Binary files a/themes/default-bootstrap/img/icon/yes.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/icon/zoom.png b/themes/default-bootstrap/img/icon/zoom.png deleted file mode 100644 index ca1631968..000000000 Binary files a/themes/default-bootstrap/img/icon/zoom.png and /dev/null differ diff --git a/themes/default-bootstrap/img/logo_paiement_mastercard.jpg b/themes/default-bootstrap/img/logo_paiement_mastercard.jpg deleted file mode 100644 index 6022d872f..000000000 Binary files a/themes/default-bootstrap/img/logo_paiement_mastercard.jpg and /dev/null differ diff --git a/themes/default-bootstrap/img/logo_paiement_paypal.jpg b/themes/default-bootstrap/img/logo_paiement_paypal.jpg deleted file mode 100644 index c94c46c0d..000000000 Binary files a/themes/default-bootstrap/img/logo_paiement_paypal.jpg and /dev/null differ diff --git a/themes/default-bootstrap/img/logo_paiement_visa.jpg b/themes/default-bootstrap/img/logo_paiement_visa.jpg deleted file mode 100644 index be8cc9ed2..000000000 Binary files a/themes/default-bootstrap/img/logo_paiement_visa.jpg and /dev/null differ diff --git a/themes/default-bootstrap/img/nav-logout.gif b/themes/default-bootstrap/img/nav-logout.gif deleted file mode 100644 index 1d7775de6..000000000 Binary files a/themes/default-bootstrap/img/nav-logout.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/onsale_en.gif b/themes/default-bootstrap/img/onsale_en.gif deleted file mode 100644 index 48bfa342d..000000000 Binary files a/themes/default-bootstrap/img/onsale_en.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/onsale_es.gif b/themes/default-bootstrap/img/onsale_es.gif deleted file mode 100644 index 787f007f2..000000000 Binary files a/themes/default-bootstrap/img/onsale_es.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/onsale_fr.gif b/themes/default-bootstrap/img/onsale_fr.gif deleted file mode 100644 index 38cd74237..000000000 Binary files a/themes/default-bootstrap/img/onsale_fr.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/pagination-bg-current.gif b/themes/default-bootstrap/img/pagination-bg-current.gif deleted file mode 100644 index 210590a20..000000000 Binary files a/themes/default-bootstrap/img/pagination-bg-current.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/pagination-next-border.gif b/themes/default-bootstrap/img/pagination-next-border.gif deleted file mode 100644 index 275f9ad30..000000000 Binary files a/themes/default-bootstrap/img/pagination-next-border.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/pagination-prev-border.gif b/themes/default-bootstrap/img/pagination-prev-border.gif deleted file mode 100644 index 903d7afa4..000000000 Binary files a/themes/default-bootstrap/img/pagination-prev-border.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/pagination-prevnext-bg.gif b/themes/default-bootstrap/img/pagination-prevnext-bg.gif deleted file mode 100644 index d14448458..000000000 Binary files a/themes/default-bootstrap/img/pagination-prevnext-bg.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/pagination_bg.gif b/themes/default-bootstrap/img/pagination_bg.gif deleted file mode 100644 index 824748ea4..000000000 Binary files a/themes/default-bootstrap/img/pagination_bg.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/payment-logo.png b/themes/default-bootstrap/img/payment-logo.png deleted file mode 100644 index fc09af124..000000000 Binary files a/themes/default-bootstrap/img/payment-logo.png and /dev/null differ diff --git a/themes/default-bootstrap/img/pict_cart_block_h4.png b/themes/default-bootstrap/img/pict_cart_block_h4.png deleted file mode 100644 index 333b9e8c7..000000000 Binary files a/themes/default-bootstrap/img/pict_cart_block_h4.png and /dev/null differ diff --git a/themes/default-bootstrap/img/product-buy-bg.gif b/themes/default-bootstrap/img/product-buy-bg.gif deleted file mode 100644 index 626fb3f63..000000000 Binary files a/themes/default-bootstrap/img/product-buy-bg.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/product-short-desc-bg.gif b/themes/default-bootstrap/img/product-short-desc-bg.gif deleted file mode 100644 index dda67ed0a..000000000 Binary files a/themes/default-bootstrap/img/product-short-desc-bg.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/sitemap-top.gif b/themes/default-bootstrap/img/sitemap-top.gif deleted file mode 100644 index 98a27e4a0..000000000 Binary files a/themes/default-bootstrap/img/sitemap-top.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/sitemap_long.gif b/themes/default-bootstrap/img/sitemap_long.gif deleted file mode 100644 index 61e090b6a..000000000 Binary files a/themes/default-bootstrap/img/sitemap_long.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/step_current.gif b/themes/default-bootstrap/img/step_current.gif deleted file mode 100644 index e3e38c4aa..000000000 Binary files a/themes/default-bootstrap/img/step_current.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/step_current_span.gif b/themes/default-bootstrap/img/step_current_span.gif deleted file mode 100644 index f6899864c..000000000 Binary files a/themes/default-bootstrap/img/step_current_span.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/step_done.gif b/themes/default-bootstrap/img/step_done.gif deleted file mode 100644 index 37d759dbc..000000000 Binary files a/themes/default-bootstrap/img/step_done.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/step_end.gif b/themes/default-bootstrap/img/step_end.gif deleted file mode 100644 index 25aa3307e..000000000 Binary files a/themes/default-bootstrap/img/step_end.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/step_end_current.gif b/themes/default-bootstrap/img/step_end_current.gif deleted file mode 100644 index 37d759dbc..000000000 Binary files a/themes/default-bootstrap/img/step_end_current.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/step_standard.gif b/themes/default-bootstrap/img/step_standard.gif deleted file mode 100644 index 25aa3307e..000000000 Binary files a/themes/default-bootstrap/img/step_standard.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/step_start.gif b/themes/default-bootstrap/img/step_start.gif deleted file mode 100644 index e595e199d..000000000 Binary files a/themes/default-bootstrap/img/step_start.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/tab_bg.jpg b/themes/default-bootstrap/img/tab_bg.jpg deleted file mode 100644 index 79f1e23ae..000000000 Binary files a/themes/default-bootstrap/img/tab_bg.jpg and /dev/null differ diff --git a/themes/default-bootstrap/img/tab_bg_selected.jpg b/themes/default-bootstrap/img/tab_bg_selected.jpg deleted file mode 100644 index 18610f21a..000000000 Binary files a/themes/default-bootstrap/img/tab_bg_selected.jpg and /dev/null differ diff --git a/themes/default-bootstrap/img/tab_bg_selected_short.jpg b/themes/default-bootstrap/img/tab_bg_selected_short.jpg deleted file mode 100644 index 914fe292b..000000000 Binary files a/themes/default-bootstrap/img/tab_bg_selected_short.jpg and /dev/null differ diff --git a/themes/default-bootstrap/img/tab_bg_short.jpg b/themes/default-bootstrap/img/tab_bg_short.jpg deleted file mode 100644 index b15dcddd3..000000000 Binary files a/themes/default-bootstrap/img/tab_bg_short.jpg and /dev/null differ diff --git a/themes/default-bootstrap/img/table_footer.gif b/themes/default-bootstrap/img/table_footer.gif deleted file mode 100644 index 01f1e34f4..000000000 Binary files a/themes/default-bootstrap/img/table_footer.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/table_header.gif b/themes/default-bootstrap/img/table_header.gif deleted file mode 100644 index 0c25ee4d7..000000000 Binary files a/themes/default-bootstrap/img/table_header.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/tail-1.png b/themes/default-bootstrap/img/tail-1.png deleted file mode 100644 index 8378afc41..000000000 Binary files a/themes/default-bootstrap/img/tail-1.png and /dev/null differ diff --git a/themes/default-bootstrap/img/thumbs_left.gif b/themes/default-bootstrap/img/thumbs_left.gif deleted file mode 100644 index ceb512b7e..000000000 Binary files a/themes/default-bootstrap/img/thumbs_left.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/thumbs_right.gif b/themes/default-bootstrap/img/thumbs_right.gif deleted file mode 100644 index 2e2c4822d..000000000 Binary files a/themes/default-bootstrap/img/thumbs_right.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/title_bg.gif b/themes/default-bootstrap/img/title_bg.gif deleted file mode 100644 index 44fd38e9a..000000000 Binary files a/themes/default-bootstrap/img/title_bg.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/title_bg.png b/themes/default-bootstrap/img/title_bg.png deleted file mode 100644 index 628588424..000000000 Binary files a/themes/default-bootstrap/img/title_bg.png and /dev/null differ diff --git a/themes/default-bootstrap/img/title_bg_large.gif b/themes/default-bootstrap/img/title_bg_large.gif deleted file mode 100644 index d06f6e6ba..000000000 Binary files a/themes/default-bootstrap/img/title_bg_large.gif and /dev/null differ diff --git a/themes/default-bootstrap/img/top-banner.gif b/themes/default-bootstrap/img/top-banner.gif deleted file mode 100644 index b1f57c7f6..000000000 Binary files a/themes/default-bootstrap/img/top-banner.gif and /dev/null differ diff --git a/themes/default-bootstrap/index.tpl b/themes/default-bootstrap/index.tpl index b8fc942b6..d8d6068bf 100644 --- a/themes/default-bootstrap/index.tpl +++ b/themes/default-bootstrap/index.tpl @@ -33,7 +33,7 @@ var max_item = "{l s='You cannot add more than %d product(s) to the product comparison' sprintf=$comparator_max_item js=1}"; var comparator_max_item = {$comparator_max_item}; var comparedProductsIds = []; - {foreach from=$compared_products item=product name=products}comparedProductsIds.push({$product.id_product});{/foreach}; + {foreach from=$compared_products key=k item=product}comparedProductsIds.push({$product});{/foreach} $('document').ready(function(){ blockHover(); if (typeof reloadProductComparison != 'undefined') diff --git a/themes/default-bootstrap/js/jquery/footable.sort.js b/themes/default-bootstrap/js/jquery/footable.sort.js new file mode 100644 index 000000000..40be2385f --- /dev/null +++ b/themes/default-bootstrap/js/jquery/footable.sort.js @@ -0,0 +1,188 @@ +(function ($, w, undefined) { + if (w.footable === undefined || w.footable === null) + throw new Error('Please check and make sure footable.js is included in the page and is loaded prior to this script.'); + + var defaults = { + sort: true, + sorters: { + alpha: function (a, b) { + if (a === b) return 0; + if (a < b) return -1; + return 1; + }, + numeric: function (a, b) { + return a - b; + } + }, + classes: { + sort: { + sortable: 'footable-sortable', + sorted: 'footable-sorted', + descending: 'footable-sorted-desc', + indicator: 'footable-sort-indicator' + } + }, + events: { + sort: { + sorting: 'footable_sorting', + sorted: 'footable_sorted' + } + } + }; + + function Sort() { + var p = this; + p.name = 'Footable Sortable'; + p.init = function (ft) { + p.footable = ft; + if (ft.options.sort === true) { + $(ft.table) + .unbind('.sorting') + .bind({ + 'footable_initialized.sorting': function (e) { + var $table = $(ft.table), + $tbody = $table.find('> tbody'), + cls = ft.options.classes.sort, + column, $th; + + if ($table.data('sort') === false) return; + + $table.find('> thead > tr:last-child > th, > thead > tr:last-child > td').each(function (ec) { + $th = $(this), column = ft.columns[$th.index()]; + if (column.sort.ignore !== true && !$th.hasClass(cls.sortable)) { + $th.addClass(cls.sortable); + $('').addClass(cls.indicator).appendTo($th); + } + }); + + $table.find('> thead > tr:last-child > th.' + cls.sortable + ', > thead > tr:last-child > td.' + cls.sortable).unbind('click.footable').bind('click.footable', function (ec) { + ec.preventDefault(); + $th = $(this); + var ascending = !$th.hasClass(cls.sorted); + p.doSort($th.index(), ascending); + return false; + }); + + var didSomeSorting = false; + for (var c in ft.columns) { + column = ft.columns[c]; + if (column.sort.initial) { + var ascending = (column.sort.initial !== 'descending'); + p.doSort(column.index, ascending); + break; + } + } + if (didSomeSorting) { + ft.bindToggleSelectors(); + } + }, + 'footable_redrawn.sorting': function(e) { + var $table = $(ft.table), + cls = ft.options.classes.sort; + if ($table.data('sorted') >= 0) { + $table.find('> thead > tr:last-child > th').each(function(i){ + var $th = $(this); + if ($th.hasClass(cls.sorted) || $th.hasClass(cls.descending)) { + p.doSort(i); + return; + } + }); + } + }, + 'footable_column_data.sorting': function (e) { + var $th = $(e.column.th); + e.column.data.sort = e.column.data.sort || {}; + e.column.data.sort.initial = $th.data('sort-initial') || false; + e.column.data.sort.ignore = $th.data('sort-ignore') || false; + e.column.data.sort.selector = $th.data('sort-selector') || null; + + var match = $th.data('sort-match') || 0; + if (match >= e.column.data.matches.length) match = 0; + e.column.data.sort.match = e.column.data.matches[match]; + } + }) + //save the sort object onto the table so we can access it later + .data('footable-sort', p); + } + }; + + p.doSort = function(columnIndex, ascending) { + var ft = p.footable; + if ($(ft.table).data('sort') === false) return; + + var $table = $(ft.table), + $tbody = $table.find('> tbody'), + column = ft.columns[columnIndex], + $th = $table.find('> thead > tr:last-child > th:eq(' + columnIndex + ')'), + cls = ft.options.classes.sort, + evt = ft.options.events.sort; + + ascending = (ascending === undefined) ? $th.hasClass(cls.sorted) : + (ascending === 'toggle') ? !$th.hasClass(cls.sorted) : ascending; + + if (column.sort.ignore === true) return true; + + //raise a pre-sorting event so that we can cancel the sorting if needed + var event = ft.raise(evt.sorting, { column: column, direction: ascending ? 'ASC' : 'DESC' }); + if (event && event.result === false) return; + + $table.data('sorted', column.index); + + $table.find('> thead > tr:last-child > th, > thead > tr:last-child > td').not($th).removeClass(cls.sorted + ' ' + cls.descending); + + if (ascending === undefined) { + ascending = $th.hasClass(cls.sorted); + } + + if (ascending) { + $th.removeClass(cls.descending).addClass(cls.sorted); + } else { + $th.removeClass(cls.sorted).addClass(cls.descending); + } + + p.sort(ft, $tbody, column, ascending); + + ft.bindToggleSelectors(); + ft.raise(evt.sorted, { column: column, direction: ascending ? 'ASC' : 'DESC' }); + }; + + p.rows = function (ft, tbody, column) { + var rows = []; + tbody.find('> tr').each(function () { + var $row = $(this), $next = null; + if ($row.hasClass(ft.options.classes.detail)) return true; + if ($row.next().hasClass(ft.options.classes.detail)) { + $next = $row.next().get(0); + } + var row = { 'row': $row, 'detail': $next }; + if (column !== undefined) { + row.value = ft.parse(this.cells[column.sort.match], column); + } + rows.push(row); + return true; + }).detach(); + return rows; + }; + + p.sort = function (ft, tbody, column, ascending) { + var rows = p.rows(ft, tbody, column); + var sorter = ft.options.sorters[column.type] || ft.options.sorters.alpha; + rows.sort(function (a, b) { + if (ascending) { + return sorter(a.value, b.value); + } else { + return sorter(b.value, a.value); + } + }); + for (var j = 0; j < rows.length; j++) { + tbody.append(rows[j].row); + if (rows[j].detail !== null) { + tbody.append(rows[j].detail); + } + } + }; + } + + w.footable.plugins.register(Sort, defaults); + +})(jQuery, window); \ No newline at end of file diff --git a/themes/default-bootstrap/lang/ru.php b/themes/default-bootstrap/lang/ru.php deleted file mode 100644 index 532a5bd9e..000000000 --- a/themes/default-bootstrap/lang/ru.php +++ /dev/null @@ -1,998 +0,0 @@ - - - -{/if} diff --git a/themes/default-bootstrap/modules/tmhtmlcontent/views/templates/hooks/home.tpl b/themes/default-bootstrap/modules/tmhtmlcontent/views/templates/hooks/home.tpl deleted file mode 100644 index 4aab7a35e..000000000 --- a/themes/default-bootstrap/modules/tmhtmlcontent/views/templates/hooks/home.tpl +++ /dev/null @@ -1,27 +0,0 @@ -{if isset($htmlitems.items) && $htmlitems.items} -
- -
-{/if} diff --git a/themes/default-bootstrap/modules/tmhtmlcontent/views/templates/hooks/left.tpl b/themes/default-bootstrap/modules/tmhtmlcontent/views/templates/hooks/left.tpl deleted file mode 100644 index afc5afbb6..000000000 --- a/themes/default-bootstrap/modules/tmhtmlcontent/views/templates/hooks/left.tpl +++ /dev/null @@ -1,27 +0,0 @@ -{if isset($htmlitems.items) && $htmlitems.items} -
- -
-{/if} \ No newline at end of file diff --git a/themes/default-bootstrap/modules/tmhtmlcontent/views/templates/hooks/right.tpl b/themes/default-bootstrap/modules/tmhtmlcontent/views/templates/hooks/right.tpl deleted file mode 100644 index 6fe8b6c57..000000000 --- a/themes/default-bootstrap/modules/tmhtmlcontent/views/templates/hooks/right.tpl +++ /dev/null @@ -1,27 +0,0 @@ -{if isset($htmlitems.items) && $htmlitems.items} -
- -
-{/if} \ No newline at end of file diff --git a/themes/default-bootstrap/modules/tmhtmlcontent/views/templates/hooks/top.tpl b/themes/default-bootstrap/modules/tmhtmlcontent/views/templates/hooks/top.tpl deleted file mode 100644 index 0f496f97f..000000000 --- a/themes/default-bootstrap/modules/tmhtmlcontent/views/templates/hooks/top.tpl +++ /dev/null @@ -1,29 +0,0 @@ -{if $page_name =='index'} - {if isset($htmlitems.items) && $htmlitems.items} -
- -
- {/if} -{/if} \ No newline at end of file diff --git a/themes/default-bootstrap/order-detail.tpl b/themes/default-bootstrap/order-detail.tpl index ab12ff73d..2e5bcebd4 100644 --- a/themes/default-bootstrap/order-detail.tpl +++ b/themes/default-bootstrap/order-detail.tpl @@ -355,19 +355,19 @@ {l s='Date'} - {l s='Carrier'} + {l s='Carrier'} {l s='Weight'} {l s='Shipping cost'} - {l s='Tracking number'} + {l s='Tracking number'} {foreach from=$order->getShipping() item=line} - {dateFormat date=$line.date_add full=0} + {dateFormat date=$line.date_add full=0} {$line.carrier_name} - {if $line.weight > 0}{$line.weight|string_format:"%.3f"} {Configuration::get('PS_WEIGHT_UNIT')}{else}-{/if} - {if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC}{displayPrice price=$line.shipping_cost_tax_incl currency=$currency->id}{else}{displayPrice price=$line.shipping_cost_tax_excl currency=$currency->id}{/if} + {if $line.weight > 0}{$line.weight|string_format:"%.3f"} {Configuration::get('PS_WEIGHT_UNIT')}{else}-{/if} + {if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC}{displayPrice price=$line.shipping_cost_tax_incl currency=$currency->id}{else}{displayPrice price=$line.shipping_cost_tax_excl currency=$currency->id}{/if} {if $line.tracking_number}{if $line.url && $line.tracking_number}{$line.tracking_number}{else}{$line.tracking_number}{/if}{else}-{/if} diff --git a/themes/default-bootstrap/order-follow.tpl b/themes/default-bootstrap/order-follow.tpl index 3471252c2..c2dc59d5b 100644 --- a/themes/default-bootstrap/order-follow.tpl +++ b/themes/default-bootstrap/order-follow.tpl @@ -59,11 +59,11 @@ - - + + - + @@ -71,8 +71,8 @@ - - + +
{l s='Return'}{l s='Order'}{l s='Return'}{l s='Order'} {l s='Package status'} {l s='Date issued'}{l s='Return slip'}{l s='Return slip'}
{l s='#'}{$return.id_order_return|string_format:"%06d"} {l s='#'}{$return.id_order|string_format:"%06d"}{$return.state_name|escape:'htmlall':'UTF-8'}{dateFormat date=$return.date_add full=0}{$return.state_name|escape:'htmlall':'UTF-8'}{dateFormat date=$return.date_add full=0} {if $return.state == 2} {l s='Print out'} diff --git a/themes/default-bootstrap/order-slip.tpl b/themes/default-bootstrap/order-slip.tpl index d0e6a417e..b1b8b39ac 100644 --- a/themes/default-bootstrap/order-slip.tpl +++ b/themes/default-bootstrap/order-slip.tpl @@ -32,10 +32,10 @@ - - + + - + @@ -43,7 +43,7 @@ - + @@ -56,7 +56,7 @@

{l s='You have not received any credit slips.'}

{/if} -
{l s='Credit slip'}{l s='Order'}{l s='Credit slip'}{l s='Order'} {l s='Date issued'}{l s='View credit slip'}{l s='View credit slip'}
{l s='#%s' sprintf=$slip.id_order_slip|string_format:"%06d"} {l s='#%s' sprintf=$slip.id_order|string_format:"%06d"}{dateFormat date=$slip.date_add full=0}{dateFormat date=$slip.date_add full=0} {l s='PDF'}