From 52803b40b99ee388686eadef46f5e19b70eff804 Mon Sep 17 00:00:00 2001 From: sLorenzini Date: Tue, 4 Dec 2012 15:27:43 +0100 Subject: [PATCH 1/6] // fixed FO bugs --- themes/default/best-sales.tpl | 26 +++++++++++++++++++------- themes/default/new-products.tpl | 24 ++++++++++++++++++------ themes/default/prices-drop.tpl | 24 ++++++++++++++++++------ 3 files changed, 55 insertions(+), 19 deletions(-) diff --git a/themes/default/best-sales.tpl b/themes/default/best-sales.tpl index c732ad25e..08895bb52 100644 --- a/themes/default/best-sales.tpl +++ b/themes/default/best-sales.tpl @@ -29,13 +29,25 @@

{l s='Top sellers'}

{if $products} -
- {include file="$tpl_dir./product-sort.tpl"} +
+ {include file="$tpl_dir./pagination.tpl"} + +
+ {include file="./product-sort.tpl"} + {include file="./product-compare.tpl"} + {include file="./nbr-product-page.tpl"} +
- {include file="./product-compare.tpl"} - {include file="$tpl_dir./product-list.tpl" products=$products} - {include file="$tpl_dir./pagination.tpl"} - {include file="./product-compare.tpl"} -{else} + + {include file="./product-list.tpl" products=$products} + +
+
+ {include file="./product-sort.tpl"} {include file="./product-compare.tpl"} {include file="./nbr-product-page.tpl"} + +
+ {include file="./pagination.tpl"} +
+ {else}

{l s='No top sellers.'}

{/if} diff --git a/themes/default/new-products.tpl b/themes/default/new-products.tpl index 0802317f4..ed98eba7a 100644 --- a/themes/default/new-products.tpl +++ b/themes/default/new-products.tpl @@ -29,13 +29,25 @@

{l s='New products'}

{if $products} -
- {include file="./product-sort.tpl"} +
+ {include file="$tpl_dir./pagination.tpl"} + +
+ {include file="./product-sort.tpl"} + {include file="./product-compare.tpl"} + {include file="./nbr-product-page.tpl"} +
- {include file="./product-compare.tpl"} + {include file="./product-list.tpl" products=$products} - {include file="./pagination.tpl"} - {include file="./product-compare.tpl"} -{else} + +
+
+ {include file="./product-sort.tpl"} {include file="./product-compare.tpl"} {include file="./nbr-product-page.tpl"} + +
+ {include file="./pagination.tpl"} +
+ {else}

{l s='No new products.'}

{/if} diff --git a/themes/default/prices-drop.tpl b/themes/default/prices-drop.tpl index 1fe7359b1..f730dac34 100644 --- a/themes/default/prices-drop.tpl +++ b/themes/default/prices-drop.tpl @@ -29,13 +29,25 @@

{l s='Price drop'}

{if $products} -
- {include file="./product-sort.tpl"} +
+ {include file="$tpl_dir./pagination.tpl"} + +
+ {include file="./product-sort.tpl"} + {include file="./product-compare.tpl"} + {include file="./nbr-product-page.tpl"} +
- {include file="./product-compare.tpl"} + {include file="./product-list.tpl" products=$products} - {include file="./pagination.tpl"} - {include file="./product-compare.tpl"} -{else} + +
+
+ {include file="./product-sort.tpl"} {include file="./product-compare.tpl"} {include file="./nbr-product-page.tpl"} + +
+ {include file="./pagination.tpl"} +
+ {else}

{l s='No price drop.'}

{/if} From 31efb947abcde64890305df62bcc63c0c67a5672 Mon Sep 17 00:00:00 2001 From: Sarah Lorenzini Date: Tue, 4 Dec 2012 17:15:49 +0100 Subject: [PATCH 2/6] // change h4, h5 --- modules/bankwire/config.xml | 6 ++--- modules/blockadvertising/config.xml | 4 +-- .../blockbestsellers-home.tpl | 4 +-- modules/blockbestsellers/blockbestsellers.tpl | 2 +- modules/blockbestsellers/config.xml | 4 +-- modules/blockcart/blockcart.css | 4 +-- modules/blockcart/blockcart.tpl | 4 +-- modules/blockcart/config.xml | 4 +-- modules/blockcategories/blockcategories.tpl | 2 +- .../blockcategories_footer.tpl | 2 +- modules/blockcategories/config.xml | 4 +-- modules/blockcms/blockcms.tpl | 4 +-- modules/blockcontact/blockcontact.tpl | 2 +- modules/blockcontact/config.xml | 4 +-- .../blockcontactinfos/blockcontactinfos.tpl | 2 +- modules/blockcontactinfos/config.xml | 4 +-- modules/blockcurrencies/config.xml | 4 +-- modules/blockcustomerprivacy/config.xml | 4 +-- modules/blocklanguages/config.xml | 4 +-- modules/blocklayered/blocklayered.tpl | 2 +- modules/blocklayered/config.xml | 4 +-- modules/blocklink/blocklink.tpl | 4 +-- modules/blocklink/config.xml | 6 ++--- .../blockmanufacturer/blockmanufacturer.tpl | 2 +- modules/blockmanufacturer/config.xml | 4 +-- modules/blockmyaccount/blockmyaccount.tpl | 2 +- modules/blockmyaccount/config.xml | 4 +-- .../blockmyaccountfooter/blockmyaccount.css | 4 +-- .../blockmyaccountfooter.tpl | 2 +- modules/blockmyaccountfooter/config.xml | 4 +-- modules/blocknewproducts/blocknewproducts.tpl | 2 +- modules/blocknewproducts/config.xml | 4 +-- modules/blocknewsletter/blocknewsletter.css | 2 +- modules/blocknewsletter/config.xml | 6 ++--- .../views/templates/hook/blocknewsletter.tpl | 2 +- modules/blockpaymentlogo/config.xml | 4 +-- modules/blockpermanentlinks/config.xml | 4 +-- modules/blockreinsurance/config.xml | 4 +-- modules/blockrss/blockrss.tpl | 2 +- modules/blockrss/config.xml | 4 +-- modules/blocksearch/blocksearch.tpl | 2 +- modules/blocksearch/config.xml | 4 +-- modules/blocksharefb/config.xml | 4 +-- modules/blocksocial/blocksocial.tpl | 2 +- modules/blocksocial/config.xml | 4 +-- modules/blockspecials/blockspecials.css | 5 ++-- modules/blockspecials/blockspecials.tpl | 4 +-- modules/blockspecials/config.xml | 4 +-- modules/blockstore/blockstore.tpl | 2 +- modules/blockstore/config.xml | 4 +-- modules/blocksupplier/blocksupplier.tpl | 2 +- modules/blocksupplier/config.xml | 4 +-- modules/blocktags/blocktags.tpl | 2 +- modules/blocktags/config.xml | 4 +-- modules/blocktopmenu/config.xml | 4 +-- modules/blockuserinfo/config.xml | 4 +-- modules/blockviewed/blockviewed.css | 7 ++++- modules/blockviewed/blockviewed.tpl | 4 +-- modules/blockviewed/config.xml | 4 +-- modules/blockwishlist/blockwishlist.css | 2 +- modules/blockwishlist/blockwishlist.tpl | 4 +-- modules/blockwishlist/config.xml | 4 +-- modules/blockwishlist/managewishlist.tpl | 2 +- modules/carriercompare/config.xml | 4 +-- modules/cashondelivery/config.xml | 4 +-- modules/cheque/config.xml | 6 ++--- modules/crossselling/config.xml | 4 +-- modules/dateofdelivery/config.xml | 4 +-- modules/editorial/config.xml | 4 +-- modules/favoriteproducts/config.xml | 4 +-- modules/feeder/config.xml | 4 +-- modules/followup/config.xml | 6 ++--- modules/graphartichow/config.xml | 2 +- modules/graphgooglechart/config.xml | 2 +- modules/graphvisifire/config.xml | 2 +- modules/graphxmlswfcharts/config.xml | 2 +- modules/gridhtml/config.xml | 2 +- modules/gsitemap/config.xml | 2 +- modules/homefeatured/config.xml | 4 +-- modules/homefeatured/homefeatured.css | 6 +++-- modules/homefeatured/homefeatured.tpl | 4 +-- modules/homeslider/config.xml | 4 +-- modules/loyalty/config.xml | 6 ++--- modules/mailalerts/config.xml | 6 ++--- modules/newsletter/config.xml | 4 +-- modules/pagesnotfound/config.xml | 4 +-- modules/productcomments/config.xml | 4 +-- modules/productcomments/productcomments.css | 2 +- modules/productcomments/productcomments.tpl | 2 +- modules/productscategory/config.xml | 4 +-- modules/producttooltip/config.xml | 4 +-- modules/referralprogram/config.xml | 8 +++--- modules/sekeywords/config.xml | 4 +-- modules/sendtoafriend/config.xml | 4 +-- modules/statsbestcategories/config.xml | 4 +-- modules/statsbestcustomers/config.xml | 4 +-- modules/statsbestmanufacturers/config.xml | 4 +-- modules/statsbestproducts/config.xml | 4 +-- modules/statsbestsuppliers/config.xml | 4 +-- modules/statsbestvouchers/config.xml | 4 +-- modules/statscarrier/config.xml | 4 +-- modules/statscatalog/config.xml | 4 +-- modules/statscheckup/config.xml | 4 +-- modules/statsdata/config.xml | 4 +-- modules/statsequipment/config.xml | 4 +-- modules/statsforecast/config.xml | 2 +- modules/statsgeolocation/config.xml | 4 +-- modules/statslive/config.xml | 4 +-- modules/statsnewsletter/config.xml | 2 +- modules/statsorigin/config.xml | 4 +-- modules/statspersonalinfos/config.xml | 4 +-- modules/statsproduct/config.xml | 4 +-- modules/statsregistrations/config.xml | 4 +-- modules/statssearch/config.xml | 4 +-- modules/statsstock/config.xml | 2 +- modules/statsvisits/config.xml | 4 +-- modules/trackingfront/config.xml | 4 +-- modules/vatnumber/config.xml | 4 +-- modules/watermark/config.xml | 8 +++--- themes/default/authentication.tpl | 2 +- themes/default/best-sales.tpl | 26 ++++++++++++++----- themes/default/cms.tpl | 4 +-- themes/default/css/comparator.css | 6 +++-- themes/default/css/global.css | 26 ++++++++++--------- themes/default/css/history.css | 4 +-- themes/default/css/my-account.css | 2 +- themes/default/css/product.css | 6 ++++- themes/default/css/scenes.css | 2 +- themes/default/mobile/addresses.tpl | 2 +- .../default/mobile/authentication-choice.tpl | 2 +- themes/default/mobile/css/global.css | 4 +-- .../default/mobile/product-desc-features.tpl | 2 +- themes/default/my-account.tpl | 2 +- themes/default/new-products.tpl | 24 ++++++++++++----- themes/default/order-address-product-line.tpl | 2 +- themes/default/order-detail.tpl | 4 +-- themes/default/order-opc-new-account.tpl | 4 +-- themes/default/order-payment.tpl | 4 +-- themes/default/order-return.tpl | 2 +- themes/default/prices-drop.tpl | 24 ++++++++++++----- themes/default/product.tpl | 4 +-- themes/default/products-comparison.tpl | 2 +- themes/default/scenes.tpl | 2 +- themes/default/shopping-cart-product-line.tpl | 2 +- themes/default/shopping-cart.tpl | 6 ++--- 145 files changed, 332 insertions(+), 280 deletions(-) diff --git a/modules/bankwire/config.xml b/modules/bankwire/config.xml index 08550b4b3..919e6ac6b 100755 --- a/modules/bankwire/config.xml +++ b/modules/bankwire/config.xml @@ -1,12 +1,12 @@ bankwire - + - + - Are you sure you want to delete your details? + Êtes-vous certain de vouloir effacer vos données ? 1 1 diff --git a/modules/blockadvertising/config.xml b/modules/blockadvertising/config.xml index 9830b4ea6..62b227aae 100755 --- a/modules/blockadvertising/config.xml +++ b/modules/blockadvertising/config.xml @@ -1,9 +1,9 @@ blockadvertising - + - + 1 diff --git a/modules/blockbestsellers/blockbestsellers-home.tpl b/modules/blockbestsellers/blockbestsellers-home.tpl index d1b6ada44..bb6d488d5 100644 --- a/modules/blockbestsellers/blockbestsellers-home.tpl +++ b/modules/blockbestsellers/blockbestsellers-home.tpl @@ -25,7 +25,7 @@
-

{l s='Top sellers' mod='blockbestsellers'}

+

{l s='Top sellers' mod='blockbestsellers'}

{if isset($best_sellers) AND $best_sellers}
{assign var='liHeight' value=320} @@ -36,7 +36,7 @@
    {foreach from=$best_sellers item=product name=myLoop}
  • -
    {$product.name|truncate:27:'...'|escape:'htmlall':'UTF-8'}
    +

    {$product.name|truncate:27:'...'|escape:'htmlall':'UTF-8'}

    {$product.description_short|strip_tags|truncate:130:'...'}
    {$product.name|escape:html:'UTF-8'}
    diff --git a/modules/blockbestsellers/blockbestsellers.tpl b/modules/blockbestsellers/blockbestsellers.tpl index 59a4df44a..31ebabe06 100644 --- a/modules/blockbestsellers/blockbestsellers.tpl +++ b/modules/blockbestsellers/blockbestsellers.tpl @@ -25,7 +25,7 @@
    -

    {l s='Top sellers' mod='blockbestsellers'}

    +

    {l s='Top sellers' mod='blockbestsellers'}

    {if $best_sellers|@count > 0}
      diff --git a/modules/blockbestsellers/config.xml b/modules/blockbestsellers/config.xml index 9bf0a39be..756a5282a 100755 --- a/modules/blockbestsellers/config.xml +++ b/modules/blockbestsellers/config.xml @@ -1,9 +1,9 @@ blockbestsellers - + - + 1 diff --git a/modules/blockcart/blockcart.css b/modules/blockcart/blockcart.css index 1e0fac942..7d92153f6 100644 --- a/modules/blockcart/blockcart.css +++ b/modules/blockcart/blockcart.css @@ -1,7 +1,7 @@ /* Special style for block cart*/ #left_column #cart_block, #right_column #cart_block { } -#header #cart_block h4 { +#header #cart_block #title { display: none; } #header #cart_block { @@ -22,7 +22,7 @@ background:#eee } #cart_block.cart_block_hover {display:block} -#cart_block h4 span { +#cart_block #title span { float: right; padding-left: 10px; text-transform: none; diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl index 32574a6f1..4563387d0 100644 --- a/modules/blockcart/blockcart.tpl +++ b/modules/blockcart/blockcart.tpl @@ -43,13 +43,13 @@ var delete_txt = '{l s='Delete' mod='blockcart'}';
      -

      +

      {l s='Cart' mod='blockcart'} {if $ajax_allowed}     {/if} -

      +

      diff --git a/modules/blockcart/config.xml b/modules/blockcart/config.xml index cb1badd0e..3647d19d7 100755 --- a/modules/blockcart/config.xml +++ b/modules/blockcart/config.xml @@ -1,9 +1,9 @@ blockcart - + - + 1 diff --git a/modules/blockcategories/blockcategories.tpl b/modules/blockcategories/blockcategories.tpl index 11f574448..0e4fbcaec 100644 --- a/modules/blockcategories/blockcategories.tpl +++ b/modules/blockcategories/blockcategories.tpl @@ -25,7 +25,7 @@
      -

      {l s='Categories' mod='blockcategories'}

      +

      {l s='Categories' mod='blockcategories'}

        {foreach from=$blockCategTree.children item=child name=blockCategTree} diff --git a/modules/blockcategories/blockcategories_footer.tpl b/modules/blockcategories/blockcategories_footer.tpl index 439b1e49e..400b2ed07 100644 --- a/modules/blockcategories/blockcategories_footer.tpl +++ b/modules/blockcategories/blockcategories_footer.tpl @@ -25,7 +25,7 @@
        -

        {l s='Categories' mod='blockcategories'}

        +

        {l s='Categories' mod='blockcategories'}

          diff --git a/modules/blockcategories/config.xml b/modules/blockcategories/config.xml index 5d3e12494..09283aa69 100755 --- a/modules/blockcategories/config.xml +++ b/modules/blockcategories/config.xml @@ -1,9 +1,9 @@ blockcategories - + - + 1 diff --git a/modules/blockcms/blockcms.tpl b/modules/blockcms/blockcms.tpl index 3e0f2b038..9bfad83b3 100755 --- a/modules/blockcms/blockcms.tpl +++ b/modules/blockcms/blockcms.tpl @@ -27,7 +27,7 @@ {foreach from=$cms_titles key=cms_key item=cms_title}
          -

          {if !empty($cms_title.name)}{$cms_title.name}{else}{$cms_title.category_name}{/if}

          +

          {if !empty($cms_title.name)}{$cms_title.name}{else}{$cms_title.category_name}{/if}

            {foreach from=$cms_title.categories item=cms_page} {if isset($cms_page.link)}
          • @@ -45,7 +45,7 @@ {else}