Skip to content

[5.0] Use own icon for dashboard due to fontawesome changes #41443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HLeithner merged 11 commits into from
Sep 12, 2023
Merged

[5.0] Use own icon for dashboard due to fontawesome changes #41443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
01b3e49
Use own icon for dashboard due to fontawesome changes
chmst Aug 25, 2023
a56ad7c
Remove extra lines
wilsonge Aug 25, 2023
ffccb3e
Update administrator/modules/mod_menu/tmpl/default_submenu.php
chmst Aug 25, 2023
2aa3f5a
Update administrator/modules/mod_menu/tmpl/default_submenu.php
chmst Aug 25, 2023
6617319
Update administrator/modules/mod_submenu/tmpl/default.php
chmst Aug 25, 2023
4b0477e
Update administrator/modules/mod_menu/tmpl/default_submenu.php
chmst Aug 25, 2023
3f7276a
Update administrator/modules/mod_menu/tmpl/default_submenu.php
chmst Aug 25, 2023
a1e6e52
unitless height
chmst Aug 30, 2023
7cffd0d
Update administrator/modules/mod_menu/tmpl/default_submenu.php
chmst Aug 31, 2023
96c2c99
Update administrator/modules/mod_menu/tmpl/default_submenu.php
chmst Sep 2, 2023
f271ec1
Update administrator/modules/mod_submenu/tmpl/default.php
HLeithner Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions administrator/modules/mod_menu/tmpl/default_submenu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

defined('_JEXEC') or die;

use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Router\Route;
use Joomla\CMS\Uri\Uri;
Expand Down Expand Up @@ -143,9 +144,23 @@

if (!empty($current->dashboard)) {
$titleDashboard = Text::sprintf('MOD_MENU_DASHBOARD_LINK', Text::_($current->title));

// Prepare the Dashboard icon. We use our own icon, not Fontawesome
$pathDashboard = 'media/templates/administrator/atum/images/icons/dashboard.svg';
$attrDashboard = [
'loading' => 'eager',
'decoding' => 'async',
'aria-hidden' => 'true',
'class' => 'atum-dashboard',
'height' => '18',
];

$iconDashboard = HTMLHelper::_('image', $pathDashboard, '', $attrDashboard, false, 0);

echo '<span class="menu-dashboard"><a href="'
. Route::_('index.php?option=com_cpanel&view=cpanel&dashboard=' . $current->dashboard) . '">'
. '<span class="icon-th-large" title="' . $titleDashboard . '" aria-hidden="true"></span>'
. Route::_('index.php?option=com_cpanel&view=cpanel&dashboard=' . $current->dashboard) . '" '
. 'title="' . $titleDashboard . '">'
. '<span>' . $iconDashboard . '</span>'
. '<span class="visually-hidden">' . $titleDashboard . '</span>'
. '</a></span>';
}
Expand Down
19 changes: 17 additions & 2 deletions administrator/modules/mod_submenu/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,23 @@
<?php endif; ?>
<?php if ($item->dashboard) : ?>
<span class="menu-dashboard">
<a href="<?php echo Route::_('index.php?option=com_cpanel&view=cpanel&dashboard=' . $item->dashboard); ?>">
<span class="icon-th-large" title="<?php echo htmlentities(Text::sprintf('MOD_MENU_DASHBOARD_LINK', Text::_($child->title))); ?>"></span>
<?php
$titleDashboard = Text::sprintf('MOD_MENU_DASHBOARD_LINK', Text::_($child->title));

// Prepare the Dashboard icon. We use our own icon, not Fontawesome
$pathDashboard = 'media/templates/administrator/atum/images/icons/dashboard.svg';
$attrDashboard = [
'loading' => 'eager',
'decoding' => 'async',
'aria-hidden' => 'true',
'class' => 'atum-dashboard',
'height' => '18',
];
$iconDashboard = HTMLHelper::_('image', $pathDashboard, '', $attrDashboard, false, 0);
?>
<a href="<?php echo Route::_('index.php?option=com_cpanel&view=cpanel&dashboard=' . $item->dashboard); ?>" title="<?php echo $titleDashboard; ?>">
<span><?php echo $iconDashboard; ?></span>
<span class="visually-hidden"><?php echo $titleDashboard; ?></span>
</a>
</span>
<?php endif; ?>
Expand Down
12 changes: 12 additions & 0 deletions build/media_source/templates/administrator/atum/images/icons/dashboard.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.