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

Merge branch 'master' into template

Browse Source
This commit is contained in:
Manuel Raynaud
2013-09-11 08:47:26 +02:00
parent 672b489418 2f07e01b06
commit 65a20381d9
174 changed files with 996 additions and 1095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/admin/default/admin-layout.tpl
View File

@@ -23,7 +23,7 @@
<link rel="stylesheet" href="{$asset_url}">
{/stylesheets}
{debugbar_renderHead}
{debugbar_rendercss}
{block name="after-bootstrap-css"}{/block}
@@ -36,8 +36,6 @@
{* Modules css are included here *}
{module_include location='head_css'}
{debugbar_renderHead}
</head>
<body>
@@ -225,11 +223,13 @@
<script src="http://code.jquery.com/jquery-2.0.3.min.js"></script>
{debugbar_renderjs}
{debugbar_renderresult}
{block name="after-javascript-include"}{/block}
{block name="javascript-initialization"}{/block}
{debugbar_render}
{* Modules scripts are included now *}
{module_include location='footer_js'}

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]-->

3
templates/default_save/includes/footer.html
View File

@@ -13,6 +13,7 @@
});
});
</script>
{debugbar_render}
{debugbar_renderjs}
{debugbar_renderresult}
</body>
</html>

2
templates/default_save/includes/header.html
View File

@@ -7,7 +7,7 @@
{stylesheets file='../assets/css/*' filters='less,cssembed'}
<link rel="stylesheet" href="{$asset_url}">
{/stylesheets}
{debugbar_renderHead}
{debugbar_rendercss}
</head>
<body>
<div>

6
templates/default_save/product.html
View File

@@ -6,14 +6,14 @@ Index : {navigate to="index"}<br />
{ifloop rel="product"}
{loop type="product" name="product" current="true"}
{loop type="product" name="product" current="true" min_price="50" max_price="100"}
<div style="border: dashed 2px red; padding: 20px; margin: 10px;">
<h2>PRODUCT ({$ID}) : {$REF}</h2>
<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>