From 873c838d57cc7797674531d28250e35316d4993c Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 23 Feb 2024 13:29:34 -0800 Subject: [PATCH] [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'),