From 35f4dc769118708e9862cf348f23e2892fd408fc Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 23 Feb 2024 11:25:38 -0800 Subject: [PATCH 01/14] [ticket/17291] Switch ACP images to font icons PHPBB3-17291 --- phpBB/adm/images/bg_hash1.gif | Bin 48 -> 0 bytes phpBB/adm/images/bg_hash2.gif | Bin 48 -> 0 bytes phpBB/adm/images/bg_hash3.gif | Bin 48 -> 0 bytes phpBB/adm/images/bg_hash4.gif | Bin 48 -> 0 bytes phpBB/adm/images/bg_header.gif | Bin 416 -> 0 bytes phpBB/adm/images/bg_header.jpg | Bin 385 -> 0 bytes phpBB/adm/images/file_conflict.gif | Bin 344 -> 0 bytes phpBB/adm/images/file_modified.gif | Bin 358 -> 0 bytes phpBB/adm/images/file_new.gif | Bin 229 -> 0 bytes phpBB/adm/images/file_new_conflict.gif | Bin 357 -> 0 bytes phpBB/adm/images/file_not_modified.gif | Bin 570 -> 0 bytes phpBB/adm/images/file_up_to_date.gif | Bin 357 -> 0 bytes phpBB/adm/images/icon_delete.gif | Bin 255 -> 0 bytes phpBB/adm/images/icon_delete_disabled.gif | Bin 249 -> 0 bytes phpBB/adm/images/icon_down.gif | Bin 239 -> 0 bytes phpBB/adm/images/icon_down_disabled.gif | Bin 166 -> 0 bytes phpBB/adm/images/icon_edit.gif | Bin 242 -> 0 bytes phpBB/adm/images/icon_edit_disabled.gif | Bin 239 -> 0 bytes phpBB/adm/images/icon_sync.gif | Bin 251 -> 0 bytes phpBB/adm/images/icon_sync_disabled.gif | Bin 246 -> 0 bytes phpBB/adm/images/icon_trace.gif | Bin 307 -> 0 bytes phpBB/adm/images/icon_up.gif | Bin 240 -> 0 bytes phpBB/adm/images/icon_up_disabled.gif | Bin 168 -> 0 bytes phpBB/adm/images/loading.gif | Bin 1320 -> 0 bytes .../adm/style/acp_avatar_options_upload.html | 24 +++++++++--------- phpBB/adm/style/acp_ext_list.html | 4 +-- phpBB/adm/style/acp_help_phpbb.html | 4 +-- .../style/installer_update_file_status.html | 10 ++++---- phpBB/adm/style/permission_mask.html | 10 ++++---- phpBB/includes/functions_acp.php | 12 ++++----- phpBB/phpbb/install/controller/helper.php | 1 - .../helper/iohandler/ajax_iohandler.php | 4 --- 32 files changed, 32 insertions(+), 37 deletions(-) delete mode 100644 phpBB/adm/images/bg_hash1.gif delete mode 100644 phpBB/adm/images/bg_hash2.gif delete mode 100644 phpBB/adm/images/bg_hash3.gif delete mode 100644 phpBB/adm/images/bg_hash4.gif delete mode 100644 phpBB/adm/images/bg_header.gif delete mode 100644 phpBB/adm/images/bg_header.jpg delete mode 100644 phpBB/adm/images/file_conflict.gif delete mode 100644 phpBB/adm/images/file_modified.gif delete mode 100644 phpBB/adm/images/file_new.gif delete mode 100644 phpBB/adm/images/file_new_conflict.gif delete mode 100644 phpBB/adm/images/file_not_modified.gif delete mode 100644 phpBB/adm/images/file_up_to_date.gif delete mode 100644 phpBB/adm/images/icon_delete.gif delete mode 100644 phpBB/adm/images/icon_delete_disabled.gif delete mode 100644 phpBB/adm/images/icon_down.gif delete mode 100644 phpBB/adm/images/icon_down_disabled.gif delete mode 100644 phpBB/adm/images/icon_edit.gif delete mode 100644 phpBB/adm/images/icon_edit_disabled.gif delete mode 100644 phpBB/adm/images/icon_sync.gif delete mode 100644 phpBB/adm/images/icon_sync_disabled.gif delete mode 100644 phpBB/adm/images/icon_trace.gif delete mode 100644 phpBB/adm/images/icon_up.gif delete mode 100644 phpBB/adm/images/icon_up_disabled.gif delete mode 100644 phpBB/adm/images/loading.gif diff --git a/phpBB/adm/images/bg_hash1.gif b/phpBB/adm/images/bg_hash1.gif deleted file mode 100644 index 61163679a80e2c6074658193458280c8713489a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 zcmZ?wbhEHbWMyDwXkcV;IBLtlz@Ye(g^_`QkwFK@28y#XFfg(AFi+pMLY#}i8UVn0 B2ekkI diff --git a/phpBB/adm/images/bg_hash2.gif b/phpBB/adm/images/bg_hash2.gif deleted file mode 100644 index d31840361c1e83c8e4828c1641d1b7d629c2068d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 zcmZ?wbhEHbWMyDwXkcV0*zksdfkE*n3nK#qBZCf*4HRc(U|?eJVV=Hig*X?3H2~Vr B2!8+o diff --git a/phpBB/adm/images/bg_hash3.gif b/phpBB/adm/images/bg_hash3.gif deleted file mode 100644 index 40bc7e1b5c67192a6299730460b88e46ce9b4c1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 zcmZ?wbhEHbWMyDwXkcV`Q`pGBz@Ye(g^_`QkwFK@28y#XFfg(AFi+pMLY#}i8UWRr B2vGn4 diff --git a/phpBB/adm/images/bg_hash4.gif b/phpBB/adm/images/bg_hash4.gif deleted file mode 100644 index 54e7f0019f7bca1fef37bee315e6b44380505ae0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 zcmZ?wbhEHbWMyDwXkcVWOG{&5U{L(Y!pOkD$e;sc1I1Yx7?{|5n5S=BAAMU((ec}GodoSPI zdiMJ6%QqJvJUe~&(VZ7>9=?A6;PtyZ&tG4D`0W16x0fG1KYi!XxqD9@zJ7P+?&JHf z-adNs{`T|NR~|jT^zhl^H}B8ifAZw*2L@7r;!hT^avcx}@)HBw-UE{gJao$X+}nyy zx>(M?up-H8t<<_3Yf^TbR_=fBA=^i9_SqRFvkv6#=Kio_j`Q;E?|$rwJMujEU%g6G zlTK?}dxv0G7ejAfzwpF~98;!F=^sWQ>T^Bp4Gf?@zQ19tJkh8+`OrN=kC4x@(&;K rKY60{{Kd;xdT-vodoT9!Bh#0!-wb~I{Pp|K-+%uZm|t--F<1it4*>Fk diff --git a/phpBB/adm/images/bg_header.jpg b/phpBB/adm/images/bg_header.jpg deleted file mode 100644 index 5ecec5360b11992492807a8fa1353ad25392d55f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 385 zcmex=uI=H%w(=K}(Mey}1a#RK7?>VxzCA7BvVV6b6eVrCR%U=n0x7G(T?gdvlGk&zMT zNCaTz;A8|TLWlraj7&gR3INrz0wobZn9(qiIZf~)lhLGLkq|KrK}H5f7G{Jz1B1{9 zM!`TP71jT@7PK`pT83 z-d-OjO?;Z2^?B`@XSFrYT3cRaroX;%Vn|&9BNzzMnYpV%4e_ z(UCu|U3+Y2{Ukp2Nud8@7sp4YCjbBce`I6;BpIj;6o0ZXGBBtx=zt6c`H6w8)M3(u zk_Hj2g-i~HIYAtYS4=U;RI|CXX3InYyDfqfRk;K7on3oP(i!qOu5kOQ4vNbd;iyia<~sQ#qRxC-0;{311cAfGAn1 S)lOV&917eVY;&C*8LR<45pCE2 diff --git a/phpBB/adm/images/file_modified.gif b/phpBB/adm/images/file_modified.gif deleted file mode 100644 index 17e8f976c3745c971ca0d8bb4c36b6d1569471cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 358 zcmZ?wbhEHb6krfwxN5-g>3ra;m$&{rU;6C+o?nNVex8v2c}n5=-Ax}ahX4Qj?elr( zKS$XAyxIO^FT=OJoWG9?e!d*{J4@oVNM%Y|)=%tltkx z{5;0>_w%KnR}=nzJo)RC*uS68f1dOBeo*wsS=T?WHvTwc|L5ua@26DWUT^q*MDg$2 zy+1F8{Jm=RYcIq9|Np=329XS;0L7myj0_A03_2i9AU`p%H9O1@D4QT6wU#NtAjgSg z{fa3DnQVTS)?5)1(AuK(mfImG#aXQ|`@_^eA*PQ%6m?Z&XE|6Eg>!G(Q{1YG+3VYXA(QmgfKf diff --git a/phpBB/adm/images/file_new.gif b/phpBB/adm/images/file_new.gif deleted file mode 100644 index d0ec75876d8889d1ec98c16d430c3c7546c3c9d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 229 zcmZ?wbhEHb6krfwI3msP>3rbFi{a1i@A-L3;pYkIUx%4qy}b4O?xsIS*njM0_7IE0OUeru>b%7 diff --git a/phpBB/adm/images/file_new_conflict.gif b/phpBB/adm/images/file_new_conflict.gif deleted file mode 100644 index 84efde4faa94e7b0c95a2793e4f355a6a5c2a56e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmZ?wbhEHb6krfwxT?%BZ{D0WYgXO4b7$+;EkAzzxPJZmix)2zFJ8EG>Ei9%x6PV0 z)J{3qZ&;Tg@WMO1rP-f5pnGNz216$L9 zi3K4UG79q#Cm800i7Z+XVwfpqc4^I*M1i<12^SkUI+-jY+rDi6;l`@yB_a~!&Mv5V zAZU5>CU*JAYDLBRNTH_45=Gf4A&G89CKeXPNDk(pIwi)b(*s3WyF}XO$}t4WGb!^X iMsYf^@vje*@>LcNh~ksn;l$0!!6(SUxyIR%!5RR?SbJyy diff --git a/phpBB/adm/images/file_not_modified.gif b/phpBB/adm/images/file_not_modified.gif deleted file mode 100644 index 8f9b3d383916ce09c6bf67a1f8788c6c96ffa794..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmZ?wbhEHb6krfwc;?D*;Q&>CNV|uNEGB zI(f&#N!uT;IQIO;(=WXnuIK0HXJuutJodb0`Pr&j`$~J3Cg#@{mz1cgswycfRaI5b z-T%bG!ot$VVban)MMXuHmX_%m8U1rsR8?1-Svy+U*hfS}I66Az7ZhY?=U7|Y^)J~| zQdU;kI(h%qx8)TT;Smvbwsy9*c6D?1wywGq79JiD7&vvw*5s_BiK~vMq@+xpI?deN zqI1Ko+RkY;J@ez@;yTt|TXW(?-_{4+oA3Ys|DRz<0mYvzj0_B}3_2iJgW`mNeR_jy zlPiN0E4wqR6LWJfr?bn%NzNR-jM9^4PU2#0;+?g?#i@mTqNA9Cx{avqWajx3jm70G zl@x_%IcQ2 zNYlYo%|LY~C&R^s6P@{7pM9Rh*2Kv5(?v*1)KNiSh*_M8mDfO_fsv7s?F}y%3xhQP D5Zj>E 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 c37234264629d4f5a4378c07f0b5be38a5b34f66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmZ?wbhEHb6krfwxN5{O?|DbuBa6$g&Xzt2t$Y&o^23XT&wFmZzLNaJuK!I*$`kvX zryjXaz0Q3*bm#SrDbH%|{k)d<%sc9l(S{cbmOY;|>sia&KQG&!W)(d1EqWHv{W?G4 zvGwae&r6;M{r&&9^L6gNFYCYl{ruq9joKG+DUTfsp7w^@rJh1xpy(BAGXPu&@8Hh_!g;B96)+ zPC-Ln0|D+J4%I-eb_L}Qu1FS!AbE8;CB@cA5vC?X2{8lhD1AO7(MUHCpIecJdn*Ws<-1jU*u44=Z&EK@$}?BVfohG z?t_~D|Nr7KR_yHTA^8LW0018VEC2ui01yBW000Gi;3s|*fFuQ?9AoP&UMw$A`w((2 z505Cwfm|@AASGgqj3K7kFk*$nFV^WOn^l=&=;2f|n<__!DCE4=&RC`~vmf6j`@#;V zl`@G!X6K+YG7c1OVQXF+Pz@gdOc6N|8Zj6m4+AXky F06RBtaaI5T diff --git a/phpBB/adm/images/icon_delete_disabled.gif b/phpBB/adm/images/icon_delete_disabled.gif deleted file mode 100644 index da55bbbe445dfc0e71a24ca92c901ba292bbb6d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 249 zcmZ?wbhEHb6krfwI3mPw^XAPfmo8nudiBYZCs(grxp(j0{rmTC-@JL}&Yc_AuRnV9 z=-IPp*RNl{a^=e7$B*yazWws$%S#t8{{R1-9ER$0FlKT^%7{*#G>%ZZ7 zY_8Lxjc)437J@)Vr7jC;UULk zPKV?r0ujVSED}2-htUW~afk*0WkYO;IvtJ4pb%XOrU%v-Nl})?@(5tWE=+{(=Nra~ s4p0ODY_g7gXeJ0FLxD#kH68#MZyr2KKqCSbE+!}+9WyGGFe)JcJIK{-EdT%j diff --git a/phpBB/adm/images/icon_edit_disabled.gif b/phpBB/adm/images/icon_edit_disabled.gif deleted file mode 100644 index ac96b0e6dca874183e3165c98062c1f8008dabfa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 239 zcmZ?wbhEHb6krfwI3msP^5x49A3i*I@Zj|6(}xcqzJLGz?c29MefsqATOVxbgn|`%|Y*ojrT@s%|-I1Y`h$lb@bFUq$Q2DCK+fcGFSrudTw>% diff --git a/phpBB/adm/images/icon_sync.gif b/phpBB/adm/images/icon_sync.gif deleted file mode 100644 index 16223dfd9a4b92754df7790c789cec24b7d67976..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 251 zcmVNk%w1VGsZi0K^{v^}>7e%aZrDTJh7W`L09zq$~BncK((G@7=-h*t7Vu zPVDRH?&8q=ofi19OY_N&_^?RsKR{g?>#zjFGgGW?$$ z?CR$InhySz0PO7SA^8LW0018VEC2ui01yBW000Ge;3tY!U{udFe#?juUMy?L#|dJ9 z$$ShbozFnl$VeoB0pPt9S0)IePTylP6CeKYo1s_U%WH9vwMy zEY^ fg@u@HtQiE9{Ka{=`$Tz_bHq6X1T_-06&b7n>9J!# diff --git a/phpBB/adm/images/icon_trace.gif b/phpBB/adm/images/icon_trace.gif deleted file mode 100644 index 5c622e9a9dc22036b560f2ef5bbc6b910abf6903..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 307 zcmZ?wbhEHb6`11UtW9k z;`8^PKY#!E@$0uy`3&QVna1TaOe$vDH_UZxobT8$^~f9KNB-W3_MHl~Ri z_51JNfB*mg{{8#s&!1nve*N_6)5nh=-@kwV`t|FlPoF-1{21s$uuHKJia%Kx85qnN zbU<<-KQXWc9Eg6TJh3KZ`;s8nhYS4VPQP-KvdmNTQ~uD!>#)7s^+<(6%!Zk%XSb!u tX-clWme$Q7-I#lyFLP=RK(7o6YFx>g+usN=oj_T%#VQnKdw{Qf+s6F2#8aMmmBX8~`79gE<)jMP);L zm|QM*NnEn6Bh6&Z3@cmf9>f+l?VPUcL23mN9Qag_IhEqWZ^A%@so#rp-u?p*?x%ad zzMt3k{kg&9K)h=#1R+>KaPya6%@&KPzTRfHJ6*KX>2lzgb~l*K1W6hU1|vlojg(%m zKUg}tW9P2-u6%Ui@?vHBjGqs_oKg})!y7mCpzWiFN|TqDKGo@Tk*4M^Zmck@Cm4>n z8TPTU#~Id3yII!b<@kWd>q}+xucQ=@kMnUn=MU_C>D2?p*S(y7`G=p!kCb=p9P8=r zYmct}`1)7H$;u1+Qti=LynFMd#ZN9?UFuvP=luMh7xxV&1+R|_g(K0}nx~)J+tj?O ztEYD$IduMmtNFvF-OoJVxglPjn(+sMU*7zYb~EsQeS&|PhWj5L-P*Uke{D2YtHYkb z-}Q9>2-;O=bxlC5h)7DysG**$ts{uKTC%=DDNaa6onDwMAJglMr4pq(Ha#Qgs43ZG zcyqRFFrD?(%*~f;Jf(LpEYwVx7On~BWa{k&jtkBk&ZJLX^I6Rn$DA&0{7`@!VBb7< z99^H`L(^WD)7H7+>&(&F@N8nsygvKQZ6WvP#YQS2*shG_&427VX?^5GX5QB)-+J=9 zw!~cTw{7f3p z0QNq$f_xwjC9u0uf3+wnjEhTi8rTR<46BN*BI3J|qVQV>{28>Z3mCc(V8P~ec@?)E zDv)tl%vN6^)2P8ojjRv6NRqJ)GJ_LYz(zalz#uoPl_i0Kx~eRPD_P4+Zgw!F<~meB zB_(`7-q zS`7*zS?2gnS&45iNNwXqZIlGZo!%MI4C@6&u?*dxQCj`Ic_lnvoG9fr0&2^()g@8? d2uOVTp3nbwY83?`yc#5-wJ)159KZv+{{|9CDcS%4 diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html index 2c998078df..b42b2d6c6f 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..8ca1b5e32b 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, 'outdated-ext') }} {enabled.META_VERSION} @@ -78,7 +78,7 @@ {disabled.META_VERSION} - + {{ Icon('font', 'circle-exclamation', '', true, 'outdated-ext') }} {disabled.META_VERSION} 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/installer_update_file_status.html b/phpBB/adm/style/installer_update_file_status.html index a27bfa6a44..fa8b67d0e0 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/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 9b5a468a7e..c176f553f0 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -102,12 +102,12 @@ function adm_page_header($page_title) '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_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..ddbb2f87b0 100644 --- a/phpBB/phpbb/install/controller/helper.php +++ b/phpBB/phpbb/install/controller/helper.php @@ -266,7 +266,6 @@ 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_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) From 2c29c8352a4a47e074c8c34d1dca63bc02b5f89e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 23 Feb 2024 22:07:38 +0100 Subject: [PATCH 02/14] [ticket/17291] Add styles/all/imgs to allowed paths for acp style files PHPBB3-17291 --- phpBB/adm/index.php | 1 + 1 file changed, 1 insertion(+) 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/', ], ); From 873c838d57cc7797674531d28250e35316d4993c Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 23 Feb 2024 13:29:34 -0800 Subject: [PATCH 03/14] [ticket/17291] Replace old forum GIFs with SVGs PHPBB3-17291 Signed-off-by: Matt Friedman --- phpBB/adm/images/icon_folder.gif | Bin 662 -> 0 bytes phpBB/adm/images/icon_folder_link.gif | Bin 708 -> 0 bytes phpBB/adm/images/icon_folder_lock.gif | Bin 681 -> 0 bytes phpBB/adm/images/icon_subfolder.gif | Bin 725 -> 0 bytes phpBB/adm/index.php | 1 + phpBB/adm/style/acp_forums.html | 11 +++++++++-- phpBB/adm/style/acp_modules.html | 8 +++++++- phpBB/includes/acp/acp_forums.php | 21 ++------------------- phpBB/includes/acp/acp_modules.php | 12 ++---------- 9 files changed, 21 insertions(+), 32 deletions(-) delete mode 100644 phpBB/adm/images/icon_folder.gif delete mode 100644 phpBB/adm/images/icon_folder_link.gif delete mode 100644 phpBB/adm/images/icon_folder_lock.gif delete mode 100644 phpBB/adm/images/icon_subfolder.gif diff --git a/phpBB/adm/images/icon_folder.gif b/phpBB/adm/images/icon_folder.gif deleted file mode 100644 index 845618c1a266a23aa575c2f12db1d75830e2c1f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 662 zcmV;H0%`q6Nk%w1VH*G&0M!5h>hboKy4$_d@kWTj>Fe%RlgH%d z>NI`4$<*Isn#!cY-TM0b_V)Pn_4hl0zWDk1#M$et#oM60*yri&^7Hj=p2^(g?EC!u zEO@$5jl;0Y;qdYE`TF`Pce%^n?RBTp;pFJ#>+!eE;IYl+CUm&=`1!Wb<{@&o;Ns`s z;pTO9b>ZXa;OFj%u+*o(*FS~8@9^^D<>}_=>-6>Z?CtRG@A2yF@A2~V0001)nVDv0 zX4~H5A^8LW002J#EC2ui02=@s000L6z@Kn9tYkV1&Z3hc5TDRrAv7BWR1{U9G2;}X zPsSoa0SwOQ0YH#gFu+od$~@TE@0&B=g!)1YGa_{l4i z6CjHyZ$k?w8xIo@5Ij6Cs4k?d6NM)WLj?%{533M9J-NBIs}BGPekc^RH^s)s$i)y3 z0vtaU2LKZ{7}Xf2KH1tl))+Sv00%M|BNGuj=;`X~>JTXn88Z$k7&P|wJlgs__x2bm z0S?H4up@`Tg9sBM+yTMEf)D~A(7-{lqQ#3AX+RJVf`bVNIdq5|NwOr#91Ry72mlg+ zOPAQRy_|_4M}&YG8eqtAp=VFCT)KMr99k0tJZL3$Ah5x-sne%S5$q@-?gt717?!2k^n w7FMJVv&4f20||9#@X$d5W;g{nNN5nlfd>mQ8c6U0CklZh(HmiNW;s_vYy9{r>*;_xR1$;P3GAcB9LUvC>+V z$&2-B=_WAqx`1$AQ?A+<|z0u?;ce?EE@ygWS9B;PK-Raol?$g@g z!q@2~bh!Ha`{n2B*X8l>^7Q!m`d5<1Uzf;IkHlr3&O?X5Xq?Dqn#g0B$KmAY?CtRG z@AB^N@$>ZdAaS?*{QU6o^WWj-0001)nVIqO^!fVw>g@0G^Y!HB>Ly^5Hj2{e>+WV| zX4~H5A^8LW002J#EC2ui02=@s000L6z@Km^G$cwDOtMl+7>H1)fz(kfI3Nayvru$M z&nOWAGfg0bbSzDPOiVC@SeQBi*0FrdqhEUfCn#blBNGIBH;Iahd;}mPf@3Ejh$134 z9+{dRiF_a@azYyz03IR{1qC7vJFTue4FwS*e;6A=DkKm$1p>YztvtfRBEAJT5F{!; z1|1-=zQz&L5yLzY(FF}49R>&_0tGKQGU=NA`1Z> z93t2_K#*V#0l|Fj;31&k0UHrGbbz6ufD9KHF}?`)!p24(FEYB2Q9uKX3K|5oV8N25 zj2t|2$Y7CUhs>5NS_sfkfuaE63pj!beRv=!QK3OC?1a&QLIDdsqDq}gb*fSd72v(F zAfanl8Z;h=ec-jM1Pd?xAy7b2!hp8}eAJjb7p`3i1Qj5-P$5H(9y$UG9!xlJj~p2) zT=~B0RTJRokGz7 diff --git a/phpBB/adm/images/icon_folder_lock.gif b/phpBB/adm/images/icon_folder_lock.gif deleted file mode 100644 index 7afb092a8f1db6878d8ac80c4cf6840edce929e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 681 zcmV;a0#^M;Nk%w1VH*G&0M!5h$_dg%Ixj%$H>gP(dBh@b#*(t3legF1G1aU_W0Y~;q>+Q&(YP>)!0mixcK?`>g@0D@bdEW_51w%UteE>f`U+u!$U+w>+<;6 z+ur&5`tb4dT0g1-0o`MbTrqP*1e^!7i6z>bcOz{14z_4e`d^zQHRnVFepW@Z2Y z0NdW`2Bij}s4|2L6GI0Z92y<79X&j^x3sz%92;Lh3=W_<#Kp$P#Hs}h zKQtFCGBqaCCZj#q*gn)IH8LC*3IYcsA3Eme=;`PmG6Gx*GA1SS^FG-3JoNJ>G7uMX zGIZ=1NU)&6f;wcd0$5^z!-o(_ka$p`;sc2#IxJ(bpu-M{AVX3Nkimn=3;`Yt$ieCY zjSo8>$dtKa1rG$bJcIx-s^@^l5B}Vlh&l5?g9J#Cf*^1W*EJpPoWamRv7*(A0a_5i zVQVIj9x%WGD`0{|g#c)4HfV68Edn1ry!zlHY_e8TMxO@ZpP-f)YE> zW>~SdaRVNsaE)p}1c00u14w4rtdjuXuh&qZNa5qjffxk_p5+|kFWj3q8l)f%Wr~6b zh$&_WvDF6x(H4RmC=Er7iUkn{#N185$J*JZi2Gp>LjVK_6d+(g(X;ysI6{mdQ6d5Z P4G`!-glOSGNDu%!s{lm(^`qKhKY^J)Ze_({r&#i-O} z_V)Pt`uoh?>-F{b>G1aW`S~n)x|*`c#o6oZ^Z5Jx{LatQDR;T~`ug|y`Q_~M@A30c zj>IByw7 z&jMvb0x`~L6R6gT6~I!_qjWae@1}F8(@qWkzoPxdmdy!!E|64(S{2)EU-WfE>Pe?3;-xF HL=XTw3P?}z diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 0f9ff7eaee..22537f6e8a 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -65,6 +65,7 @@ $template->set_custom_style( $phpbb_admin_path . 'style', $phpbb_root_path . 'styles/all/imgs/', $phpbb_root_path . 'styles/all/template/', + $phpbb_root_path . 'styles/prosilver/imgs/', ], ); diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index f51ce98776..dc4a7cd1d4 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -348,7 +348,7 @@
- +
@@ -472,7 +472,14 @@ - {forums.FOLDER_IMAGE} + + {{ Icon('svg', { + 'link-variant' : forums.S_FORUM_LINK, + 'lock' : forums.S_FORUM_LOCKED, + 'file-document-box-multiple-outline' : forums.S_SUBFORUMS, + 'file-document-box-outline' : true, + }, '', true, 'c-forum-row-icon') }} +
{forums.FORUM_IMAGE}
{forums.FORUM_NAME}{forums.FORUM_NAME} diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 43f57a184a..8d60796cb0 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -132,7 +132,13 @@ - {modules.MODULE_IMAGE} + + {{ Icon('svg', { + 'lock' : not modules.MODULE_ENABLED, + 'file-document-box-multiple-outline' : modules.S_SUB_MODULE, + 'file-document-box-outline' : true, + }, '', true, 'c-forum-row-icon', {'style' : 'width: 27px; height: 27px;'}) }} + {modules.MODULE_TITLE} [{L_HIDDEN_MODULE}]  {L_DISABLE}{L_ENABLE}  diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 077c037484..8c31d4e965 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'), From 3cc3bc7e816898ebb0fa6cb8b5a8a6338a34409a Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 23 Feb 2024 16:39:40 -0800 Subject: [PATCH 04/14] [ticket/17291] Use font icons instead of SVGs PHPBB3-17291 Signed-off-by: Matt Friedman --- phpBB/adm/index.php | 1 - phpBB/adm/style/acp_forums.html | 10 +++++----- phpBB/adm/style/acp_modules.html | 8 ++++---- phpBB/adm/style/admin.css | 5 +++++ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 22537f6e8a..0f9ff7eaee 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -65,7 +65,6 @@ $template->set_custom_style( $phpbb_admin_path . 'style', $phpbb_root_path . 'styles/all/imgs/', $phpbb_root_path . 'styles/all/template/', - $phpbb_root_path . 'styles/prosilver/imgs/', ], ); diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index dc4a7cd1d4..672fbca780 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -473,12 +473,12 @@ - {{ Icon('svg', { - 'link-variant' : forums.S_FORUM_LINK, + {{ Icon('font', { + 'link' : forums.S_FORUM_LINK, 'lock' : forums.S_FORUM_LOCKED, - 'file-document-box-multiple-outline' : forums.S_SUBFORUMS, - 'file-document-box-outline' : true, - }, '', true, 'c-forum-row-icon') }} + 'comments' : forums.S_SUBFORUMS, + 'comment' : true, + }, '', true) }}
{forums.FORUM_IMAGE}
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 8d60796cb0..01d52a433d 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -133,11 +133,11 @@ - {{ Icon('svg', { + {{ Icon('font', { 'lock' : not modules.MODULE_ENABLED, - 'file-document-box-multiple-outline' : modules.S_SUB_MODULE, - 'file-document-box-outline' : true, - }, '', true, 'c-forum-row-icon', {'style' : 'width: 27px; height: 27px;'}) }} + 'folder-tree' : modules.S_SUB_MODULE, + 'folder-open' : true, + }, '', true, 'fas') }} {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..0f88bcf84a 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -2965,6 +2965,11 @@ fieldset.permissions .permissions-switch { font-style: normal; } +.table1 .o-icon { + font-size: 20px; + padding: 10px 0; +} + .send-stats-data-row { background: #f9f9f9; border: #dedede 1px solid; From 4adf5ac99faf6acfdfc626ea35df9548ec1cf040 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 23 Feb 2024 17:26:03 -0800 Subject: [PATCH 05/14] [ticket/17291] Clean out older FontAwesome 4 code PHPBB3-17291 Signed-off-by: Matt Friedman --- phpBB/adm/style/admin.css | 13 +++++-------- phpBB/includes/functions_acp.php | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 0f88bcf84a..83cf1702de 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -2809,7 +2809,7 @@ fieldset.permissions .permissions-switch { } .roles-options > span { - background: url("../images/arrow_down.gif") no-repeat 245px 0.7em; + background: url("../images/arrow_down.gif") no-repeat 235px 0.7em; border: 1px solid #dedede; border-radius: 3px; display: none; @@ -2960,11 +2960,6 @@ fieldset.permissions .permissions-switch { padding-right: 0.3em; } -.icon { - font-family: FontAwesome; - font-style: normal; -} - .table1 .o-icon { font-size: 20px; padding: 10px 0; @@ -3018,12 +3013,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"; } diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index c176f553f0..1964ebca14 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'), From c46b700e224fea9d5e7cfa2732d040d2e408599e Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 24 Feb 2024 00:54:46 -0800 Subject: [PATCH 06/14] [ticket/17291] Fix some classes for compatibility PHPBB3-17291 Signed-off-by: Matt Friedman --- phpBB/adm/style/acp_forums.html | 2 +- phpBB/adm/style/acp_modules.html | 2 +- phpBB/adm/style/admin.css | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 672fbca780..0e1b340b54 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -478,7 +478,7 @@ 'lock' : forums.S_FORUM_LOCKED, 'comments' : forums.S_SUBFORUMS, 'comment' : true, - }, '', true) }} + }, '', true, 'fas acp-icon-large') }}
{forums.FORUM_IMAGE}
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 01d52a433d..0197ed2263 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -137,7 +137,7 @@ 'lock' : not modules.MODULE_ENABLED, 'folder-tree' : modules.S_SUB_MODULE, 'folder-open' : true, - }, '', true, 'fas') }} + }, '', true, 'fas acp-icon-large') }} {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 83cf1702de..83b733ae44 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -2960,7 +2960,12 @@ fieldset.permissions .permissions-switch { padding-right: 0.3em; } -.table1 .o-icon { +.icon { + font-family: "Font Awesome 6 Free", "Font Awesome 6 Brands"; + font-style: normal; +} + +.acp-icon-large { font-size: 20px; padding: 10px 0; } From 9d8d82e1761ec10a31502ecd724943e7eb98a339 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 24 Feb 2024 08:26:15 -0800 Subject: [PATCH 07/14] [ticket/17291] Stack the bigger acp icons PHPBB3-17291 Signed-off-by: Matt Friedman --- phpBB/adm/style/acp_forums.html | 5 ++++- phpBB/adm/style/acp_modules.html | 7 +++++-- phpBB/adm/style/admin.css | 5 ----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 0e1b340b54..613a054b32 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -473,12 +473,15 @@ + + {{ 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 acp-icon-large') }} + }, '', true, 'fas fa-inverse fa-stack-1x') }} +
{forums.FORUM_IMAGE}
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 0197ed2263..a4ff0aea97 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -133,11 +133,14 @@ + + {{ Icon('font', 'circle', '', true, 'fas fa-stack-2x') }} {{ Icon('font', { 'lock' : not modules.MODULE_ENABLED, 'folder-tree' : modules.S_SUB_MODULE, - 'folder-open' : true, - }, '', true, 'fas acp-icon-large') }} + '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 83b733ae44..e8e099a802 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -2965,11 +2965,6 @@ fieldset.permissions .permissions-switch { font-style: normal; } -.acp-icon-large { - font-size: 20px; - padding: 10px 0; -} - .send-stats-data-row { background: #f9f9f9; border: #dedede 1px solid; From 690370fac0f80f7795c5ea705804d9787dfbaaf1 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 24 Feb 2024 11:16:11 -0800 Subject: [PATCH 08/14] [ticket/17291] Icon class clean up PHPBB3-17291 Signed-off-by: Matt Friedman --- phpBB/adm/style/admin.css | 1 + .../style/installer_update_file_status.html | 10 +++++----- phpBB/adm/style/permission_mask.html | 2 +- phpBB/includes/functions_acp.php | 20 +++++++++---------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index e8e099a802..1a25ba9468 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -2960,6 +2960,7 @@ fieldset.permissions .permissions-switch { padding-right: 0.3em; } +/* this class loads Free and Brand icons, for use when .fas and .fab are needed at same time */ .icon { font-family: "Font Awesome 6 Free", "Font Awesome 6 Brands"; font-style: normal; diff --git a/phpBB/adm/style/installer_update_file_status.html b/phpBB/adm/style/installer_update_file_status.html index fa8b67d0e0..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}

- {{ Icon('font', 'circle-xmark', lang('STATUS_DELETED'), true, '', {'style' : 'color:red;"'}) }} + {{ 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}

- {{ Icon('font', 'circle-exclamation', lang('STATUS_CONFLICT'), true, '', {'style' : 'color:red;"'}) }} + {{ 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}

- {{ Icon('font', 'circle-arrow-left', lang('STATUS_MODIFIED'), true, '', {'style' : 'color:#ffd43b;"'}) }} + {{ 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}

From 6d47a6c6dc71cf031284707772408b8fdba16075 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 1 Mar 2024 07:59:56 -0800 Subject: [PATCH 10/14] [ticket/17291] Add FontAwesome to installer PHPBB3-17291 Signed-off-by: Matt Friedman --- phpBB/adm/style/installer_header.html | 1 + phpBB/phpbb/install/controller/helper.php | 1 + 2 files changed, 2 insertions(+) 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/phpbb/install/controller/helper.php b/phpBB/phpbb/install/controller/helper.php index ddbb2f87b0..c6f49784bf 100644 --- a/phpBB/phpbb/install/controller/helper.php +++ b/phpBB/phpbb/install/controller/helper.php @@ -267,6 +267,7 @@ class helper 'L_SKIP' => $this->language->lang('SKIP'), 'PAGE_TITLE' => $this->language->lang($page_title), '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', From e586cd833c9b30eb1a6b6fd1b00142fbe21d6bc1 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 2 Mar 2024 08:02:01 -0800 Subject: [PATCH 11/14] [ticket/17291] Replace last GIFs with font icons PHPBB3-17291 Signed-off-by: Matt Friedman --- phpBB/adm/images/arrow_down.gif | Bin 51 -> 0 bytes phpBB/adm/images/arrow_left.gif | Bin 49 -> 0 bytes phpBB/adm/images/arrow_right.gif | Bin 49 -> 0 bytes phpBB/adm/style/admin.css | 56 +++++++++++++++++++++++++------ 4 files changed, 46 insertions(+), 10 deletions(-) delete mode 100644 phpBB/adm/images/arrow_down.gif delete mode 100644 phpBB/adm/images/arrow_left.gif delete mode 100644 phpBB/adm/images/arrow_right.gif diff --git a/phpBB/adm/images/arrow_down.gif b/phpBB/adm/images/arrow_down.gif deleted file mode 100644 index b7fbf7e2764e1f1c58ed0a166ec0d02eec927970..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51 zcmZ?wbhEHbWMg1sXkcJ4Ha2EpU{L(Y!pOkD$e;sc1I5`G7?`+v_!DNXzIefUIRk?= E0LkGAF8}}l diff --git a/phpBB/adm/images/arrow_left.gif b/phpBB/adm/images/arrow_left.gif deleted file mode 100644 index ac92cb49719f40ae82a284f16e3b9bca63feeded..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmZ?wbhEHbWMN=qXkcJ4Ha2EpU{L(Y!pOkD$e;scGk|0mm^geG+E!#f4`5`l1^}?* B2Z8_q diff --git a/phpBB/adm/images/arrow_right.gif b/phpBB/adm/images/arrow_right.gif deleted file mode 100644 index 3a080ffdfe21b646239778d71fa09e843351a63f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmZ?wbhEHbWMN=qXkcJ4Ha2EpU{L(Y!pOkD$e;scGk|0mm^fI3+E!#f4`5`l1^}+L B2TT9} diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 9b4183f9ef..d4ccb09b38 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -607,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, @@ -636,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; From 6c5518157df98b90d1ac9e6adb7d68a34cf113d9 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 3 Mar 2024 14:33:56 -0800 Subject: [PATCH 12/14] [ticket/17291] Fix .fas classes and alert close button PHPBB3-17291 Signed-off-by: Matt Friedman --- .../adm/style/acp_avatar_options_upload.html | 24 +++++++++---------- phpBB/adm/style/acp_ext_list.html | 4 ++-- phpBB/adm/style/admin.css | 10 +++----- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html index b42b2d6c6f..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 8ca1b5e32b..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, 'outdated-ext') }} + {{ Icon('font', 'circle-exclamation', '', true, 'fas outdated-ext') }} {enabled.META_VERSION} @@ -78,7 +78,7 @@ {disabled.META_VERSION} - {{ Icon('font', 'circle-exclamation', '', true, 'outdated-ext') }} + {{ Icon('font', 'circle-exclamation', '', true, 'fas outdated-ext') }} {disabled.META_VERSION} diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index d4ccb09b38..4bf0091c6c 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1866,18 +1866,14 @@ input.button2:focus { display: none; width: 620px; margin: 0 auto; - padding: 25px; padding: 0 25px 20px; } .phpbb_alert .alert_close { - font-size: 16px; - text-decoration: none !important; - display: block; + font-size: 14px; float: right; - overflow: hidden; - margin-top: -7px; - margin-right: -31px; + margin-top: 2px; + margin-right: -22px; } .phpbb_alert .alert_close:hover { From 511d96a5226a6822e48e4d11a3d855883fdfe0ad Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 4 Mar 2024 09:01:01 -0800 Subject: [PATCH 13/14] [ticket/17291] Utilize font classes from the Icon function PHPBB3-17291 Signed-off-by: Matt Friedman --- phpBB/adm/style/admin.css | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 4bf0091c6c..290eaffcf8 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -3007,12 +3007,6 @@ fieldset.permissions .permissions-switch { padding-right: 0.3em; } -/* this class loads Free and Brand icons, for use when .fas and .fab are needed at same time */ -.icon { - font-family: "Font Awesome 6 Free", "Font Awesome 6 Brands"; - font-style: normal; -} - .send-stats-data-row { background: #f9f9f9; border: #dedede 1px solid; @@ -3106,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; } From ddb4f142a6db7b1e11834546f91794a86d168b6b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 4 Mar 2024 19:24:52 +0100 Subject: [PATCH 14/14] [ticket/17291] Default to fa-solid if classes are set without fa class PHPBB3-17291 --- phpBB/phpbb/template/twig/extension/icon.php | 35 +++++++++++++++++++- tests/template/extension_test.php | 2 +- 2 files changed, 35 insertions(+), 2 deletions(-) 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 */