From 06e11951892c16681457cc54452f2519aafd6cad Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sat, 10 Dec 2022 18:55:39 +0200
Subject: [PATCH] restore "cancel" button JC removed

---
 files/templates/comments.html    | 4 ++--
 files/templates/submission.html  | 2 +-
 files/templates/util/macros.html | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/files/templates/comments.html b/files/templates/comments.html
index f8b4d5a69..118a6420f 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -297,7 +297,7 @@
 							</label>
 						</div>
 						<button type="button" id="edit-btn-{{c.id}}" form="comment-edit-form-{{c.id}}" class="btn btn-primary ml-2 fl-r commentmob" onclick="comment_edit('{{c.id}}');remove_dialog()">Save Edit</button> 
-						<button type="button" id="cancel-edit-{{c.id}}" onclick="toggleEdit('{{c.id}}');remove_dialog()" class="btn btn-link text-muted ml-auto cancel-form fl-r commentmob">Cancel</button> 
+						<button type="button" id="cancel-edit-{{c.id}}" onclick="toggleEdit('{{c.id}}');remove_dialog()" class="btn btn-link text-muted ml-auto fl-r commentmob">Cancel</button> 
 					</form>
 					<div id="preview-edit-{{c.id}}" class="preview mb-3 mt-5"></div>
 					<div class="form-text text-small p-0 m-0"><a href="/formatting" {% if v and v.newtab %}data-target="t" target="_blank"{% endif %}>Formatting help</a></div>
@@ -556,7 +556,7 @@
 							{% endif %}
 						</div>
 
-						<button type="button" onclick="document.getElementById('reply-message-{{c.id}}').classList.add('d-none');remove_dialog()" class="btn btn-link text-muted ml-auto cancel-form">Cancel</button> 
+						<button type="button" onclick="document.getElementById('reply-message-{{c.id}}').classList.add('d-none');remove_dialog()" class="btn btn-link text-muted ml-auto">Cancel</button> 
 						<button type="button" id="save-reply-to-{{c.id}}" class="btn btn-primary ml-2" onclick="post_reply('{{c.id}}');remove_dialog()">Reply</button>
 					</form>
 					<div id="message-reply-{{c.id}}" class="preview mt-2"></div>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 73f157440..2f9da2e98 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -188,7 +188,7 @@
 										<small class="format d-none"><i class="fas fa-link" aria-hidden="true"></i></small> 
 								</div>
 								<button type="submit" form="post-edit-form-{{p.id}}" class="btn btn-primary ml-2 fl-r" onclick="disable(this);remove_dialog()">Save Edit</button>
-								<button type="button" onclick="togglePostEdit('{{p.id}}');remove_dialog()" class="btn btn-link text-muted ml-auto cancel-form fl-r">Cancel</button> 
+								<button type="button" onclick="togglePostEdit('{{p.id}}');remove_dialog()" class="btn btn-link text-muted ml-auto fl-r">Cancel</button> 
 							</form>
 							<div id="post-edit-{{p.id}}" class="preview mb-3 mt-5"></div>
 							<div class="form-text text-small p-0 m-0"><a href="/formatting" {% if v and v.newtab %}data-target="t" target="_blank"{% endif %}>Formatting help</a></div>
diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html
index 4fd4ea850..fe862f5f9 100644
--- a/files/templates/util/macros.html
+++ b/files/templates/util/macros.html
@@ -136,6 +136,7 @@
 					{% endif %}
 				</div>
 				<button type="button" id="save-reply-to-{{target_fullname}}" form="reply-to-{{target_fullname}}" class="btn btn-primary text-whitebtn ml-auto fl-r" onclick="postComment('{{target_fullname}}', '{{hide}}');remove_dialog();">Comment</button>
+				<button type="button" onclick="document.getElementById('reply-to-{{target_fullname}}').classList.add('d-none');remove_dialog()" class="btn btn-link text-muted ml-auto fl-r mr-3">Cancel</button> 
 			</form>
 			<div id="form-preview-{{target_fullname}}" class="preview mb-3 mt-5"></div>
 			<div class="form-text text-small p-0 m-0"><a href="/formatting" {% if v and v.newtab %}data-target="t" target="_blank"{% endif %}>Formatting help</a></div>