components: move around a bit

files/templates/comments.html

@@ -162,11 +162,7 @@
 {% endmacro %}
 
 {% for comment in comments %}
-	{% if parent_level %}
+	{%- set parent_level = parent_level | int if parent_level else 0 -%}
-		{% set parent_level = parent_level | int %}
-	{% else %}
-		{% set parent_level = 0 %}
-	{% endif %}
 	{{single_comment(comment, level = parent_level + 1)}}
 {% endfor %}
 
@@ -175,7 +171,7 @@
 {% if not ajax %}
 	{% if v %}
 		{% if v.admin_level >= 2 %}
-			{% include "ban_modal.html" %}
+			{% include "component/modal/ban.html" %}
 		{% endif %}
 		{%- include 'component/modal/delete_comment.html' -%}
 		{%- include 'component/modal/report_comment.html' -%}
@@ -193,14 +189,16 @@
 
 	<script src="{{ 'js/clipboard.js' | asset }}"></script>
 
-	{% if v and v.admin_level >= 2 %}
+	{% if v %}
+		{% if v.admin_level >= 2 %}
 			<script src="{{ 'js/comments_admin.js' | asset }}"></script>
+		{% endif %}
 		{% if v.admin_level >= 2 %}
 			<script src="{{ 'js/filter_actions.js' | asset }}"></script>
 		{% endif %}
 	{% endif %}
 
-	{% include "component/modal/expanded_image.html.html" %}
+	{% include "component/modal/expanded_image.html" %}
 
 	<script src="{{ 'js/comments+submission_listing.js' | asset }}"></script>
 	<script src="{{ 'js/comments.js' | asset }}"></script>

files/templates/formatting.html

@@ -461,6 +461,6 @@ line breaks
 
 <h5>Comment Commands</h5>
 
-{% include "component/modal/expanded_image.html.html" %}
+{% include "component/modal/expanded_image.html" %}
 
 {% endblock %}

files/templates/submission.html

@@ -114,7 +114,7 @@
 							<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-dismiss="modal" onclick="expandMarkdown(this,'{{p.id}}')"><i class="fas text-expand-icon-{{p.id}} fa-expand-alt text-center mr-3"></i><span>View source</span></button>
 						{% endif %}
 
-						{% include "post_actions_mobile.html" %}
+						{% include "component/post/actions_mobile.html" %}
 					</ul>
 				</div>
 			</div>
@@ -123,7 +123,7 @@
 {% endif %}
 
 {% if v and v.admin_level > 1 %}
-	{% include "post_admin_actions_mobile.html" %}
+	{% include "component/post/actions_admin_mobile.html" %}
 {% endif %}
 
 {% endblock %}
@@ -338,7 +338,7 @@
 							<a class="list-inline-item" role="button" onclick="expandMarkdown(this,'{{p.id}}')"><i class="fas text-expand-icon-{{p.id}} fa-expand-alt"></i><span>View source</span></a>
 						{% endif %}
 
-						{% include 'post_actions.html' %}
+						{% include 'component/post/actions.html' %}
 					</ul>
 						</div>
 						</div>
@@ -557,7 +557,7 @@
 {% endif %}
 
 {% if v %}
-	{% include "report_post_modal.html" %}
+	{% include "component/modal/report_post.html" %}
 {% endif %}
 
 {% if v and (v.id == p.author_id or v.admin_level > 1 and v.admin_level > 2) %}

files/templates/submission_listing.html

@@ -243,7 +243,7 @@
 							{% if p.realbody(v) %}
 								<a class="list-inline-item" role="button" onclick="expandText('{{p.id}}')"><i class="fas fa-expand-alt mr-0 text-expand-icon-{{p.id}}"></i></a>
 							{% endif %}
-							{% include 'post_actions.html' %}
+							{% include 'component/post/actions.html' %}
 						</ul>
 					</div>
 				</div>
@@ -292,7 +292,7 @@
 								</div>
 								<div class="modal-body">
 									<ul class="list-group post-actions">
-										{% include "post_actions_mobile.html" %}
+										{% include "component/post/actions_mobile.html" %}
 									</ul>
 								</div>
 							</div>
@@ -311,7 +311,7 @@
 
 
 	{% if v and v.admin_level > 1 %}
-		{% include "post_admin_actions_mobile.html" %}
+		{% include "component/post/actions_admin_mobile.html" %}
 	{% endif %}
 
 
@@ -408,12 +408,12 @@
 
 {% if v %}
 	{% include "component/modal/delete_post.html" %}
-	{% include "report_post_modal.html" %}
+	{% include "component/modal/report_post.html" %}
 	{% if v.admin_level > 1 %}
-		{% include "ban_modal.html" %}
+		{% include "component/modal/ban.html" %}
 	{% endif %}
 {% endif %}
-{% include "component/modal/expanded_image.html.html" %}
+{% include "component/modal/expanded_image.html" %}
 
 <script src="{{ 'js/clipboard.js' | asset }}"></script>
 <script src="{{ 'js/comments+submission_listing.js' | asset }}"></script>