Skip to content

convert icon-trash to fas fa-trash #30468

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

Closed
N6REJ wants to merge 14 commits into from
Closed

convert icon-trash to fas fa-trash #30468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
465dd4a
save my place
N6REJ Aug 24, 2020
b2648c4
convert icon-trash to fas fa-trash
N6REJ Aug 24, 2020
3cbf5ac
better fix for trash
N6REJ Aug 25, 2020
8028ea0
phpcs fixes
N6REJ Aug 25, 2020
d94d4e0
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into t…
N6REJ Aug 26, 2020
c716c1b
drone
N6REJ Aug 26, 2020
cc40011
phpcs fix
N6REJ Aug 26, 2020
125f1ce
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into t…
N6REJ Aug 27, 2020
b8e6363
revert changes to dropdown function
N6REJ Aug 27, 2020
4210323
revert changes to actions dropdown function
N6REJ Aug 27, 2020
a68ce0f
revert changes to jgrid to make it vendor non-specific
N6REJ Aug 27, 2020
7703810
revert changes to jgrid to make it vendor non-specific
N6REJ Aug 27, 2020
d794ed0
revert changes to attempt drone issue.
N6REJ Aug 27, 2020
a2d4a66
revert to using mapped fix.
N6REJ Aug 27, 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
14 changes: 10 additions & 4 deletions layouts/joomla/button/iconclass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,15 @@
// Convert icomoon to fa
$icon = $displayData['icon'];

if(strpos($icon, 'fa-') == true || strpos($icon, 'icon-') == true){
if (strpos($icon, 'fa-') !== false)
{
$icon = 'fas ' . str_ireplace('fas ', '', $icon);
}
elseif (strpos($icon, 'icon-') !== false)
{
$icon = $icon;
}
elseif ($icon === 'archive' || $icon === 'folder-close' || $icon === 'folder-folder-2' || $icon === 'folder-minus' || $icon === 'folder-plus-2' || $icon === 'folder-remove' || $icon === 'drawer-2')
elseif ($icon === 'archive' || $icon === 'folder-close' || $icon === 'folder-folder-2' || $icon === 'folder-minus' || $icon === 'folder-plus-2' || $icon === 'folder-remove' || $icon === 'drawer-2')
{
$icon = 'fas fa-folder';
}
Expand Down Expand Up @@ -67,7 +72,7 @@
{
$icon = 'fas fa-compress';
}
elseif ($icon === 'purge')
elseif ($icon === 'purge' || $icon === 'trash')
{
$icon = 'fas fa-trash';
}
Expand Down Expand Up @@ -115,7 +120,8 @@
{
$icon = 'fas fa-arrows-alt';
}
else{
else
{
$icon = 'icon-' . $icon;
}
echo $icon;
11 changes: 8 additions & 3 deletions layouts/joomla/toolbar/iconclass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,15 @@
// Convert icomoon to fa
$icon = $displayData['icon'];

if(strpos($icon, 'fa-') == true || strpos($icon, 'icon-') == true){
if (strpos($icon, 'fa-') !== false)
{
$icon = 'fas ' . str_ireplace('fas ', '', $icon);
}
elseif (strpos($icon, 'icon-') !== false)
{
$icon = $icon;
}
elseif ($icon === 'archive' || $icon === 'folder-close' || $icon === 'folder-folder-2' || $icon === 'folder-minus' || $icon === 'folder-plus-2' || $icon === 'folder-remove' || $icon === 'drawer-2')
elseif ($icon === 'archive' || $icon === 'folder-close' || $icon === 'folder-folder-2' || $icon === 'folder-minus' || $icon === 'folder-plus-2' || $icon === 'folder-remove' || $icon === 'drawer-2')
{
$icon = 'fas fa-folder';
}
Expand Down Expand Up @@ -67,7 +72,7 @@
{
$icon = 'fas fa-compress';
}
elseif ($icon === 'purge')
elseif ($icon === 'purge' || $icon === 'trash')
{
$icon = 'fas fa-trash';
}
Expand Down
11 changes: 10 additions & 1 deletion libraries/src/HTML/Helpers/ActionsDropdown.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,18 @@ public static function divider()
*/
public static function addCustomItem($label, $icon = '', $id = '', $task = '')
{
if (strpos($icon, 'fa-') !== false)
{
$icon = 'fas ' . str_ireplace('fas ', '', $icon);
}
elseif (strpos($icon, 'icon-') !== false)
{
$icon = $icon;
}

static::$dropDownList[] = '<li>'
. '<a href = "javascript://" onclick="Joomla.listItemTask(\'' . $id . '\', \'' . $task . '\')">'
. ($icon ? '<span class="icon-' . $icon . '" aria-hidden="true"></span> ' : '')
. ($icon ? '<span class="' . $icon . '" aria-hidden="true"></span> ' : '')
. $label
. '</a>'
. '</li>';
Expand Down
1 change: 1 addition & 0 deletions libraries/src/Toolbar/ToolbarButton.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ protected function renderButton(array &$options): string

// Isolate button class from icon class
$buttonClass = str_replace('fas fa-', '', $this->getName());
$buttonClass = str_ireplace('fa-', '', $buttonClass);
$iconclass = $options['btnClass'] ?? '';
$options['btnClass'] = 'button-' . $buttonClass . ' ' . $iconclass;

Expand Down