Skip to content

Loading…

Html5 reco #1232

Closed
wants to merge 5 commits into from
Showing with 295 additions and 258 deletions.
  1. +39 −45 themes/default-bootstrap/css/global.css
  2. +2 −2 themes/default-bootstrap/css/modules/blocknewsletter/blocknewsletter.css
  3. +3 −3 themes/default-bootstrap/footer.tpl
  4. +10 −9 themes/default-bootstrap/header.tpl
  5. +25 −21 themes/default-bootstrap/modules/blockbestsellers/blockbestsellers.tpl
  6. +2 −2 themes/default-bootstrap/modules/blockcart/blockcart.tpl
  7. +3 −3 themes/default-bootstrap/modules/blockcategories/blockcategories_footer.tpl
  8. +9 −9 themes/default-bootstrap/modules/blockcms/blockcms.tpl
  9. +2 −2 themes/default-bootstrap/modules/blockcontact/blockcontact.tpl
  10. +22 −24 themes/default-bootstrap/modules/blockcontactinfos/blockcontactinfos.tpl
  11. +1 −1 themes/default-bootstrap/modules/blocklayered/blocklayered.tpl
  12. +7 −7 themes/default-bootstrap/modules/blocklink/blocklink.tpl
  13. +2 −2 themes/default-bootstrap/modules/blockmanufacturer/blockmanufacturer.tpl
  14. +2 −2 themes/default-bootstrap/modules/blockmyaccount/blockmyaccount.tpl
  15. +48 −10 themes/default-bootstrap/modules/blockmyaccountfooter/blockmyaccountfooter.tpl
  16. +2 −2 themes/default-bootstrap/modules/blocknewproducts/blocknewproducts.tpl
  17. +2 −2 themes/default-bootstrap/modules/blocknewsletter/blocknewsletter.tpl
  18. +1 −1 themes/default-bootstrap/modules/blockrss/blockrss.tpl
  19. +1 −1 themes/default-bootstrap/modules/blocksearch/blocksearch.tpl
  20. +3 −3 themes/default-bootstrap/modules/blocksocial/blocksocial.tpl
  21. +54 −54 themes/default-bootstrap/modules/blockspecials/blockspecials.tpl
  22. +2 −2 themes/default-bootstrap/modules/blockstore/blockstore.tpl
  23. +2 −2 themes/default-bootstrap/modules/blocksupplier/blocksupplier.tpl
  24. +2 −2 themes/default-bootstrap/modules/blocktags/blocktags.tpl
  25. +17 −15 themes/default-bootstrap/modules/blocktopmenu/blocktopmenu.tpl
  26. +1 −1 themes/default-bootstrap/modules/blockviewed/blockviewed.tpl
  27. +2 −2 themes/default-bootstrap/modules/blockwishlist/blockwishlist.tpl
  28. +28 −28 themes/default-bootstrap/sass/global.sass
  29. +1 −1 themes/default-bootstrap/sass/modules/blocknewsletter/blocknewsletter.scss
View
84 themes/default-bootstrap/css/global.css
@@ -5271,8 +5271,7 @@ textarea {
header {
z-index: 1;
position: relative;
- background: white;
- padding-bottom: 15px; }
+ background: white; }
header .banner {
background: black; }
header .banner .row {
@@ -5291,6 +5290,9 @@ header {
position: relative; }
header .row #header_logo {
padding-top: 15px; }
+ header .row #header_logo h1 {
+ text-indent: -9999px;
+ font-size: 0; }
@media (max-width: 992px) {
header .row #header_logo {
padding-top: 40px; } }
@@ -6049,25 +6051,21 @@ table.table_block td {
.block .block_content {
margin-bottom: 20px; } }
-.block .title_block,
-.block h4 {
+.block h2 {
font: 600 18px/22px "Open Sans", sans-serif;
color: #555454;
background: #f6f6f6;
border-top: 5px solid #333333;
text-transform: uppercase;
padding: 14px 5px 17px 20px;
- margin-bottom: 20px; }
+ margin: 0 0 20px 0; }
@media (min-width: 768px) and (max-width: 991px) {
- .block .title_block,
- .block h4 {
+ .block h2 {
font-size: 14px; } }
@media (max-width: 767px) {
- .block .title_block,
- .block h4 {
+ .block h2 {
position: relative; }
- .block .title_block:after,
- .block h4:after {
+ .block h2:after {
display: block;
font-family: "FontAwesome";
content: "";
@@ -6078,14 +6076,11 @@ table.table_block td {
width: 36px;
font-size: 26px;
font-weight: normal; }
- .block .title_block.active:after,
- .block h4.active:after {
+ .block h2.active:after {
content: ""; } }
- .block .title_block a,
- .block h4 a {
+ .block h2 a {
color: #555454; }
- .block .title_block a:hover,
- .block h4 a:hover {
+ .block h2 a:hover {
color: #333333; }
.block .list-block {
margin-top: -8px; }
@@ -6783,25 +6778,25 @@ div.star a:hover {
color: #777777; }
.footer-container #footer a:hover {
color: white; }
- .footer-container #footer h4 {
+ .footer-container #footer h2 {
font: 600 18px/22px "Open Sans", sans-serif;
color: white;
margin: 0 0 13px 0; }
@media (max-width: 767px) {
- .footer-container #footer h4 {
+ .footer-container #footer h2 {
position: relative;
margin-bottom: 0;
padding-bottom: 13px; }
- .footer-container #footer h4:after {
+ .footer-container #footer h2:after {
display: block;
content: "\f055";
font-family: "FontAwesome";
position: absolute;
right: 0;
top: 1px; }
- .footer-container #footer h4.active:after {
+ .footer-container #footer h2.active:after {
content: "\f056"; } }
- .footer-container #footer h4 a {
+ .footer-container #footer h2 a {
color: white; }
.footer-container #footer ul li {
padding-bottom: 8px; }
@@ -6809,30 +6804,29 @@ div.star a:hover {
font-weight: bold;
text-shadow: 1px 1px 0px rgba(0, 0, 0, 0.4); }
.footer-container #footer #block_contact_infos {
- border-left: 1px solid #515151; }
+ border-left: 1px solid #515151;
+ padding: 0 0 0 5px; }
@media (max-width: 767px) {
.footer-container #footer #block_contact_infos {
border: none; } }
- .footer-container #footer #block_contact_infos > div {
- padding: 0 0 0 5px; }
- @media (max-width: 767px) {
- .footer-container #footer #block_contact_infos > div {
- padding-left: 0; } }
- .footer-container #footer #block_contact_infos > div ul li {
- padding: 0 0 7px 4px;
- overflow: hidden;
- line-height: 30px; }
- .footer-container #footer #block_contact_infos > div ul li > span,
- .footer-container #footer #block_contact_infos > div ul li > span a {
- color: white;
- font-weight: normal; }
- .footer-container #footer #block_contact_infos > div ul li i {
- font-size: 25px;
- width: 32px;
- text-align: center;
- padding-right: 12px;
- float: left;
- color: #908f8f; }
+ @media (max-width: 767px) {
+ .footer-container #footer #block_contact_infos {
+ padding-left: 0; } }
+ .footer-container #footer #block_contact_infos ul li {
+ padding: 0 0 7px 4px;
+ overflow: hidden;
+ line-height: 30px; }
+ .footer-container #footer #block_contact_infos ul li > span,
+ .footer-container #footer #block_contact_infos ul li > span a {
+ color: white;
+ font-weight: normal; }
+ .footer-container #footer #block_contact_infos ul li i {
+ font-size: 25px;
+ width: 32px;
+ text-align: center;
+ padding-right: 12px;
+ float: left;
+ color: #908f8f; }
.footer-container #footer .blockcategories_footer {
clear: left; }
.footer-container #footer #social_block {
@@ -6883,7 +6877,7 @@ div.star a:hover {
content: "\f0d5"; }
.footer-container #footer #social_block ul li.pinterest a:before {
content: "\f0d2"; }
- .footer-container #footer #social_block h4 {
+ .footer-container #footer #social_block h2 {
float: right;
margin-bottom: 0;
font-size: 21px;
@@ -6891,7 +6885,7 @@ div.star a:hover {
text-transform: none;
padding: 0 10px 0 0; }
@media (max-width: 767px) {
- .footer-container #footer #social_block h4 {
+ .footer-container #footer #social_block h2 {
display: none;
text-align: center; } }
.footer-container #footer .bottom-footer {
View
4 themes/default-bootstrap/css/modules/blocknewsletter/blocknewsletter.css
@@ -28,7 +28,7 @@
@media (max-width: 767px) {
#footer #newsletter_block_left {
width: 100%; } }
- #footer #newsletter_block_left h4 {
+ #footer #newsletter_block_left h2 {
background: none;
float: left;
padding: 7px 16px 5px 0;
@@ -36,7 +36,7 @@
font-size: 21px;
line-height: 25px;
border: none; }
- #footer #newsletter_block_left h4:after {
+ #footer #newsletter_block_left h2:after {
display: none; }
#footer #newsletter_block_left .block_content {
overflow: hidden; }
View
6 themes/default-bootstrap/footer.tpl
@@ -23,11 +23,11 @@
* International Registered Trademark & Property of PrestaShop SA
*}
{if !$content_only}
- </div><!-- #center_column -->
+ </section><!-- #center_column -->
{if isset($right_column_size) && !empty($right_column_size)}
- <div id="right_column" class="col-xs-12 col-sm-3 column">
+ <aside id="right_column" class="col-xs-12 col-sm-3 column">
{$HOOK_RIGHT_COLUMN}
- </div>
+ </aside>
{/if}
</div><!-- .row -->
</div><!-- #columns -->
View
19 themes/default-bootstrap/header.tpl
@@ -78,16 +78,17 @@
</div>
</div>
</div>
- <div>
- <div class="container">
- <div class="row">
- <div id="header_logo">
+ <div class="container">
+ <div class="row">
+ <div id="header_logo">
+ <h1>
+ {$shop_name|escape:'html':'UTF-8'}
<a href="{$base_dir}" title="{$shop_name|escape:'html':'UTF-8'}">
<img class="logo img-responsive" src="{$logo_url}" alt="{$shop_name|escape:'html':'UTF-8'}"{if $logo_image_width} width="{$logo_image_width}"{/if}{if $logo_image_height} height="{$logo_image_height}"{/if}/>
</a>
- </div>
- {if isset($HOOK_TOP)}{$HOOK_TOP}{/if}
+ </h1>
</div>
+ {if isset($HOOK_TOP)}{$HOOK_TOP}{/if}
</div>
</div>
</header>
@@ -104,9 +105,9 @@
</div>
<div class="row">
{if isset($left_column_size) && !empty($left_column_size)}
- <div id="left_column" class="column col-xs-12 col-sm-3">
+ <aside id="left_column" class="column col-xs-12 col-sm-3">
{$HOOK_LEFT_COLUMN}
- </div>
+ </aside>
{/if}
- <div id="center_column" class="center_column col-xs-12 col-sm-{12 - $left_column_size - $right_column_size}">
+ <section id="center_column" class="center_column col-xs-12 col-sm-{12 - $left_column_size - $right_column_size}">
{/if}
View
46 themes/default-bootstrap/modules/blockbestsellers/blockbestsellers.tpl
@@ -26,33 +26,37 @@
<!-- MODULE Block best sellers -->
<div id="best-sellers_block_right" class="block products_block">
- <h4 class="title_block">
- <a href="{$link->getPageLink('best-sales')|escape:'html'}" title="{l s='View a top sellers products' mod='blockbestsellers'}">{l s='Top sellers' mod='blockbestsellers'}</a>
- </h4>
+ <h2>
+ <a href="{$link->getPageLink('best-sales')|escape:'html'}" title="{l s='View a top sellers products' mod='blockbestsellers'}">
+ {l s='Top sellers' mod='blockbestsellers'}
+ </a>
+ </h2>
<div class="block_content">
{if $best_sellers && $best_sellers|@count > 0}
<ul class="block_content products-block">
{foreach from=$best_sellers item=product name=myLoop}
- <li class="clearfix">
- <a class="products-block-image" href="{$product.link|escape:'html'}" title="{$product.legend|escape:'html':'UTF-8'}" class="content_img clearfix">
- <img class="replace-2x img-responsive" src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small_default')|escape:'html'}" alt="{$product.legend|escape:'html':'UTF-8'}" />
- </a>
- <div class="product-content">
- <h5>
- <a class="product-name" href="{$product.link|escape:'html'}" title="{$product.legend|escape:'html':'UTF-8'}">
- {$product.name|strip_tags:'UTF-8'|escape:'html':'UTF-8'}
- </a>
- </h5>
- <p class="product-description">{$product.description_short|strip_tags:'UTF-8'|truncate:75:'...'}</p>
- <div class="price-box">
- <span class="price">{$product.price}</span>
- </div>
- </div>
- </li>
- {/foreach}
+ <li class="clearfix">
+ <a class="products-block-image" href="{$product.link|escape:'html'}" title="{$product.legend|escape:'html':'UTF-8'}" class="content_img clearfix">
+ <img class="replace-2x img-responsive" src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small_default')|escape:'html'}" alt="{$product.legend|escape:'html':'UTF-8'}" />
+ </a>
+ <div class="product-content">
+ <h5>
+ <a class="product-name" href="{$product.link|escape:'html'}" title="{$product.legend|escape:'html':'UTF-8'}">
+ {$product.name|strip_tags:'UTF-8'|escape:'html':'UTF-8'}
+ </a>
+ </h5>
+ <p class="product-description">{$product.description_short|strip_tags:'UTF-8'|truncate:75:'...'}</p>
+ <div class="price-box">
+ <span class="price">{$product.price}</span>
+ </div>
+ </div>
+ </li>
+ {/foreach}
</ul>
<div class="lnk">
- <a href="{$link->getPageLink('best-sales')|escape:'html'}" title="{l s='All best sellers' mod='blockbestsellers'}" class="btn btn-default button button-small"><span>{l s='All best sellers' mod='blockbestsellers'}<i class="icon-chevron-right right"></i></span></a>
+ <a href="{$link->getPageLink('best-sales')|escape:'html'}" title="{l s='All best sellers' mod='blockbestsellers'}" class="btn btn-default button button-small">
+ <span>{l s='All best sellers' mod='blockbestsellers'}<i class="icon-chevron-right right"></i></span>
+ </a>
</div>
{else}
<p>{l s='No best sellers at this time' mod='blockbestsellers'}</p>
View
4 themes/default-bootstrap/modules/blockcart/blockcart.tpl
@@ -49,7 +49,7 @@ var generated_date = {$smarty.now|intval};
<!-- MODULE Block cart -->
<div id="cart_block" class="block exclusive">
- <p class="title_block">
+ <h2>
<a href="{$link->getPageLink("$order_process", true)|escape:'html':'UTF-8'}" title="{l s='View my shopping cart' mod='blockcart'}" rel="nofollow">
{l s='Cart' mod='blockcart'}
{if $ajax_allowed}
@@ -65,7 +65,7 @@ var generated_date = {$smarty.now|intval};
</span>
{/if}
</a>
- </p>
+ </h2>
<div class="block_content">
<!-- block summary -->
<div
View
6 themes/default-bootstrap/modules/blockcategories/blockcategories_footer.tpl
@@ -24,8 +24,8 @@
*}
<!-- Block categories module -->
-<section class="blockcategories_footer footer-block col-xs-12 col-sm-2">
- <h4>{l s='Categories' mod='blockcategories'}</h4>
+<div class="blockcategories_footer footer-block col-xs-12 col-sm-2">
+ <h2>{l s='Categories' mod='blockcategories'}</h2>
<div class="category_footer toggle-footer">
<div class="list">
<ul class="tree {if $isDhtml}dhtml{/if}">
@@ -49,5 +49,5 @@
</ul>
</div>
</div> <!-- .category_footer -->
-</section>
+</div>
<!-- /Block categories module -->
View
18 themes/default-bootstrap/modules/blockcms/blockcms.tpl
@@ -26,12 +26,12 @@
{if $block == 1}
<!-- Block CMS module -->
{foreach from=$cms_titles key=cms_key item=cms_title}
- <section id="informations_block_left_{$cms_key}" class="block informations_block_left">
- <p class="title_block">
+ <div id="informations_block_left_{$cms_key}" class="block informations_block_left">
+ <h2>
<a href="{$cms_title.category_link|escape:'html':'UTF-8'}">
{if !empty($cms_title.name)}{$cms_title.name}{else}{$cms_title.category_name}{/if}
</a>
- </p>
+ </h2>
<div class="block_content list-block">
<ul>
{foreach from=$cms_title.categories item=cms_page}
@@ -61,13 +61,13 @@
{/if}
</ul>
</div>
- </section>
+ </div>
{/foreach}
<!-- /Block CMS module -->
{else}
<!-- MODULE Block footer -->
- <section class="footer-block col-xs-12 col-sm-2" id="block_various_links_footer">
- <h4>{l s='Information' mod='blockcms'}</h4>
+ <div class="footer-block col-xs-12 col-sm-2" id="block_various_links_footer">
+ <h2>{l s='Information' mod='blockcms'}</h2>
<ul class="toggle-footer">
{if !$PS_CATALOG_MODE}
<li class="first_item">
@@ -116,14 +116,14 @@
</li>
</ul>
{$footer_text}
- </section>
+ </div>
{if $display_poweredby}
- <section class="bottom-footer col-xs-12">
+ <div class="bottom-footer col-xs-12">
<div>
&copy; 2013 {l s='Powered by' mod='blockcms'}
<a class="_blank" href="http://www.prestashop.com">PrestaShop</a>&trade;
</div>
- </section>
+ </div>
{/if}
<!-- /MODULE Block footer -->
{/if}
View
4 themes/default-bootstrap/modules/blockcontact/blockcontact.tpl
@@ -24,9 +24,9 @@
*}
<div id="contact_block" class="block">
- <h4 class="title_block">
+ <h2>
{l s='Contact Us' mod='blockcontact'}
- </h4>
+ </h2>
<div class="block_content clearfix">
<p>
{l s='Our support hotline is available 24/7.' mod='blockcontact'}
View
46 themes/default-bootstrap/modules/blockcontactinfos/blockcontactinfos.tpl
@@ -25,28 +25,26 @@
*}
<!-- MODULE Block contact infos -->
-<section id="block_contact_infos" class="footer-block col-xs-12 col-sm-4">
- <div>
- <h4>{l s='Store Information' mod='blockcontactinfos'}</h4>
- <ul class="toggle-footer">
- {if $blockcontactinfos_company != ''}
- <li>
- <i class="icon-map-marker"></i>{$blockcontactinfos_company|escape:'html':'UTF-8'}{if $blockcontactinfos_address != ''}, {$blockcontactinfos_address|escape:'html':'UTF-8'}{/if}
- </li>
- {/if}
- {if $blockcontactinfos_phone != ''}
- <li>
- <i class="icon-phone"></i>{l s='Call us now toll free:' mod='blockcontactinfos'}
- <span>{$blockcontactinfos_phone|escape:'html':'UTF-8'}</span>
- </li>
- {/if}
- {if $blockcontactinfos_email != ''}
- <li>
- <i class="icon-envelope-alt"></i>{l s='Email:' mod='blockcontactinfos'}
- <span>{mailto address=$blockcontactinfos_email|escape:'html':'UTF-8' encode="hex"}</span>
- </li>
- {/if}
- </ul>
- </div>
-</section>
+<div id="block_contact_infos" class="footer-block col-xs-12 col-sm-4">
+ <h2>{l s='Store Information' mod='blockcontactinfos'}</h2>
+ <ul class="toggle-footer">
+ {if $blockcontactinfos_company != ''}
+ <li>
+ <i class="icon-map-marker"></i>{$blockcontactinfos_company|escape:'html':'UTF-8'}{if $blockcontactinfos_address != ''}, {$blockcontactinfos_address|escape:'html':'UTF-8'}{/if}
+ </li>
+ {/if}
+ {if $blockcontactinfos_phone != ''}
+ <li>
+ <i class="icon-phone"></i>{l s='Call us now toll free:' mod='blockcontactinfos'}
+ <span>{$blockcontactinfos_phone|escape:'html':'UTF-8'}</span>
+ </li>
+ {/if}
+ {if $blockcontactinfos_email != ''}
+ <li>
+ <i class="icon-envelope-alt"></i>{l s='Email:' mod='blockcontactinfos'}
+ <span>{mailto address=$blockcontactinfos_email|escape:'html':'UTF-8' encode="hex"}</span>
+ </li>
+ {/if}
+ </ul>
+</div>
<!-- /MODULE Block contact infos -->
View
2 themes/default-bootstrap/modules/blocklayered/blocklayered.tpl
@@ -36,7 +36,7 @@
{addJsDef blocklayeredSliderName=$blocklayeredSliderName}
</script>
<div id="layered_block_left" class="block">
- <p class="title_block">{l s='Catalog' mod='blocklayered'}</p>
+ <h2>{l s='Catalog' mod='blocklayered'}</h2>
<div class="block_content">
<form action="#" id="layered_form">
<div>
View
14 themes/default-bootstrap/modules/blocklink/blocklink.tpl
@@ -25,13 +25,13 @@
<!-- Block links module -->
<div id="links_block_left" class="block">
- <p class="title_block">
- {if $url}
- <a href="{$url|escape}">{$title|escape}</a>
- {else}
- {$title|escape}
- {/if}
- </p>
+ <h2>
+ {if $url}
+ <a href="{$url|escape}">{$title|escape}</a>
+ {else}
+ {$title|escape}
+ {/if}
+ </h2>
<div class="block_content list-block">
<ul>
{foreach from=$blocklink_links item=blocklink_link}
View
4 themes/default-bootstrap/modules/blockmanufacturer/blockmanufacturer.tpl
@@ -25,7 +25,7 @@
<!-- Block manufacturers module -->
<div id="manufacturers_block_left" class="block blockmanufacturer">
- <p class="title_block">
+ <h2>
{if $display_link_manufacturer}
<a href="{$link->getPageLink('manufacturer')|escape:'html':'UTF-8'}" title="{l s='Manufacturers' mod='blockmanufacturer'}">
{/if}
@@ -33,7 +33,7 @@
{if $display_link_manufacturer}
</a>
{/if}
- </p>
+ </h2>
<div class="block_content list-block">
{if $manufacturers}
{if $text_list}
View
4 themes/default-bootstrap/modules/blockmyaccount/blockmyaccount.tpl
@@ -25,11 +25,11 @@
<!-- Block myaccount module -->
<div class="block myaccount-column">
- <p class="title_block">
+ <h2>
<a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}" title="{l s='My account' mod='blockmyaccount'}">
{l s='My account' mod='blockmyaccount'}
</a>
- </p>
+ </h2>
<div class="block_content list-block">
<ul>
<li>
View
58 themes/default-bootstrap/modules/blockmyaccountfooter/blockmyaccountfooter.tpl
@@ -24,19 +24,57 @@
*}
<!-- Block myaccount module -->
-<section class="footer-block col-xs-12 col-sm-4">
- <h4><a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}" title="{l s='Manage my customer account' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My account' mod='blockmyaccountfooter'}</a></h4>
+<div class="footer-block col-xs-12 col-sm-4">
+ <h2>
+ <a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}" title="{l s='Manage my customer account' mod='blockmyaccountfooter'}" rel="nofollow">
+ {l s='My account' mod='blockmyaccountfooter'}
+ </a>
+ </h2>
<div class="block_content toggle-footer">
<ul class="bullet">
- <li><a href="{$link->getPageLink('history', true)|escape:'html':'UTF-8'}" title="{l s='My orders' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My orders' mod='blockmyaccountfooter'}</a></li>
- {if $returnAllowed}<li><a href="{$link->getPageLink('order-follow', true)|escape:'html':'UTF-8'}" title="{l s='My merchandise returns' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My merchandise returns' mod='blockmyaccountfooter'}</a></li>{/if}
- <li><a href="{$link->getPageLink('order-slip', true)|escape:'html':'UTF-8'}" title="{l s='My credit slips' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My credit slips' mod='blockmyaccountfooter'}</a></li>
- <li><a href="{$link->getPageLink('addresses', true)|escape:'html':'UTF-8'}" title="{l s='My addresses' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My addresses' mod='blockmyaccountfooter'}</a></li>
- <li><a href="{$link->getPageLink('identity', true)|escape:'html':'UTF-8'}" title="{l s='Manage my personal information' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My personal info' mod='blockmyaccountfooter'}</a></li>
- {if $voucherAllowed}<li><a href="{$link->getPageLink('discount', true)|escape:'html':'UTF-8'}" title="{l s='My vouchers' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My vouchers' mod='blockmyaccountfooter'}</a></li>{/if}
+ <li>
+ <a href="{$link->getPageLink('history', true)|escape:'html':'UTF-8'}" title="{l s='My orders' mod='blockmyaccountfooter'}" rel="nofollow">
+ {l s='My orders' mod='blockmyaccountfooter'}
+ </a>
+ </li>
+ {if $returnAllowed}
+ <li>
+ <a href="{$link->getPageLink('order-follow', true)|escape:'html':'UTF-8'}" title="{l s='My merchandise returns' mod='blockmyaccountfooter'}" rel="nofollow">
+ {l s='My merchandise returns' mod='blockmyaccountfooter'}
+ </a>
+ </li>
+ {/if}
+ <li>
+ <a href="{$link->getPageLink('order-slip', true)|escape:'html':'UTF-8'}" title="{l s='My credit slips' mod='blockmyaccountfooter'}" rel="nofollow">
+ {l s='My credit slips' mod='blockmyaccountfooter'}
+ </a>
+ </li>
+ <li>
+ <a href="{$link->getPageLink('addresses', true)|escape:'html':'UTF-8'}" title="{l s='My addresses' mod='blockmyaccountfooter'}" rel="nofollow">
+ {l s='My addresses' mod='blockmyaccountfooter'}
+ </a>
+ </li>
+ <li>
+ <a href="{$link->getPageLink('identity', true)|escape:'html':'UTF-8'}" title="{l s='Manage my personal information' mod='blockmyaccountfooter'}" rel="nofollow">
+ {l s='My personal info' mod='blockmyaccountfooter'}
+ </a>
+ </li>
+ {if $voucherAllowed}
+ <li>
+ <a href="{$link->getPageLink('discount', true)|escape:'html':'UTF-8'}" title="{l s='My vouchers' mod='blockmyaccountfooter'}" rel="nofollow">
+ {l s='My vouchers' mod='blockmyaccountfooter'}
+ </a>
+ </li>
+ {/if}
{$HOOK_BLOCK_MY_ACCOUNT}
- {if $logged}<li><a href="{$link->getPageLink('index')}?mylogout" title="{l s='Sign out' mod='blockmyaccountfooter'}" rel="nofollow">{l s='Sign out' mod='blockmyaccountfooter'}</a></li>{/if}
+ {if $logged}
+ <li>
+ <a href="{$link->getPageLink('index')}?mylogout" title="{l s='Sign out' mod='blockmyaccountfooter'}" rel="nofollow">
+ {l s='Sign out' mod='blockmyaccountfooter'}
+ </a>
+ </li>
+ {/if}
</ul>
</div>
-</section>
+</div>
<!-- /Block myaccount module -->
View
4 themes/default-bootstrap/modules/blocknewproducts/blocknewproducts.tpl
@@ -24,9 +24,9 @@
*}
<!-- MODULE Block new products -->
<div id="new-products_block_right" class="block products_block">
- <h4 class="title_block">
+ <h2>
<a href="{$link->getPageLink('new-products')|escape:'html'}" title="{l s='New products' mod='blocknewproducts'}">{l s='New products' mod='blocknewproducts'}</a>
- </h4>
+ </h2>
<div class="block_content products-block">
{if $new_products !== false}
<ul class="products">
View
4 themes/default-bootstrap/modules/blocknewsletter/blocknewsletter.tpl
@@ -25,7 +25,7 @@
<!-- Block Newsletter module-->
<div id="newsletter_block_left" class="block">
- <h4>{l s='Newsletter' mod='blocknewsletter'}</h4>
+ <h2>{l s='Newsletter' mod='blocknewsletter'}</h2>
<div class="block_content">
<form action="{$link->getPageLink('index')|escape:'html':'UTF-8'}" method="post">
<div class="form-group{if isset($msg) && $msg } {if $nw_error}form-error{else}form-ok{/if}{/if}" >
@@ -41,7 +41,7 @@
<!-- /Block Newsletter module-->
<script type="text/javascript">
- var placeholder = "{l s='Enter your e-mail' mod='blocknewsletter' js=1}";
+ var placeholder = '{l s='Enter your e-mail' mod='blocknewsletter' js=1}';
var msg_newsl = '{if isset($msg) && $msg }{$msg|@addcslashes:'\''}{/if}';
$(document).ready(function() {ldelim}
$('#newsletter-input').on({ldelim}
View
2 themes/default-bootstrap/modules/blockrss/blockrss.tpl
@@ -25,7 +25,7 @@
<!-- Block RSS module-->
<div id="rss_block_left" class="block">
- <p class="title_block">{$title}</p>
+ <h2>{$title}</h2>
<div class="block_content">
{if $rss_links}
<ul>
View
2 themes/default-bootstrap/modules/blocksearch/blocksearch.tpl
@@ -25,7 +25,7 @@
<!-- Block search module -->
<div id="search_block_left" class="block exclusive">
- <p class="title_block">{l s='Search' mod='blocksearch'}</p>
+ <h2>{l s='Search' mod='blocksearch'}</h2>
<form method="get" action="{$link->getPageLink('search', true)|escape:'html':'UTF-8'}" id="searchbox">
<label for="search_query_block">{l s='Search products:' mod='blocksearch'}</label>
<p class="block_content clearfix">
View
6 themes/default-bootstrap/modules/blocksocial/blocksocial.tpl
@@ -24,7 +24,7 @@
* International Registered Trademark & Property of PrestaShop SA
*}
-<section id="social_block">
+<div id="social_block">
<ul>
{if $facebook_url != ''}
<li class="facebook">
@@ -69,6 +69,6 @@
</li>
{/if}
</ul>
- <h4>{l s='Follow us' mod='blocksocial'}</h4>
-</section>
+ <h2>{l s='Follow us' mod='blocksocial'}</h2>
+</div>
<div class="clearfix"></div>
View
108 themes/default-bootstrap/modules/blockspecials/blockspecials.tpl
@@ -25,67 +25,67 @@
<!-- MODULE Block specials -->
<div id="special_block_right" class="block">
- <p class="title_block">
+ <h2>
<a href="{$link->getPageLink('prices-drop')|escape:'html':'UTF-8'}" title="{l s='Specials' mod='blockspecials'}">
{l s='Specials' mod='blockspecials'}
</a>
- </p>
+ </h2>
<div class="block_content products-block">
- {if $special}
- <ul>
- <li class="clearfix">
- <a class="products-block-image" href="{$special.link|escape:'html':'UTF-8'}">
- <img
- class="replace-2x img-responsive"
- src="{$link->getImageLink($special.link_rewrite, $special.id_image, 'small_default')|escape:'html':'UTF-8'}"
- alt="{$special.legend|escape:'html':'UTF-8'}"
- title="{$special.name|escape:'html':'UTF-8'}" />
- </a>
- <div class="product-content">
- <h5>
- <a class="product-name" href="{$special.link|escape:'html':'UTF-8'}" title="{$special.name|escape:'html':'UTF-8'}">
- {$special.name|escape:'html':'UTF-8'}
- </a>
- </h5>
- {if isset($special.description_short) && $special.description_short}
- <p class="product-description">
- {$special.description_short|strip_tags:'UTF-8'|truncate:40}
- </p>
- {/if}
- <div class="price-box">
- {if !$PS_CATALOG_MODE}
- <span class="price special-price">
- {if !$priceDisplay}
- {displayWtPrice p=$special.price}{else}{displayWtPrice p=$special.price_tax_exc}
- {/if}
- </span>
- {if $special.specific_prices}
- {assign var='specific_prices' value=$special.specific_prices}
- {if $specific_prices.reduction_type == 'percentage' && ($specific_prices.from == $specific_prices.to OR ($smarty.now|date_format:'%Y-%m-%d %H:%M:%S' <= $specific_prices.to && $smarty.now|date_format:'%Y-%m-%d %H:%M:%S' >= $specific_prices.from))}
- <span class="price-percent-reduction">-{$specific_prices.reduction*100|floatval}%</span>
+ {if $special}
+ <ul>
+ <li class="clearfix">
+ <a class="products-block-image" href="{$special.link|escape:'html':'UTF-8'}">
+ <img
+ class="replace-2x img-responsive"
+ src="{$link->getImageLink($special.link_rewrite, $special.id_image, 'small_default')|escape:'html':'UTF-8'}"
+ alt="{$special.legend|escape:'html':'UTF-8'}"
+ title="{$special.name|escape:'html':'UTF-8'}" />
+ </a>
+ <div class="product-content">
+ <h5>
+ <a class="product-name" href="{$special.link|escape:'html':'UTF-8'}" title="{$special.name|escape:'html':'UTF-8'}">
+ {$special.name|escape:'html':'UTF-8'}
+ </a>
+ </h5>
+ {if isset($special.description_short) && $special.description_short}
+ <p class="product-description">
+ {$special.description_short|strip_tags:'UTF-8'|truncate:40}
+ </p>
+ {/if}
+ <div class="price-box">
+ {if !$PS_CATALOG_MODE}
+ <span class="price special-price">
+ {if !$priceDisplay}
+ {displayWtPrice p=$special.price}{else}{displayWtPrice p=$special.price_tax_exc}
+ {/if}
+ </span>
+ {if $special.specific_prices}
+ {assign var='specific_prices' value=$special.specific_prices}
+ {if $specific_prices.reduction_type == 'percentage' && ($specific_prices.from == $specific_prices.to OR ($smarty.now|date_format:'%Y-%m-%d %H:%M:%S' <= $specific_prices.to && $smarty.now|date_format:'%Y-%m-%d %H:%M:%S' >= $specific_prices.from))}
+ <span class="price-percent-reduction">-{$specific_prices.reduction*100|floatval}%</span>
+ {/if}
{/if}
+ <span class="old-price">
+ {if !$priceDisplay}
+ {displayWtPrice p=$special.price_without_reduction}{else}{displayWtPrice p=$priceWithoutReduction_tax_excl}
+ {/if}
+ </span>
{/if}
- <span class="old-price">
- {if !$priceDisplay}
- {displayWtPrice p=$special.price_without_reduction}{else}{displayWtPrice p=$priceWithoutReduction_tax_excl}
- {/if}
- </span>
- {/if}
+ </div>
</div>
- </div>
- </li>
- </ul>
- <div>
- <a
- class="btn btn-default button button-small"
- href="{$link->getPageLink('prices-drop')|escape:'html':'UTF-8'}"
- title="{l s='All specials' mod='blockspecials'}">
- <span>{l s='All specials' mod='blockspecials'}<i class="icon-chevron-right right"></i></span>
- </a>
- </div>
- {else}
- <div>{l s='No specials at this time.' mod='blockspecials'}</div>
- {/if}
+ </li>
+ </ul>
+ <div>
+ <a
+ class="btn btn-default button button-small"
+ href="{$link->getPageLink('prices-drop')|escape:'html':'UTF-8'}"
+ title="{l s='All specials' mod='blockspecials'}">
+ <span>{l s='All specials' mod='blockspecials'}<i class="icon-chevron-right right"></i></span>
+ </a>
+ </div>
+ {else}
+ <div>{l s='No specials at this time.' mod='blockspecials'}</div>
+ {/if}
</div>
</div>
<!-- /MODULE Block specials -->
View
4 themes/default-bootstrap/modules/blockstore/blockstore.tpl
@@ -25,11 +25,11 @@
<!-- Block stores module -->
<div id="stores_block_left" class="block">
- <p class="title_block">
+ <h2>
<a href="{$link->getPageLink('stores')|escape:'html':'UTF-8'}" title="{l s='Our stores' mod='blockstore'}">
{l s='Our stores' mod='blockstore'}
</a>
- </p>
+ </h2>
<div class="block_content blockstore">
<p class="store_image">
<a href="{$link->getPageLink('stores')|escape:'html':'UTF-8'}" title="{l s='Our stores' mod='blockstore'}">
View
4 themes/default-bootstrap/modules/blocksupplier/blocksupplier.tpl
@@ -25,7 +25,7 @@
<!-- Block suppliers module -->
<div id="suppliers_block_left" class="block blocksupplier">
- <p class="title_block">
+ <h2>
{if $display_link_supplier}
<a href="{$link->getPageLink('supplier')|escape:'html':'UTF-8'}" title="{l s='Suppliers' mod='blocksupplier'}">
{/if}
@@ -33,7 +33,7 @@
{if $display_link_supplier}
</a>
{/if}
- </p>
+ </h2>
<div class="block_content list-block">
{if $suppliers}
{if $text_list}
View
4 themes/default-bootstrap/modules/blocktags/blocktags.tpl
@@ -25,9 +25,9 @@
<!-- Block tags module -->
<div id="tags_block_left" class="block tags_block">
- <p class="title_block">
+ <h2>
{l s='Tags' mod='blocktags'}
- </p>
+ </h2>
<div class="block_content">
{if $tags}
{foreach from=$tags item=tag name=myLoop}
View
32 themes/default-bootstrap/modules/blocktopmenu/blocktopmenu.tpl
@@ -2,21 +2,23 @@
<!-- Menu -->
<div id="block_top_menu" class="sf-contener clearfix col-lg-12">
<div class="cat-title">{l s="Categories" mod="blocktopmenu"}</div>
- <ul class="sf-menu clearfix menu-content">
- {$MENU}
- {if $MENU_SEARCH}
- <li class="sf-search noBack" style="float:right">
- <form id="searchbox" action="{$link->getPageLink('search')|escape:'html':'UTF-8'}" method="get">
- <p>
- <input type="hidden" name="controller" value="search" />
- <input type="hidden" value="position" name="orderby"/>
- <input type="hidden" value="desc" name="orderway"/>
- <input type="text" name="search_query" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|escape:'html':'UTF-8'}{/if}" />
- </p>
- </form>
- </li>
- {/if}
- </ul>
+ <nav>
+ <ul class="sf-menu clearfix menu-content">
+ {$MENU}
+ {if $MENU_SEARCH}
+ <li class="sf-search noBack" style="float:right">
+ <form id="searchbox" action="{$link->getPageLink('search')|escape:'html':'UTF-8'}" method="get">
+ <p>
+ <input type="hidden" name="controller" value="search" />
+ <input type="hidden" value="position" name="orderby"/>
+ <input type="hidden" value="desc" name="orderway"/>
+ <input type="text" name="search_query" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|escape:'html':'UTF-8'}{/if}" />
+ </p>
+ </form>
+ </li>
+ {/if}
+ </ul>
+ </nav>
</div>
<!--/ Menu -->
{literal}
View
2 themes/default-bootstrap/modules/blockviewed/blockviewed.tpl
@@ -25,7 +25,7 @@
<!-- Block Viewed products -->
<div id="viewed-products_block_left" class="block">
- <p class="title_block">{l s='Viewed products' mod='blockviewed'}</p>
+ <h2>{l s='Viewed products' mod='blockviewed'}</h2>
<div class="block_content products-block">
<ul>
{foreach from=$productsViewedObj item=viewedProduct name=myLoop}
View
4 themes/default-bootstrap/modules/blockwishlist/blockwishlist.tpl
@@ -23,14 +23,14 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<div id="wishlist_block" class="block account">
- <h4 class="title_block">
+ <h2>
<a
href="{$wishlist_link|escape:'html':'UTF-8'}"
title="{l s='My wishlists' mod='blockwishlist'}"
rel="nofollow">
{l s='Wishlist' mod='blockwishlist'}
</a>
- </h4>
+ </h2>
<div class="block_content">
<div id="wishlist_block_list" class="expanded">
View
56 themes/default-bootstrap/sass/global.sass
@@ -43,7 +43,6 @@ header
z-index: 1
position: relative
background: $light-background
- padding-bottom: 15px
.banner
background: black
.row
@@ -62,6 +61,9 @@ header
position: relative
#header_logo
padding-top: 15px
+ h1
+ text-indent: -9999px
+ font-size: 0
@extend .col-sm-4
@media (max-width: $screen-md)
padding-top: 40px
@@ -805,16 +807,15 @@ table.table_block td
@media (max-width: $screen-xs-max)
margin-bottom: 20px
-.block
- .title_block,
- h4
+.block
+ h2
font: 600 18px/22px $font-custom
color: $base-heading-color
background: #f6f6f6
border-top: 5px solid $dark-border-color
text-transform: uppercase
padding: 14px 5px 17px 20px
- margin-bottom: 20px
+ margin: 0 0 20px 0
@media (min-width: $screen-sm) and (max-width: $screen-sm-max)
font-size: 14px
// max 767px
@@ -1474,7 +1475,7 @@ div.star a:hover
color: #777
&:hover
color: $light-text-color
- h4
+ h2
font: 600 18px/22px $font-custom
color: $light-text-color
margin: 0 0 13px 0
@@ -1506,27 +1507,26 @@ div.star a:hover
// max 767px
@media (max-width: $screen-xs-max)
border: none
- > div
- padding: 0 0 0 5px
- // max 767px
- @media (max-width: $screen-xs-max)
- padding-left: 0
- ul
- li
- padding: 0 0 7px 4px
- overflow: hidden
- line-height: 30px
- > span,
- > span a
- color: $light-text-color
- font-weight: normal
- i
- font-size: 25px
- width: 32px
- text-align: center
- padding-right: 12px
- float: left
- color: #908f8f
+ padding: 0 0 0 5px
+ // max 767px
+ @media (max-width: $screen-xs-max)
+ padding-left: 0
+ ul
+ li
+ padding: 0 0 7px 4px
+ overflow: hidden
+ line-height: 30px
+ > span,
+ > span a
+ color: $light-text-color
+ font-weight: normal
+ i
+ font-size: 25px
+ width: 32px
+ text-align: center
+ padding-right: 12px
+ float: left
+ color: #908f8f
.blockcategories_footer
clear: left
@@ -1589,7 +1589,7 @@ div.star a:hover
a
&:before
content: "\f0d2"
- h4
+ h2
float: right
margin-bottom: 0
font-size: 21px
View
2 themes/default-bootstrap/sass/modules/blocknewsletter/blocknewsletter.scss
@@ -38,7 +38,7 @@
@media (max-width: $screen-xs-max) { // max 767px
width: 100%;
}
- h4 {
+ h2 {
background: none;
float: left;
padding: 7px 16px 5px 0;
Something went wrong with that request. Please try again.