Enforce blog posts not allowing commenting on them
This commit is contained in:
parent
21dbede734
commit
c665db20b8
|
|
@ -81,6 +81,7 @@
|
||||||
{{ include_page("comment.partial_index",
|
{{ include_page("comment.partial_index",
|
||||||
thread="blog-"+post["post_id"]|string,
|
thread="blog-"+post["post_id"]|string,
|
||||||
subject=post["subject"],
|
subject=post["subject"],
|
||||||
|
addable=post["comments"],
|
||||||
) | safe }}
|
) | safe }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -168,8 +168,13 @@ def unsubscribe():
|
||||||
return template("comment/unsubscribed.html")
|
return template("comment/unsubscribed.html")
|
||||||
|
|
||||||
|
|
||||||
def partial_index(thread, subject, header=True):
|
def partial_index(thread, subject, header=True, addable=True):
|
||||||
"""Partial template for including the index view of a comment thread."""
|
"""Partial template for including the index view of a comment thread.
|
||||||
|
|
||||||
|
* thread: unique name for the comment thread
|
||||||
|
* subject: subject name for the comment thread
|
||||||
|
* header: show the Comments h1 header
|
||||||
|
* addable: boolean, can new comments be added to the thread"""
|
||||||
|
|
||||||
comments = Comment.get_comments(thread)
|
comments = Comment.get_comments(thread)
|
||||||
|
|
||||||
|
|
@ -199,6 +204,7 @@ def partial_index(thread, subject, header=True):
|
||||||
g.info["header"] = header
|
g.info["header"] = header
|
||||||
g.info["thread"] = thread
|
g.info["thread"] = thread
|
||||||
g.info["subject"] = subject
|
g.info["subject"] = subject
|
||||||
|
g.info["commenting_disabled"] = not addable
|
||||||
g.info["url"] = request.url
|
g.info["url"] = request.url
|
||||||
g.info["comments"] = sorted_comments
|
g.info["comments"] = sorted_comments
|
||||||
g.info["photo_url"] = Config.photo.root_public
|
g.info["photo_url"] = Config.photo.root_public
|
||||||
|
|
|
||||||
|
|
@ -1,66 +1,70 @@
|
||||||
{# Common template for leaving a comment/updating the comment preview. #}
|
{# Common template for leaving a comment/updating the comment preview. #}
|
||||||
|
|
||||||
<form name="comment" action="{{ url_for('comment.preview') }}" method="POST">
|
{% if commenting_disabled %}
|
||||||
<input type="hidden" name="token" value="{{ csrf_token() }}">
|
No new comments may be added to this thread.
|
||||||
<input type="hidden" name="thread" value="{{ thread }}">
|
|
||||||
<input type="hidden" name="url" value="{{ url }}">
|
|
||||||
<input type="hidden" name="subject" value="{{ subject }}">
|
|
||||||
<table border="0" cellspacing="2" cellpadding="2">
|
|
||||||
<tr>
|
|
||||||
<td align="left" valign="middle">
|
|
||||||
Your name:
|
|
||||||
</td>
|
|
||||||
<td align="left" valign="middle">
|
|
||||||
{% if session["login"] %}
|
|
||||||
<strong>{{ session["name"] }}</strong>
|
|
||||||
{% else %}
|
|
||||||
<input type="text" class="form-control" size="40" name="name" value="{{ name }}">
|
|
||||||
{% endif %}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td align="left" valign="middle">
|
|
||||||
Your Email:
|
|
||||||
</td>
|
|
||||||
<td align="left" valign="middle">
|
|
||||||
<input type="text" class="form-control" size="40" name="contact" value="{{ contact }}" placeholder="(optional; used for Gravatar icons and subscribing)">
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td align="left" valign="top">
|
|
||||||
Message:
|
|
||||||
</td>
|
|
||||||
<td align="left" valign="top">
|
|
||||||
<textarea class="form-control" cols="40" rows="8" name="message" style="width: 100%">{{ message }}</textarea>
|
|
||||||
<div>
|
|
||||||
<small>Comments can be formatted with <a href="/markdown" target="_blank">Markdown</a>,
|
|
||||||
and you can use<br><a href="{{ url_for('emoticons.index') }}" target="_blank">emoticons</a>
|
|
||||||
in your comment.</small>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td colspan="2" align="left" valign="top">
|
|
||||||
<label>
|
|
||||||
<input type="checkbox" name="subscribe" value="true"{% if subscribe == "true" %} checked{% endif %}>
|
|
||||||
Notify me of future comments on this page via e-mail
|
|
||||||
(<a href="{{ url_for('comment.privacy') }}" target="_blank">Privacy Policy</a>)
|
|
||||||
</label>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table><p>
|
|
||||||
|
|
||||||
<div style="display: none">
|
|
||||||
If you can see this, don't touch the following fields.<br>
|
|
||||||
<input type="text" class="form-control" name="website" value="http://"><br>
|
|
||||||
<input type="text" class="form-control" name="email" value="">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% if preview %}
|
|
||||||
<button class="btn btn-default" type="submit" name="action" value="preview">Refresh Preview</button>
|
|
||||||
<button class="btn btn-primary" type="submit" name="action" value="submit">Submit Comment</button>
|
|
||||||
{% else %}
|
{% else %}
|
||||||
<button class="btn btn-primary" type="submit" name="action" value="preview">Leave Comment</button>
|
<form name="comment" action="{{ url_for('comment.preview') }}" method="POST">
|
||||||
{% endif %}
|
<input type="hidden" name="token" value="{{ csrf_token() }}">
|
||||||
|
<input type="hidden" name="thread" value="{{ thread }}">
|
||||||
|
<input type="hidden" name="url" value="{{ url }}">
|
||||||
|
<input type="hidden" name="subject" value="{{ subject }}">
|
||||||
|
<table border="0" cellspacing="2" cellpadding="2">
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="middle">
|
||||||
|
Your name:
|
||||||
|
</td>
|
||||||
|
<td align="left" valign="middle">
|
||||||
|
{% if session["login"] %}
|
||||||
|
<strong>{{ session["name"] }}</strong>
|
||||||
|
{% else %}
|
||||||
|
<input type="text" class="form-control" size="40" name="name" value="{{ name }}">
|
||||||
|
{% endif %}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="middle">
|
||||||
|
Your Email:
|
||||||
|
</td>
|
||||||
|
<td align="left" valign="middle">
|
||||||
|
<input type="text" class="form-control" size="40" name="contact" value="{{ contact }}" placeholder="(optional; used for Gravatar icons and subscribing)">
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top">
|
||||||
|
Message:
|
||||||
|
</td>
|
||||||
|
<td align="left" valign="top">
|
||||||
|
<textarea class="form-control" cols="40" rows="8" name="message" style="width: 100%">{{ message }}</textarea>
|
||||||
|
<div>
|
||||||
|
<small>Comments can be formatted with <a href="/markdown" target="_blank">Markdown</a>,
|
||||||
|
and you can use<br><a href="{{ url_for('emoticons.index') }}" target="_blank">emoticons</a>
|
||||||
|
in your comment.</small>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td colspan="2" align="left" valign="top">
|
||||||
|
<label>
|
||||||
|
<input type="checkbox" name="subscribe" value="true"{% if subscribe == "true" %} checked{% endif %}>
|
||||||
|
Notify me of future comments on this page via e-mail
|
||||||
|
(<a href="{{ url_for('comment.privacy') }}" target="_blank">Privacy Policy</a>)
|
||||||
|
</label>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table><p>
|
||||||
|
|
||||||
</form>
|
<div style="display: none">
|
||||||
|
If you can see this, don't touch the following fields.<br>
|
||||||
|
<input type="text" class="form-control" name="website" value="http://"><br>
|
||||||
|
<input type="text" class="form-control" name="email" value="">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% if preview %}
|
||||||
|
<button class="btn btn-default" type="submit" name="action" value="preview">Refresh Preview</button>
|
||||||
|
<button class="btn btn-primary" type="submit" name="action" value="submit">Submit Comment</button>
|
||||||
|
{% else %}
|
||||||
|
<button class="btn btn-primary" type="submit" name="action" value="preview">Leave Comment</button>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
</form>
|
||||||
|
{% endif %}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user