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}