Skip to content

[4.0] Convert icon used for jgrid defaults to fas fa- #30464

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
infograf768 merged 2 commits into from
Aug 25, 2020
Merged

[4.0] Convert icon used for jgrid defaults to fas fa- #30464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec74c0c
make icon-circle use fa-circle
N6REJ Aug 24, 2020
aef5cdd
allows for including icon- in call
N6REJ Aug 24, 2020
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
2 changes: 1 addition & 1 deletion administrator/components/com_menus/tmpl/items/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
<td class="text-center d-none d-md-table-cell">
<?php if ($item->type == 'component') : ?>
<?php if ($item->language == '*' || $item->home == '0') : ?>
<?php echo HTMLHelper::_('jgrid.isdefault', $item->home, $i, 'items.', ($item->language != '*' || !$item->home) && $canChange && !$item->protected, 'cb', null, 'home', 'circle'); ?>
<?php echo HTMLHelper::_('jgrid.isdefault', $item->home, $i, 'items.', ($item->language != '*' || !$item->home) && $canChange && !$item->protected, 'cb', null, 'fa-home', 'fa-circle'); ?>
<?php elseif ($canChange) : ?>
<a href="<?php echo Route::_('index.php?option=com_menus&task=items.unsetDefault&cid[]=' . $item->id . '&' . Session::getFormToken() . '=1'); ?>">
<?php if ($item->language_image) : ?>
Expand Down
12 changes: 10 additions & 2 deletions libraries/src/HTML/Helpers/JGrid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,11 @@ public static function action($i, $task, $prefix = '', $active_title = '', $inac
$html[] = $tip ? ' aria-labelledby="' . $ariaid . '"' : '';
$html[] = '>';

if (strpos($active_class, 'fa-') == true || strpos($active_class, 'icon-') == true)
if (strpos($active_class, 'fa-') !== false)
{
$active_class = 'fas ' . $active_class;
}
elseif (strpos($active_class, 'icon-') !== false)
{
$active_class = $active_class;
}
Expand Down Expand Up @@ -139,7 +143,11 @@ public static function action($i, $task, $prefix = '', $active_title = '', $inac
}
else
{
if (strpos($inactive_class, 'fa-') == true || strpos($inactive_class, 'icon-') == true)
if (strpos($inactive_class, 'fa-') !== false)
{
$inactive_class = 'fas ' . $inactive_class;
}
elseif (strpos($inactive_class, 'icon-') !== false)
{
$inactive_class = $inactive_class;
}
Expand Down