This commit is contained in:
Thibault GUILLAUME 2015-10-21 14:31:27 +02:00
parent ba6a6027d7
commit abaddc752d
7 changed files with 148 additions and 96 deletions

View File

@ -800,7 +800,7 @@ class BlockCms extends Module
if (!$this->isCached('blockcms.tpl', $this->getCacheId($column)))
{
$cms_titles = BlockCMSModel::getCMSTitles($column);
$this->smarty->assign(array(
'block' => 1,
'cms_titles' => $cms_titles,

View File

@ -49,7 +49,7 @@ $_MODULE['<{blockcms}prestashop>blockcms_2d81a9da91ff3f073e6aecbe42c33e69'] = 'V
$_MODULE['<{blockcms}prestashop>blockcms_af979c5a556c7a2c5340a06273046b0d'] = 'Activation du pied de page non valide.';
$_MODULE['<{blockcms}prestashop>blockcms_dc08eb6c896a19dd0f0585ab7205ed17'] = 'Impossible de créer un bloc !';
$_MODULE['<{blockcms}prestashop>blockcms_f3d25e325923cd522fd610bd869d736c'] = 'Erreur : vous essayez de supprimer un bloc CMS inexistant.';
$_MODULE['<{blockcms}prestashop>blockcms_0c579767f53365887ac199a96e26c591'] = 'Informations du pied de page mises à jour';
$_MODULE['<{blockcms}prestashop>blockcms_e47b20fa6a26735c78d2f3b0f6bd2d7e'] = 'Vos informations de pied de page ont été mises à jour.';
$_MODULE['<{blockcms}prestashop>blockcms_c28716416d2fd75a37b4496586755853'] = 'Le bloc CMS a bien été ajouté';
$_MODULE['<{blockcms}prestashop>blockcms_a94db349ae0c662fd55c9d402481165b'] = 'Le bloc CMS a bien été modifié';
$_MODULE['<{blockcms}prestashop>blockcms_64e1a7a1be29d5937f2eaa90a3d32ad0'] = 'Suppression réussie.';
@ -66,8 +66,6 @@ $_MODULE['<{blockcms}prestashop>form_b718adec73e04ce3ec720dd11a06a308'] = 'ID';
$_MODULE['<{blockcms}prestashop>form_83ef1503b3bd9858cc923a74e5f9e917'] = 'Nom du bloc';
$_MODULE['<{blockcms}prestashop>form_bb34a159a88035cce7ef1607e7907f8f'] = 'Nom de la catégorie';
$_MODULE['<{blockcms}prestashop>form_52f5e0bc3859bc5f5e25130b6c7e8881'] = 'Position';
$_MODULE['<{blockcms}prestashop>form_08a38277b0309070706f6652eeae9a53'] = 'Descendre';
$_MODULE['<{blockcms}prestashop>form_258f49887ef8d14ac268c92b02503aaa'] = 'Monter';
$_MODULE['<{blockcms}prestashop>form_7dce122004969d56ae2e0245cb754d35'] = 'Modifier';
$_MODULE['<{blockcms}prestashop>form_f2a6c498fb90ee345d997f888fce3b18'] = 'Supprimer';
$_MODULE['<{blockcms}prestashop>form_49ee3087348e8d44e1feda1917443987'] = 'Nom';

View File

@ -0,0 +1,21 @@
<?php
if (!defined('_CAN_LOAD_FILES_'))
exit;
class BlockCmsOverride extends BlockCms
{
public function install()
{
if (!parent::install()
|| !$this->registerHook('displayLeftCms')
)
return false;
return true;
}
public function hookdisplayLeftCms()
{
return $this->displayBlockCMS(BlockCMSModel::LEFT_COLUMN);
}
}

View File

@ -1,18 +1,20 @@
{capture name=path}{$cms->meta_title}{/capture}
<main>
<section>
<header class="page-heading">
{if !$content_only}
<div id="breadcrumbs">
<div class="container">
{include file="$tpl_dir./breadcrumb.tpl"}
</div>
</div>
{/if}
<div class="container">
<h1>{$cms->meta_title}</h1>
</div>
</header>
<header>
<div class="intro_top">
<div class="container">
<div class="intro_cat">
<h1>{$cms->meta_title}</h1>
</div>
</div>
</div>
<div id="breadcrumbs">
<div class="container">
{include file="$tpl_dir./breadcrumb.tpl"}
</div>
</div>
</header>
{if !isset($cms)}
<div class="alert alert-danger">
@ -25,28 +27,9 @@
{if isset($cms)}
<div class="container main">
<div class="row">
<!-- Sous navigation -->
{if isset($cms_pages) && !empty($cms_pages)}
<div class="col-md-3 clearfix">
<nav class="sub-nav-cms">
<p class="title-cat-cms">{l s='Categories'}</p>
<ul class="bullet list-group">
{foreach from=$cms_categories.children item=childrenCategory}
<li {if $cms->id_cms_category == $childrenCategory.id_cms_category} class="open"{/if}>
<span>{$childrenCategory.name}</span>
<ul>
{foreach from=$childrenCategory.cms item=cmsPage}
<li>
<a {if $cms->id == $cmsPage.id_cms} class="active" {/if}href="{$link->getCMSLink($cmsPage.id_cms, $cmsPage.link_rewrite)|escape:'html':'UTF-8'}">- {$cmsPage.meta_title|escape:'html':'UTF-8'}</a>
</li>
{/foreach}
</ul>
</li>
{/foreach}
</ul>
</nav>
</div>
{/if}
<div class="col-md-3 clearfix">
{hook h='displayLeftCms'}
</div>
<!-- Contenu -->
<div class="col-md-9 cms-content{if $content_only} content_only{/if}">

View File

@ -3921,6 +3921,17 @@ body .addresses {
#module-we_mail-default div.uploader span.action { margin-left: 5%; padding: 12px 0px 12px; width: 45% }
}
.informations_block_left {}
.informations_block_left h4 {
font-size: 22px;
font-family: 'vidaloka';
border-bottom: 3px solid #333;
margin-bottom: 15px;
}
.informations_block_left ul li { margin-left: 15px; list-style: circle;}
.informations_block_left ul li a { color: #333; }
.informations_block_left ul li a:hover { color: #e44e58; }
/* Plan de site */
#sitemap h2 {
color: #333;

View File

@ -1,69 +1,108 @@
{if $blocks}
{foreach $blocks as $key => $block}
<div class="links col-md-4 col-sm-4 col-xs-4 col-xxs-12">
<h5 class="title_block">
{if !empty($block.name)}{$block.name}{else}{$block.category_name}{/if}
</h5>
<ul>
{if $key == 0}
<li>
<a href="{$link->getModuleLink('we_firmware', 'home')|escape:'html':'UTF-8'}" title="{l s='Firmware update' mod='blockcms'}">
{l s='Firmware update' mod='blockcms'}
</a>
</li>
<li>
<a href="{$link->getModuleLink('we_customer2product', 'registerProduct')|escape:'html':'UTF-8'}" title="{l s='Register a product' mod='blockcms'}">
{l s='Register a product' mod='blockcms'}
</a>
</li>
<li>
<a href="{$link->getModuleLink('we_odr', 'list')|escape:'html':'UTF-8'}" title="{l s='Refund offers' mod='blockcms'}">
{l s='Refund offers' mod='blockcms'}
</a>
</li>
<li>
<a href="{$link->getCMSLink(6)}" title="{l s='Investor space' mod='blockcms'}">
{l s='Investor space' mod='blockcms'}
</a>
</li>
<li>
<a href="{$link->getCMSLink(7)}" title="{l s='The group' mod='blockcms'}">
{l s='The group' mod='blockcms'}
</a>
</li>
{/if}
{foreach from=$block.categories item=cms_page}
{*
* 2007-2014 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2014 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
{if $block == 1}
<!-- Block CMS module -->
{foreach from=$cms_titles key=cms_key item=cms_title}
<div id="informations_block_left_{$cms_key}" class="block informations_block_left">
<h4 class="title_block">
{if !empty($cms_title.name)}{$cms_title.name}{else}{$cms_title.category_name}{/if}
</h4>
<ul class="block_content">
{foreach from=$cms_title.categories item=cms_page}
{if isset($cms_page.link)}
<li class="bullet">
<a href="{$cms_page.link|escape:'html':'UTF-8'}" title="{$cms_page.name|escape:'html':'UTF-8'}">
{$cms_page.name|escape:'html':'UTF-8'}
</a>
<b style="margin-left:2em;">
<a href="{$cms_page.link|escape:'html'}" title="{$cms_page.name|escape:html:'UTF-8'}">{$cms_page.name|escape:html:'UTF-8'}</a>
</b>
</li>
{/if}
{/foreach}
{foreach from=$block.cms item=cms_page}
{if $cms_page.id_cms != 4}
{if isset($cms_page.link)}
<li>
<a href="{$cms_page.link|escape:'html':'UTF-8'}" title="{$cms_page.meta_title|escape:'html':'UTF-8'}">
{$cms_page.meta_title|escape:'html':'UTF-8'}
</a>
</li>
{/if}
{else}
<li>
<a href="{$link->getCMSLink(7)}" title="{$cms_page.meta_title|escape:'html':'UTF-8'}">
{$cms_page.meta_title|escape:'html':'UTF-8'}
</a>
</li>
{/if}
{/foreach}
{if $key == 1}
{foreach from=$cms_title.cms item=cms_page}
{if isset($cms_page.link)}
<li>
<a href="{$cms_page.link|escape:'html'}" title="{$cms_page.meta_title|escape:html:'UTF-8'}">{$cms_page.meta_title|escape:html:'UTF-8'}</a>
</li>
{/if}
{/foreach}
{if $cms_title.display_store}
<li>
<a href="{$link->getPageLink('contact', true)|escape:'html'}" title="{l s='Contact us' mod='blockcms'}">{l s='Contact us' mod='blockcms'}</a>
<a href="{$link->getPageLink('stores')|escape:'html'}" title="{l s='Our stores' mod='blockcms'}">{l s='Our stores' mod='blockcms'}</a>
</li>
{/if}
</ul>
</div>
{/foreach}
{/if}
<!-- /Block CMS module -->
{else}
<!-- MODULE Block footer -->
<div class="block_various_links" id="block_various_links_footer">
<h4 class="title_block">{l s='Information' mod='blockcms'}</h4>
<ul>
{if isset($show_price_drop) && $show_price_drop && !$PS_CATALOG_MODE}
<li class="first_item">
<a href="{$link->getPageLink('prices-drop')|escape:'html'}" title="{l s='Specials' mod='blockcms'}">{l s='Specials' mod='blockcms'}</a>
</li>
{/if}
{if isset($show_new_products) && $show_new_products}
<li class="item">
<a href="{$link->getPageLink('new-products')|escape:'html'}" title="{l s='New products' mod='blockcms'}">{l s='New products' mod='blockcms'}</a>
</li>
{/if}
{if isset($show_best_sales) && $show_best_sales && !$PS_CATALOG_MODE}
<li class="item">
<a href="{$link->getPageLink('best-sales')|escape:'html'}" title="{l s='Best sellers' mod='blockcms'}">{l s='Best sellers' mod='blockcms'}</a>
</li>
{/if}
{if isset($display_stores_footer) && $display_stores_footer}
<li class="item">
<a href="{$link->getPageLink('stores')|escape:'html'}" title="{l s='Our stores' mod='blockcms'}">{l s='Our stores' mod='blockcms'}</a>
</li>
{/if}
{if isset($show_contact) && $show_contact}
<li class="item">
<a href="{$link->getPageLink($contact_url, true)|escape:'html'}" title="{l s='Contact us' mod='blockcms'}">{l s='Contact us' mod='blockcms'}</a>
</li>
{/if}
{foreach from=$cmslinks item=cmslink}
{if $cmslink.meta_title != ''}
<li class="item">
<a href="{$cmslink.link|addslashes|escape:'html'}" title="{$cmslink.meta_title|escape:'html':'UTF-8'}">{$cmslink.meta_title|escape:'html':'UTF-8'}</a>
</li>
{/if}
{/foreach}
{if isset($show_sitemap) && $show_sitemap}
<li>
<a href="{$link->getPageLink('sitemap')|escape:'html'}" title="{l s='Sitemap' mod='blockcms'}">{l s='Sitemap' mod='blockcms'}</a>
</li>
{/if}
{if isset($display_poweredby) && $display_poweredby}
<li class="last_item">{l s='[1]Ecommerce software by %s[/1]' mod='blockcms' sprintf=['PrestaShop™'] tags=['<a class="_blank" href="http://www.prestashop.com">']}</li>
{/if}
</ul>
{$footer_text}
</div>
<!-- /MODULE Block footer -->
{/if}

Binary file not shown.