Merge branch 'master' of github.com:gergelypolonkai/gergelypolonkaiweb

This commit is contained in:
Gergely Polonkai 2013-01-06 04:49:50 +01:00
commit b3bd39d136

View File

@ -1,5 +1,5 @@
<div class="post">
<h3>{% if title_links %}<a href="{{ path('GergelyPolonkaiFrontBundle_blogViewPost', {year: post.createdAt|date('Y'), month: post.createdAt|date('m'), day: post.createdAt|date('d'), slug: post.slug}) }}">{% endif %}{{ post.title }}{% if title_links %}</a>{% endif %}<div class="plusone-container"><div class="g-plusone" data-annotation="inline" data-size="small" data-width="300"></div></div></h3>
<h3>{% if title_links %}<a href="{{ path('GergelyPolonkaiFrontBundle_blogViewPost', {year: post.createdAt|date('Y'), month: post.createdAt|date('m'), day: post.createdAt|date('d'), slug: post.slug}) }}">{% endif %}{{ post.title }}{% if title_links %}</a>{% else %}<div class="plusone-container"><div class="g-plusone" data-annotation="inline" data-size="small" data-width="300"></div></div>{% endif %}</h3>
<p class="article-date">{{ post.createdAt|date('m-d-Y :: H:i') }} by {{ post.user.name }}</p>
{{ post.content|insert_code_chunks }}
{% if post.tags|length > 0 %}
@ -9,5 +9,7 @@
{% endfor %}
</p>
{% endif %}
{% if not title_links %}
<div class="g-plus" data-action="share" data-height="15"></div>
{% endif %}
</div>