From c155e282bd91511af352b08402d48e32c7c0ec90 Mon Sep 17 00:00:00 2001
From: Aevann1 <Aevann3@gmail.com>
Date: Fri, 13 Aug 2021 04:52:37 +0200
Subject: [PATCH] fggf

---
 files/helpers/jinja2.py                 |   2 +-
 files/templates/submission_listing.html | 136 ++++++++++++------------
 2 files changed, 70 insertions(+), 68 deletions(-)

diff --git a/files/helpers/jinja2.py b/files/helpers/jinja2.py
index 5902d4054..05767f86b 100644
--- a/files/helpers/jinja2.py
+++ b/files/helpers/jinja2.py
@@ -19,4 +19,4 @@ def crosspost_embed(id):
 	
 	p = get_post(id, graceful=True)
 	
-	return render_template("submission_listing.html", listing=[p])
\ No newline at end of file
+	return render_template("submission_listing.html", listing=[p], postembed=True)
\ No newline at end of file
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index ee363776e..3f40ca038 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -25,40 +25,41 @@
 	<div class="d-flex flex-row-reverse flex-md-row flex-nowrap justify-content-end">
 
 		<!-- Voting on "medium" devices or larger, hidden on smaller devices -->
+		{% if not postembed %}
+			<div class="voting my-2 d-none d-md-block pr-2">
+				{% if v and request.path.startswith('/@') and v.admin_level == 0 %}
 
-		<div class="voting my-2 d-none d-md-block pr-2">
-			{% if v and request.path.startswith('/@') and v.admin_level == 0 %}
+					{% if voted==1 %}
+					<div class="mx-auto arrow-up post-{{p.id}}-up active"></div>
+					{% endif %}
 
-				{% if voted==1 %}
-				<div class="mx-auto arrow-up post-{{p.id}}-up active"></div>
-				{% endif %}
+					<span id="post-score-{{p.id}}" class="score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}"{% if not p.is_banned %} data-toggle="tooltip" data-placement="right" data-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
+
+					{% if voted==-1 %}
+					<div class="text-muted mx-auto arrow-down post-{{p.id}}-down active"></div>
+					{% endif %}
+
+				{% elif v %}
+
+				<div id="post-{{p.id}}-up" tabindex="0" data-id-up="{{p.id}}" data-content-type="post" class="mx-auto arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}"></div>
 
 				<span id="post-score-{{p.id}}" class="score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}"{% if not p.is_banned %} data-toggle="tooltip" data-placement="right" data-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
 
-				{% if voted==-1 %}
-				<div class="text-muted mx-auto arrow-down post-{{p.id}}-down active"></div>
+				<div id="post-{{p.id}}-down" tabindex="0" data-id-down="{{p.id}}" data-content-type="post" class="text-muted mx-auto arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></div>
+
+				{% else %}
+
+				<div id="post-{{p.id}}-up" tabindex="0" class="mx-auto arrow-up" onclick="location.href='/login';"></div>
+
+				<span id="post-{{p.id}}-score-none" class="score"{% if not p.is_banned %} data-toggle="tooltip" data-placement="right" data-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
+
+				<div id="post-{{p.id}}-down" tabindex="0" class="text-muted mx-auto arrow-down" onclick="location.href='/login';"></div>
+
+
 				{% endif %}
 
-			{% elif v %}
-
-			<div id="post-{{p.id}}-up" tabindex="0" data-id-up="{{p.id}}" data-content-type="post" class="mx-auto arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}"></div>
-
-			<span id="post-score-{{p.id}}" class="score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}"{% if not p.is_banned %} data-toggle="tooltip" data-placement="right" data-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
-
-			<div id="post-{{p.id}}-down" tabindex="0" data-id-down="{{p.id}}" data-content-type="post" class="text-muted mx-auto arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}"></div>
-
-			{% else %}
-
-			<div id="post-{{p.id}}-up" tabindex="0" class="mx-auto arrow-up" onclick="location.href='/login';"></div>
-
-			<span id="post-{{p.id}}-score-none" class="score"{% if not p.is_banned %} data-toggle="tooltip" data-placement="right" data-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
-
-			<div id="post-{{p.id}}-down" tabindex="0" class="text-muted mx-auto arrow-down" onclick="location.href='/login';"></div>
-
-
-			{% endif %}
-
-		</div>
+			</div>
+		{% endif %}
 
 		<div class="card-header bg-transparent border-0 d-flex flex-row flex-nowrap pl-2 pl-md-0 p-0 mr-md-2">
 
@@ -236,49 +237,50 @@
 				</a>
 			</li>
 			{% endif %}
-			{% if v and request.path.startswith('/@') and v.admin_level == 0 %}
-			<li id="voting-{{p.id}}-mobile" class="voting list-inline-item d-md-none">
+			{% if not postembed %}
+				{% if v and request.path.startswith('/@') and v.admin_level == 0 %}
+				<li id="voting-{{p.id}}-mobile" class="voting list-inline-item d-md-none">
 
-				{% if voted==1 %}
-				<span class="mr-2 arrow-up post-{{p.id}}-up active">
-				</span>
+					{% if voted==1 %}
+					<span class="mr-2 arrow-up post-{{p.id}}-up active">
+					</span>
+					{% endif %}
+
+					<span id="post-score-{{p.id}}-mobile" class="score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}"{% if not p.is_banned %} data-toggle="tooltip" data-placement="top" data-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
+
+					{% if voted==-1 %}
+					<span class="ml-2 my-0 arrow-down post-{{p.id}}-down active">
+					</span>
+					{% endif %}
+
+
+				</li>
+				{% elif v %}
+				<li id="voting-{{p.id}}-mobile" class="voting list-inline-item d-md-none">
+
+					<span id="post-{{p.id}}-up-mobile" tabindex="0" data-id-up="{{p.id}}" data-content-type="post" class="mr-2 arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}">
+					</span>
+
+					<span id="post-score-{{p.id}}-mobile" class="score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}"{% if not p.is_banned %} data-toggle="tooltip" data-placement="top" data-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
+
+					<span id="post-{{p.id}}-down-mobile" tabindex="0" data-id-down="{{p.id}}" data-content-type="post" class="ml-2 my-0 arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}">
+					</span>
+
+				</li>
+				{% else %}
+				<li id="voting-{{p.id}}-mobile" class="voting list-inline-item d-md-none">
+					<span id="arrow-{{p.id}}-mobile-up" tabindex="0" class="mr-2 arrow-mobile-up" onclick="location.href='/login';">
+						<i class="fas fa-arrow-alt-up mx-0" aria-hidden="true"></i>
+					</span>
+
+					<span id="post-score-{{p.id}}-mobile" class="score"{% if not p.is_banned %} data-toggle="tooltip" data-placement="top" data-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
+
+					<span id="arrow-{{p.id}}-mobile-down" tabindex="0" class="arrow-mobile-down ml-2 my-0" onclick="location.href='/login';">
+						<i class="fas fa-arrow-alt-down mx-0" aria-hidden="true"></i>
+					</span>
+				</li>
 				{% endif %}
-
-				<span id="post-score-{{p.id}}-mobile" class="score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}"{% if not p.is_banned %} data-toggle="tooltip" data-placement="top" data-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
-
-				{% if voted==-1 %}
-				<span class="ml-2 my-0 arrow-down post-{{p.id}}-down active">
-				</span>
-				{% endif %}
-
-
-			</li>
-			{% elif v %}
-			<li id="voting-{{p.id}}-mobile" class="voting list-inline-item d-md-none">
-
-				<span id="post-{{p.id}}-up-mobile" tabindex="0" data-id-up="{{p.id}}" data-content-type="post" class="mr-2 arrow-up upvote-button post-{{p.id}}-up {% if voted==1 %}active{% endif %}">
-				</span>
-
-				<span id="post-score-{{p.id}}-mobile" class="score post-score-{{p.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}"{% if not p.is_banned %} data-toggle="tooltip" data-placement="top" data-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
-
-				<span id="post-{{p.id}}-down-mobile" tabindex="0" data-id-down="{{p.id}}" data-content-type="post" class="ml-2 my-0 arrow-down downvote-button post-{{p.id}}-down {% if voted==-1 %}active{% endif %}">
-				</span>
-
-			</li>
-			{% else %}
-			<li id="voting-{{p.id}}-mobile" class="voting list-inline-item d-md-none">
-				<span id="arrow-{{p.id}}-mobile-up" tabindex="0" class="mr-2 arrow-mobile-up" onclick="location.href='/login';">
-					<i class="fas fa-arrow-alt-up mx-0" aria-hidden="true"></i>
-				</span>
-
-				<span id="post-score-{{p.id}}-mobile" class="score"{% if not p.is_banned %} data-toggle="tooltip" data-placement="top" data-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
-
-				<span id="arrow-{{p.id}}-mobile-down" tabindex="0" class="arrow-mobile-down ml-2 my-0" onclick="location.href='/login';">
-					<i class="fas fa-arrow-alt-down mx-0" aria-hidden="true"></i>
-				</span>
-			</li>
 			{% endif %}
-
 		</ul>
 	</div>
 </div>