Move comment labels template into templates block

Also adds the comment reply template to the user page, where it was
missed.

tildes/tildes/templates/notifications_unread.jinja2

@@ -76,10 +76,9 @@
   <p>No unread notifications.</p>
   <p><a href="/notifications">Go to previously read notifications</a></p>
 {% endif %}
-
-{% if request.user %}{{ comment_label_options_template(comment_label_options) }}{% endif %}
 {% endblock %}
 
 {% block templates %}
+  {{ comment_label_options_template(comment_label_options) }}
   {{ comment_reply_template() }}
 {% endblock %}

tildes/tildes/templates/topic.jinja2

@@ -12,7 +12,10 @@
 {% block title %}{{ topic.title }} - ~{{ topic.group.path }}{% endblock %}
 
 {% block templates %}
+  {% if request.user %}
     {{ comment_reply_template() }}
+    {{ comment_label_options_template(comment_label_options) }}
+  {% endif %}
 {% endblock %}
 
 {% block header_context_link %}
@@ -280,7 +283,6 @@
 
 </article>
 
-{% if request.user %}{{ comment_label_options_template(comment_label_options) }}{% endif %}
 {% endblock content %}
 
 {% block sidebar %}

tildes/tildes/templates/user.jinja2

@@ -3,12 +3,19 @@
 
 {% extends 'base_user_menu.jinja2' %}
 
-{% from 'macros/comments.jinja2' import comment_label_options_template, render_single_comment with context %}
+{% from 'macros/comments.jinja2' import comment_label_options_template, comment_reply_template, render_single_comment with context %}
 {% from 'macros/links.jinja2' import group_linked, username_linked %}
 {% from 'macros/topics.jinja2' import render_topic_for_listing with context %}
 
 {% block title %}User: {{ user.username }}{% endblock %}
 
+{% block templates %}
+  {% if request.user %}
+    {{ comment_reply_template() }}
+    {{ comment_label_options_template(comment_label_options) }}
+  {% endif %}
+{% endblock %}
+
 {% block header_context_link %}
 <a class="site-header-context" href="/user/{{ user.username }}">{{ user.username }}</a>
 {% endblock %}
@@ -130,8 +137,6 @@
   {% endif %}
 {% endif %}
 
-{% if request.user %}{{ comment_label_options_template(comment_label_options) }}{% endif %}
-
 {% endblock %}
 
 {% block sidebar %}