diff --git a/comments/templates/comments/_add_comment_form.html b/comments/templates/comments/_add_comment_form.html
index 721d7b0d66da204cd6a4fd757cceaf6362dff1da..2c74de632b79566cc11a817bc7fe4a8678b64523 100644
--- a/comments/templates/comments/_add_comment_form.html
+++ b/comments/templates/comments/_add_comment_form.html
@@ -12,12 +12,10 @@
<div class="row">
<div class="col-md-9">
{{ form.comment_text|bootstrap:'12,12' }}
-
- <p class="good_commenter">
+ <p><strong>
You can use plain text, Markdown or reStructuredText; see our
<a href="{% url 'markup:help' %}" target="_blank">markup help</a> pages.
- <br>
- Be professional. Only serious and meaningful comments will be vetted through.</p>
+ </strong></p>
</div>
<div class="col-md-3 radio-list">
<label>Specify categorization(s):</label>
@@ -52,7 +50,7 @@
</div>
{% endif %}
<div id="submitButton">
- <input type="submit" value="Submit your Comment for vetting" class="btn btn-primary">
+ <input type="submit" value="Preview looks good; submit this Comment for vetting" class="btn btn-primary">
{% if form.anonymous %}
<p class="mt-2" id="goodCommenter"><i>By clicking on Submit, you agree with the <a target="_blank" href="{% url 'scipost:terms_and_conditions' %}">Terms and Conditions</a>.</i></p>
{% else %}
@@ -63,7 +61,7 @@
</div>
</form>
-<button class="btn btn-warning" id="runPreviewButton">Run/refresh preview and check your Comment before submitting it:</button>
+<button class="btn btn-warning" id="runPreviewButton">Run/refresh preview of your Comment</button>
<div class="card m-2">
<div class="card-header">
Preview of your comment
diff --git a/comments/templates/comments/_comment_card_content.html b/comments/templates/comments/_comment_card_content.html
index d329cd0c33f80db50036dabe2dd2339d17fc8f41..62f8633e5b3aef40868493788e39dd0d7b806cb1 100644
--- a/comments/templates/comments/_comment_card_content.html
+++ b/comments/templates/comments/_comment_card_content.html
@@ -7,18 +7,18 @@
<a href="{{ comment.author.get_absolute_url }}">{{ comment.get_author_str }}</a>:
{% endif %}
- <a href="{{comment.get_absolute_url}}">
- "{{comment.comment_text|slice:'30'}}{% if comment.comment_text|length > 30 %}...{% endif %}"
+ <a href="{{ comment.get_absolute_url }}">
+ "{{ comment.comment_text|slice:'30' }}{% if comment.comment_text|length > 30 %}...{% endif %}"
</a>
</p><p class="card-text pl-md-3">
- in {{comment.content_type|capfirst}} on <a href="{{comment.content_object.get_absolute_url}}" class="pubtitleli">{{comment.title}}</a>
+ in {{ comment.content_type|capfirst }} on <a href="{{ comment.content_object.get_absolute_url }}" class="pubtitleli">{{ comment.title }}</a>
{% if comment.content_object.author_list %}
{% comment %}
Using 'by xxx' on non-submission comments here would be ambigious. Does the `by xxx` apply to the
other object (eg. Report), or the Submission, the Comment, etc?
{% endcomment %}
- <span class="text-muted">by {{comment.content_object.author_list}}</span>
+ <span class="text-muted">by {{ comment.content_object.author_list }}</span>
{% endif %}
</p>
</div>
diff --git a/comments/templates/comments/_comment_card_extended_for_author.html b/comments/templates/comments/_comment_card_extended_for_author.html
index 02fd05618a6d5d9ec3a308a565d58a79184bd33c..3cea105aba47cfea79a92144076043bef4564447 100644
--- a/comments/templates/comments/_comment_card_extended_for_author.html
+++ b/comments/templates/comments/_comment_card_extended_for_author.html
@@ -1,20 +1,22 @@
+{% load automarkup %}
+
<div class="card-body card-comment">
<div class="mb-4 mt-2">
- <div class="d-inline-block mr-1">Nr {{comment.id}}</div>
+ <div class="d-inline-block mr-1">Nr {{ comment.id }}</div>
{% include 'comments/_comment_voting_summary.html' with comment=comment class='small' %}
</div>
- <p>"{{comment.comment_text|linebreaksbr}}"</p>
+ <p>{{ comment.comment_text|automarkup }}</p>
{% if comment.anonymous %}
- <p class="card-text">by Anonymous in {{comment.content_type|capfirst}} on <a href="{{comment.content_object.get_absolute_url}}" class="pubtitleli">{{comment.title}}</a> {% if comment.content_object.author_list %} <span class="text-muted">by {{comment.content_object.author_list}}</span>{% endif %}</p>
+ <p class="card-text">by Anonymous in {{ comment.content_type|capfirst }} on <a href="{{ comment.content_object.get_absolute_url }}" class="pubtitleli">{{ comment.title }}</a> {% if comment.content_object.author_list %} <span class="text-muted">by {{ comment.content_object.author_list }}</span>{% endif %}</p>
{% else %}
- <p class="card-text">by <a href="{{comment.author.get_absolute_url}}">{{comment.author.user.first_name}} {{comment.author.user.last_name}}</a> in {{comment.content_type|capfirst}} on <a href="{{comment.content_object.get_absolute_url}}" class="pubtitleli">{{comment.title}}</a> {% if comment.content_object.author_list %} <span class="text-muted">by {{comment.content_object.author_list}}</span>{% endif %}</p>
+ <p class="card-text">by <a href="{{ comment.author.get_absolute_url }}">{{ comment.author.user.first_name }} {{ comment.author.user.last_name }}</a> in {{ comment.content_type|capfirst }} on <a href="{{ comment.content_object.get_absolute_url }}" class="pubtitleli">{{ comment.title }}</a> {% if comment.content_object.author_list %} <span class="text-muted">by {{ comment.content_object.author_list }}</span>{% endif %}</p>
{% endif %}
{% comment %}
Using 'by xxx' on non-submission comments here would be ambigious. Does the `by xxx` apply to the
other object (eg. Report), or the Submission, the Comment, etc?
{% endcomment %}
- <p class="card-text text-muted">Comment submitted {{comment.date_submitted}}</p>
- <p class="card-text">Status: <span class="{% if comment.status == 1 %} text-success{% elif comment.status == 0 %} text-danger{% endif %}">{{comment.get_status_display}}</span></p>
+ <p class="card-text text-muted">Comment submitted {{ comment.date_submitted }}</p>
+ <p class="card-text">Status: <span class="{% if comment.status == 1 %} text-success{% elif comment.status == 0 %} text-danger{% endif %}">{{ comment.get_status_display }}</span></p>
</div>
diff --git a/comments/templates/comments/_single_comment.html b/comments/templates/comments/_single_comment.html
index 01cf9a852d231fd47c62bd078f2489c7a3fb00c6..041a172684f8449ad6e1cbe433d5720be72388d5 100644
--- a/comments/templates/comments/_single_comment.html
+++ b/comments/templates/comments/_single_comment.html
@@ -17,7 +17,7 @@
{% endif %}
<p class="my-3 pb-2">
- {{ comment.comment_text|automarkup:'plain' }}
+ {{ comment.comment_text|automarkup }}
</p>
{% if comment.file_attachment %}
@@ -36,7 +36,7 @@
{% if is_editorial_college or is_edcol_admin %}
{% if comment.remarks_for_editors %}
<h3>Remarks for editors:</h3>
- <p>{{ comment.remarks_for_editors|linebreaksbr }}</p>
+ <p>{{ comment.remarks_for_editors|automarkup }}</p>
{% endif %}
{% endif %}
diff --git a/comments/templates/comments/_vet_comment_form.html b/comments/templates/comments/_vet_comment_form.html
index 7cbb6f4c08049e38d8e857ed96b3ebfa52dfc80c..a2eba9933b4a1ed04762d15a5670acdfbfeb3372 100644
--- a/comments/templates/comments/_vet_comment_form.html
+++ b/comments/templates/comments/_vet_comment_form.html
@@ -2,10 +2,11 @@
{% load filename %}
{% load file_extentions %}
{% load comment_extras %}
+{% load automarkup %}
<div>
- <h3>Details of the related {{comment.core_content_object|get_core_content_type|capfirst}}</h3>
- <a href="{{comment.get_absolute_url}}" target="_blank">See detail page</a>
+ <h3>Details of the related {{ comment.core_content_object|get_core_content_type|capfirst }}</h3>
+ <a href="{{ comment.get_absolute_url }}" target="_blank">See detail page</a>
<div class="py-2">
{% get_summary_template comment.core_content_object %}
</div>
@@ -16,12 +17,8 @@
<div class="row">
<div class="col-md-6">
- <!-- {% include 'comments/_comment_identifier.html' with comment=comment %} -->
{% include 'comments/_single_comment.html' with comment=comment hide_votes=1 %}
- <h3>Comment text:</h3>
- <p>{{ comment.comment_text|linebreaksbr }}</p>
-
{% if comment.file_attachment %}
<h3>Attachment:</h3>
<p>
@@ -37,7 +34,7 @@
{% if comment.remarks_for_editors %}
<h3>Remarks for Editors only:</h3>
- <p>{{ comment.remarks_for_editors|linebreaksbr }}</p>
+ <p>{{ comment.remarks_for_editors|automarkup }}</p>
{% endif %}
</div>
<div class="col-md-6">
diff --git a/comments/templates/comments/reply_to_comment.html b/comments/templates/comments/reply_to_comment.html
index 75c208d5a8ec40bf8a1f77ff32aec3cdc5bc4ce2..9a12df8289e9d22f66d10922a11ca110ef8cd6c7 100644
--- a/comments/templates/comments/reply_to_comment.html
+++ b/comments/templates/comments/reply_to_comment.html
@@ -1,6 +1,7 @@
{% extends 'scipost/base.html' %}
{% load comment_extras %}
+{% load automarkup %}
{% block pagetitle %}: reply to comment{% endblock pagetitle %}
@@ -15,7 +16,7 @@
<div class="row">
<div class="col-12">
- <h2>The {{comment.core_content_object|get_core_content_type|capfirst}} concerned:</h2>
+ <h2>The {{ comment.core_content_object|get_core_content_type|capfirst }} concerned:</h2>
{% get_summary_template comment.core_content_object %}
</div>
</div>
@@ -34,7 +35,7 @@
{% include 'comments/_comment_voting_summary.html' with comment=comment %}
- <p>{{ comment.comment_text|linebreaksbr }}</p>
+ <p>{{ comment.comment_text|automarkup }}</p>
</div>
</div>
</div>
diff --git a/comments/templates/comments/vet_submitted_comments.html b/comments/templates/comments/vet_submitted_comments.html
index a5d1323935cf150fa55c7819ffa60bea4de28e59..2aef2c158b8a06946ab896f3e992d206bef7d2f3 100644
--- a/comments/templates/comments/vet_submitted_comments.html
+++ b/comments/templates/comments/vet_submitted_comments.html
@@ -25,6 +25,8 @@
<h1 class="highlight">SciPost Comments to vet:</h1>
{% for comment_to_vet in comments_to_vet %}
+ <hr>
+ <h3 class="highlight">Comment {{ comment_to_vet.id }}</h3>
{% include 'comments/_vet_comment_form.html' with comment=comment_to_vet form=form %}
{% endfor %}
diff --git a/scipost/static/scipost/SciPost.css b/scipost/static/scipost/SciPost.css
index af05481c254ebc51118cd25efa8bed3022dc0729..f1064762f46659f5d97436405a20b5e3017484e0 100644
--- a/scipost/static/scipost/SciPost.css
+++ b/scipost/static/scipost/SciPost.css
@@ -33,12 +33,6 @@ li ol > li:before {
content: counters(item, ".") " ";
}
-
-.good_commenter {
- font-size: 90%;
- font-style: italic;
-}
-
.opinionsDisplay {
font-family: 'Merriweather Sans';
font-size: 10px;
diff --git a/templates/email/commenters/inform_commenter_comment_received.html b/templates/email/commenters/inform_commenter_comment_received.html
index 4f648aba05a3470f9bdda7871a4cbe8ece242a04..314293fc71d5822eb02de3384edfa3e4bd6e776a 100644
--- a/templates/email/commenters/inform_commenter_comment_received.html
+++ b/templates/email/commenters/inform_commenter_comment_received.html
@@ -1,32 +1,33 @@
-<p>Dear {{comment.author.get_title_display}} {{comment.author.user.last_name}},</p>
-<p>
- We hereby confirm reception of your Comment, concerning
+{% load automarkup %}
- <br/>
- {{comment.core_content_object.title}}
- {% if comment.core_content_object.author_list %}
- <br>
- by {{comment.core_content_object.author_list}}.
- {% elif comment.core_content_object.author %}
- <br>
- by {{comment.core_content_object.author}}.
- {% endif %}
-</p>
+<p>Dear {{ comment.author.get_title_display }} {{ comment.author.user.last_name }},</p>
<p>
- We copy it below for your convenience.
+ We hereby confirm reception of your Comment, concerning
+ <br/>
+ {{ comment.core_content_object.title }}
+ {% if comment.core_content_object.author_list %}
+ <br>
+ by {{ comment.core_content_object.author_list }}.
+ {% elif comment.core_content_object.author %}
<br>
- Your Comment will soon be vetted, at which point you will receive an email update from us.
+ by {{ comment.core_content_object.author }}.
+ {% endif %}
</p>
<p>
- Thank you for your contribution,<br><br>
- The SciPost Team.
+ We copy it below for your convenience.
+ <br>
+ Your Comment will soon be vetted, at which point you will receive an email update from us.
+</p>
+<p>
+ Thank you for your contribution,<br><br>
+ The SciPost Team.
</p>
<br>
<p>
- Comment:
- <br>
- {{ comment.comment_text|linebreaksbr }}
+ Comment:
+ <br>
+ {{ comment.comment_text|automarkup }}
</p>
{% include 'email/_footer.html' %}
diff --git a/templates/email/commenters/inform_commenter_comment_rejected.html b/templates/email/commenters/inform_commenter_comment_rejected.html
index 99cb52af3f8193a7075779ab1e028f4b16292476..efcfee2f60047340e15cd1e6f2d65dfdbed07d20 100644
--- a/templates/email/commenters/inform_commenter_comment_rejected.html
+++ b/templates/email/commenters/inform_commenter_comment_rejected.html
@@ -1,28 +1,30 @@
-<p>Dear {{comment.author.get_title_display}} {{comment.author.user.last_name}},</p>
+{% load automarkup %}
+
+<p>Dear {{ comment.author.get_title_display }} {{ comment.author.user.last_name }},</p>
<p>
- The Comment you have submitted, concerning
- <br/>
- {{comment.core_content_object.title}} by {% if comment.core_content_object.author_list %}{{comment.core_content_object.author_list}}{% elif comment.core_content_object.author %}{{comment.core_content_object.author}}{% endif %} (<a href="https://scipost.org{{comment.get_absolute_url}}">see on SciPost.org</a>)
- <br/>
- has been rejected for the following reason: {{comment.get_status_display}}.
+ The Comment you have submitted, concerning
+ <br/>
+ {{ comment.core_content_object.title }} by {% if comment.core_content_object.author_list %}{{ comment.core_content_object.author_list }}{% elif comment.core_content_object.author %}{{ comment.core_content_object.author }}{% endif %} (<a href="https://scipost.org{{ comment.get_absolute_url }}">see on SciPost.org</a>)
+ <br/>
+ has been rejected for the following reason: {{ comment.get_status_display }}.
</p>
<p>
- We copy it below for your convenience.
+ We copy it below for your convenience.
</p>
<p>
- Thank you for your contribution,<br><br>
- The SciPost Team.
+ Thank you for your contribution,<br><br>
+ The SciPost Team.
</p>
{% if email_response %}
- <p>Further explanations: {{email_response}}</p>
+ <p>Further explanations: {{ email_response }}</p>
{% endif %}
<p>
- <br>
- Comment:
- <br>
- {{comment.comment_text|linebreaksbr}}
+ <br>
+ Comment:
+ <br>
+ {{ comment.comment_text|automarkup }}
</p>
{% include 'email/_footer.html' %}
diff --git a/templates/email/commenters/inform_commenter_comment_vetted.html b/templates/email/commenters/inform_commenter_comment_vetted.html
index b9f218e61d6e3b910d7b4e964ab845b0137500f3..a4fa53fdce2dffb4916738e681753595a36dcbfe 100644
--- a/templates/email/commenters/inform_commenter_comment_vetted.html
+++ b/templates/email/commenters/inform_commenter_comment_vetted.html
@@ -1,23 +1,25 @@
-<p>Dear {{comment.author.get_title_display}} {{comment.author.user.last_name}},</p>
+{% load automarkup %}
+
+<p>Dear {{ comment.author.get_title_display }} {{ comment.author.user.last_name }},</p>
<p>
- The Comment you have submitted, concerning
- <br/>
- {{comment.core_content_object.title}} by {% if comment.core_content_object.author_list %}{{comment.core_content_object.author_list}}{% elif comment.core_content_object.author %}{{comment.core_content_object.author}}{% endif %} (<a href="https://scipost.org{{comment.get_absolute_url}}">see on SciPost.org</a>)
- <br/>
- has been accepted and published online.
+ The Comment you have submitted, concerning
+ <br/>
+ {{ comment.core_content_object.title }} by {% if comment.core_content_object.author_list %}{{ comment.core_content_object.author_list }}{% elif comment.core_content_object.author %}{{ comment.core_content_object.author }}{% endif %} (<a href="https://scipost.org{{ comment.get_absolute_url }}">see on SciPost.org</a>)
+ <br/>
+ has been accepted and published online.
</p>
<p>
- We copy it below for your convenience.
+ We copy it below for your convenience.
</p>
<p>
- Thank you for your contribution,<br><br>
- The SciPost Team
+ Thank you for your contribution,<br><br>
+ The SciPost Team
</p>
<p>
- <br>
- Comment:
- <br>
- {{comment.comment_text|linebreaksbr}}
+ <br>
+ Comment:
+ <br>
+ {{ comment.comment_text|automarkup }}
</p>
{% include 'email/_footer.html' %}
diff --git a/templates/search/indexes/comments/comment_text.txt b/templates/search/indexes/comments/comment_text.txt
index 896dec580c8f2d3fb36fbbbf840076ce88922a09..cab7b7a4dc4e672acf4a2261a33f0add8ddcf7e4 100644
--- a/templates/search/indexes/comments/comment_text.txt
+++ b/templates/search/indexes/comments/comment_text.txt
@@ -1,3 +1,3 @@
-{{object.comment_text}}
-{{object.date_submitted}}
+{{ object.comment_text }}
+{{ object.date_submitted }}
{% if not object.anonymous %}{{ object.author }}{% endif %}