ctactic/aircox-radiocampus
1
0
Fork 0
forked from rc/aircox
Code Issues 10 Pull Requests Activity

fix conflict issue

Browse Source
This commit is contained in:
bkfox
2016-05-26 01:56:09 +02:00
parent a989e53da4
commit 7402fc49b6
7 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/templates/aircox/cms/detail.html
View File

@ -6,7 +6,7 @@
{% endblock %}
{% block pre_title %}
<div class="pre_title">
<div class="pre_title metadata">
{% if object.thread %}
<div class="threads">
{{ object|threads:' > '|safe }}

17
cms/templates/aircox/cms/section_comments.html
View File

@ -5,7 +5,7 @@
{% block section_content %}
{{ form.non_field_errors }}
<form action="" method="POST" class="comment-form">
<form action="" method="POST" class="comment_form">
{% csrf_token %}
{% render_honeypot_field "hp_website" %}
<div>
@ -25,13 +25,16 @@
<button type="submit">{% trans "Post!" %}</button>
</div>
</form>
<ul style="padding:0; margin:0">
<div class="comment_list">
{% for item in object_list %}
<li id="comment-{{ item.id }}" class="{{item.css}}">
<div id="comment-{{ item.id }}" class="comment_item">
{{ item.content }}
<div class="info">
<a href="{% if item.url %}{{ item.url }}{% else %}#{% endif %}">{{ item.author }}</a>
<div class="metadata">
<a href="{% if item.url %}{{ item.url }}{% else
%}#{% endif %}" class="author">
{{ item.author }}
</a>
<time datetime="{{ item.date }}">
{{ item.date|date:'l d F Y' }},
@ -40,9 +43,9 @@
<a href="#comment-{{ item.id }}">#{{ item.id }}</a>
</div>
</li>
</div>
{% endfor %}
</ul>
</div>
{% endblock %}