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