From dc4fe2d4b7834c7671038cb84959aabfbce77c7c Mon Sep 17 00:00:00 2001 From: hanakin Date: Sat, 2 May 2020 11:50:31 -1000 Subject: [PATCH] [ticket/16237] squash all commits PHPBB3-16237 --- .gitignore | 1 - phpBB/includes/functions.php | 1 + phpBB/includes/mcp/mcp_forum.php | 5 + phpBB/includes/ucp/ucp_main.php | 5 + phpBB/search.php | 5 + .../prosilver/template/display_options.html | 6 +- phpBB/styles/prosilver/template/faq_body.html | 2 +- phpBB/styles/prosilver/template/forum_fn.js | 9 +- .../prosilver/template/forumlist_body.html | 28 ++- phpBB/styles/prosilver/template/jumpbox.html | 10 +- .../styles/prosilver/template/mcp_forum.html | 32 +++- .../styles/prosilver/template/mcp_front.html | 6 +- phpBB/styles/prosilver/template/mcp_post.html | 13 +- .../styles/prosilver/template/mcp_queue.html | 2 +- .../prosilver/template/mcp_reports.html | 6 +- .../styles/prosilver/template/mcp_topic.html | 8 +- .../styles/prosilver/template/mcp_whois.html | 4 +- .../prosilver/template/memberlist_view.html | 2 +- .../prosilver/template/message_body.html | 2 +- .../prosilver/template/navbar_footer.html | 19 +- .../prosilver/template/navbar_header.html | 45 +++-- .../template/notification_dropdown.html | 2 +- .../prosilver/template/overall_footer.html | 18 +- .../prosilver/template/overall_header.html | 20 ++- .../styles/prosilver/template/pagination.html | 6 +- .../prosilver/template/posting_buttons.html | 27 ++- .../prosilver/template/posting_review.html | 4 +- .../template/posting_topic_review.html | 10 +- .../prosilver/template/search_results.html | 52 ++++-- .../prosilver/template/simple_footer.html | 5 +- .../template/ucp_main_bookmarks.html | 34 +++- .../prosilver/template/ucp_main_front.html | 32 +++- .../template/ucp_main_subscribed.html | 47 +++-- .../prosilver/template/ucp_pm_history.html | 6 +- .../template/ucp_pm_message_header.html | 16 +- .../prosilver/template/ucp_pm_viewfolder.html | 15 +- .../template/ucp_pm_viewmessage.html | 39 +++-- .../prosilver/template/viewforum_body.html | 52 ++++-- .../prosilver/template/viewtopic_body.html | 118 ++++++------- .../template/viewtopic_topic_tools.html | 19 +- phpBB/styles/prosilver/theme/buttons.css | 18 +- phpBB/styles/prosilver/theme/colours.css | 163 ++++++++---------- phpBB/styles/prosilver/theme/common.css | 67 ++++--- phpBB/styles/prosilver/theme/content.css | 26 +-- phpBB/styles/prosilver/theme/cp.css | 4 - phpBB/styles/prosilver/theme/forms.css | 4 +- phpBB/styles/prosilver/theme/icons.css | 162 +++++++++-------- .../prosilver/theme/images/announce_read.gif | Bin 3549 -> 0 bytes .../theme/images/announce_read_locked.gif | Bin 3558 -> 0 bytes .../images/announce_read_locked_mine.gif | Bin 3558 -> 0 bytes .../theme/images/announce_read_mine.gif | Bin 3580 -> 0 bytes .../theme/images/announce_unread.gif | Bin 3531 -> 0 bytes .../theme/images/announce_unread_locked.gif | Bin 3534 -> 0 bytes .../images/announce_unread_locked_mine.gif | Bin 3564 -> 0 bytes .../theme/images/announce_unread_mine.gif | Bin 3560 -> 0 bytes .../prosilver/theme/images/forum_link.gif | Bin 3500 -> 0 bytes .../prosilver/theme/images/forum_read.gif | Bin 3448 -> 0 bytes .../theme/images/forum_read_locked.gif | Bin 3444 -> 0 bytes .../theme/images/forum_read_subforum.gif | Bin 3641 -> 0 bytes .../prosilver/theme/images/forum_unread.gif | Bin 3440 -> 0 bytes .../theme/images/forum_unread_locked.gif | Bin 3442 -> 0 bytes .../theme/images/forum_unread_subforum.gif | Bin 3637 -> 0 bytes .../prosilver/theme/images/icons_contact.png | Bin 8507 -> 0 bytes .../prosilver/theme/images/sticky_read.gif | Bin 3198 -> 0 bytes .../theme/images/sticky_read_locked.gif | Bin 3248 -> 0 bytes .../theme/images/sticky_read_locked_mine.gif | Bin 3295 -> 0 bytes .../theme/images/sticky_read_mine.gif | Bin 3241 -> 0 bytes .../prosilver/theme/images/sticky_unread.gif | Bin 3191 -> 0 bytes .../theme/images/sticky_unread_locked.gif | Bin 3246 -> 0 bytes .../images/sticky_unread_locked_mine.gif | Bin 3316 -> 0 bytes .../theme/images/sticky_unread_mine.gif | Bin 3275 -> 0 bytes .../prosilver/theme/images/topic_moved.gif | Bin 3459 -> 0 bytes .../prosilver/theme/images/topic_read.gif | Bin 3482 -> 0 bytes .../prosilver/theme/images/topic_read_hot.gif | Bin 3548 -> 0 bytes .../theme/images/topic_read_hot_mine.gif | Bin 3570 -> 0 bytes .../theme/images/topic_read_locked.gif | Bin 3458 -> 0 bytes .../theme/images/topic_read_locked_mine.gif | Bin 3416 -> 0 bytes .../theme/images/topic_read_mine.gif | Bin 3492 -> 0 bytes .../prosilver/theme/images/topic_unread.gif | Bin 3327 -> 0 bytes .../theme/images/topic_unread_hot.gif | Bin 3551 -> 0 bytes .../theme/images/topic_unread_hot_mine.gif | Bin 3582 -> 0 bytes .../theme/images/topic_unread_locked.gif | Bin 3349 -> 0 bytes .../theme/images/topic_unread_locked_mine.gif | Bin 3375 -> 0 bytes .../theme/images/topic_unread_mine.gif | Bin 3393 -> 0 bytes phpBB/styles/prosilver/theme/links.css | 11 +- phpBB/styles/prosilver/theme/responsive.css | 32 ++++ phpBB/styles/prosilver/theme/stylesheet.css | 2 + phpBB/styles/prosilver/theme/svg/logo.svg | 6 + phpBB/viewforum.php | 1 + 89 files changed, 692 insertions(+), 537 deletions(-) delete mode 100644 phpBB/styles/prosilver/theme/images/announce_read.gif delete mode 100644 phpBB/styles/prosilver/theme/images/announce_read_locked.gif delete mode 100644 phpBB/styles/prosilver/theme/images/announce_read_locked_mine.gif delete mode 100644 phpBB/styles/prosilver/theme/images/announce_read_mine.gif delete mode 100644 phpBB/styles/prosilver/theme/images/announce_unread.gif delete mode 100644 phpBB/styles/prosilver/theme/images/announce_unread_locked.gif delete mode 100644 phpBB/styles/prosilver/theme/images/announce_unread_locked_mine.gif delete mode 100644 phpBB/styles/prosilver/theme/images/announce_unread_mine.gif delete mode 100644 phpBB/styles/prosilver/theme/images/forum_link.gif delete mode 100644 phpBB/styles/prosilver/theme/images/forum_read.gif delete mode 100644 phpBB/styles/prosilver/theme/images/forum_read_locked.gif delete mode 100644 phpBB/styles/prosilver/theme/images/forum_read_subforum.gif delete mode 100644 phpBB/styles/prosilver/theme/images/forum_unread.gif delete mode 100644 phpBB/styles/prosilver/theme/images/forum_unread_locked.gif delete mode 100644 phpBB/styles/prosilver/theme/images/forum_unread_subforum.gif delete mode 100644 phpBB/styles/prosilver/theme/images/icons_contact.png delete mode 100644 phpBB/styles/prosilver/theme/images/sticky_read.gif delete mode 100644 phpBB/styles/prosilver/theme/images/sticky_read_locked.gif delete mode 100644 phpBB/styles/prosilver/theme/images/sticky_read_locked_mine.gif delete mode 100644 phpBB/styles/prosilver/theme/images/sticky_read_mine.gif delete mode 100644 phpBB/styles/prosilver/theme/images/sticky_unread.gif delete mode 100644 phpBB/styles/prosilver/theme/images/sticky_unread_locked.gif delete mode 100644 phpBB/styles/prosilver/theme/images/sticky_unread_locked_mine.gif delete mode 100644 phpBB/styles/prosilver/theme/images/sticky_unread_mine.gif delete mode 100644 phpBB/styles/prosilver/theme/images/topic_moved.gif delete mode 100644 phpBB/styles/prosilver/theme/images/topic_read.gif delete mode 100644 phpBB/styles/prosilver/theme/images/topic_read_hot.gif delete mode 100644 phpBB/styles/prosilver/theme/images/topic_read_hot_mine.gif delete mode 100644 phpBB/styles/prosilver/theme/images/topic_read_locked.gif delete mode 100644 phpBB/styles/prosilver/theme/images/topic_read_locked_mine.gif delete mode 100644 phpBB/styles/prosilver/theme/images/topic_read_mine.gif delete mode 100644 phpBB/styles/prosilver/theme/images/topic_unread.gif delete mode 100644 phpBB/styles/prosilver/theme/images/topic_unread_hot.gif delete mode 100644 phpBB/styles/prosilver/theme/images/topic_unread_hot_mine.gif delete mode 100644 phpBB/styles/prosilver/theme/images/topic_unread_locked.gif delete mode 100644 phpBB/styles/prosilver/theme/images/topic_unread_locked_mine.gif delete mode 100644 phpBB/styles/prosilver/theme/images/topic_unread_mine.gif create mode 100644 phpBB/styles/prosilver/theme/svg/logo.svg diff --git a/.gitignore b/.gitignore index df389eda1f..9e7fc2f0d0 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,6 @@ /phpBB/store/* /phpBB/styles/* !/phpBB/styles/prosilver -/phpBB/styles/prosilver/theme/*/ !/phpBB/styles/prosilver/theme/en !/phpBB/styles/prosilver/theme/images !/phpBB/styles/all diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 4999d1f0f5..15f7924a77 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3933,6 +3933,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'CURRENT_USER_AVATAR' => phpbb_get_user_avatar($user->data), 'CURRENT_USERNAME_SIMPLE' => get_username_string('no_profile', $user->data['user_id'], $user->data['username'], $user->data['user_colour']), 'CURRENT_USERNAME_FULL' => get_username_string('full', $user->data['user_id'], $user->data['username'], $user->data['user_colour']), + 'CURRENT_USER_GROUP_COLOR' => ' color: #' . $user->data['user_colour'], 'UNREAD_NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '', 'NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '', 'U_VIEW_ALL_NOTIFICATIONS' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=ucp_notifications'), diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 19f71e092a..e783512099 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -275,6 +275,11 @@ function mcp_forum_view($id, $mode, $action, $forum_info) 'TOPIC_ICON_IMG_HEIGHT' => (!empty($icons[$row_ary['icon_id']])) ? $icons[$row_ary['icon_id']]['height'] : '', 'UNAPPROVED_IMG' => ($topic_unapproved || $posts_unapproved) ? $user->img('icon_topic_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '', 'DELETED_IMG' => ($topic_deleted) ? $user->img('icon_topic_deleted', 'TOPIC_DELETED') : '', + 'S_POST_ANNOUNCE' => ($row['topic_type'] == POST_ANNOUNCE) ? true : false, + 'S_POST_GLOBAL' => ($row['topic_type'] == POST_GLOBAL) ? true : false, + 'S_POST_STICKY' => ($row['topic_type'] == POST_STICKY) ? true : false, + 'S_TOPIC_LOCKED' => ($row['topic_status'] == ITEM_LOCKED) ? true : false, + 'S_TOPIC_MOVED' => ($row['topic_status'] == ITEM_MOVED) ? true : false, 'TOPIC_AUTHOR' => get_username_string('username', $row_ary['topic_poster'], $row_ary['topic_first_poster_name'], $row_ary['topic_first_poster_colour']), 'TOPIC_AUTHOR_COLOUR' => get_username_string('colour', $row_ary['topic_poster'], $row_ary['topic_first_poster_name'], $row_ary['topic_first_poster_colour']), diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index 36f45f3f46..a258f51431 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -977,6 +977,11 @@ class ucp_main 'TOPIC_ICON_IMG_WIDTH' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '', 'TOPIC_ICON_IMG_HEIGHT' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '', 'ATTACH_ICON_IMG' => ($auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', + 'S_POST_ANNOUNCE' => ($row['topic_type'] == POST_ANNOUNCE) ? true : false, + 'S_POST_GLOBAL' => ($row['topic_type'] == POST_GLOBAL) ? true : false, + 'S_POST_STICKY' => ($row['topic_type'] == POST_STICKY) ? true : false, + 'S_TOPIC_LOCKED' => ($row['topic_status'] == ITEM_LOCKED) ? true : false, + 'S_TOPIC_MOVED' => ($row['topic_status'] == ITEM_MOVED) ? true : false, 'S_TOPIC_TYPE' => $row['topic_type'], 'S_USER_POSTED' => (!empty($row['topic_posted'])) ? true : false, diff --git a/phpBB/search.php b/phpBB/search.php index 678b4d9ff8..b2a8aa2c3a 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -1122,6 +1122,11 @@ if ($keywords || $author || $author_id || $search_id || $submit) 'TOPIC_IMG_STYLE' => $folder_img, 'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt), 'TOPIC_FOLDER_IMG_ALT' => $user->lang[$folder_alt], + 'S_POST_ANNOUNCE' => ($row['topic_type'] == POST_ANNOUNCE) ? true : false, + 'S_POST_GLOBAL' => ($row['topic_type'] == POST_GLOBAL) ? true : false, + 'S_POST_STICKY' => ($row['topic_type'] == POST_STICKY) ? true : false, + 'S_TOPIC_LOCKED' => ($row['topic_status'] == ITEM_LOCKED) ? true : false, + 'S_TOPIC_MOVED' => ($row['topic_status'] == ITEM_MOVED) ? true : false, 'TOPIC_ICON_IMG' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '', 'TOPIC_ICON_IMG_WIDTH' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '', diff --git a/phpBB/styles/prosilver/template/display_options.html b/phpBB/styles/prosilver/template/display_options.html index 1bcaf40087..db55be9737 100644 --- a/phpBB/styles/prosilver/template/display_options.html +++ b/phpBB/styles/prosilver/template/display_options.html @@ -1,7 +1,9 @@
- - + {{ Icon('iconify', 'fa:sort-amount-asc', '', true, 'c-button-icon') }} + + {{ Icon('iconify', 'fa:caret-down', '', true, 'c-button-icon') }} +