[ticket/17291] Replace old forum GIFs with SVGs

PHPBB3-17291

Signed-off-by: Matt Friedman <maf675@gmail.com>

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/',
 	],
 );
 

phpBB/adm/style/acp_forums.html

@@ -472,7 +472,14 @@
 		<tbody>
 		<!-- BEGIN forums -->
 			<tr>
-				<td class="folder">{forums.FOLDER_IMAGE}</td>
+				<td class="folder">
+					{{ 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') }}
+				</td>
 				<td class="forum-desc">
 					<!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->
 					<strong><!-- IF forums.S_FORUM_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong>

phpBB/adm/style/acp_modules.html

@@ -132,7 +132,13 @@
 		<tbody>
 		<!-- BEGIN modules -->
 			<tr>
-				<td style="width: 5%; text-align: center;">{modules.MODULE_IMAGE}</td>
+				<td style="width: 5%; text-align: center;">
+					{{ 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;'}) }}
+				</td>
 				<td><a href="{modules.U_MODULE}">{modules.MODULE_TITLE}</a><!-- IF not modules.MODULE_DISPLAYED --> <span class="small">[{L_HIDDEN_MODULE}]</span><!-- ENDIF --></td>
 				<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td>
 				<td class="actions">

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 = '<img src="images/icon_folder_lock.gif" alt="' . $user->lang['LOCKED'] . '" />';
-				}
-				else
-				{
-					switch ($forum_type)
-					{
-						case FORUM_LINK:
-							$folder_image = '<img src="images/icon_folder_link.gif" alt="' . $user->lang['LINK'] . '" />';
-						break;
-
-						default:
-							$folder_image = ($row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="' . $user->lang['SUBFORUM'] . '" />' : '<img src="images/icon_folder.gif" alt="' . $user->lang['FOLDER'] . '" />';
-						break;
-					}
-				}
-
 				$url = $this->u_action . "&amp;parent_id=$this->parent_id&amp;f={$row['forum_id']}";
 
 				$template->assign_block_vars('forums', array(
-					'FOLDER_IMAGE'		=> $folder_image,
 					'FORUM_IMAGE'		=> ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="" />' : '',
 					'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 . '&amp;parent_id=' . $row['forum_id'],
 					'U_MOVE_UP'			=> $url . '&amp;action=move_up',

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 = '<img src="images/icon_folder_lock.gif" alt="' . $user->lang['DEACTIVATED_MODULE'] .'" />';
-				}
-				else
-				{
-					$module_image = (!$row['module_basename'] || $row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="' . $user->lang['CATEGORY'] . '" />' : '<img src="images/icon_folder.gif" alt="' . $user->lang['MODULE'] . '" />';
-				}
-
 				$url = $this->u_action . '&amp;parent_id=' . $this->parent_id . '&amp;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 . '&amp;parent_id=' . $row['module_id'],
 					'U_MOVE_UP'			=> $url . '&amp;action=move_up&amp;hash=' . generate_link_hash('acp_modules'),
 					'U_MOVE_DOWN'		=> $url . '&amp;action=move_down&amp;hash=' . generate_link_hash('acp_modules'),