Merge pull request #6510 from marc1706/ticket/17155

[ticket/17155] Default to first unread post on topics
This commit is contained in:
Marc Alexander 2023-08-03 19:39:02 +02:00 committed by GitHub
commit db2ddd1fd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 35 additions and 32 deletions

View file

@ -99,12 +99,11 @@
{% endif %} {% endif %}
<div class="list-inner"> <div class="list-inner">
<!-- EVENT topiclist_row_prepend --> <!-- EVENT topiclist_row_prepend -->
<!-- IF searchresults.S_UNREAD_TOPIC and not S_IS_BOT --> {% if searchresults.S_UNREAD_TOPIC and not S_IS_BOT %}
<a class="unread" href="{searchresults.U_NEWEST_POST}"> <a href="{{ searchresults.U_NEWEST_POST }}" class="topictitle unread">{{ searchresults.TOPIC_TITLE }}</a>
{{ Icon('iconify', 'fa:file', lang('NEW_POST'), true, 'c-topic-unread-icon') }} {% else %}
</a> <a href="{{ searchresults.U_VIEW_TOPIC }}" class="topictitle">{{ searchresults.TOPIC_TITLE }}</a>
<!-- ENDIF --> {% endif %}
<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a>
<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED --> <!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED -->
<a href="{searchresults.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}"> <a href="{searchresults.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}">
{{ Icon('iconify', 'fa:question', lang('TOPIC_UNAPPROVED'), true, 'c-uapproved-icon') }} {{ Icon('iconify', 'fa:question', lang('TOPIC_UNAPPROVED'), true, 'c-uapproved-icon') }}

View file

@ -54,11 +54,11 @@
<img class="row-item-sub" src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" alt=""> <img class="row-item-sub" src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" alt="">
{% endif %} {% endif %}
<div class="list-inner"> <div class="list-inner">
<!-- IF topicrow.S_UNREAD_TOPIC --> {% if topicrow.S_UNREAD_TOPIC %}
<a class="unread" href="{topicrow.U_NEWEST_POST}"> <a href="{{ topicrow.U_NEWEST_POST }}" class="topictitle unread">{{ topicrow.TOPIC_TITLE }}</a>
{{ Icon('iconify', 'fa:file', NEW_POST, true, 'c-topic-unread-icon') }} {% else %}
</a> <a href="{{ topicrow.U_VIEW_TOPIC }}" class="topictitle">{{ topicrow.TOPIC_TITLE }}</a>
<!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> {% endif %}
<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --> <!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
<a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}"> <a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}">
{{ Icon('iconify', 'fa:question', lang('TOPIC_UNAPPROVED'), true, 'c-unapproved-icon') }} {{ Icon('iconify', 'fa:question', lang('TOPIC_UNAPPROVED'), true, 'c-unapproved-icon') }}

View file

@ -33,12 +33,12 @@
<img class="row-item-sub" src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" alt=""> <img class="row-item-sub" src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" alt="">
{% endif %} {% endif %}
<div class="list-inner"> <div class="list-inner">
<!-- IF topicrow.S_UNREAD --> {% if topicrow.S_UNREAD %}
<a class="unread" href="{topicrow.U_NEWEST_POST}"> <a href="{{ topicrow.U_NEWEST_POST }}" class="topictitle unread">{{ topicrow.TOPIC_TITLE }}</a>
{{ Icon('iconify', 'fa:file', NEW_POST, true, 'c-topic-unread-icon') }} {% else %}
</a> <a href="{{ topicrow.U_VIEW_TOPIC }}" class="topictitle">{{ topicrow.TOPIC_TITLE }}</a>
<!-- ENDIF --> {% endif %}
<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><br /> <br>
<!-- IF .topicrow.pagination --> <!-- IF .topicrow.pagination -->
<div class="pagination"> <div class="pagination">
<span>{{ Icon('iconify', 'fa:clone', '', true) }}</span> <span>{{ Icon('iconify', 'fa:clone', '', true) }}</span>

View file

@ -104,11 +104,11 @@
<img class="row-item-sub" src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" alt=""> <img class="row-item-sub" src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" alt="">
{% endif %} {% endif %}
<div class="list-inner"> <div class="list-inner">
<!-- IF topicrow.S_UNREAD_TOPIC --> {% if topicrow.S_UNREAD_TOPIC %}
<a class="unread" href="{topicrow.U_NEWEST_POST}"> <a href="{{ topicrow.U_NEWEST_POST }}" class="topictitle unread">{{ topicrow.TOPIC_TITLE }}</a>
{{ Icon('iconify', 'fa:file', NEW_POST, true, 'c-topic-unread-icon') }} {% else %}
</a> <a href="{{ topicrow.U_VIEW_TOPIC }}" class="topictitle">{{ topicrow.TOPIC_TITLE }}</a>
<!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> {% endif %}
<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --> <!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
<a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}"> <a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}">
{{ Icon('iconify', 'fa:question', lang('TOPIC_UNAPPROVED'), true, 'c-unapproved-icon') }} {{ Icon('iconify', 'fa:question', lang('TOPIC_UNAPPROVED'), true, 'c-unapproved-icon') }}

View file

@ -177,12 +177,13 @@
{% endif %} {% endif %}
<div class="list-inner"> <div class="list-inner">
<!-- EVENT topiclist_row_prepend --> <!-- EVENT topiclist_row_prepend -->
<!-- IF topicrow.S_UNREAD_TOPIC and not S_IS_BOT --> {% if topicrow.S_UNREAD_TOPIC and not S_IS_BOT %}
<a class="unread" href="{topicrow.U_NEWEST_POST}"> <a href="{{ topicrow.U_NEWEST_POST }}" class="topictitle unread">{{ topicrow.TOPIC_TITLE }}</a>
{{ Icon('iconify', 'fa:file', NEW_POST, true, 'c-topic-unread-icon') }} {% elseif topicrow.U_VIEW_TOPIC %}
</a> <a href="{{ topicrow.U_VIEW_TOPIC }}" class="topictitle">{{ topicrow.TOPIC_TITLE }}</a>
<!-- ENDIF --> {% else %}
<!-- IF topicrow.U_VIEW_TOPIC --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><!-- ELSE -->{topicrow.TOPIC_TITLE}<!-- ENDIF --> <span class="topictitle">{{ topicrow.TOPIC_TITLE }}</span>
{% endif %}
<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --> <!-- 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 -->"> <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> {{ 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>

View file

@ -220,8 +220,7 @@ a:hover .icon.icon-red, /* DEPRECATED 4.0 */
.c-topic-reported-icon, .c-topic-reported-icon,
.c-topic-unread-icon, .c-topic-unread-icon,
.c-warning-icon, .c-warning-icon,
.c-unapproved-icon, .c-unapproved-icon {
.unread {
color: #d41142; color: #d41142;
} }

View file

@ -66,10 +66,10 @@ th a:hover {
/* Links for forum/topic lists */ /* Links for forum/topic lists */
a.forumtitle, a.forumtitle,
a.topictitle { a.topictitle,
span.topictitle {
font-family: "Trebuchet MS", Helvetica, Arial, sans-serif; font-family: "Trebuchet MS", Helvetica, Arial, sans-serif;
font-size: 13px; font-size: 13px;
font-weight: bold;
text-decoration: none; text-decoration: none;
} }
@ -81,6 +81,10 @@ a.topictitle {
display: inline; display: inline;
} }
a.unread {
font-weight: bold;
}
a.topictitle:hover { a.topictitle:hover {
text-decoration: underline; text-decoration: underline;
} }