Manual merge of develop into opennebula-integration

This commit is contained in:
M.Ravi 2017-04-26 22:48:28 +05:30
parent cb4d96604c
commit 9abffdfc8a
1 changed files with 1 additions and 12 deletions

View File

@ -16,18 +16,7 @@
</h2>
</a>
<p class="post-meta" style="font-size:0.9em;">
Posted
{% if post.author %}
by
<!-- <a href="{% url 'djangocms_blog:posts-author' post.author.get_username %}"> -->
{% if post.author.get_full_name %}
{{ post.author.get_full_name }}
{% else %}
{{ post.author }}
{% endif %}
<!-- </a> -->
{% endif %}
on {{ post.date_published|date:"DATE_FORMAT" }}
Posted on {{ post.date_published|date:"DATE_FORMAT" }}
</p>
<p class="post-subtitle">