From 4573e2eae02d8b8172c622c56f78034c3171392b Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 4 May 2024 08:32:51 -0700
Subject: [PATCH] [ticket/17300] Replace Sticky and Announcement Icons

PHPBB3-17300

Signed-off-by: Matt Friedman <maf675@gmail.com>
---
 phpBB/phpbb/template/twig/extension/icon.php             | 2 +-
 phpBB/styles/prosilver/imgs/svg/bullhorn.svg             | 1 +
 phpBB/styles/prosilver/imgs/svg/globe.svg                | 1 +
 phpBB/styles/prosilver/imgs/svg/thumbtack.svg            | 1 +
 phpBB/styles/prosilver/template/mcp_forum.html           | 6 +++---
 phpBB/styles/prosilver/template/search_results.html      | 6 +++---
 phpBB/styles/prosilver/template/ucp_main_bookmarks.html  | 6 +++---
 phpBB/styles/prosilver/template/ucp_main_front.html      | 6 +++---
 phpBB/styles/prosilver/template/ucp_main_subscribed.html | 6 +++---
 phpBB/styles/prosilver/template/viewforum_body.html      | 6 +++---
 tests/template/extension_test.php                        | 4 ++--
 11 files changed, 24 insertions(+), 21 deletions(-)
 create mode 100644 phpBB/styles/prosilver/imgs/svg/bullhorn.svg
 create mode 100644 phpBB/styles/prosilver/imgs/svg/globe.svg
 create mode 100644 phpBB/styles/prosilver/imgs/svg/thumbtack.svg

diff --git a/phpBB/phpbb/template/twig/extension/icon.php b/phpBB/phpbb/template/twig/extension/icon.php
index 8edd33bbc7..3788853837 100644
--- a/phpBB/phpbb/template/twig/extension/icon.php
+++ b/phpBB/phpbb/template/twig/extension/icon.php
@@ -280,7 +280,7 @@ class icon extends AbstractExtension
 	 *
 	 * {{ Icon('font', {
 	 * 		'bullhorn': topicrow.S_POST_GLOBAL or topicrow.S_POST_ANNOUNCE,
-	 * 		'star': topicrow.S_POST_STICKY,
+	 * 		'thumbtack': topicrow.S_POST_STICKY,
 	 * 		'lock': topicrow.S_TOPIC_LOCKED,
 	 * 		'fire': topicrow.S_TOPIC_HOT,
 	 * 		'file': true,
diff --git a/phpBB/styles/prosilver/imgs/svg/bullhorn.svg b/phpBB/styles/prosilver/imgs/svg/bullhorn.svg
new file mode 100644
index 0000000000..2755c3b78b
--- /dev/null
+++ b/phpBB/styles/prosilver/imgs/svg/bullhorn.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M480 32c0-12.9-7.8-24.6-19.8-29.6s-25.7-2.2-34.9 6.9L381.7 53c-48 48-113.1 75-181 75H192 160 64c-35.3 0-64 28.7-64 64v96c0 35.3 28.7 64 64 64l0 128c0 17.7 14.3 32 32 32h64c17.7 0 32-14.3 32-32V352l8.7 0c67.9 0 133 27 181 75l43.6 43.6c9.2 9.2 22.9 11.9 34.9 6.9s19.8-16.6 19.8-29.6V300.4c18.6-8.8 32-32.5 32-60.4s-13.4-51.6-32-60.4V32zm-64 76.7V240 371.3C357.2 317.8 280.5 288 200.7 288H192V192h8.7c79.8 0 156.5-29.8 215.3-83.3z"/></svg>
diff --git a/phpBB/styles/prosilver/imgs/svg/globe.svg b/phpBB/styles/prosilver/imgs/svg/globe.svg
new file mode 100644
index 0000000000..c340561509
--- /dev/null
+++ b/phpBB/styles/prosilver/imgs/svg/globe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M352 256c0 22.2-1.2 43.6-3.3 64H163.3c-2.2-20.4-3.3-41.8-3.3-64s1.2-43.6 3.3-64H348.7c2.2 20.4 3.3 41.8 3.3 64zm28.8-64H503.9c5.3 20.5 8.1 41.9 8.1 64s-2.8 43.5-8.1 64H380.8c2.1-20.6 3.2-42 3.2-64s-1.1-43.4-3.2-64zm112.6-32H376.7c-10-63.9-29.8-117.4-55.3-151.6c78.3 20.7 142 77.5 171.9 151.6zm-149.1 0H167.7c6.1-36.4 15.5-68.6 27-94.7c10.5-23.6 22.2-40.7 33.5-51.5C239.4 3.2 248.7 0 256 0s16.6 3.2 27.8 13.8c11.3 10.8 23 27.9 33.5 51.5c11.6 26 20.9 58.2 27 94.7zm-209 0H18.6C48.6 85.9 112.2 29.1 190.6 8.4C165.1 42.6 145.3 96.1 135.3 160zM8.1 192H131.2c-2.1 20.6-3.2 42-3.2 64s1.1 43.4 3.2 64H8.1C2.8 299.5 0 278.1 0 256s2.8-43.5 8.1-64zM194.7 446.6c-11.6-26-20.9-58.2-27-94.6H344.3c-6.1 36.4-15.5 68.6-27 94.6c-10.5 23.6-22.2 40.7-33.5 51.5C272.6 508.8 263.3 512 256 512s-16.6-3.2-27.8-13.8c-11.3-10.8-23-27.9-33.5-51.5zM135.3 352c10 63.9 29.8 117.4 55.3 151.6C112.2 482.9 48.6 426.1 18.6 352H135.3zm358.1 0c-30 74.1-93.6 130.9-171.9 151.6c25.5-34.2 45.2-87.7 55.3-151.6H493.4z"/></svg>
diff --git a/phpBB/styles/prosilver/imgs/svg/thumbtack.svg b/phpBB/styles/prosilver/imgs/svg/thumbtack.svg
new file mode 100644
index 0000000000..9a0adc18fa
--- /dev/null
+++ b/phpBB/styles/prosilver/imgs/svg/thumbtack.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M32 32C32 14.3 46.3 0 64 0H320c17.7 0 32 14.3 32 32s-14.3 32-32 32H290.5l11.4 148.2c36.7 19.9 65.7 53.2 79.5 94.7l1 3c3.3 9.8 1.6 20.5-4.4 28.8s-15.7 13.3-26 13.3H32c-10.3 0-19.9-4.9-26-13.3s-7.7-19.1-4.4-28.8l1-3c13.8-41.5 42.8-74.8 79.5-94.7L93.5 64H64C46.3 64 32 49.7 32 32zM160 384h64v96c0 17.7-14.3 32-32 32s-32-14.3-32-32V384z"/></svg>
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
index cff04e89bc..786c09c531 100644
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ b/phpBB/styles/prosilver/template/mcp_forum.html
@@ -40,9 +40,9 @@
 				<dt>
 					<a class="row-item-link{% if topicrow.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{topicrow.U_VIEW_TOPIC}" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
 						{{ Icon('svg', {
-							'info-variant' : topicrow.S_POST_GLOBAL,
-							'info-variant' : topicrow.S_POST_ANNOUNCE,
-							'star' : topicrow.S_POST_STICKY,
+							'globe' : topicrow.S_POST_GLOBAL,
+							'bullhorn' : topicrow.S_POST_ANNOUNCE,
+							'thumbtack' : topicrow.S_POST_STICKY,
 							'lock' : topicrow.S_TOPIC_LOCKED,
 							'arrow-right-bold' : topicrow.S_TOPIC_MOVED,
 							'fire' : topicrow.S_TOPIC_HOT,
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index 8ea1bd0518..e7cd42ff4f 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -82,9 +82,9 @@
 					<dt>
 						<a class="row-item-link{% if searchresults.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{searchresults.U_NEWEST_POST}" title="{searchresults.TOPIC_FOLDER_IMG_ALT}">
 							{{ Icon('svg', {
-								'info-variant' : searchresults.S_POST_GLOBAL,
-								'info-variant' : searchresults.S_POST_ANNOUNCE,
-								'star' : searchresults.S_POST_STICKY,
+								'globe' : searchresults.S_POST_GLOBAL,
+								'bullhorn' : searchresults.S_POST_ANNOUNCE,
+								'thumbtack' : searchresults.S_POST_STICKY,
 								'lock' : searchresults.S_TOPIC_LOCKED,
 								'arrow-right-bold' : searchresults.S_TOPIC_MOVED,
 								'fire' : searchresults.S_TOPIC_HOT,
diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
index 98616732f9..6d0fd6933c 100644
--- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
+++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
@@ -38,9 +38,9 @@
 				<dt>
 					<a class="row-item-link{% if topicrow.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{topicrow.U_NEWEST_POST}" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
 						{{ Icon('svg', {
-							'info-variant' : topicrow.S_POST_GLOBAL,
-							'info-variant' : topicrow.S_POST_ANNOUNCE,
-							'star' : topicrow.S_POST_STICKY,
+							'globe' : topicrow.S_POST_GLOBAL,
+							'bullhorn' : topicrow.S_POST_ANNOUNCE,
+							'thumbtack' : topicrow.S_POST_STICKY,
 							'lock' : topicrow.S_TOPIC_LOCKED,
 							'arrow-right-bold' : topicrow.S_TOPIC_MOVED,
 							'fire' : topicrow.S_TOPIC_HOT,
diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html
index c8b5093e81..1276b38738 100644
--- a/phpBB/styles/prosilver/template/ucp_main_front.html
+++ b/phpBB/styles/prosilver/template/ucp_main_front.html
@@ -17,9 +17,9 @@
 				<dt>
 					<a class="row-item-link{% if topicrow.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{topicrow.U_NEWEST_POST}" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
 						{{ Icon('svg', {
-							'info-variant' : topicrow.S_POST_GLOBAL,
-							'info-variant' : topicrow.S_POST_ANNOUNCE,
-							'star' : topicrow.S_POST_STICKY,
+							'globe' : topicrow.S_POST_GLOBAL,
+							'bullhorn' : topicrow.S_POST_ANNOUNCE,
+							'thumbtack' : topicrow.S_POST_STICKY,
 							'lock' : topicrow.S_TOPIC_LOCKED,
 							'arrow-right-bold' : topicrow.S_TOPIC_MOVED,
 							'fire' : topicrow.S_TOPIC_HOT,
diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
index 6f365bfd9e..b91a70048e 100644
--- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html
+++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
@@ -88,9 +88,9 @@
 				<dt>
 					<a class="row-item-link{% if topicrow.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{topicrow.U_NEWEST_POST}" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
 						{{ Icon('svg', {
-							'info-variant' : topicrow.S_POST_GLOBAL,
-							'info-variant' : topicrow.S_POST_ANNOUNCE,
-							'star' : topicrow.S_POST_STICKY,
+							'globe' : topicrow.S_POST_GLOBAL,
+							'bullhorn' : topicrow.S_POST_ANNOUNCE,
+							'thumbtack' : topicrow.S_POST_STICKY,
 							'lock' : topicrow.S_TOPIC_LOCKED,
 							'arrow-right-bold' : topicrow.S_TOPIC_MOVED,
 							'fire' : topicrow.S_TOPIC_HOT,
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 024be04a2b..8d784b6943 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -160,9 +160,9 @@
 				<dt>
 					<a class="row-item-link{% if topicrow.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{topicrow.U_NEWEST_POST}" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
 						{{ Icon('svg', {
-							'info-variant' : topicrow.S_POST_GLOBAL,
-							'info-variant' : topicrow.S_POST_ANNOUNCE,
-							'star' : topicrow.S_POST_STICKY,
+							'globe' : topicrow.S_POST_GLOBAL,
+							'bullhorn' : topicrow.S_POST_ANNOUNCE,
+							'thumbtack' : topicrow.S_POST_STICKY,
 							'lock' : topicrow.S_TOPIC_LOCKED,
 							'arrow-right-bold' : topicrow.S_TOPIC_MOVED,
 							'fire' : topicrow.S_TOPIC_HOT,
diff --git a/tests/template/extension_test.php b/tests/template/extension_test.php
index ea762f5b0f..207aa5e99f 100644
--- a/tests/template/extension_test.php
+++ b/tests/template/extension_test.php
@@ -322,7 +322,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
 					'type'			=> 'font',
 					'icon'			=> [
 						'bullhorn'		=> false,
-						'star'			=> false,
+						'thumbtack'			=> false,
 						'lock'			=> true,
 						'fire'			=> false,
 						'file'			=> true,
@@ -344,7 +344,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
 					'type'			=> 'font',
 					'icon'			=> [
 						'bullhorn'		=> false,
-						'star'			=> false,
+						'thumbtack'			=> false,
 						'lock'			=> false,
 						'fire'			=> false,
 						'file',