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:
Manuel Raynaud
2013-09-11 08:16:39 +02:00
parent 66d6f86b9a 08a6b0d195
commit 8fa3ed287b
19 changed files with 446 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/admin/default/includes/generic-js-dialog.html
View File

@@ -15,7 +15,7 @@ Parameters:
{* re-display the form creation dialog if it contains errors *}
{form name="{$form_name}"}
{if #form_error}
{if $form_error}
$('#{$dialog_id}').modal();
{/if}
{/form}

4
templates/admin/default/includes/thelia_news_feed.html
View File

@@ -3,8 +3,8 @@
{loop type="feed" name="thelia_feeds" url="http://thelia.net/Flux-rss.html?id_rubrique=8" limit="3"}
<div class="span4 feed-list-item">
<h3>{$DATE}</h3>
<h2><a href="#URL" target="_blank" title="{intl l='Lire la suite'}">{$TITLE|strip_tags}</a></h2>
<h2><a href="{$URL}" target="_blank" title="{intl l='Lire la suite'}">{$TITLE|strip_tags}</a></h2>
<p>{$DESCRIPTION|strip_tags|truncate:250:"...":true}</p>
<p><a class="btn" href="#URL" target="_blank">{intl l='Lire la suite »'}</a></p>
<p><a class="btn" href="{$URL}" target="_blank">{intl l='Lire la suite »'}</a></p>
</div>
{/loop}

5
templates/default/layout.tpl
View File

@@ -30,7 +30,7 @@ URL: http://www.thelia.net
{stylesheets file='assets/less/styles.less' filters='less,cssembed'}
<link rel="stylesheet" href="{$asset_url}">
{/stylesheets}
{debugbar_rendercss}
{block name="stylesheet"}{/block}
</head>
@@ -397,6 +397,9 @@ URL: http://www.thelia.net
<script src="{$asset_url}"></script>
{/javascripts}
{debugbar_renderjs}
{debugbar_renderresult}
<!--[if lt IE 9]>
<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->

4
templates/default_save/product.html
View File

@@ -13,7 +13,7 @@ Index : {navigate to="index"}<br />
<h3>{$TITLE}</h3>
<p>{$DESCRIPTION}</p>
<p>Starting by {$BEST_PRICE} € HT (TAX : {$BEST_PRICE_TAX} ; {$BEST_TAXED_PRICE} € TTC)</p>
<p>Starting by {$BEST_PRICE} {currency attr="symbol"} HT (TAX : {$BEST_PRICE_TAX} ; {$BEST_TAXED_PRICE} {currency attr="symbol"} TTC)</p>
{ifloop rel="acc"}
<h4>Accessories</h4>
@@ -66,7 +66,7 @@ Index : {navigate to="index"}<br />
{$ATTRIBUTE_TITLE} = {$ATTRIBUTE_AVAILABILITY_TITLE}<br />
{/loop}
<br />{$WEIGHT} g
<br /><strong>{if $IS_PROMO == 1} {$PROMO_PRICE} € HT // TAX : {$PROMO_PRICE_TAX} ; {$TAXED_PROMO_PRICE} € TTC (instead of {$PRICE HT} // TAX : {$PRICE_TAX} ; {$TAXED_PRICE} € TTC){else} {$PRICE} € HT // TAX : {$PRICE_TAX} ; {$TAXED_PRICE} € TTC{/if}</strong>
<br /><strong>{if $IS_PROMO == 1} {$PROMO_PRICE} {currency attr="symbol"} HT // TAX : {$PROMO_PRICE_TAX} ; {$TAXED_PROMO_PRICE} {currency attr="symbol"} TTC (instead of {$PRICE HT} // TAX : {$PRICE_TAX} ; {$TAXED_PRICE} {currency attr="symbol"} TTC){else} {$PRICE} {currency attr="symbol"} HT // TAX : {$PRICE_TAX} ; {$TAXED_PRICE} {currency attr="symbol"} TTC{/if}</strong>
<br /><br />
Add
<select>