diff options
| -rw-r--r-- | app/jrnl/views.py | 2 | ||||
| -rw-r--r-- | design/templates/comments/preview.html | 29 |
2 files changed, 17 insertions, 14 deletions
diff --git a/app/jrnl/views.py b/app/jrnl/views.py index 7ea3e41..ed5018b 100644 --- a/app/jrnl/views.py +++ b/app/jrnl/views.py @@ -139,7 +139,7 @@ class JrnlLatestView(EntryDetailView): template_name = "details/entry_latest.html" def get_object(self, queryset=None): - obj = self.model.objects.latest() + obj = self.model.objects.filter(status=1).latest() self.location = obj.location return obj diff --git a/design/templates/comments/preview.html b/design/templates/comments/preview.html index 8129658..164b724 100644 --- a/design/templates/comments/preview.html +++ b/design/templates/comments/preview.html @@ -11,34 +11,37 @@ class="detail"{%endblock%} <header class="post-header"> <h1 class="post-title">{% trans "Preview your comment" %}</h1> </header> + {% load comments %} - <form action="{% comment_form_target %}" method="post" class="cform-arc comment--form" style="margin-left: 0;">{% csrf_token %} +<div class="comment--form--wrapper"> +<div class="comment--form--header"> + <form action="{% comment_form_target %}" method="post" class="comment--form" style="margin-left: 0;">{% csrf_token %} {% if next %}<div><input type="hidden" name="next" value="{{ next }}" /></div>{% endif %} {% if form.errors %} <h3>{% if form.errors|length == 1 %}{% trans "Please correct the error below" %}{% else %}{% trans "Please correct the errors below" %}{% endif %}</h3> {% else %} <blockquote>{{ comment|linebreaks }}</blockquote> <p> - <input type="submit" name="submit" class="submit-post" value="{% trans "Post your comment" %}" id="submit" /> <h3>{% trans "Or make changes" %}:</h3> + <input type="submit" name="submit" class="submit-post btn" value="{% trans "Post your comment" %}" id="submit" /> <h3>{% trans "Or make changes" %}:</h3> </p> {% endif %} {% for field in form %} {% if field.is_hidden %} - <div>{{ field }}</div> + {{ field }} {% else %} - {% if field.errors %}{{ field.errors }}{% endif %} - <p - {% if field.errors %} class="error"{% endif %} - {% ifequal field.name "honeypot" %} style="display:none;"{% endifequal %}> - {{ field.label_tag }} {{ field }} - </p> + <fieldset {% if field.errors %} class="error"{% endif %} {% ifequal field.name "honeypot" %} style="display:none;"{% endifequal %}> + {{ field.label_tag }} + {%ifequal field.name "comment"%}<div class="textarea-rounded">{{ field }}</div>{%else%}{{field}}{%endifequal%} + </fieldset> {% endif %} {% endfor %} - <p class="submit"> - <input type="submit" name="submit" class="submit-post" value="{% trans "Post" %}" /> - <input type="submit" name="preview" class="submit-preview" value="{% trans "Preview" %}" /> - </p> + <div class="submit"> + <input type="submit" name="post" class="submit-post btn" value="{% trans "Post" %}" /> + <input type="submit" name="preview" class="submit-preview btn" value="{% trans "Preview" %}" /> + </div> </form> + </div> + </div> </article> </main> {% endblock %} |