From 0c9689df54f57cb86fb21ef79a979a5da122d17d Mon Sep 17 00:00:00 2001
From: Aevann <randomname42029@gmail.com>
Date: Sun, 1 Oct 2023 15:35:40 +0300
Subject: [PATCH] fixes to modal change

---
 files/assets/css/main.css                     |  2 +-
 files/templates/comments.html                 | 31 ++++++++++---------
 files/templates/header.html                   |  8 ++---
 files/templates/post.html                     |  8 ++---
 .../templates/post_admin_actions_mobile.html  |  2 +-
 files/templates/post_listing.html             | 10 +++---
 6 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/files/assets/css/main.css b/files/assets/css/main.css
index 1313c2ce97..2b468d90b6 100644
--- a/files/assets/css/main.css
+++ b/files/assets/css/main.css
@@ -5859,7 +5859,7 @@ html {
 	padding: 12px;
 	padding-bottom: 4px;
 }
-[id^="m-"]:target {
+.modal:target {
 	display: block !important;
 	background: rgba(33,38,45,.8) !important;
 }
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 94220154f3..4ec6fd17ab 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -282,9 +282,9 @@
 							<ul class="list-inline text-right d-flex">
 								<li class="list-inline-item mr-auto">
 									{% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
-										<button type="button" href="#m-adminModal-{{c.id}}">
+										<a href="#m-admin-{{c.id}}">
 											<i class="fas fa-broom"></i>
-										</button>
+										</a>
 									{% endif %}
 								</li>
 
@@ -293,9 +293,9 @@
 								{% endif %}
 
 								<li class="list-inline-item">
-									<button type="button" href="#m-actionsModal-{{c.id}}">
+									<a href="#m-actions-{{c.id}}">
 										<i class="fas fa-ellipsis-h"></i>
-									</button>
+									</a>
 								</li>
 
 								{% if v and (request.path.startswith('/@') and not wall) and v.admin_level < PERMS['VIEW_VOTE_BUTTONS_ON_USER_PAGE'] %}
@@ -433,9 +433,9 @@
 									{% endif %}
 
 									{% if url != "" %}
-										<a id="pin-{{c.id}}" class="dropdown-item list-inline-item {% if not c.stickied %}d-md-block{% endif %} text-muted d-none text-info" href="#m-actionsModal-{{c.id}}" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/{{url}}/{{c.id}}','pin-{{c.id}}','unpin-{{c.id}}','d-md-block')"><i class="fas fa-thumbtack fa-rotate--45 text-info fa-fw"></i>Pin</a>
+										<button type="button" id="pin-{{c.id}}" class="dropdown-item list-inline-item {% if not c.stickied %}d-md-block{% endif %} text-muted d-none text-info"  data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/{{url}}/{{c.id}}','pin-{{c.id}}','unpin-{{c.id}}','d-md-block')"><i class="fas fa-thumbtack fa-rotate--45 text-info fa-fw"></i>Pin</button>
 
-										<a id="unpin-{{c.id}}" class="dropdown-item list-inline-item {% if c.stickied %}d-md-block{% endif %} text-muted d-none text-info" href="#m-actionsModal-{{c.id}}" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/un{{url}}/{{c.id}}','pin-{{c.id}}','unpin-{{c.id}}','d-md-block')"><i class="fas fa-thumbtack fa-rotate--45 text-info fa-fw"></i>Unpin</a>
+										<button type="button" id="unpin-{{c.id}}" class="dropdown-item list-inline-item {% if c.stickied %}d-md-block{% endif %} text-muted d-none text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/un{{url}}/{{c.id}}','pin-{{c.id}}','unpin-{{c.id}}','d-md-block')"><i class="fas fa-thumbtack fa-rotate--45 text-info fa-fw"></i>Unpin</buttin>
 									{% endif %}
 								{% endif %}
 
@@ -571,7 +571,7 @@
 	</div>
 
 
-<div class="modal d-md-none" id="actionsModal-{{c.id}}" tabindex="-1">
+<div class="modal d-md-none" id="m-actions-{{c.id}}" tabindex="-1">
 	<div class="modal-dialog modal-dialog-centered">
 		<div class="modal-content">
 			<div class="modal-header">
@@ -632,11 +632,13 @@
 
 						{% if v.admin_level < PERMS['POST_COMMENT_MODERATION'] %}
 							{% if c.parent_post and v.id == c.post.author_id %}
-								<a id="pin2-{{c.id}}" class="list-group-item {% if c.stickied %}d-none{% endif %} text-info" href="#m-actionsModal-{{c.id}}" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/pin_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}','d-none')" dismiss_modal><i class="fas fa-thumbtack fa-rotate--45 text-info mr-2"></i>Pin</a>
-								<a id="unpin2-{{c.id}}" class="list-group-item {% if not c.stickied %}d-none{% endif %} text-info" href="#m-actionsModal-{{c.id}}" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unpin_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}','d-none')" dismiss_modal><i class="fas fa-thumbtack fa-rotate--45 text-info mr-2"></i>Unpin</a>
+								<button type="button" id="pin2-{{c.id}}" class="list-group-item {% if c.stickied %}d-none{% endif %} text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/pin_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}','d-none')" dismiss_modal><i class="fas fa-thumbtack fa-rotate--45 text-info mr-2"></i>Pin</button>
+
+								<button type="button" id="unpin2-{{c.id}}" class="list-group-item {% if not c.stickied %}d-none{% endif %} text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unpin_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}','d-none')" dismiss_modal><i class="fas fa-thumbtack fa-rotate--45 text-info mr-2"></i>Unpin</button>
 							{% elif c.post.sub and v.mods(c.post.sub) %}
-								<a id="pin2-{{c.id}}" class="list-group-item {% if c.stickied %}d-none{% endif %} text-info" href="#m-actionsModal-{{c.id}}" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/pin_comment_mod/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}','d-none')" dismiss_modal><i class="fas fa-thumbtack fa-rotate--45 text-info mr-2"></i>Pin</a>
-								<a id="unpin2-{{c.id}}" class="list-group-item {% if not c.stickied %}d-none{% endif %} text-info" href="#m-actionsModal-{{c.id}}" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unpin_comment_mod/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}','d-none')" dismiss_modal><i class="fas fa-thumbtack fa-rotate--45 text-info mr-2"></i>Unpin</a>
+								<button type="button" id="pin2-{{c.id}}" class="list-group-item {% if c.stickied %}d-none{% endif %} text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/pin_comment_mod/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}','d-none')" dismiss_modal><i class="fas fa-thumbtack fa-rotate--45 text-info mr-2"></i>Pin</button>
+
+								<button type="button" id="unpin2-{{c.id}}" class="list-group-item {% if not c.stickied %}d-none{% endif %} text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unpin_comment_mod/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}','d-none')" dismiss_modal><i class="fas fa-thumbtack fa-rotate--45 text-info mr-2"></i>Unpin</button>
 							{% endif %}
 						{% endif %}
 
@@ -660,7 +662,7 @@
 
 
 {% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
-	<div class="modal d-md-none" id="adminModal-{{c.id}}" tabindex="-1">
+	<div class="modal d-md-none" id="m-admin-{{c.id}}" tabindex="-1">
 		<div class="modal-dialog modal-dialog-centered">
 			<div class="modal-content">
 				<div class="modal-header">
@@ -687,8 +689,9 @@
 								<button type="button" id="undistinguish2-{{c.id}}" class="list-group-item {% if not c.distinguish_level %}d-none{% endif %} text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/distinguish_comment/{{c.id}}','distinguish2-{{c.id}}','undistinguish2-{{c.id}}','d-none')" dismiss_modal><i class="fas fa-id-badge text-info mr-2"></i>Undistinguish</button>
 							{% endif %}
 
-							<a id="pin2-{{c.id}}" class="list-group-item {% if c.stickied %}d-none{% endif %} text-info" href="#m-adminModal-{{c.id}}" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/sticky_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}','d-none')" dismiss_modal><i class="fas fa-thumbtack fa-rotate--45 text-info mr-2"></i>Pin</a>
-							<a id="unpin2-{{c.id}}" class="list-group-item {% if not c.stickied %}d-none{% endif %} text-info" href="#m-adminModal-{{c.id}}" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unsticky_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}','d-none')" dismiss_modal><i class="fas fa-thumbtack fa-rotate--45 text-info mr-2"></i>Unpin</a>
+							<button type="button" id="pin2-{{c.id}}" class="list-group-item {% if c.stickied %}d-none{% endif %} text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/sticky_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}','d-none')" dismiss_modal><i class="fas fa-thumbtack fa-rotate--45 text-info mr-2"></i>Pin</button>
+
+							<button type="button" id="unpin2-{{c.id}}" class="list-group-item {% if not c.stickied %}d-none{% endif %} text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unsticky_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}','d-none')" dismiss_modal><i class="fas fa-thumbtack fa-rotate--45 text-info mr-2"></i>Unpin</button>
 
 							{% if FEATURES['NSFW_MARKING'] %}
 								<button type="button" id="mark2-{{c.id}}" class="{% if c.over_18 %}d-none{% endif %} list-group-item text-danger" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/toggle_comment_nsfw/{{c.id}}','mark2-{{c.id}}','unmark2-{{c.id}}','d-none')" dismiss_modal><i class="fas fa-eye-evil text-danger mr-2"></i>Mark 18+</button>
diff --git a/files/templates/header.html b/files/templates/header.html
index b536958422..5355641a41 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -210,10 +210,10 @@
 				</a>
 			{% endif %}
 
-			<button type="button" class="navbar-toggler" data-bs-toggle="collapse" href="#m-navbarResponsive">
-			<span class="navbar-toggler-icon {% if v and v.notifications_count %}position-relative{% endif %}"><i class="fas fa-bars align-middle text-gray-500 black"></i>
-			</span>
-		</button>
+			<a class="navbar-toggler" data-bs-toggle="collapse" href="#m-navbarResponsive">
+				<span class="navbar-toggler-icon {% if v and v.notifications_count %}position-relative{% endif %}"><i class="fas fa-bars align-middle text-gray-500 black"></i>
+				</span>
+			</a>
 
 		<div class="collapse navbar-collapse" id="navbarResponsive">
 			<ul class="navbar-nav ml-auto d-none d-md-flex mr-3">
diff --git a/files/templates/post.html b/files/templates/post.html
index a6a1fae4b4..224e986fa8 100644
--- a/files/templates/post.html
+++ b/files/templates/post.html
@@ -253,17 +253,17 @@
 						<span class="text-info d-none {{p.id}}-new-comments"></span>
 					</a>
 					{% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
-						<button type="button" class="ml-2" href="#m-adminModal-{{p.id}}">
+						<a class="ml-2" href="#m-admin-{{p.id}}">
 							<i class="fas fa-broom"></i>
-						</button>
+						</a>
 					{% endif %}
 				</li>
 
 				{% if v %}
 				<li class="list-inline-item">
-					<button type="button" href="#m-actions">
+					<a href="#m-actions">
 						<i class="fas fa-ellipsis-h"></i>
-					</button>
+					</a>
 				</li>
 				{% endif %}
 				<li id="voting-{{p.id}}-mobile" class="voting list-inline-item d-md-none{% if voted==1 %} upvoted{% elif voted==-1 %} downvoted{% endif %}">
diff --git a/files/templates/post_admin_actions_mobile.html b/files/templates/post_admin_actions_mobile.html
index aa1139b80d..cddbac3f19 100644
--- a/files/templates/post_admin_actions_mobile.html
+++ b/files/templates/post_admin_actions_mobile.html
@@ -1,4 +1,4 @@
-<div class="modal d-md-none" id="adminModal-{{p.id}}" tabindex="-1">
+<div class="modal d-md-none" id="m-admin-{{p.id}}" tabindex="-1">
 	<div class="modal-dialog modal-dialog-centered">
 		<div class="modal-content">
 			<div class="modal-header p-3">
diff --git a/files/templates/post_listing.html b/files/templates/post_listing.html
index 68d2fd646a..9cff43ef63 100644
--- a/files/templates/post_listing.html
+++ b/files/templates/post_listing.html
@@ -127,9 +127,9 @@
 				</a>
 
 				{% if v and v.admin_level >= PERMS['ADMIN_HOME_VISIBLE'] %}
-					<button type="button" class="ml-2" href="#m-adminModal-{{p.id}}">
+					<a class="ml-2" href="#m-admin-{{p.id}}">
 						<i class="fas fa-broom"></i>
-					</button>
+					</a>
 				{% endif %}
 
 			</li>
@@ -140,9 +140,9 @@
 
 			{% if v %}
 				<li class="list-inline-item">
-					<button type="button" href="#m-actionsModal-{{p.id}}">
+					<a href="#m-actions-{{p.id}}">
 						<i class="fas fa-ellipsis-h"></i>
-					</button>
+					</a>
 				</li>
 			{% endif %}
 			{% if v and request.path.startswith('/@') and v.admin_level < PERMS['VIEW_VOTE_BUTTONS_ON_USER_PAGE'] %}
@@ -182,7 +182,7 @@
 </div>
 
 {% if v %}
-	<div class="modal d-md-none" id="actionsModal-{{p.id}}" tabindex="-1">
+	<div class="modal d-md-none" id="m-actions-{{p.id}}" tabindex="-1">
 		<div class="modal-dialog modal-dialog-centered">
 			<div class="modal-content">
 				<div class="modal-header p-3">