Finish moving comments to automarkup

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

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>

comments/templates/comments/_comment_card_extended_for_author.html

+{% 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>

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 %}
 

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">

comments/templates/comments/reply_to_comment.html

 {% 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>

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 %}
 

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;

templates/email/commenters/inform_commenter_comment_received.html

-<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' %}

templates/email/commenters/inform_commenter_comment_rejected.html

-<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' %}

templates/email/commenters/inform_commenter_comment_vetted.html

-<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' %}

templates/search/indexes/comments/comment_text.txt

-{{object.comment_text}}
-{{object.date_submitted}}
+{{ object.comment_text }}
+{{ object.date_submitted }}
 {% if not object.anonymous %}{{ object.author }}{% endif %}