From 3345ee62b8b9b2d2c190ac72b2e166935e4b3804 Mon Sep 17 00:00:00 2001
From: Ray <raypeaslee@gmail.com>
Date: Wed, 15 Feb 2023 08:34:06 -0500
Subject: [PATCH] update modal close buttons

because they look like windows 95 and I just can't
---
 view/tpl/acl_selector.tpl        |  2 +-
 view/tpl/admin_cover_photo.tpl   |  2 +-
 view/tpl/admin_profile_photo.tpl |  2 +-
 view/tpl/conv_item.tpl           |  2 +-
 view/tpl/conv_list.tpl           |  2 +-
 view/tpl/cover_photo.tpl         |  2 +-
 view/tpl/filer_dialog.tpl        |  3 +--
 view/tpl/generic_modal.tpl       |  2 +-
 view/tpl/jot.tpl                 | 12 ++++++------
 view/tpl/nav_login.tpl           |  2 +-
 view/tpl/photo_view.tpl          |  2 +-
 view/tpl/profile_photo.tpl       |  2 +-
 view/tpl/settings.tpl            |  2 +-
 13 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index 0e7bf1129..50462ec44 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -9,7 +9,7 @@
 					<a target="hubzilla-help" href="{{$helpUrl}}" class="contextual-help-tool" title="Help and documentation"><i class="fa fa-fw fa-question"></i></a>
 					{{/if}}
 				</h4>
-				<button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 			</div>
 			<div class="section-content-wrapper">
 				{{if $aclModalDesc}}
diff --git a/view/tpl/admin_cover_photo.tpl b/view/tpl/admin_cover_photo.tpl
index e10437d26..282312e72 100755
--- a/view/tpl/admin_cover_photo.tpl
+++ b/view/tpl/admin_cover_photo.tpl
@@ -154,7 +154,7 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
-				<button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 			</div>
 			<div class="modal-body" id="embedPhotoModalBody" >
 				<div id="embedPhotoModalBodyAlbumListDialog" class="d-none">
diff --git a/view/tpl/admin_profile_photo.tpl b/view/tpl/admin_profile_photo.tpl
index bee19e17c..2f7620e5f 100644
--- a/view/tpl/admin_profile_photo.tpl
+++ b/view/tpl/admin_profile_photo.tpl
@@ -182,7 +182,7 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
-				<button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 			</div>
 			<div class="modal-body" id="embedPhotoModalBody" >
 				<div id="embedPhotoModalBodyAlbumListDialog" class="d-none">
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 45a7d9f1d..c4c977586 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -221,7 +221,7 @@
 									<div class="modal-content">
 										<div class="modal-header">
 											<h4 class="modal-title">{{$response.button}}</h4>
-											<button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
+											<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 										</div>
 										<div class="modal-body response-list">
 											<ul class="nav nav-pills flex-column">{{foreach $response.list as $liker}}<li class="nav-item">{{$liker}}</li>{{/foreach}}</ul>
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index 84c17d12f..0bedf5e6f 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -197,7 +197,7 @@
 									<div class="modal-content">
 										<div class="modal-header">
 											<h4 class="modal-title">{{$response.button}}</h4>
-											<button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
+											<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 										</div>
 										<div class="modal-body response-list">
 											<ul class="nav nav-pills flex-column">{{foreach $response.list as $liker}}<li class="nav-item">{{$liker}}</li>{{/foreach}}</ul>
diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl
index 3ade16a17..8fc07c4e1 100755
--- a/view/tpl/cover_photo.tpl
+++ b/view/tpl/cover_photo.tpl
@@ -154,7 +154,7 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
-				<button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 			</div>
 			<div class="modal-body" id="embedPhotoModalBody" >
 				<div id="embedPhotoModalBodyAlbumListDialog" class="d-none">
diff --git a/view/tpl/filer_dialog.tpl b/view/tpl/filer_dialog.tpl
index aaab81911..434fbde5e 100755
--- a/view/tpl/filer_dialog.tpl
+++ b/view/tpl/filer_dialog.tpl
@@ -3,8 +3,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <h4 class="modal-title">{{$title}}</h4>
-        <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
         </button>
       </div>
       <div class="modal-body">
diff --git a/view/tpl/generic_modal.tpl b/view/tpl/generic_modal.tpl
index b2aa7520c..4ed8a1112 100644
--- a/view/tpl/generic_modal.tpl
+++ b/view/tpl/generic_modal.tpl
@@ -3,7 +3,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <h4 class="modal-title" id="generic-modal-title-{{$id}}">{{$title}}</h4>
-        <button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
       <div class="modal-body" id="generic-modal-body-{{$id}}"></div>
       <div class="modal-footer">
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 0d6c8aa67..e753d5f90 100644
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -287,7 +287,7 @@
 			<div class="modal-content">
 				<div class="modal-header">
 					<h4 class="modal-title" id="jotnetsModalLabel">{{$jotnets_label}}</h4>
-					<button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
+					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 				</div>
 				<div class="modal-body">
 					{{$jotnets}}
@@ -306,7 +306,7 @@
 			<div class="modal-content">
 				<div class="modal-header">
 					<h4 class="modal-title" id="jotcollModalLabel">{{$jotcoll_label}}</h4>
-					<button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
+					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 				</div>
 				<div class="modal-body">
 					{{$jotcoll}}
@@ -325,7 +325,7 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title" id="commModalLabel">{{$commctrl}}</h4>
-				<button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 			</div>
 			<div class="modal-body form-group" >
 				{{include file="field_checkbox.tpl" field=$comments_allowed}}				
@@ -357,7 +357,7 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title" id="expiryModalLabel">{{$expires}}</h4>
-				<button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 			</div>
 			<div class="modal-body form-group" style="width:90%">
 				<div class="date">
@@ -386,7 +386,7 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title" id="createdModalLabel">{{$future_txt}}</h4>
-				<button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 			</div>
 			<div class="modal-body form-group" style="width:90%">
 				<div class="date">
@@ -432,7 +432,7 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title" id="linkModalLabel">{{$linkurl}}</h4>
-				<button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 			</div>
 			<div class="modal-body form-group" style="width:100%">
 					<input type="text" name="link_url" id="id_link_url" class="form-control" >
diff --git a/view/tpl/nav_login.tpl b/view/tpl/nav_login.tpl
index 03fef4b30..ed374a5c0 100644
--- a/view/tpl/nav_login.tpl
+++ b/view/tpl/nav_login.tpl
@@ -4,7 +4,7 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">{{$nav.loginmenu.1.1}}</h4>
-				<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 			</div>
 			<div class="modal-body">
 				<div class="form-group">
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index e49645cfe..8d0722077 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -126,7 +126,7 @@
 							<div class="modal-dialog">
 								<div class="modal-content">
 									<div class="modal-header">
-										<button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
+										<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 										<h4 class="modal-title">{{$response.title}}</h4>
 									</div>
 									<div class="modal-body">
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index 107266f82..c473ec999 100755
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
@@ -182,7 +182,7 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
-				<button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 			</div>
 			<div class="modal-body" id="embedPhotoModalBody" >
 				<div id="embedPhotoModalBodyAlbumListDialog" class="d-none">
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index e791fd355..3fc6ff97c 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -72,7 +72,7 @@
                                     <div class="modal-content">
                                         <div class="modal-header">
                                             <h4 class="modal-title">{{$lbl_p2macro}}</h4>
-                                            <button type="button" class="close" data-bs-dismiss="modal" aria-label="{{$close}}"><span aria-hidden="true">&times;</span></button>
+                                            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                                         </div>
                                         <div class="modal-body">
                                             {{foreach $permiss_arr as $permit}}