From 68fb6dcb57f26b7f66c1724031ef56f595ae7e4e Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 2 Jul 2023 14:04:31 +0200
Subject: [PATCH] [ticket/17155] Default to first unread post on topics

Also removed the unread post icon and instead opted for playing with font
weight and color for indication.

PHPBB3-17155
---
 phpBB/styles/prosilver/template/search_results.html | 11 +++++------
 .../prosilver/template/ucp_main_bookmarks.html      | 10 +++++-----
 phpBB/styles/prosilver/template/ucp_main_front.html | 12 ++++++------
 .../prosilver/template/ucp_main_subscribed.html     | 10 +++++-----
 phpBB/styles/prosilver/template/viewforum_body.html | 13 +++++++------
 phpBB/styles/prosilver/theme/colours.css            |  3 +--
 phpBB/styles/prosilver/theme/links.css              |  8 ++++++--
 7 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index 44256d8283..c448ea52fd 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -99,12 +99,11 @@
 						{% endif %}
 						<div class="list-inner">
 							<!-- EVENT topiclist_row_prepend -->
-							<!-- IF searchresults.S_UNREAD_TOPIC and not S_IS_BOT -->
-								<a class="unread" href="{searchresults.U_NEWEST_POST}">
-									{{ Icon('iconify', 'fa:file', lang('NEW_POST'), true, 'c-topic-unread-icon') }}
-								</a>
-							<!-- ENDIF -->
-							<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a>
+							{% if searchresults.S_UNREAD_TOPIC and not S_IS_BOT %}
+								<a href="{{ searchresults.U_NEWEST_POST }}" class="topictitle unread">{{ searchresults.TOPIC_TITLE }}</a>
+							{% else %}
+								<a href="{{ searchresults.U_VIEW_TOPIC }}" class="topictitle">{{ searchresults.TOPIC_TITLE }}</a>
+							{% endif %}
 							<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED -->
 								<a href="{searchresults.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}">
 									{{ Icon('iconify', 'fa:question', lang('TOPIC_UNAPPROVED'), true, 'c-uapproved-icon') }}
diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
index 72b13d4f2a..47bb3cbfac 100644
--- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
+++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
@@ -54,11 +54,11 @@
 						<img class="row-item-sub" src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" alt="">
 					{% endif %}
 					<div class="list-inner">
-						<!-- IF topicrow.S_UNREAD_TOPIC -->
-							<a class="unread" href="{topicrow.U_NEWEST_POST}">
-								{{ Icon('iconify', 'fa:file', NEW_POST, true, 'c-topic-unread-icon') }}
-							</a>
-						<!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+						{% if topicrow.S_UNREAD_TOPIC %}
+							<a href="{{ topicrow.U_NEWEST_POST }}" class="topictitle unread">{{ topicrow.TOPIC_TITLE }}</a>
+						{% else %}
+							<a href="{{ topicrow.U_VIEW_TOPIC }}" class="topictitle">{{ topicrow.TOPIC_TITLE }}</a>
+						{% endif %}
 						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
 							<a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}">
 								{{ Icon('iconify', 'fa:question', lang('TOPIC_UNAPPROVED'), true, 'c-unapproved-icon') }}
diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html
index 7c6c083d8d..2744d28dd9 100644
--- a/phpBB/styles/prosilver/template/ucp_main_front.html
+++ b/phpBB/styles/prosilver/template/ucp_main_front.html
@@ -33,12 +33,12 @@
 						<img class="row-item-sub" src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" alt="">
 					{% endif %}
 					<div class="list-inner">
-						<!-- IF topicrow.S_UNREAD -->
-							<a class="unread" href="{topicrow.U_NEWEST_POST}">
-								{{ Icon('iconify', 'fa:file', NEW_POST, true, 'c-topic-unread-icon') }}
-							</a>
-						<!-- ENDIF -->
-						<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><br />
+						{% if topicrow.S_UNREAD %}
+							<a href="{{ topicrow.U_NEWEST_POST }}" class="topictitle unread">{{ topicrow.TOPIC_TITLE }}</a>
+						{% else %}
+							<a href="{{ topicrow.U_VIEW_TOPIC }}" class="topictitle">{{ topicrow.TOPIC_TITLE }}</a>
+						{% endif %}
+						<br>
 						<!-- IF .topicrow.pagination -->
 						<div class="pagination">
 							<span>{{ Icon('iconify', 'fa:clone', '', true) }}</span>
diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
index f72869b108..814f054a4a 100644
--- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html
+++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
@@ -104,11 +104,11 @@
 						<img class="row-item-sub" src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" alt="">
 					{% endif %}
 					<div class="list-inner">
-						<!-- IF topicrow.S_UNREAD_TOPIC -->
-							<a class="unread" href="{topicrow.U_NEWEST_POST}">
-								{{ Icon('iconify', 'fa:file', NEW_POST, true, 'c-topic-unread-icon') }}
-							</a>
-						<!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+						{% if topicrow.S_UNREAD_TOPIC %}
+							<a href="{{ topicrow.U_NEWEST_POST }}" class="topictitle unread">{{ topicrow.TOPIC_TITLE }}</a>
+						{% else %}
+							<a href="{{ topicrow.U_VIEW_TOPIC }}" class="topictitle">{{ topicrow.TOPIC_TITLE }}</a>
+						{% endif %}
 						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
 							<a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}">
 								{{ Icon('iconify', 'fa:question', lang('TOPIC_UNAPPROVED'), true, 'c-unapproved-icon') }}
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 428e5dc9fd..0feff713c2 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -177,12 +177,13 @@
 					{% endif %}
 					<div class="list-inner">
 						<!-- EVENT topiclist_row_prepend -->
-						<!-- IF topicrow.S_UNREAD_TOPIC and not S_IS_BOT -->
-							<a class="unread" href="{topicrow.U_NEWEST_POST}">
-								{{ Icon('iconify', 'fa:file', NEW_POST, true, 'c-topic-unread-icon') }}
-							</a>
-						<!-- ENDIF -->
-						<!-- IF topicrow.U_VIEW_TOPIC --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><!-- ELSE -->{topicrow.TOPIC_TITLE}<!-- ENDIF -->
+						{% if topicrow.S_UNREAD_TOPIC and not S_IS_BOT %}
+							<a href="{{ topicrow.U_NEWEST_POST }}" class="topictitle unread">{{ topicrow.TOPIC_TITLE }}</a>
+						{% elseif topicrow.U_VIEW_TOPIC %}
+							<a href="{{ topicrow.U_VIEW_TOPIC }}" class="topictitle">{{ topicrow.TOPIC_TITLE }}</a>
+						{% else %}
+							<span class="topictitle">{{ topicrow.TOPIC_TITLE }}</span>
+						{% endif %}
 						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
 							<a href="{topicrow.U_MCP_QUEUE}" title="<!-- IF topicrow.S_TOPIC_UNAPPROVED -->{L_TOPIC_UNAPPROVED}<!-- ELSE -->{L_POSTS_UNAPPROVED}<!-- ENDIF -->">
 								{{ Icon('iconify', 'fa:question', '', true, 'c-unapproved-icon') }}<span class="sr-only"><!-- IF topicrow.S_TOPIC_UNAPPROVED -->{L_TOPIC_UNAPPROVED}<!-- ELSE -->{L_POSTS_UNAPPROVED}<!-- ENDIF --></span>
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 2499908b44..0c6d4077a0 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -220,8 +220,7 @@ a:hover .icon.icon-red, /* DEPRECATED 4.0 */
 .c-topic-reported-icon,
 .c-topic-unread-icon,
 .c-warning-icon,
-.c-unapproved-icon,
-.unread {
+.c-unapproved-icon {
 	color: #d41142;
 }
 
diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css
index 22a8bfd1f4..8405ba4224 100644
--- a/phpBB/styles/prosilver/theme/links.css
+++ b/phpBB/styles/prosilver/theme/links.css
@@ -66,10 +66,10 @@ th a:hover {
 
 /* Links for forum/topic lists */
 a.forumtitle,
-a.topictitle {
+a.topictitle,
+span.topictitle {
 	font-family: "Trebuchet MS", Helvetica, Arial, sans-serif;
 	font-size: 13px;
-	font-weight: bold;
 	text-decoration: none;
 }
 
@@ -81,6 +81,10 @@ a.topictitle {
 	display: inline;
 }
 
+a.unread {
+	font-weight: bold;
+}
+
 a.topictitle:hover {
 	text-decoration: underline;
 }