diff --git a/phpBB/adm/images/alert_close.png b/phpBB/adm/images/alert_close.png deleted file mode 100644 index 79750a013c..0000000000 Binary files a/phpBB/adm/images/alert_close.png and /dev/null differ diff --git a/phpBB/adm/images/arrow_down.gif b/phpBB/adm/images/arrow_down.gif deleted file mode 100644 index b7fbf7e276..0000000000 Binary files a/phpBB/adm/images/arrow_down.gif and /dev/null differ diff --git a/phpBB/adm/images/arrow_left.gif b/phpBB/adm/images/arrow_left.gif deleted file mode 100644 index ac92cb4971..0000000000 Binary files a/phpBB/adm/images/arrow_left.gif and /dev/null differ diff --git a/phpBB/adm/images/arrow_right.gif b/phpBB/adm/images/arrow_right.gif deleted file mode 100644 index 3a080ffdfe..0000000000 Binary files a/phpBB/adm/images/arrow_right.gif and /dev/null differ diff --git a/phpBB/adm/images/arrow_up.gif b/phpBB/adm/images/arrow_up.gif deleted file mode 100644 index 0ff5872182..0000000000 Binary files a/phpBB/adm/images/arrow_up.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_button.gif b/phpBB/adm/images/bg_button.gif deleted file mode 100644 index 03172ff5c6..0000000000 Binary files a/phpBB/adm/images/bg_button.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_hash1.gif b/phpBB/adm/images/bg_hash1.gif deleted file mode 100644 index 61163679a8..0000000000 Binary files a/phpBB/adm/images/bg_hash1.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_hash2.gif b/phpBB/adm/images/bg_hash2.gif deleted file mode 100644 index d31840361c..0000000000 Binary files a/phpBB/adm/images/bg_hash2.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_hash3.gif b/phpBB/adm/images/bg_hash3.gif deleted file mode 100644 index 40bc7e1b5c..0000000000 Binary files a/phpBB/adm/images/bg_hash3.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_hash4.gif b/phpBB/adm/images/bg_hash4.gif deleted file mode 100644 index 54e7f0019f..0000000000 Binary files a/phpBB/adm/images/bg_hash4.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_header.gif b/phpBB/adm/images/bg_header.gif deleted file mode 100644 index b95bf3ba95..0000000000 Binary files a/phpBB/adm/images/bg_header.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_header.jpg b/phpBB/adm/images/bg_header.jpg deleted file mode 100644 index 5ecec5360b..0000000000 Binary files a/phpBB/adm/images/bg_header.jpg and /dev/null differ diff --git a/phpBB/adm/images/bg_tabs_alt1.gif b/phpBB/adm/images/bg_tabs_alt1.gif deleted file mode 100644 index 335a72c711..0000000000 Binary files a/phpBB/adm/images/bg_tabs_alt1.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_tabs_alt2.gif b/phpBB/adm/images/bg_tabs_alt2.gif deleted file mode 100644 index a2142d5432..0000000000 Binary files a/phpBB/adm/images/bg_tabs_alt2.gif and /dev/null differ diff --git a/phpBB/adm/images/cellpic3.gif b/phpBB/adm/images/cellpic3.gif deleted file mode 100644 index be46fc6fcc..0000000000 Binary files a/phpBB/adm/images/cellpic3.gif and /dev/null differ diff --git a/phpBB/adm/images/file_conflict.gif b/phpBB/adm/images/file_conflict.gif deleted file mode 100644 index 4458c4ff23..0000000000 Binary files a/phpBB/adm/images/file_conflict.gif and /dev/null differ diff --git a/phpBB/adm/images/file_modified.gif b/phpBB/adm/images/file_modified.gif deleted file mode 100644 index 17e8f976c3..0000000000 Binary files a/phpBB/adm/images/file_modified.gif and /dev/null differ diff --git a/phpBB/adm/images/file_new.gif b/phpBB/adm/images/file_new.gif deleted file mode 100644 index d0ec75876d..0000000000 Binary files a/phpBB/adm/images/file_new.gif and /dev/null differ diff --git a/phpBB/adm/images/file_new_conflict.gif b/phpBB/adm/images/file_new_conflict.gif deleted file mode 100644 index 84efde4faa..0000000000 Binary files a/phpBB/adm/images/file_new_conflict.gif and /dev/null differ diff --git a/phpBB/adm/images/file_not_modified.gif b/phpBB/adm/images/file_not_modified.gif deleted file mode 100644 index 8f9b3d3839..0000000000 Binary files a/phpBB/adm/images/file_not_modified.gif and /dev/null differ diff --git a/phpBB/adm/images/file_up_to_date.gif b/phpBB/adm/images/file_up_to_date.gif deleted file mode 100644 index c372342646..0000000000 Binary files a/phpBB/adm/images/file_up_to_date.gif and /dev/null differ diff --git a/phpBB/adm/images/gradient2b.gif b/phpBB/adm/images/gradient2b.gif deleted file mode 100644 index a8107659e2..0000000000 Binary files a/phpBB/adm/images/gradient2b.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_delete.gif b/phpBB/adm/images/icon_delete.gif deleted file mode 100644 index 57962d5172..0000000000 Binary files a/phpBB/adm/images/icon_delete.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_delete_disabled.gif b/phpBB/adm/images/icon_delete_disabled.gif deleted file mode 100644 index da55bbbe44..0000000000 Binary files a/phpBB/adm/images/icon_delete_disabled.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_down.gif b/phpBB/adm/images/icon_down.gif deleted file mode 100644 index 793db26cde..0000000000 Binary files a/phpBB/adm/images/icon_down.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_down_disabled.gif b/phpBB/adm/images/icon_down_disabled.gif deleted file mode 100644 index 3ba36975b4..0000000000 Binary files a/phpBB/adm/images/icon_down_disabled.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_edit.gif b/phpBB/adm/images/icon_edit.gif deleted file mode 100644 index c95cf98eb9..0000000000 Binary files a/phpBB/adm/images/icon_edit.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_edit_disabled.gif b/phpBB/adm/images/icon_edit_disabled.gif deleted file mode 100644 index ac96b0e6dc..0000000000 Binary files a/phpBB/adm/images/icon_edit_disabled.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_folder.gif b/phpBB/adm/images/icon_folder.gif deleted file mode 100644 index 845618c1a2..0000000000 Binary files a/phpBB/adm/images/icon_folder.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_folder_link.gif b/phpBB/adm/images/icon_folder_link.gif deleted file mode 100644 index efeaf0a11f..0000000000 Binary files a/phpBB/adm/images/icon_folder_link.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_folder_lock.gif b/phpBB/adm/images/icon_folder_lock.gif deleted file mode 100644 index 7afb092a8f..0000000000 Binary files a/phpBB/adm/images/icon_folder_lock.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_subfolder.gif b/phpBB/adm/images/icon_subfolder.gif deleted file mode 100644 index 7119486539..0000000000 Binary files a/phpBB/adm/images/icon_subfolder.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_sync.gif b/phpBB/adm/images/icon_sync.gif deleted file mode 100644 index 16223dfd9a..0000000000 Binary files a/phpBB/adm/images/icon_sync.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_sync_disabled.gif b/phpBB/adm/images/icon_sync_disabled.gif deleted file mode 100644 index 39985045c8..0000000000 Binary files a/phpBB/adm/images/icon_sync_disabled.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_trace.gif b/phpBB/adm/images/icon_trace.gif deleted file mode 100644 index 5c622e9a9d..0000000000 Binary files a/phpBB/adm/images/icon_trace.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_up.gif b/phpBB/adm/images/icon_up.gif deleted file mode 100644 index 7daa95c07e..0000000000 Binary files a/phpBB/adm/images/icon_up.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_up_disabled.gif b/phpBB/adm/images/icon_up_disabled.gif deleted file mode 100644 index 2797192574..0000000000 Binary files a/phpBB/adm/images/icon_up_disabled.gif and /dev/null differ diff --git a/phpBB/adm/images/innerbox_bg.gif b/phpBB/adm/images/innerbox_bg.gif deleted file mode 100644 index 460526f0ba..0000000000 Binary files a/phpBB/adm/images/innerbox_bg.gif and /dev/null differ diff --git a/phpBB/adm/images/loading.gif b/phpBB/adm/images/loading.gif deleted file mode 100644 index e1ed0883e0..0000000000 Binary files a/phpBB/adm/images/loading.gif and /dev/null differ diff --git a/phpBB/adm/images/phpbb_logo.png b/phpBB/adm/images/phpbb_logo.png deleted file mode 100644 index 2d76ef18cb..0000000000 Binary files a/phpBB/adm/images/phpbb_logo.png and /dev/null differ diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 68f8ee634a..0f9ff7eaee 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -63,6 +63,7 @@ $template->set_custom_style( ], [ $phpbb_admin_path . 'style', + $phpbb_root_path . 'styles/all/imgs/', $phpbb_root_path . 'styles/all/template/', ], ); diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html index 2c998078df..7601b802de 100644 --- a/phpBB/adm/style/acp_avatar_options_upload.html +++ b/phpBB/adm/style/acp_avatar_options_upload.html @@ -17,52 +17,52 @@
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html index 0b63302eed..bb22ac861c 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -52,7 +52,7 @@ {enabled.META_VERSION} - + {{ Icon('font', 'circle-exclamation', '', true, 'fas outdated-ext') }} {enabled.META_VERSION} @@ -78,7 +78,7 @@ {disabled.META_VERSION} - + {{ Icon('font', 'circle-exclamation', '', true, 'fas outdated-ext') }} {disabled.META_VERSION} diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index f51ce98776..613a054b32 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -348,7 +348,7 @@ - +
@@ -472,7 +472,17 @@ - {forums.FOLDER_IMAGE} + + + {{ Icon('font', 'circle', '', true, 'fas fa-stack-2x') }} + {{ Icon('font', { + 'link' : forums.S_FORUM_LINK, + 'lock' : forums.S_FORUM_LOCKED, + 'comments' : forums.S_SUBFORUMS, + 'comment' : true, + }, '', true, 'fas fa-inverse fa-stack-1x') }} + +
{forums.FORUM_IMAGE}
{forums.FORUM_NAME}{forums.FORUM_NAME} diff --git a/phpBB/adm/style/acp_help_phpbb.html b/phpBB/adm/style/acp_help_phpbb.html index c88ed21dfa..23bfc33a78 100644 --- a/phpBB/adm/style/acp_help_phpbb.html +++ b/phpBB/adm/style/acp_help_phpbb.html @@ -8,11 +8,11 @@
-

{L_SEND_STATISTICS}

+

{{ Icon('font', 'chart-column', lang('SEND_STATISTICS')) }}

{L_EXPLAIN_SEND_STATISTICS}

- {L_SHOW_STATISTICS} + {L_SHOW_STATISTICS}{{ Icon('font', 'angle-down', '', true) }}
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 43f57a184a..a4ff0aea97 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -132,7 +132,16 @@ - {modules.MODULE_IMAGE} + + + {{ Icon('font', 'circle', '', true, 'fas fa-stack-2x') }} + {{ Icon('font', { + 'lock' : not modules.MODULE_ENABLED, + 'folder-tree' : modules.S_SUB_MODULE, + 'folder' : true, + }, '', true, 'fas fa-inverse fa-stack-1x') }} + + {modules.MODULE_TITLE} [{L_HIDDEN_MODULE}]  {L_DISABLE}{L_ENABLE}  diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index f6598331eb..290eaffcf8 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -334,7 +334,8 @@ li { } #content { - background: #f3f3f3 url("../images/innerbox_bg.gif") repeat-x top; + background: #f3f3f3; + background: linear-gradient(to bottom, #dbdee2 0%, #e0e2e5 27%, #ecedee 65%, #f3f3f3 100%); padding: 5px; } @@ -501,7 +502,8 @@ li { /* Main Panel ---------------------------------------- */ #acp { - background: #f3f3f3 url("../images/innerbox_bg.gif") repeat-x top; + background: #f3f3f3; + background: linear-gradient(to bottom, #dbdee2 0%, #e0e2e5 27%, #ecedee 65%, #f3f3f3 100%); border: 1px #999999 solid; border-radius: 5px; box-shadow: #ffffff 0 0 0 1px inset; @@ -517,7 +519,8 @@ li { } .panel { - background: #f3f3f3 url("../images/innerbox_bg.gif") repeat-x top; + background: #f3f3f3; + background: linear-gradient(to bottom, #dbdee2 0%, #e0e2e5 27%, #ecedee 65%, #f3f3f3 100%); border-radius: 5px; overflow: hidden; padding: 5px 0; @@ -604,25 +607,47 @@ li { #menu li#activemenu a span { font-weight: bold; text-decoration: none; - background: transparent url("../images/arrow_right.gif") 0% 50% no-repeat; color: #1180b7; } -.rtl #menu li#activemenu a span { - background: transparent url("../images/arrow_left.gif") 100% 50% no-repeat; -} #menu li#activemenu a:hover span, #menu li#activemenu span { font-weight: bold; text-decoration: none; - background: #ffffff url("../images/arrow_right.gif") 1% 50% no-repeat; color: #bc2a4d; } -.rtl #menu li#activemenu a:hover span, -.rtl #menu li#activemenu span { - background: #ffffff url("../images/arrow_left.gif") 99% 50% no-repeat; +#menu li#activemenu a span:before, +#menu li#activemenu a:hover span:before, +#menu li#activemenu span:before { + font-family: "Font Awesome 6 Free"; + color: #515f77; + margin-right: 3px; + margin-left: -10px; + content: "\f105"; +} + +#menu li#activemenu a:hover span:before, +#menu li#activemenu span:before { + margin-right: 1px; + margin-left: -8px; +} + +.rtl #menu li#activemenu a span:before, +.rtl #menu li#activemenu a:hover span:before, +.rtl #menu li#activemenu span:before { + font-family: "Font Awesome 6 Free"; + color: #515f77; + margin-right: -10px; + margin-left: 3px; + content: "\f104"; +} + +.rtl #menu li#activemenu a:hover span:before, +.rtl #menu li#activemenu span:before { + margin-right: -8px; + margin-left: 1px; } #menu li a:active, @@ -633,16 +658,30 @@ li { #menu li span.completed { text-decoration: none; - background: url("../images/arrow_down.gif") 1% 50% no-repeat; padding: 3px 3px 3px 12px; } +#menu li span.completed:before { + font-family: "Font Awesome 6 Free"; + color: #515f77; + margin-right: 1px; + margin-left: -8px; + content: "\f107"; +} + .rtl #menu li span.completed { text-decoration: none; - background: url("../images/arrow_down.gif") 99% 50% no-repeat; padding: 3px 12px 3px 3px; } +.rtl #menu li span.completed:before { + font-family: "Font Awesome 6 Free"; + color: #515f77; + margin-right: -8px; + margin-left: 1px; + content: "\f107"; +} + #menu .header { font-family: Tahoma, Helvetica, sans-serif; font-size: 0.75em; @@ -734,7 +773,8 @@ th { font-size: 0.75em; text-align: left; text-transform: uppercase; - background: #70aed3 url("../images/gradient2b.gif") bottom left repeat-x; + background: #70aed3; + background: linear-gradient(to bottom, #70aed3 0%, #5ba0c9 100%); border-top: 1px solid #6dacd2; border-bottom: 1px solid #327aa5; color: #ffffff; @@ -1019,7 +1059,8 @@ table.fixed-width-table { font-weight: bold; text-align: left; text-transform: uppercase; - background: #70aed3 url("../images/gradient2b.gif") bottom left repeat-x; + background: #70aed3; + background: linear-gradient(to bottom, #70aed3 0%, #5ba0c9 100%); border-top: 1px solid #6dacd2; border-bottom: 1px solid #327aa5; color: #ffffff; @@ -1719,7 +1760,8 @@ a.button2, input.button2 { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; font-size: 0.85em; - background: #efefef url("../images/bg_button.gif") repeat-x top; + background: #efefef; + background: linear-gradient(to bottom, #ffffff 0%, #d2d2d2 4%, #dfdfdf 26%, #efefef 65%, #efefef 100%); color: #000000; width: auto !important; padding: 1px 3px 0; @@ -1763,7 +1805,8 @@ a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover { - background: #efefef url("../images/bg_button.gif") repeat bottom; + background: #efefef; + background: linear-gradient(to bottom, #ffffff 0%, #d2d2d2 4%, #dfdfdf 26%, #efefef 65%, #efefef 100%); border: 1px solid #bc2a4d; color: #bc2a4d; } @@ -1823,24 +1866,18 @@ input.button2:focus { display: none; width: 620px; margin: 0 auto; - padding: 25px; padding: 0 25px 20px; } .phpbb_alert .alert_close { - text-decoration: none !important; - background: transparent url("../images/alert_close.png") 0 0 no-repeat; - display: block; + font-size: 14px; float: right; - overflow: hidden; - width: 16px; - height: 16px; - margin-top: -7px; - margin-right: -31px; + margin-top: 2px; + margin-right: -22px; } .phpbb_alert .alert_close:hover { - background-position: 0 -16px; + color: #bc2a4d; } .phpbb_alert p { @@ -2351,11 +2388,11 @@ fieldset.permissions .permissions-switch { font-size: 0.85em; line-height: normal; min-width: 570px; - margin: 0 0 -1px 7px; + margin: 0 0 0 7px; } .rtl .permissions-category { - margin: 0 7px -1px 0; + margin: 0 7px 0 0; } .permissions-category ul { @@ -2376,7 +2413,9 @@ fieldset.permissions .permissions-switch { .permissions-category a { text-decoration: none; - background: url("../images/bg_tabs_alt1.gif") no-repeat 0% -35px; + background: #bcccd8; + border: 1px solid transparent; + border-radius: 4px 4px 0 0; position: relative; float: left; margin: 0 1px 0 0; @@ -2389,7 +2428,6 @@ fieldset.permissions .permissions-switch { .permissions-category a span.tabbg { white-space: nowrap; - background: url("../images/bg_tabs_alt2.gif") no-repeat 100% -35px; color: #536482; display: block; float: left; @@ -2400,41 +2438,34 @@ fieldset.permissions .permissions-switch { float: right; } -/* Commented Backslash Hack hides rule from IE5-Mac \ */ .permissions-category a span.tabbg, .rtl .permissions-category a span.tabbg { float: none; } -/* End hack */ +.permissions-category a:hover, .permissions-category a:hover span.tabbg { - background-position: 100% -70px; + background: #dfedfa; color: #dd6900; } +.permissions-category .activetab a, +.permissions-category .activetab a:hover, +.permissions-category .activetab a span.tabbg { + background: #ccdcea; + background: linear-gradient(to bottom, #eaf2f9 0%, #ccdcea 100%); + color: #333333; +} + .permissions-category .activetab a { - background-position: 0 0; + border-color: #cadceb; + box-shadow: 0 1px 1px #f2f9ff inset; } .permissions-category .activetab a span.tabbg { - background-position: 100% 0; - color: #333333; padding-bottom: 7px; } -.permissions-category a:hover { - background-position: 0 -70px; -} - -.permissions-category .activetab a:hover span.tabbg { - background-position: 100% 0; - color: #333333; -} - -.permissions-category .activetab a:hover { - background-position: 0 0; -} - .permissions-category a span.colour { border: 1px solid #536482; display: block; @@ -2808,8 +2839,16 @@ fieldset.permissions .permissions-switch { user-select: none; } +.roles-options > .button:hover { + background: transparent; +} + +.roles-options > .button:active { + padding: 4px; +} + .roles-options > span { - background: url("../images/arrow_down.gif") no-repeat 245px 0.7em; + background: transparent; border: 1px solid #dedede; border-radius: 3px; display: none; @@ -2817,8 +2856,16 @@ fieldset.permissions .permissions-switch { padding: 4px; } -.rtl .roles-options > span { - background: url("../images/arrow_down.gif") no-repeat 7px 0.7em; +.roles-options > span:after { + font-family: "Font Awesome 6 Free"; + float: right; + content: "\f107"; +} + +.rtl .roles-options > span:after { + font-family: "Font Awesome 6 Free"; + float: left; + content: "\f107"; } .roles-options li { @@ -2960,11 +3007,6 @@ fieldset.permissions .permissions-switch { padding-right: 0.3em; } -.icon { - font-family: FontAwesome; - font-style: normal; -} - .send-stats-data-row { background: #f9f9f9; border: #dedede 1px solid; @@ -3013,12 +3055,14 @@ fieldset.permissions .permissions-switch { } .send-stats-settings input[type="checkbox"] + label:before { - font-family: FontAwesome; + font-family: "Font Awesome 6 Free", "Font Awesome 6 Brands"; font-size: 1.5em; - content: "\f096"; + font-weight: 400; + content: "\f0c8"; } .send-stats-settings input[type="checkbox"]:checked + label:before { + font-weight: 900; color: #3c763d; content: "\f14a"; } @@ -3056,6 +3100,28 @@ fieldset.permissions .permissions-switch { overflow-x: scroll; } +.o-icon { + vertical-align: middle !important; +} + +.o-icon-font { + font-family: "Font Awesome 6 Free", "Font Awesome 6 Brands"; + font-style: normal; + font-variant: normal; + -webkit-font-smoothing: antialiased; + vertical-align: baseline; + display: inline-block; + /* stylelint-disable order/properties-order */ + -moz-osx-font-smoothing: grayscale; + /* stylelint-enable order/properties-order */ + text-rendering: auto; /* optimizelegibility throws things off #1094 */ +} + +.o-icon + span, +span + .o-icon { + padding-left: 4px; +} + .acp-icon { font-size: 1.5em; } diff --git a/phpBB/adm/style/installer_header.html b/phpBB/adm/style/installer_header.html index 704db9e174..a3b8eda825 100644 --- a/phpBB/adm/style/installer_header.html +++ b/phpBB/adm/style/installer_header.html @@ -7,6 +7,7 @@ {META} {PAGE_TITLE} + diff --git a/phpBB/adm/style/installer_update_file_status.html b/phpBB/adm/style/installer_update_file_status.html index a27bfa6a44..b49faf0f41 100644 --- a/phpBB/adm/style/installer_update_file_status.html +++ b/phpBB/adm/style/installer_update_file_status.html @@ -4,7 +4,7 @@

{L_FILES_DELETED_EXPLAIN}

- {L_STATUS_DELETED} + {{ Icon('font', 'circle-xmark', lang('STATUS_DELETED'), true, '', {'style' : 'color:red;'}) }}
{deleted.DIR_PART}{deleted.FILE_PART}
@@ -20,7 +20,7 @@

{L_FILES_CONFLICT_EXPLAIN}

- {L_STATUS_CONFLICT} + {{ Icon('font', 'circle-exclamation', lang('STATUS_CONFLICT'), true, '', {'style' : 'color:red;'}) }}
{conflict.DIR_PART}{conflict.FILE_PART}
@@ -36,7 +36,7 @@

{L_FILES_MODIFIED_EXPLAIN}

- {L_STATUS_MODIFIED} + {{ Icon('font', 'circle-arrow-left', lang('STATUS_MODIFIED'), true, '', {'style' : 'color:#ffd43b;'}) }}
{modified.DIR_PART}{modified.FILE_PART}
@@ -52,7 +52,7 @@

{L_FILES_NEW_EXPLAIN}

diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html index 26aa5e098f..2d9ebf92dc 100644 --- a/phpBB/adm/style/permission_mask.html +++ b/phpBB/adm/style/permission_mask.html @@ -27,7 +27,7 @@
- + {p_mask.f_mask.PADDING}{p_mask.f_mask.PADDING}{p_mask.f_mask.NAME} @@ -73,7 +73,7 @@
- +

{L_APPLY_PERMISSIONS_EXPLAIN}

@@ -139,7 +139,7 @@

{L_MARK_ALL} • {L_UNMARK_ALL}

- +
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 2df8abed00..6aafce12bc 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -869,28 +869,9 @@ class acp_forums { $forum_type = $row['forum_type']; - if ($row['forum_status'] == ITEM_LOCKED) - { - $folder_image = '' . $user->lang['LOCKED'] . ''; - } - else - { - switch ($forum_type) - { - case FORUM_LINK: - $folder_image = '' . $user->lang['LINK'] . ''; - break; - - default: - $folder_image = ($row['left_id'] + 1 != $row['right_id']) ? '' . $user->lang['SUBFORUM'] . '' : '' . $user->lang['FOLDER'] . ''; - break; - } - } - $url = $this->u_action . "&parent_id=$this->parent_id&f={$row['forum_id']}"; $template->assign_block_vars('forums', array( - 'FOLDER_IMAGE' => $folder_image, 'FORUM_IMAGE' => ($row['forum_image']) ? '' : '', 'FORUM_IMAGE_SRC' => ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '', 'FORUM_NAME' => $row['forum_name'], @@ -900,6 +881,8 @@ class acp_forums 'S_FORUM_LINK' => ($forum_type == FORUM_LINK) ? true : false, 'S_FORUM_POST' => ($forum_type == FORUM_POST) ? true : false, + 'S_FORUM_LOCKED' => ($row['forum_status'] == ITEM_LOCKED) ? true : false, + 'S_SUBFORUMS' => ($row['left_id'] + 1 != $row['right_id']) ? true : false, 'U_FORUM' => $this->u_action . '&parent_id=' . $row['forum_id'], 'U_MOVE_UP' => $url . '&action=move_up', diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index fb03d50cda..c5582d3cc5 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -467,19 +467,9 @@ class acp_modules { $langname = $user->lang($row['module_langname']); - if (!$row['module_enabled']) - { - $module_image = '' . $user->lang['DEACTIVATED_MODULE'] .''; - } - else - { - $module_image = (!$row['module_basename'] || $row['left_id'] + 1 != $row['right_id']) ? '' . $user->lang['CATEGORY'] . '' : '' . $user->lang['MODULE'] . ''; - } - $url = $this->u_action . '&parent_id=' . $this->parent_id . '&m=' . $row['module_id']; $template->assign_block_vars('modules', array( - 'MODULE_IMAGE' => $module_image, 'MODULE_TITLE' => $langname, 'MODULE_ENABLED' => ($row['module_enabled']) ? true : false, 'MODULE_DISPLAYED' => ($row['module_display']) ? true : false, @@ -487,6 +477,8 @@ class acp_modules 'S_ACP_CAT_SYSTEM' => ($this->module_class == 'acp' && $row['module_langname'] == 'ACP_CAT_SYSTEM') ? true : false, 'S_ACP_MODULE_MANAGEMENT' => ($this->module_class == 'acp' && ($row['module_basename'] == 'modules' || $row['module_langname'] == 'ACP_MODULE_MANAGEMENT')) ? true : false, + 'S_SUB_MODULE' => (!$row['module_basename'] || $row['left_id'] + 1 != $row['right_id']) ? true : false, + 'U_MODULE' => $this->u_action . '&parent_id=' . $row['module_id'], 'U_MOVE_UP' => $url . '&action=move_up&hash=' . generate_link_hash('acp_modules'), 'U_MOVE_DOWN' => $url . '&action=move_down&hash=' . generate_link_hash('acp_modules'), diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 9b5a468a7e..e63ed0701b 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -98,16 +98,16 @@ function adm_page_header($page_title) 'T_ASSETS_VERSION' => $config['assets_version'], 'T_ASSETS_PATH' => "{$phpbb_root_path}assets", - 'ICON_MOVE_UP' => '', - 'ICON_MOVE_UP_DISABLED' => '', - 'ICON_MOVE_DOWN' => '', - 'ICON_MOVE_DOWN_DISABLED' => '', - 'ICON_EDIT' => '', - 'ICON_EDIT_DISABLED' => '', - 'ICON_DELETE' => '', - 'ICON_DELETE_DISABLED' => '', - 'ICON_SYNC' => '', - 'ICON_SYNC_DISABLED' => '', + 'ICON_MOVE_UP' => '', + 'ICON_MOVE_UP_DISABLED' => '', + 'ICON_MOVE_DOWN' => '', + 'ICON_MOVE_DOWN_DISABLED' => '', + 'ICON_EDIT' => '', + 'ICON_EDIT_DISABLED' => '', + 'ICON_DELETE' => '', + 'ICON_DELETE_DISABLED' => '', + 'ICON_SYNC' => '', + 'ICON_SYNC_DISABLED' => '', 'S_USER_ID' => $user->data['user_id'], 'S_USER_LANG' => $user->lang('USER_LANG'), diff --git a/phpBB/phpbb/install/controller/helper.php b/phpBB/phpbb/install/controller/helper.php index 1f936dda86..c6f49784bf 100644 --- a/phpBB/phpbb/install/controller/helper.php +++ b/phpBB/phpbb/install/controller/helper.php @@ -266,8 +266,8 @@ class helper 'L_SELECT_LANG' => $this->language->lang('SELECT_LANG'), 'L_SKIP' => $this->language->lang('SKIP'), 'PAGE_TITLE' => $this->language->lang($page_title), - 'T_IMAGE_PATH' => $this->path_helper->get_web_root_path() . $path . 'images', 'T_JQUERY_LINK' => $this->path_helper->get_web_root_path() . $path . '../assets/javascript/jquery-3.6.0.min.js', + 'T_FONT_AWESOME_LINK' => $this->path_helper->get_web_root_path() . $path . '../assets/css/font-awesome.min.css', 'T_TEMPLATE_PATH' => $this->path_helper->get_web_root_path() . $path . 'style', 'T_ASSETS_PATH' => $this->path_helper->get_web_root_path() . $path . '../assets', diff --git a/phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php b/phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php index 62ef42108d..d1de940445 100644 --- a/phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php +++ b/phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php @@ -432,10 +432,6 @@ class ajax_iohandler extends iohandler_base */ public function render_update_file_status($status_array) { - $this->template->assign_vars(array( - 'T_IMAGE_PATH' => $this->path_helper->get_web_root_path() . 'adm/images/', - )); - foreach ($status_array as $block => $list) { foreach ($list as $filename) diff --git a/phpBB/phpbb/template/twig/extension/icon.php b/phpBB/phpbb/template/twig/extension/icon.php index f0748432a6..8edd33bbc7 100644 --- a/phpBB/phpbb/template/twig/extension/icon.php +++ b/phpBB/phpbb/template/twig/extension/icon.php @@ -83,7 +83,7 @@ class icon extends AbstractExtension switch ($type) { case 'font': - // Nothing to do here.. + $classes = $this->insert_fa_class($classes); break; case 'png': @@ -168,6 +168,39 @@ class icon extends AbstractExtension } } + /** + * Insert fa class into class string by checking if class string contains any fa classes + * + * @param string $class_string + * @return string Updated class string or original class string if fa class is already set or string is empty + */ + protected function insert_fa_class(string $class_string): string + { + if (empty($class_string)) + { + return $class_string; + } + + // These also include pro class name we don't use, but handle them properly anyway + $fa_classes = ['fa-solid', 'fas', 'fa-regular', 'far', 'fal', 'fa-light', 'fab', 'fa-brands']; + + // Split the class string into individual words + $icon_classes = explode(' ', $class_string); + + // Check if the class string contains any of the fa classes, just return class string in that case + foreach ($icon_classes as $word) + { + if (in_array($word, $fa_classes)) + { + return $class_string; + } + } + + // If we reach this it means we didn't have any fa classes in the class string. + // Prepend class string with fas for fa-solid + return 'fas ' . $class_string; + } + /** * Prepare an SVG for usage in the template icon. * diff --git a/tests/template/extension_test.php b/tests/template/extension_test.php index 3050ed6c52..ea762f5b0f 100644 --- a/tests/template/extension_test.php +++ b/tests/template/extension_test.php @@ -313,7 +313,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case [ 'ICON_PENCIL' => 'Pencil icon', ], - ' + ' Pencil icon' ], /** Font: icons array */