Skip to content

Commit

Permalink
Merge pull request phpbb#6605 from iMattPro/ticket/17300
Browse files Browse the repository at this point in the history 
[ticket/17300] Better Sticky and Announcement Icons
  • Loading branch information
@marc1706
marc1706 authored May 30, 2024
2 parents f5b14a9 + 4573e2e commit e101f02
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 21 deletions.
2 changes: 1 addition & 1 deletion phpBB/phpbb/template/twig/extension/icon.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ protected function prepare_svg(\Twig\TemplateWrapper $file, &$view_box = '')
*
* {{ 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,
Expand Down
1 change: 1 addition & 0 deletions phpBB/styles/prosilver/imgs/svg/bullhorn.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions phpBB/styles/prosilver/imgs/svg/globe.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions phpBB/styles/prosilver/imgs/svg/thumbtack.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions phpBB/styles/prosilver/template/mcp_forum.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ <h2><a href="{U_VIEW_FORUM}">{L_FORUM}{L_COLON} {FORUM_NAME}</a></h2>
<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,
Expand Down
6 changes: 3 additions & 3 deletions phpBB/styles/prosilver/template/search_results.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ <h2 class="searchresults-title"><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE
<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,
Expand Down
6 changes: 3 additions & 3 deletions phpBB/styles/prosilver/template/ucp_main_bookmarks.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ <h2>{L_TITLE}</h2>
<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,
Expand Down
6 changes: 3 additions & 3 deletions phpBB/styles/prosilver/template/ucp_main_front.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ <h3>{L_IMPORTANT_NEWS}</h3>
<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,
Expand Down
6 changes: 3 additions & 3 deletions phpBB/styles/prosilver/template/ucp_main_subscribed.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ <h2>{L_TITLE}</h2>
<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,
Expand Down
6 changes: 3 additions & 3 deletions phpBB/styles/prosilver/template/viewforum_body.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,9 @@ <h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED --
<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,
Expand Down
4 changes: 2 additions & 2 deletions tests/template/extension_test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ public function data_template_icon_extension()
'type' => 'font',
'icon' => [
'bullhorn' => false,
'star' => false,
'thumbtack' => false,
'lock' => true,
'fire' => false,
'file' => true,
Expand All @@ -344,7 +344,7 @@ public function data_template_icon_extension()
'type' => 'font',
'icon' => [
'bullhorn' => false,
'star' => false,
'thumbtack' => false,
'lock' => false,
'fire' => false,
'file',
Expand Down

0 comments on commit e101f02

Please sign in to comment.