Skip to content

[4.0] Change to use FontAwesome 5 #24648

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
wilsonge merged 6 commits into from
Apr 21, 2019
Merged

[4.0] Change to use FontAwesome 5 #24648

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6cfecc9
initial commit
brianteeman Apr 20, 2019
63b833c
fix front end
brianteeman Apr 20, 2019
ca3ecf6
debug and front end fix
brianteeman Apr 20, 2019
4e15893
Update administrator/components/com_media/resources/scripts/component…
Apr 20, 2019
95729dd
add brands, update markup
brianteeman Apr 21, 2019
8dcb55e
Merge branch '4.0-dev' into fa-5
wilsonge Apr 21, 2019
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_associations/tmpl/associations/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'associations.', $canCheckin); ?>
<?php endif; ?>
<?php if ($canEdit) : ?>
<?php $editIcon = $isCheckout ? '' : '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
<?php $editIcon = $isCheckout ? '' : '<span class="fa fa-pen-square mr-2" aria-hidden="true"></span>'; ?>
<a class="hasTooltip" href="<?php echo Route::_($this->editUri . '&id=' . (int) $item->id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->title)); ?>">
<?php echo $editIcon; ?><?php echo $this->escape($item->title); ?></a>
<?php else : ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_banners/tmpl/banners/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'banners.', $canCheckin); ?>
<?php endif; ?>
<?php if ($canEdit) : ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pen-square mr-2" aria-hidden="true"></span>'; ?>
<a class="hasTooltip" href="<?php echo Route::_('index.php?option=com_banners&task=banner.edit&id=' . (int) $item->id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->name)); ?>">
<?php echo $editIcon; ?><?php echo $this->escape($item->name); ?></a>
<?php else : ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_banners/tmpl/clients/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'clients.', $canCheckin); ?>
<?php endif; ?>
<?php if ($canEdit) : ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pen-square mr-2" aria-hidden="true"></span>'; ?>
<a class="hasTooltip" href="<?php echo Route::_('index.php?option=com_banners&task=client.edit&id=' . (int) $item->id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->name)); ?>">
<?php echo $editIcon; ?><?php echo $this->escape($item->name); ?></a>
<?php else : ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_categories/tmpl/categories/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'categories.', $canCheckin); ?>
<?php endif; ?>
<?php if ($canEdit || $canEditOwn) : ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pen-square mr-2" aria-hidden="true"></span>'; ?>
<a class="hasTooltip" href="<?php echo Route::_('index.php?option=com_categories&task=category.edit&id=' . $item->id . '&extension=' . $extension); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->title)); ?>">
<?php echo $editIcon; ?><?php echo $this->escape($item->title); ?></a>
<?php else : ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_contact/tmpl/contacts/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'contacts.', $canCheckin); ?>
<?php endif; ?>
<?php if ($canEdit || $canEditOwn) : ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pen-square mr-2" aria-hidden="true"></span>'; ?>
<a class="hasTooltip" href="<?php echo Route::_('index.php?option=com_contact&task=contact.edit&id=' . (int) $item->id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->name)); ?>">
<?php echo $editIcon; ?><?php echo $this->escape($item->name); ?></a>
<?php else : ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_content/tmpl/articles/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@
<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'articles.', $canCheckin); ?>
<?php endif; ?>
<?php if ($canEdit || $canEditOwn) : ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pen-square mr-2" aria-hidden="true"></span>'; ?>
<a class="hasTooltip" href="<?php echo Route::_('index.php?option=com_content&task=article.edit&id=' . $item->id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->title)); ?>">
<?php echo $editIcon; ?><?php echo $this->escape($item->title); ?></a>
<?php else : ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_content/tmpl/featured/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@
<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'articles.', $canCheckin); ?>
<?php endif; ?>
<?php if ($canEdit) : ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pen-square mr-2" aria-hidden="true"></span>'; ?>
<a class="hasTooltip" href="<?php echo Route::_('index.php?option=com_content&task=article.edit&return=featured&id=' . $item->id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->title)); ?>">
<?php echo $editIcon; ?><?php echo $this->escape($item->title); ?></a>
<?php else : ?>
Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_cpanel/Model/SystemModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ public function getItems()
{
$user = Factory::getUser();
$systemSection = new SystemHeader('COM_CPANEL_SYSTEM_SETUP', 'cog');
$maintainSection = new SystemHeader('MOD_MENU_MAINTAIN', 'refresh');
$infoSection = new SystemHeader('MOD_MENU_INFORMATION', 'refresh');
$maintainSection = new SystemHeader('MOD_MENU_MAINTAIN', 'sync');
$infoSection = new SystemHeader('MOD_MENU_INFORMATION', 'sync');
$installSection = new SystemHeader('MOD_MENU_INSTALL', 'download');
$manageSection = new SystemHeader('MOD_MENU_MANAGE', 'refresh');
$manageSection = new SystemHeader('MOD_MENU_MANAGE', 'sync');
$updateSection = new SystemHeader('MOD_MENU_UPDATE', 'upload');
$templateSection = new SystemHeader('MOD_MENU_TEMPLATES', 'image');
$accessSection = new SystemHeader('MOD_MENU_ACCESS', 'lock');
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_fields/tmpl/fields/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'fields.', $canCheckin); ?>
<?php endif; ?>
<?php if ($canEdit || $canEditOwn) : ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pen-square mr-2" aria-hidden="true"></span>'; ?>
<a href="<?php echo Route::_('index.php?option=com_fields&task=field.edit&id=' . $item->id . '&context=' . $context); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->title)); ?>">
<?php echo $editIcon; ?><?php echo $this->escape($item->title); ?></a>
<?php else : ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_fields/tmpl/groups/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'groups.', $canCheckin); ?>
<?php endif; ?>
<?php if ($canEdit || $canEditOwn) : ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pen-square mr-2" aria-hidden="true"></span>'; ?>
<a href="<?php echo Route::_('index.php?option=com_fields&task=group.edit&id=' . $item->id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->title)); ?>">
<?php echo $editIcon; ?><?php echo $this->escape($item->title); ?></a>
<?php else : ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_languages/tmpl/languages/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<span class="editlinktip hasTooltip" title="<?php echo HTMLHelper::_('tooltipText', Text::_('JGLOBAL_EDIT_ITEM'), $item->title, 0); ?>">
<?php if ($canEdit) : ?>
<a href="<?php echo Route::_('index.php?option=com_languages&task=language.edit&lang_id=' . (int) $item->lang_id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->title)); ?>">
<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span><?php echo $this->escape($item->title); ?></a>
<span class="fa fa-pen-square mr-2" aria-hidden="true"></span><?php echo $this->escape($item->title); ?></a>
<?php else : ?>
<?php echo $this->escape($item->title); ?>
<?php endif; ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_languages/tmpl/override/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
</span>
</div>
<span id="refresh-status" class="help-block">
<span class="fa fa-refresh fa-spin" aria-hidden="true"></span>
<span class="fa fa-sync fa-spin" aria-hidden="true"></span>
<?php echo Text::_('COM_LANGUAGES_VIEW_OVERRIDE_REFRESHING'); ?>
</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_languages/tmpl/overrides/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<th scope="row">
<?php if ($canEdit) : ?>
<a id="key[<?php echo $this->escape($key); ?>]" href="<?php echo Route::_('index.php?option=com_languages&task=override.edit&id=' . $key); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($key)); ?>">
<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span><?php echo $this->escape($key); ?></a>
<span class="fa fa-pen-square mr-2" aria-hidden="true"></span><?php echo $this->escape($key); ?></a>
<?php else : ?>
<?php echo $this->escape($key); ?>
<?php endif; ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_media/resources/scripts/components/browser/items/directory.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@dblclick.stop.prevent="onPreviewDblClick()">
<div class="file-background">
<div class="folder-icon">
<span class="fa fa-folder-o"></span>
<span class="fa fa-folder"></span>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_media/resources/scripts/components/browser/items/file.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="media-browser-item-preview">
<div class="file-background">
<div class="file-icon">
<span class="fa fa-file-text-o"></span>
<span class="fa fa-file-alt"></span>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_media/resources/scripts/components/browser/items/video.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="media-browser-item-preview">
<div class="file-background">
<div class="file-icon">
<span class="fa fa-file-text-o"></span>
<span class="fa fa-file-alt"></span>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_media/resources/scripts/components/tree/item.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
iconClass() {
return {
fa: true,
'fa-folder-o': !this.isOpen,
'fa-folder-open-o': this.isOpen,
'fa-folder': !this.isOpen,
'fa-folderpen-o': this.isOpen,
Comment thread
brianteeman marked this conversation as resolved.
Outdated
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_media/resources/styles/components/_media-browser.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
left: 0;
width: calc(#{$grid-item-icon-size} * 1.3);
height: calc(#{$grid-item-icon-size} * 1.3);
font-family: FontAwesome;
font-family: "Font Awesome 5 Free";
font-size: $grid-item-icon-size;
line-height: calc(#{$grid-item-icon-size} * 1.3);
text-align: center;
Expand Down Expand Up @@ -347,7 +347,7 @@
transition: all .2s cubic-bezier(.4, .0, .2, 1);
}
&::before {
font-family: FontAwesome;
font-family:"Font Awesome 5 Free";
color: $table-item-icon-color;
.selected & {
color: $table-item-icon-color-selected;
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_media/resources/styles/components/_media-tree.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ul.media-tree {
padding: 4px 10px;
&::before {
margin-right: 6px;
font-family: FontAwesome;
font-family:"Font Awesome 5 Free";
color: $sidebar-tree-icon-color;
content: $sidebar-tree-folder-icon;
}
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_menus/presets/joomla.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<menuitem
title="MOD_MENU_COM_CONTENT"
type="heading"
class="class:file-text"
class="class:file-alt"
>
<menuitem
title="MOD_MENU_COM_CONTENT_ARTICLE_MANAGER"
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_menus/presets/modern.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
<menuitem
title="MOD_MENU_COM_CONTENT"
type="heading"
class="class:file-text"
class="class:file-alt"
>
<menuitem
title="MOD_MENU_COM_CONTENT_ARTICLE_MANAGER"
Expand Down
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 @@ -182,7 +182,7 @@
<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'items.', $canCheckin); ?>
<?php endif; ?>
<?php if ($canEdit && !$item->protected) : ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pen-square mr-2" aria-hidden="true"></span>'; ?>
<a class="hasTooltip"
href="<?php echo Route::_('index.php?option=com_menus&task=item.edit&id=' . (int) $item->id); ?>"
title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->title)); ?>">
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_menus/tmpl/menus/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<div class="name break-word">
<?php if ($canEdit) : ?>
<a href="<?php echo Route::_('index.php?option=com_menus&task=menu.edit&id=' . $item->id); ?>">
<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>
<span class="fa fa-pen-square mr-2" aria-hidden="true"></span>
<span class="sr-only"><?php echo Text::_('COM_MENUS_EDIT_MENU'); ?></span><?php echo $this->escape($item->title); ?>
</a>
<?php else : ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_modules/tmpl/modules/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'modules.', $canCheckin); ?>
<?php endif; ?>
<?php if ($canEdit) : ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pen-square mr-2" aria-hidden="true"></span>'; ?>
<a class="hasTooltip" href="<?php echo Route::_('index.php?option=com_modules&task=module.edit&id=' . (int) $item->id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->title)); ?>">
<?php echo $editIcon; ?><?php echo $this->escape($item->title); ?></a>
<?php else : ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'newsfeeds.', $canCheckin); ?>
<?php endif; ?>
<?php if ($canEdit || $canEditOwn) : ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pen-square mr-2" aria-hidden="true"></span>'; ?>
<a class="hasTooltip" href="<?php echo Route::_('index.php?option=com_newsfeeds&task=newsfeed.edit&id=' . (int) $item->id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->name)); ?>">
<?php echo $editIcon; ?><?php echo $this->escape($item->name); ?></a>
<?php else : ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_plugins/tmpl/plugins/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'plugins.', $canCheckin); ?>
<?php endif; ?>
<?php if ($canEdit) : ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pen-square mr-2" aria-hidden="true"></span>'; ?>
<a class="hasTooltip" href="<?php echo Route::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . (int) $item->extension_id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->name)); ?>">
<?php echo $editIcon; ?><?php echo $item->name; ?></a>
<?php else : ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_redirect/tmpl/links/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
<th scope="row" class="break-word">
<?php if ($canEdit) : ?>
<a href="<?php echo Route::_('index.php?option=com_redirect&task=link.edit&id=' . $item->id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape($item->old_url); ?>">
<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span><?php echo $this->escape(str_replace(Uri::root(), '', rawurldecode($item->old_url))); ?></a>
<span class="fa fa-pen-square mr-2" aria-hidden="true"></span><?php echo $this->escape(str_replace(Uri::root(), '', rawurldecode($item->old_url))); ?></a>
<?php else : ?>
<?php echo $this->escape(str_replace(Uri::root(), '', rawurldecode($item->old_url))); ?>
<?php endif; ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_tags/tmpl/tags/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'tags.', $canCheckin); ?>
<?php endif; ?>
<?php if ($canEdit) : ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
<?php $editIcon = $item->checked_out ? '' : '<span class="fa fa-pen-square mr-2" aria-hidden="true"></span>'; ?>
<a class="hasTooltip" href="<?php echo Route::_('index.php?option=com_tags&task=tag.edit&id=' . $item->id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->title)); ?>">
<?php echo $editIcon; ?><?php echo $this->escape($item->title); ?></a>
<?php else : ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_templates/tmpl/styles/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<th scope="row">
<?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_templates&task=style.edit&id=' . (int) $item->id); ?>" title="<?php echo JText::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->title)); ?>">
<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span><?php echo $this->escape($item->title); ?></a>
<span class="fa fa-pen-square mr-2" aria-hidden="true"></span><?php echo $this->escape($item->title); ?></a>
<?php else : ?>
<?php echo $this->escape($item->title); ?>
<?php endif; ?>
Expand Down
Loading