Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
153 commits
Select commit Hold shift + click to select a range
f85ff13
several single icons found
N6REJ Feb 20, 2020
de3d6e7
eye close
N6REJ Feb 21, 2020
b7c1f36
eye
N6REJ Feb 21, 2020
e49cbc5
admin page title
N6REJ Feb 25, 2020
c75f469
$iconimage
N6REJ Feb 25, 2020
ee9f5b9
sub-menu
N6REJ Feb 25, 2020
d93eb82
icon-delete
N6REJ Feb 25, 2020
2cd8341
mapping non same named.
N6REJ Feb 25, 2020
65bd8e8
reformat
N6REJ Feb 25, 2020
dd8757e
Update administrator/templates/atum/scss/pages/_com_privacy.scss
N6REJ Feb 25, 2020
8c01546
refresh
N6REJ Feb 25, 2020
82fd4a0
refresh
N6REJ Feb 25, 2020
f39e3c2
remove
N6REJ Feb 25, 2020
393465e
featured
N6REJ Feb 25, 2020
4b2e5a2
featured
N6REJ Feb 25, 2020
ac5a742
column sort icon
N6REJ Feb 26, 2020
f7f4184
square
N6REJ Feb 26, 2020
c4b2f95
$displaydata
N6REJ Feb 26, 2020
289d4ec
[class^='icon-']
N6REJ Feb 27, 2020
4d5c682
make fa-check green
N6REJ Feb 27, 2020
18d3927
com_contacts featured
N6REJ Feb 28, 2020
757ad48
more featured
N6REJ Feb 28, 2020
4801825
more publish/unpublish
N6REJ Feb 28, 2020
8861dc7
Merge remote-tracking branch 'Joomla/4.0-dev' into icon-
N6REJ Feb 28, 2020
c92fa96
com_categories
N6REJ Feb 28, 2020
04f3efc
newsfeeds
N6REJ Feb 28, 2020
fe1f916
associations
N6REJ Feb 28, 2020
b5be20d
$iconStates
N6REJ Feb 28, 2020
ff8a6b2
fixed broken _icons.scss
N6REJ Feb 28, 2020
8289367
icon-ban-circle
N6REJ Feb 29, 2020
bf4aabc
Merge remote-tracking branch 'Joomla/4.0-dev' into icon-
N6REJ Feb 29, 2020
c7fe8e3
revert to icon-home per jm
N6REJ Feb 29, 2020
b007eda
revert to icon-home per jm
N6REJ Feb 29, 2020
a2b8ed0
revert to icon-home per jm
N6REJ Feb 29, 2020
bb0292b
Merge remote-tracking branch 'upstream/4.0-dev' into icon-
richard67 Mar 1, 2020
d0b6101
[4.0][RTL] CSS logical properties init
ciar4n Apr 6, 2020
9cba3ac
Update _modals.scss
ciar4n Apr 6, 2020
6b264dd
use margin-inline
ciar4n Apr 6, 2020
eb0d8bb
Update _modals.scss
ciar4n Apr 7, 2020
570d447
Revert "Update _modals.scss"
ciar4n Apr 7, 2020
9c5a697
Revert "use margin-inline"
ciar4n Apr 7, 2020
69948e4
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into l…
ciar4n Apr 8, 2020
4274776
Merge remote-tracking branch 'Joomla/4.0-dev' into icon-
N6REJ Apr 10, 2020
85e0fb6
Merge remote-tracking branch 'upstream/4.0-dev' into icon-
richard67 Apr 10, 2020
f670c57
Merge branch 'pull/28589' into icon-
N6REJ Apr 12, 2020
52c1968
Merge remote-tracking branch 'N6REJ/icon-' into icon-
N6REJ Apr 12, 2020
58025c3
Use margin-inline-end in atum's _header.scss
richard67 Apr 12, 2020
d60c9d1
Fix CS from last commit in atum's _header.scss
richard67 Apr 12, 2020
53d0c71
Merge remote-tracking branch 'upstream/4.0-dev' into 4.0-dev-N6REJ-ic…
richard67 Apr 18, 2020
3808c2d
Merge remote-tracking branch 'Joomla/4.0-dev' into icon-
N6REJ Apr 18, 2020
c318439
Merge remote-tracking branch 'N6REJ/icon-' into icon-
N6REJ Apr 18, 2020
4b254f7
Merge branch '4.0-dev-N6REJ-icon-mod-1' into icon-
richard67 Apr 18, 2020
2da7134
working on #28607
N6REJ Apr 18, 2020
bf9aca7
Merge remote-tracking branch 'N6REJ/icon-' into icon-
N6REJ Apr 18, 2020
828965e
working on #28607 ugh
N6REJ Apr 18, 2020
359bb9b
working on toolbar cross-reference missing from part 1
N6REJ Apr 20, 2020
138933e
icon-loop fix.
N6REJ Apr 27, 2020
ac5ca95
finder fix
N6REJ Apr 27, 2020
a4ea3b8
more loop->sync changes
N6REJ Apr 27, 2020
ec42403
more loop->sync changes
N6REJ Apr 27, 2020
e957b4b
puzzle -> puzzle-piece
N6REJ Apr 27, 2020
ff8cff6
puzzle -> puzzle-piece
N6REJ Apr 27, 2020
f9ec1b5
joomla brand
N6REJ Apr 27, 2020
e841dac
address->file-alt
N6REJ Apr 27, 2020
7777920
stack->copy
N6REJ Apr 27, 2020
1fe7fe1
added more to star, such as default
N6REJ Apr 28, 2020
368bc27
removed blank line
N6REJ Apr 28, 2020
78f30e7
equalizer->sliders-h
N6REJ Apr 28, 2020
36a2ca1
lightning->bolt
N6REJ Apr 28, 2020
af5927e
checkin->check-square
N6REJ Apr 28, 2020
cd75e66
comments-2->comments
N6REJ Apr 28, 2020
d6ebf45
power-cord->plug
N6REJ Apr 28, 2020
3f81d4b
info-2->info-circle
N6REJ Apr 28, 2020
e16cff8
generic not fixed
N6REJ Apr 28, 2020
accf7e2
generic not fixed
N6REJ Apr 28, 2020
71c6f27
workaround for generic
N6REJ Apr 28, 2020
4bf8137
drone fix?
N6REJ Apr 28, 2020
19c5d1a
puzzle->puzzle-piece
N6REJ Apr 28, 2020
8791a86
per luca
N6REJ Apr 28, 2020
fe33dd5
match button icon-class to toolbar
N6REJ Apr 28, 2020
fdfcd7a
chevron & publish
N6REJ Apr 29, 2020
ea6643b
publish/unpublish star. NEEDS REVIEW!
N6REJ Apr 29, 2020
7fe5814
publish/unpublish star. NEEDS REVIEW!
N6REJ Apr 29, 2020
86a8f64
Merge remote-tracking branch 'N6REJ/icon-' into icon-
N6REJ Apr 29, 2020
97bc31e
few more icons
N6REJ Apr 30, 2020
4821385
more folders
N6REJ Apr 30, 2020
0220621
conflict fix.
N6REJ Apr 30, 2020
9b0622a
Merge branch '4.0-dev' into icon-
richard67 Apr 30, 2020
bc1b742
com_template->modals
N6REJ May 1, 2020
4bb293f
modifed jgrid to handle known active classes
N6REJ May 1, 2020
4b67610
arrow-down3 -> caret-down
N6REJ May 2, 2020
a579c2a
icon-checkedout -> fa-lock
N6REJ May 2, 2020
b06ab87
Merge remote-tracking branch 'Joomla/4.0-dev' into icon-
N6REJ May 2, 2020
0cf4c46
icon-puzzle -> puzzle-piece
N6REJ May 2, 2020
c2136a4
trying to fix drone
N6REJ May 4, 2020
eeff3aa
trying to fix drone
N6REJ May 4, 2020
4eabc96
trying to fix drone
N6REJ May 4, 2020
9c87783
else if fix per quy
N6REJ May 4, 2020
ace0dcb
Update layouts/joomla/button/iconclass.php
N6REJ May 5, 2020
5caece8
Update layouts/joomla/button/iconclass.php
N6REJ May 5, 2020
f2d3cb0
code format fix per quy
N6REJ May 5, 2020
210bf49
code formatting changes per @quy
N6REJ May 5, 2020
550a9a5
code formatting changes
N6REJ May 5, 2020
5fb71a6
articles toolbar icon
N6REJ May 5, 2020
b46a600
remove space before 'fas'
N6REJ May 5, 2020
17788a6
featured
N6REJ May 5, 2020
38fa57d
com_contact
N6REJ May 5, 2020
2d0d1d6
featured
N6REJ May 5, 2020
bd6e4a3
Merge remote-tracking branch 'Joomla/4.0-dev' into icon-
N6REJ May 8, 2020
6007b6a
preview = icon-eye -> fas fa-eye
N6REJ May 8, 2020
ebdeac6
workflows featured
N6REJ May 8, 2020
e4ad3e2
added mapping for $inactive class
N6REJ May 8, 2020
6084daf
Merge remote-tracking branch 'upstream/4.0-dev' into 4.0-dev-N6REJ-ic…
richard67 May 10, 2020
72c7462
Merge remote-tracking branch 'upstream/4.0-dev' into 4.0-dev-N6REJ-ic…
richard67 May 10, 2020
a7557c8
Merge pull request #11 from richard67/4.0-dev-N6REJ-icon-mod-1
N6REJ May 11, 2020
513d569
missing closing ?>
N6REJ May 11, 2020
0e1fb62
Increase Opacity of disabled Featured Icons
coolcat-creations May 13, 2020
5b91907
Change Icon Classes
coolcat-creations May 14, 2020
b507f51
Update build/media_source/com_categories/js/shared-categories-accordi…
N6REJ May 14, 2020
8e92253
Update build/media_source/system/js/fields/passwordview.es6.js
N6REJ May 14, 2020
c8f7a43
Update build/media_source/system/js/fields/passwordview.es6.js
N6REJ May 14, 2020
e9df8cd
Update layouts/joomla/toolbar/title.php
N6REJ May 15, 2020
83c4365
Update administrator/templates/atum/scss/template-rtl.scss
N6REJ May 15, 2020
e305cfd
Merge remote-tracking branch 'Joomla/4.0-dev' into icon-
N6REJ May 15, 2020
603d7e0
pr #29016 compatibility fix.
N6REJ May 15, 2020
5efec30
Merge remote-tracking branch 'N6REJ/icon-' into icon-
N6REJ May 15, 2020
c7d401e
pr #29016 compatibility fix.
N6REJ May 15, 2020
398e593
Update FeaturedButton.php
coolcat-creations May 15, 2020
f89b13e
Update FeaturedButton.php
coolcat-creations May 15, 2020
127c466
Update FeaturedButton.php
infograf768 May 15, 2020
8a7038b
Update FeaturedButton.php
infograf768 May 15, 2020
bc254c2
Merge branch 'pull/29050' into icon-
N6REJ May 19, 2020
8d94e9b
Merge branch '4.0-dev' into icon-
N6REJ May 19, 2020
360e12d
removed stupid package-lock.json
N6REJ May 19, 2020
938a300
b/c compatibility fix
N6REJ May 27, 2020
10c4611
b/c compatibility fix
N6REJ May 27, 2020
f5e9bf6
Revert "b/c compatibility fix"
N6REJ May 27, 2020
2624df0
"b/c compatibility fix"
N6REJ May 27, 2020
8830766
shelving
N6REJ May 27, 2020
15b1633
shelving
N6REJ May 27, 2020
9bd54c1
b/c compatability fix as found by jm.
N6REJ May 27, 2020
e0c737e
phpcs fix
N6REJ May 27, 2020
1ddfaad
phpcs fix
N6REJ May 27, 2020
4b309f6
phpcs fix
N6REJ May 27, 2020
3c7b0bd
Merge remote-tracking branch 'Joomla/4.0-dev' into icon-
N6REJ Jun 1, 2020
ef96c0f
conflict fix.
N6REJ Jun 1, 2020
4aa7349
conflict fix.
N6REJ Jun 1, 2020
a49d1be
Revert "conflict fix."
N6REJ Jun 1, 2020
feb9410
Revert "conflict fix."
N6REJ Jun 1, 2020
a15d72c
Merge remote-tracking branch 'Joomla/4.0-dev' into icon-
N6REJ Jun 1, 2020
5b34846
removed improperly kept 133-147
N6REJ Jun 1, 2020
c47f52a
Merge remote-tracking branch 'Joomla/4.0-dev' into icon-
N6REJ Jun 8, 2020
4e5b861
Merge remote-tracking branch 'Joomla/4.0-dev' into icon-
N6REJ Jun 13, 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
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public function display($tpl = null)
*/
protected function addToolbar()
{
ToolbarHelper::title(Text::_('COM_ACTIONLOGS_MANAGER_USERLOGS'), 'list-2');
ToolbarHelper::title(Text::_('COM_ACTIONLOGS_MANAGER_USERLOGS'), 'fas fa-list-ul');

ToolbarHelper::custom('actionlogs.exportSelectedLogs', 'download', '', 'COM_ACTIONLOGS_EXPORT_CSV', true);
ToolbarHelper::custom('actionlogs.exportLogs', 'download', '', 'COM_ACTIONLOGS_EXPORT_ALL_CSV', false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public function display($tpl = null): void
*/
protected function addToolbar(): void
{
ToolbarHelper::title(Text::_('COM_ADMIN_SYSTEM_INFORMATION'), 'info-2 systeminfo');
ToolbarHelper::title(Text::_('COM_ADMIN_SYSTEM_INFORMATION'), 'info-circle systeminfo');
ToolbarHelper::link(
Route::_('index.php?option=com_admin&view=sysinfo&format=text'),
'COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_TEXT',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
$canManageCheckin = Factory::getUser()->authorise('core.manage', 'com_checkin');

$iconStates = array(
-2 => 'icon-trash',
0 => 'icon-unpublish',
1 => 'icon-publish',
2 => 'icon-archive',
-2 => 'fas fa-trash',
0 => 'fas fa-times',
1 => 'fas fa-check',
2 => 'fas fa-folder',
);

Text::script('COM_ASSOCIATIONS_PURGE_CONFIRM_PROMPT', true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
$canManageCheckin = Factory::getUser()->authorise('core.manage', 'com_checkin');

$iconStates = array(
-2 => 'icon-trash',
0 => 'icon-unpublish',
1 => 'icon-publish',
2 => 'icon-archive',
-2 => 'fas fa-trash',
0 => 'fas fa-times',
1 => 'fas fa-check',
2 => 'fas fa-folder',
);

$this->document->addScriptOptions('associations-modal', ['func' => $function]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ protected function addToolbar(): void
$dHtml = $layout->render(
[
'selector' => 'downloadModal',
'icon' => 'icon-download',
'icon' => 'fas fa-download',
'text' => Text::_('JTOOLBAR_EXPORT'),
'doTask' => Route::_('index.php?option=com_banners&view=download&tmpl=component'),
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<?php echo HTMLHelper::_('grid.checkall'); ?>
</td>
<th scope="col" class="w-1 text-center d-none d-md-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
<?php echo HTMLHelper::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'fas fa-sort'); ?>
</th>
<th scope="col" class="w-1 text-center">
<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public function display($tpl = null): void
*/
protected function addToolbar(): void
{
ToolbarHelper::title(Text::_('COM_CACHE_CLEAR_CACHE'), 'lightning clear');
ToolbarHelper::title(Text::_('COM_CACHE_CLEAR_CACHE'), 'bolt clear');

// Get the toolbar object instance
$toolbar = Toolbar::getInstance('toolbar');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<?php echo HTMLHelper::_('grid.checkall'); ?>
</td>
<th scope="col" class="w-1 text-center d-none d-md-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', '', 'a.lft', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
<?php echo HTMLHelper::_('searchtools.sort', '', 'a.lft', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'fas fa-sort'); ?>
</th>
<th scope="col" class="w-1 text-center">
<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@
<tbody>
<?php
$iconStates = array(
-2 => 'icon-trash',
0 => 'icon-unpublish',
1 => 'icon-publish',
2 => 'icon-archive',
-2 => 'fas fa-trash',
0 => 'fas fa-times',
1 => 'fas fa-check',
2 => 'fas fa-folder',
);
?>
<?php foreach ($this->items as $i => $item) : ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public function display($tpl = null)
*/
protected function addToolbar()
{
ToolbarHelper::title(Text::_('COM_CHECKIN_GLOBAL_CHECK_IN'), 'checkin');
ToolbarHelper::title(Text::_('COM_CHECKIN_GLOBAL_CHECK_IN'), 'check-square');

ToolbarHelper::custom('checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public function display($tpl = null)
*/
protected function addToolbar()
{
ToolbarHelper::title(Text::_('COM_CONFIG_GLOBAL_CONFIGURATION'), 'equalizer config');
ToolbarHelper::title(Text::_('COM_CONFIG_GLOBAL_CONFIGURATION'), 'sliders-h config');
ToolbarHelper::apply('application.apply');
ToolbarHelper::divider();
ToolbarHelper::save('application.save');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public function display($tpl = null)
*/
protected function addToolbar()
{
ToolbarHelper::title(Text::_($this->component->option . '_configuration'), 'equalizer config');
ToolbarHelper::title(Text::_($this->component->option . '_configuration'), 'sliders-h config');
ToolbarHelper::apply('component.apply');
ToolbarHelper::divider();
ToolbarHelper::save('component.save');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,18 +131,18 @@ public function featured($value, $i, $canChange = true)
1 => array('featured', 'contacts.unfeatured', 'JFEATURED', 'JGLOBAL_TOGGLE_FEATURED'),
);
$state = ArrayHelper::getValue($states, (int) $value, $states[1]);
$icon = $state[0];
$icon = $state[0] === 'featured' ? 'star featured' : 'star';

if ($canChange)
{
$html = '<a href="#" onclick="return Joomla.listItemTask(\'cb' . $i . '\',\'' . $state[1] . '\')" class="tbody-icon'
. ($value == 1 ? ' active' : '') . '" title="' . Text::_($state[3])
. '"><span class="icon-' . $icon . '" aria-hidden="true"></span></a>';
. '"><span class="fas fa-' . $icon . '" aria-hidden="true"></span></a>';
}
else
{
$html = '<a class="tbody-icon disabled' . ($value == 1 ? ' active' : '')
. '" title="' . Text::_($state[2]) . '"><span class="icon-' . $icon . '" aria-hidden="true"></span></a>';
. '" title="' . Text::_($state[2]) . '"><span class="fas fa-' . $icon . '" aria-hidden="true"></span></a>';
}

return $html;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<?php echo HTMLHelper::_('grid.checkall'); ?>
</td>
<th scope="col" class="w-1 text-center d-none d-md-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
<?php echo HTMLHelper::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'fas fa-sort'); ?>
</th>
<th scope="col" class="w-1 text-center">
<?php echo HTMLHelper::_('searchtools.sort', 'JFEATURED', 'a.featured', $listDirn, $listOrder); ?>
Expand Down
8 changes: 4 additions & 4 deletions administrator/components/com_contact/tmpl/contacts/modal.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@
<tbody>
<?php
$iconStates = array(
-2 => 'icon-trash',
0 => 'icon-unpublish',
1 => 'icon-publish',
2 => 'icon-archive',
-2 => 'fas fa-trash',
0 => 'fas fa-times',
1 => 'fas fa-check',
2 => 'fas fa-folder',
);
?>
<?php foreach ($this->items as $i => $item) : ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ protected function addToolbar()

ToolbarHelper::title(
Text::_('COM_CONTENT_PAGE_' . ($checkedOut ? 'VIEW_ARTICLE' : ($isNew ? 'ADD_ARTICLE' : 'EDIT_ARTICLE'))),
'pencil-2 article-add'
'pencil-alt article-add'
);

// For new records, check the create permission.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ protected function addToolbar()
// Get the toolbar object instance
$toolbar = Toolbar::getInstance('toolbar');

ToolbarHelper::title(Text::_('COM_CONTENT_ARTICLES_TITLE'), 'stack article');
ToolbarHelper::title(Text::_('COM_CONTENT_ARTICLES_TITLE'), 'copy article');

if ($canDo->get('core.create') || count($user->getAuthorisedCategories('com_content', 'core.create')) > 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<?php echo HTMLHelper::_('grid.checkall'); ?>
</td>
<th scope="col" class="w-1 text-center d-none d-md-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
<?php echo HTMLHelper::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'fas fa-sort'); ?>
</th>
<?php if ($workflow_enabled) : ?>
<th scope="col" class="w-1 text-center">
Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_content/tmpl/articles/modal.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@
<tbody>
<?php
$iconStates = array(
-2 => 'icon-trash',
0 => 'icon-unpublish',
1 => 'icon-publish',
-2 => 'fas fa-trash',
0 => 'fas fa-times',
1 => 'fas fa-check',
);
?>
<?php foreach ($this->items as $i => $item) : ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<?php echo HTMLHelper::_('grid.checkall'); ?>
</td>
<th scope="col" class="w-1 text-center d-none d-md-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', '', 'fp.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
<?php echo HTMLHelper::_('searchtools.sort', '', 'fp.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'fas fa-sort'); ?>
</th>
<?php if ($workflow_enabled) : ?>
<th scope="col" class="w-1 text-center d-none d-md-table-cell">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public function display($tpl = null)
}
elseif ($parts[0] === 'privacy')
{
$icon = 'lock';
$icon = 'fas fa-lock';
}
elseif ($parts[0] === 'help')
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ protected function addToolbar()
$title = Text::sprintf('COM_FIELDS_VIEW_FIELDS_TITLE', Text::_(strtoupper($component)));

// Prepare the toolbar.
ToolbarHelper::title($title, 'puzzle fields ' . substr($component, 4) . ($section ? "-$section" : '') . '-fields');
ToolbarHelper::title($title, 'puzzle-piece fields ' . substr($component, 4) . ($section ? "-$section" : '') . '-fields');

if ($canDo->get('core.create'))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ protected function addToolbar()
// Prepare the toolbar.
ToolbarHelper::title(
$title,
'puzzle field-' . ($isNew ? 'add' : 'edit') . ' ' . substr($component, 4) . '-group-' .
'puzzle-piece field-' . ($isNew ? 'add' : 'edit') . ' ' . substr($component, 4) . '-group-' .
($isNew ? 'add' : 'edit')
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ protected function addToolbar()
$title = Text::sprintf('COM_FIELDS_VIEW_GROUPS_TITLE', Text::_(strtoupper($component)));

// Prepare the toolbar.
ToolbarHelper::title($title, 'puzzle fields ' . substr($component, 4) . '-groups');
ToolbarHelper::title($title, 'puzzle-piece fields ' . substr($component, 4) . '-groups');

if ($canDo->get('core.create'))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<?php echo HTMLHelper::_('grid.checkall'); ?>
</td>
<th scope="col" class="w-1 text-center d-none d-md-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
<?php echo HTMLHelper::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'fas fa-sort'); ?>
</th>
<th scope="col" class="w-1 text-center">
<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
Expand Down
8 changes: 4 additions & 4 deletions administrator/components/com_fields/tmpl/fields/modal.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@
<tbody>
<?php
$iconStates = array(
-2 => 'icon-trash',
0 => 'icon-unpublish',
1 => 'icon-publish',
2 => 'icon-archive',
-2 => 'fas fa-trash',
0 => 'fas fa-times',
1 => 'fas fa-check',
2 => 'fas fa-folder',
);
foreach ($this->items as $i => $item) :
?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<?php echo HTMLHelper::_('grid.checkall'); ?>
</td>
<th scope="col" class="w-1 text-center d-none d-md-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
<?php echo HTMLHelper::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'fas fa-sort'); ?>
</th>
<th scope="col" class="w-1 text-center">
<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ protected function addToolbar()
{
$canDo = ContentHelper::getActions('com_finder');

ToolbarHelper::title(Text::_('COM_FINDER_FILTERS_TOOLBAR_TITLE'), 'zoom-in finder');
ToolbarHelper::title(Text::_('COM_FINDER_FILTERS_TOOLBAR_TITLE'), 'search-plus finder');
$toolbar = Toolbar::getInstance('toolbar');

if ($canDo->get('core.create'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ protected function addToolbar()
// Get the toolbar object instance
$toolbar = Toolbar::getInstance('toolbar');

ToolbarHelper::title(Text::_('COM_FINDER_INDEX_TOOLBAR_TITLE'), 'zoom-in finder');
ToolbarHelper::title(Text::_('COM_FINDER_INDEX_TOOLBAR_TITLE'), 'search-plus finder');

$toolbar->appendButton(
'Popup', 'archive', 'COM_FINDER_INDEX', 'index.php?option=com_finder&view=indexer&tmpl=component', 500, 210, 0, 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ protected function addToolbar()
{
$canDo = ContentHelper::getActions('com_finder');

ToolbarHelper::title(Text::_('COM_FINDER_MAPS_TOOLBAR_TITLE'), 'zoom-in finder');
ToolbarHelper::title(Text::_('COM_FINDER_MAPS_TOOLBAR_TITLE'), 'search-plus finder');

// Get the toolbar object instance
$toolbar = Toolbar::getInstance('toolbar');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public function display($tpl = null)
protected function addToolbar()
{
$canDo = ContentHelper::getActions('com_installer');
ToolbarHelper::title(Text::_('COM_INSTALLER_HEADER_' . strtoupper($this->getName())), 'puzzle install');
ToolbarHelper::title(Text::_('COM_INSTALLER_HEADER_' . strtoupper($this->getName())), 'puzzle-piece install');

if ($canDo->get('core.admin') || $canDo->get('core.options'))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function display($tpl = null)
protected function addToolbar()
{
$canDo = ContentHelper::getActions('com_installer');
ToolbarHelper::title(Text::_('COM_INSTALLER_HEADER_' . $this->getName()), 'puzzle install');
ToolbarHelper::title(Text::_('COM_INSTALLER_HEADER_' . $this->getName()), 'puzzle-piece install');

if ($canDo->get('core.admin'))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public function display($tpl = null)

// Set the toolbar information.
ToolbarHelper::title(Text::_('COM_JOOMLAUPDATE_OVERVIEW'), 'joomla install');
ToolbarHelper::custom('update.purge', 'loop', 'loop', 'COM_JOOMLAUPDATE_TOOLBAR_CHECK', false);
ToolbarHelper::custom('update.purge', 'sync', 'sync', 'COM_JOOMLAUPDATE_TOOLBAR_CHECK', false);

// Add toolbar buttons.
if (Factory::getUser()->authorise('core.admin'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function display($tpl = null)
Factory::getApplication()->input->set('hidemainmenu', true);

// Set the toolbar information.
ToolbarHelper::title(Text::_('COM_JOOMLAUPDATE_OVERVIEW'), 'loop install');
ToolbarHelper::title(Text::_('COM_JOOMLAUPDATE_OVERVIEW'), 'sync install');

// Render the view.
parent::display($tpl);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class HtmlView extends BaseHtmlView
public function display($tpl = null)
{
// Set the toolbar information.
ToolbarHelper::title(Text::_('COM_JOOMLAUPDATE_OVERVIEW'), 'loop install');
ToolbarHelper::title(Text::_('COM_JOOMLAUPDATE_OVERVIEW'), 'sync install');
ToolbarHelper::divider();
ToolbarHelper::help('JHELP_COMPONENTS_JOOMLA_UPDATE');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@ protected function addToolbar()

if ((int) $this->state->get('client_id') === 1)
{
ToolbarHelper::title(Text::_('COM_LANGUAGES_VIEW_INSTALLED_ADMIN_TITLE'), 'comments-2 langmanager');
ToolbarHelper::title(Text::_('COM_LANGUAGES_VIEW_INSTALLED_ADMIN_TITLE'), 'comments langmanager');
}
else
{
ToolbarHelper::title(Text::_('COM_LANGUAGES_VIEW_INSTALLED_SITE_TITLE'), 'comments-2 langmanager');
ToolbarHelper::title(Text::_('COM_LANGUAGES_VIEW_INSTALLED_SITE_TITLE'), 'comments langmanager');
}

if ($canDo->get('core.edit.state'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ protected function addToolbar(): void
{
$canDo = ContentHelper::getActions('com_languages');

ToolbarHelper::title(Text::_('COM_LANGUAGES_VIEW_LANGUAGES_TITLE'), 'comments-2 langmanager');
ToolbarHelper::title(Text::_('COM_LANGUAGES_VIEW_LANGUAGES_TITLE'), 'comments langmanager');

// Get the toolbar object instance
$toolbar = Toolbar::getInstance('toolbar');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ protected function addToolbar()

$canDo = ContentHelper::getActions('com_languages');

ToolbarHelper::title(Text::_('COM_LANGUAGES_VIEW_OVERRIDE_EDIT_TITLE'), 'comments-2 langmanager');
ToolbarHelper::title(Text::_('COM_LANGUAGES_VIEW_OVERRIDE_EDIT_TITLE'), 'comments langmanager');

$toolbarButtons = [];

Expand Down
Loading