Manual merge of develop into opennebula-integration
This commit is contained in:
parent
cb4d96604c
commit
9abffdfc8a
1 changed files with 1 additions and 12 deletions
|
@ -16,18 +16,7 @@
|
||||||
</h2>
|
</h2>
|
||||||
</a>
|
</a>
|
||||||
<p class="post-meta" style="font-size:0.9em;">
|
<p class="post-meta" style="font-size:0.9em;">
|
||||||
Posted
|
Posted on {{ post.date_published|date:"DATE_FORMAT" }}
|
||||||
{% 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" }}
|
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p class="post-subtitle">
|
<p class="post-subtitle">
|
||||||
|
|
Loading…
Reference in a new issue