TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:thelia/thelia

Browse Source
This commit is contained in:
Etienne Roudeix
2013-10-30 12:28:30 +01:00
parent e998717c9b b8dad621fd
commit 457c0460cf
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
View File

@@ -70,8 +70,14 @@ class SmartyParser extends Smarty implements ParserInterface
$this->error_reporting = E_ALL ^ E_NOTICE; $this->error_reporting = E_ALL ^ E_NOTICE;
// Si on n'est pas en mode debug, activer le cache, avec une lifetime de 15mn, et en vérifiant que les templates sources n'ont pas été modifiés. // Si on n'est pas en mode debug, activer le cache, avec une lifetime de 15mn, et en vérifiant que les templates sources n'ont pas été modifiés.
$this->caching = Smarty::CACHING_OFF;
$this->force_compile = true; if($debug) {
$this->setCaching(Smarty::CACHING_OFF);
$this->setForceCompile(true);
} else {
$this->setForceCompile(false);
}
// The default HTTP status // The default HTTP status
$this->status = 200; $this->status = 200;

8
templates/default/index.html
View File

@@ -14,16 +14,16 @@
<figure class="item active"> <figure class="item active">
{images file='assets/img/carousel/slider1.png'}<img src="{$asset_url}" alt="img1">{/images} {images file='assets/img/carousel/slider1.png'}<img src="{$asset_url}" alt="img1">{/images}
</figure> </figure>
<figure class="item"> {* <figure class="item">
{images file='assets/img/carousel/slider2.png'}<img src="{$asset_url}" alt="img2">{/images} {images file='assets/img/carousel/slider2.png'}<img src="{$asset_url}" alt="img2">{/images}
</figure> </figure>
<figure class="item"> <figure class="item">
{images file='assets/img/carousel/slider3.png'}<img src="{$asset_url}" alt="img3">{/images} {images file='assets/img/carousel/slider3.png'}<img src="{$asset_url}" alt="img3">{/images}
</figure> </figure>*}
</div> </div>
</div> </div>
<a class="left carousel-control" href="#carousel" data-slide="prev"><span class="icon-prev"></span></a> {* <a class="left carousel-control" href="#carousel" data-slide="prev"><span class="icon-prev"></span></a>
<a class="right carousel-control" href="#carousel" data-slide="next"><span class="icon-next"></span></a> <a class="right carousel-control" href="#carousel" data-slide="next"><span class="icon-next"></span></a>*}
</div> </div>
</section><!-- #carousel --> </section><!-- #carousel -->