Skip to content

[4.0] Convert icon- in toolbar to fa- ( part 1 ) #27686

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 70 commits into from
Feb 18, 2020
Merged

[4.0] Convert icon- in toolbar to fa- ( part 1 ) #27686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
96e8568
navbar toggler
N6REJ Jan 27, 2020
a2d3b54
convert icon-new to fa-plus
N6REJ Jan 28, 2020
8ede6eb
Merge remote-tracking branch 'Joomla/4.0-dev' into 4.0-dev
N6REJ Jan 28, 2020
bb7cdb6
actions ellipsis
N6REJ Jan 29, 2020
1b1568d
Merge branch '4.0-dev' into icon-new
N6REJ Jan 29, 2020
bd5f740
Merge branch '4.0-dev' into icon-new
N6REJ Jan 29, 2020
478b028
media folder icons in toolbar
N6REJ Jan 29, 2020
213fdcd
Merge remote-tracking branch 'N6REJ/icon-new' into icon-new
N6REJ Jan 29, 2020
e1e78ac
calendar & eye open
N6REJ Jan 29, 2020
46dc41e
open eye
N6REJ Jan 29, 2020
2f25ade
Merge remote-tracking branch 'Joomla/4.0-dev' into 4.0-dev
N6REJ Jan 30, 2020
7d1f2f7
Merge branch '4.0-dev' into icon-new
N6REJ Jan 31, 2020
4b80fe5
Merge remote-tracking branch 'Joomla/4.0-dev' into icon-new
N6REJ Feb 5, 2020
61581a5
fix missed change
N6REJ Feb 5, 2020
c5b9fa6
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into 4…
N6REJ Feb 5, 2020
8284067
Merge remote-tracking branch 'Joomla/4.0-dev' into icon-new
N6REJ Feb 5, 2020
c7452e6
Merge branch '4.0-dev' into icon-new
N6REJ Feb 5, 2020
c618325
Merge remote-tracking branch 'N6REJ/icon-new' into icon-new
N6REJ Feb 5, 2020
9d2b669
media
N6REJ Feb 6, 2020
5ece8e7
Merge remote-tracking branch 'N6REJ/icon-new' into icon-new
N6REJ Feb 6, 2020
ce9af52
icon-refresh
N6REJ Feb 6, 2020
e516f99
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into i…
N6REJ Feb 6, 2020
eeb0639
icon-apply
N6REJ Feb 6, 2020
35af9f4
icon-file
N6REJ Feb 6, 2020
b5cc26f
icon-checkbox
N6REJ Feb 6, 2020
adaf002
icon-warning
N6REJ Feb 6, 2020
3fb7c4d
icon-eye
N6REJ Feb 6, 2020
0403531
icon-lock
N6REJ Feb 6, 2020
47d35a0
icon-lock
N6REJ Feb 6, 2020
b913de3
icon-ok
N6REJ Feb 6, 2020
3060dbb
icon-remove & icon-edit
N6REJ Feb 6, 2020
f2ecfb6
icon-publish
N6REJ Feb 6, 2020
4e6aa7b
icon-unpublish
N6REJ Feb 6, 2020
d37369f
icon-folder
N6REJ Feb 6, 2020
658d3a8
icon-trash
N6REJ Feb 6, 2020
0ff506f
icon-plus & minus
N6REJ Feb 6, 2020
8b0760e
icon-unchecked
N6REJ Feb 6, 2020
73e1cdd
icon-arrow-left
N6REJ Feb 6, 2020
a65b177
icon-arrow-left
N6REJ Feb 6, 2020
9e06e92
icon-arrow-right
N6REJ Feb 6, 2020
0ee2acd
icon-arrow-up-4
N6REJ Feb 6, 2020
a46c7c3
icon-featured
N6REJ Feb 6, 2020
519258a
icon-info
N6REJ Feb 6, 2020
fc0a541
icon-out-2
N6REJ Feb 6, 2020
2f23cd3
icon-cancel
N6REJ Feb 6, 2020
1cce8dc
icon-play
N6REJ Feb 6, 2020
a4f819e
icon-save
N6REJ Feb 6, 2020
9ea8595
icon-calendar
N6REJ Feb 6, 2020
24688e5
icon-menu
N6REJ Feb 6, 2020
1446b72
icon-pending
N6REJ Feb 6, 2020
67e226f
icon-list
N6REJ Feb 6, 2020
62a73af
icon-cube
N6REJ Feb 6, 2020
aa36639
icon-checkbox-partial
N6REJ Feb 6, 2020
1240b24
icon-user
N6REJ Feb 6, 2020
aeb2ca8
icon-ban-circle
N6REJ Feb 6, 2020
5481064
icon-sort
N6REJ Feb 6, 2020
9d1b7bb
icon-help
N6REJ Feb 6, 2020
09fe1cb
icon-chevron
N6REJ Feb 6, 2020
8580210
extra span
N6REJ Feb 6, 2020
ed39f81
extra <
N6REJ Feb 6, 2020
4ba6a13
extra <
N6REJ Feb 6, 2020
cca795a
icon-featured
N6REJ Feb 6, 2020
d36b344
Update administrator/components/com_joomlaupdate/tmpl/joomlaupdate/de…
N6REJ Feb 12, 2020
f516052
icon-file fix
N6REJ Feb 14, 2020
13abb53
Merge remote-tracking branch 'Joomla/4.0-dev' into icon-new
N6REJ Feb 15, 2020
5f40ab5
Update administrator/components/com_categories/src/Field/Modal/Catego…
N6REJ Feb 17, 2020
ea6effb
Update administrator/components/com_contact/src/Field/Modal/ContactFi…
N6REJ Feb 17, 2020
baa7347
Update administrator/components/com_content/src/Field/Modal/ArticleFi…
N6REJ Feb 17, 2020
15f959a
Update administrator/components/com_newsfeeds/src/Field/Modal/Newsfee…
N6REJ Feb 17, 2020
2cffd57
Update administrator/components/com_menus/src/Field/Modal/MenuField.php
N6REJ Feb 17, 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
4 changes: 2 additions & 2 deletions administrator/components/com_associations/src/Field/Modal/AssociationField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ protected function getInput()
. ' data-select="' . Text::_('COM_ASSOCIATIONS_SELECT_TARGET') . '"'
. ' data-change="' . Text::_('COM_ASSOCIATIONS_CHANGE_TARGET') . '"'
. ' data-target="#associationSelect' . $this->id . 'Modal">'
. '<span class="icon-file" aria-hidden="true"></span> '
. '<span class="fas fa-file" aria-hidden="true"></span> '
. '<span id="select-change-text"></span>'
. '</button>';

Expand All @@ -77,7 +77,7 @@ protected function getInput()
. ' class="btn btn-secondary' . ($value ? '' : ' hidden') . '"'
. ' onclick="return Joomla.submitbutton(\'undo-association\');"'
. ' id="remove-assoc">'
. '<span class="icon-remove" aria-hidden="true"></span> ' . Text::_('JCLEAR')
. '<span class="fas fa-times" aria-hidden="true"></span> ' . Text::_('JCLEAR')
. '</button>';

$html[] = '<input type="hidden" id="' . $this->id . '_id" name="' . $this->name . '" value="' . $value . '">';
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_associations/src/View/Association/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,13 +370,13 @@ protected function addToolbar(): void

$bar->appendButton(
'Custom', '<button onclick="Joomla.submitbutton(\'reference\')" '
. 'class="btn btn-sm btn-success"><span class="icon-apply" aria-hidden="true"></span>'
. 'class="btn btn-sm btn-success"><span class="fas fa-save" aria-hidden="true"></span>'
. Text::_('COM_ASSOCIATIONS_SAVE_REFERENCE') . '</button>', 'reference'
);

$bar->appendButton(
'Custom', '<button onclick="Joomla.submitbutton(\'target\')" '
. 'class="btn btn-sm btn-success"><span class="icon-apply" aria-hidden="true"></span>'
. 'class="btn btn-sm btn-success"><span class="fas fa-save" aria-hidden="true"></span>'
. Text::_('COM_ASSOCIATIONS_SAVE_TARGET') . '</button>', 'target'
);

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_banners/src/Field/ClicksField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ protected function getInput()
return '<div class="input-group"><input class="form-control" type="text" name="' . $this->name . '" id="' . $this->id . '" value="'
. htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly">'
. '<span class="input-group-append"><button type="button" class="btn btn-secondary" ' . $onclick . '>'
. '<span class="icon-refresh" aria-hidden="true"></span> ' . Text::_('COM_BANNERS_RESET_CLICKS') . '</button></span></div>';
. '<span class="fas fa-sync" aria-hidden="true"></span> ' . Text::_('COM_BANNERS_RESET_CLICKS') . '</button></span></div>';
}
}
2 changes: 1 addition & 1 deletion administrator/components/com_banners/src/Field/ImpmadeField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ protected function getInput()
return '<div class="input-group"><input class="form-control" type="text" name="' . $this->name . '" id="' . $this->id . '" value="'
. htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly">'
. '<span class="input-group-append"><button type="button" class="btn btn-secondary" ' . $onclick . '>'
. '<span class="icon-refresh" aria-hidden="true"></span> ' . Text::_('COM_BANNERS_RESET_IMPMADE') . '</button></span></div>';
. '<span class="fas fa-sync" aria-hidden="true"></span> ' . Text::_('COM_BANNERS_RESET_IMPMADE') . '</button></span></div>';
}
}
8 changes: 4 additions & 4 deletions 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 @@ -67,19 +67,19 @@
<?php echo HTMLHelper::_('searchtools.sort', 'COM_BANNERS_HEADING_CONTACT', 'a.contact', $listDirn, $listOrder); ?>
</th>
<th scope="col" style="width:3%" class="text-center d-none d-md-table-cell">
<span class="icon-publish" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?>"></span>
<span class="fas fa-check" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?>"></span>
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?></span>
</th>
<th scope="col" style="width:3%" class="text-center d-none d-md-table-cell">
<span class="icon-unpublish" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?>"></span>
<span class="fas fa-times" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?>"></span>
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?></span>
</th>
<th scope="col" style="width:3%" class="text-center d-none d-md-table-cell">
<span class="icon-archive" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?>"></span>
<span class="fas fa-folder" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?>"></span>
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?></span>
</th>
<th scope="col" style="width:3%" class="text-center d-none d-md-table-cell">
<span class="icon-trash" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?>"></span>
<span class="fas fa-trash" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?>"></span>
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?></span>
</th>
<th scope="col" style="width:10%" class="d-none d-md-table-cell">
Expand Down
10 changes: 5 additions & 5 deletions administrator/components/com_categories/src/Field/Modal/CategoryField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ function jSelectCategory_" . $this->id . "(id, title, object) {
. ' data-toggle="modal"'
. ' type="button"'
. ' data-target="#ModalSelect' . $modalId . '">'
. '<span class="icon-file" aria-hidden="true"></span> ' . Text::_('JSELECT')
. '<span class="fas fa-file" aria-hidden="true"></span> ' . Text::_('JSELECT')
. '</button>';
}

Expand All @@ -173,7 +173,7 @@ function jSelectCategory_" . $this->id . "(id, title, object) {
. ' data-toggle="modal"'
. ' type="button"'
. ' data-target="#ModalNew' . $modalId . '">'
. '<span class="icon-new" aria-hidden="true"></span> ' . Text::_('JACTION_CREATE')
. '<span class="fas fa-plus" aria-hidden="true"></span> ' . Text::_('JACTION_CREATE')
. '</button>';
}

Expand All @@ -186,7 +186,7 @@ function jSelectCategory_" . $this->id . "(id, title, object) {
. ' data-toggle="modal"'
. ' type="button"'
. ' data-target="#ModalEdit' . $modalId . '">'
. '<span class="icon-edit" aria-hidden="true"></span> ' . Text::_('JACTION_EDIT')
. '<span class="fas fa-pen-square" aria-hidden="true"></span> ' . Text::_('JACTION_EDIT')
. '</button>';
}

Expand All @@ -198,7 +198,7 @@ function jSelectCategory_" . $this->id . "(id, title, object) {
. ' id="' . $this->id . '_clear"'
. ' type="button"'
. ' onclick="window.processModalParent(\'' . $this->id . '\'); return false;">'
. '<span class="icon-remove" aria-hidden="true"></span> ' . Text::_('JCLEAR')
. '<span class="fas fa-times" aria-hidden="true"></span> ' . Text::_('JCLEAR')
. '</button>';
}

Expand All @@ -215,7 +215,7 @@ function jSelectCategory_" . $this->id . "(id, title, object) {
. ' id="' . $this->id . '_propagate"'
. ' title="' . Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_TIP') . '"'
. ' onclick="Joomla.propagateAssociation(\'' . $this->id . '\', \'' . $callbackFunctionStem . '\');">'
. '<span class="icon-refresh" aria-hidden="true"></span> ' . Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON')
. '<span class="fas fa-sync" aria-hidden="true"></span> ' . Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON')
. '</button>';
}

Expand Down
8 changes: 4 additions & 4 deletions 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 @@ -83,25 +83,25 @@
</th>
<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_published')) : ?>
<th scope="col" style="width:3%" class="text-center d-none d-md-table-cell">
<span class="icon-publish" aria-hidden="true" title="<?php echo Text::_('COM_CATEGORY_COUNT_PUBLISHED_ITEMS'); ?>"></span>
<span class="fas fa-check" aria-hidden="true" title="<?php echo Text::_('COM_CATEGORY_COUNT_PUBLISHED_ITEMS'); ?>"></span>
<span class="sr-only"><?php echo Text::_('COM_CATEGORY_COUNT_PUBLISHED_ITEMS'); ?></span>
</th>
<?php endif; ?>
<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_unpublished')) : ?>
<th scope="col" style="width:3%" class="text-center d-none d-md-table-cell">
<span class="icon-unpublish" aria-hidden="true" title="<?php echo Text::_('COM_CATEGORY_COUNT_UNPUBLISHED_ITEMS'); ?>"></span>
<span class="fas fa-times" aria-hidden="true" title="<?php echo Text::_('COM_CATEGORY_COUNT_UNPUBLISHED_ITEMS'); ?>"></span>
<span class="sr-only"><?php echo Text::_('COM_CATEGORY_COUNT_UNPUBLISHED_ITEMS'); ?></span>
</th>
<?php endif; ?>
<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_archived')) : ?>
<th scope="col" style="width:3%" class="text-center d-none d-md-table-cell">
<span class="icon-archive" aria-hidden="true" title="<?php echo Text::_('COM_CATEGORY_COUNT_ARCHIVED_ITEMS'); ?>"></span>
<span class="fas fa-folder" aria-hidden="true" title="<?php echo Text::_('COM_CATEGORY_COUNT_ARCHIVED_ITEMS'); ?>"></span>
<span class="sr-only"><?php echo Text::_('COM_CATEGORY_COUNT_ARCHIVED_ITEMS'); ?></span>
</th>
<?php endif; ?>
<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_trashed')) : ?>
<th scope="col" style="width:3%" class="text-center d-none d-md-table-cell">
<span class="icon-trash" aria-hidden="true" title="<?php echo Text::_('COM_CATEGORY_COUNT_TRASHED_ITEMS'); ?>"></span>
<span class="fas fa-trash" aria-hidden="true" title="<?php echo Text::_('COM_CATEGORY_COUNT_TRASHED_ITEMS'); ?>"></span>
<span class="sr-only"><?php echo Text::_('COM_CATEGORY_COUNT_TRASHED_ITEMS'); ?></span>
</th>
<?php endif; ?>
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_config/src/Model/ApplicationModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,7 @@ public function storePermissions($permission = null)
if ($isSuperUserGroupAfter)
{
$result['class'] = 'badge badge-success';
$result['text'] = '<span class="icon-lock icon-white" aria-hidden="true"></span>' . Text::_('JLIB_RULES_ALLOWED_ADMIN');
$result['text'] = '<span class="fas fa-lock icon-white" aria-hidden="true"></span>' . Text::_('JLIB_RULES_ALLOWED_ADMIN');
}
// Not super user.
else
Expand Down Expand Up @@ -1179,7 +1179,7 @@ public function storePermissions($permission = null)
elseif ($inheritedGroupParentAssetRule === false || $inheritedParentGroupRule === false)
{
$result['class'] = 'badge badge-danger';
$result['text'] = '<span class="icon-lock icon-white" aria-hidden="true"></span>' . Text::_('JLIB_RULES_NOT_ALLOWED_LOCKED');
$result['text'] = '<span class="fas fa-lock icon-white" aria-hidden="true"></span>' . Text::_('JLIB_RULES_NOT_ALLOWED_LOCKED');
}
}

Expand Down
10 changes: 5 additions & 5 deletions administrator/components/com_contact/src/Field/Modal/ContactField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ function jSelectContact_" . $this->id . "(id, title, object) {
. ' data-toggle="modal"'
. ' type="button"'
. ' data-target="#ModalSelect' . $modalId . '">'
. '<span class="icon-file" aria-hidden="true"></span> ' . Text::_('JSELECT')
. '<span class="fas fa-file" aria-hidden="true"></span> ' . Text::_('JSELECT')
. '</button>';
}

Expand All @@ -162,7 +162,7 @@ function jSelectContact_" . $this->id . "(id, title, object) {
. ' data-toggle="modal"'
. ' type="button"'
. ' data-target="#ModalNew' . $modalId . '">'
. '<span class="icon-new" aria-hidden="true"></span> ' . Text::_('JACTION_CREATE')
. '<span class="fas fa-plus" aria-hidden="true"></span> ' . Text::_('JACTION_CREATE')
. '</button>';
}

Expand All @@ -175,7 +175,7 @@ function jSelectContact_" . $this->id . "(id, title, object) {
. ' data-toggle="modal"'
. ' type="button"'
. ' data-target="#ModalEdit' . $modalId . '">'
. '<span class="icon-edit" aria-hidden="true"></span> ' . Text::_('JACTION_EDIT')
. '<span class="fas fa-pen-square" aria-hidden="true"></span> ' . Text::_('JACTION_EDIT')
. '</button>';
}

Expand All @@ -187,7 +187,7 @@ function jSelectContact_" . $this->id . "(id, title, object) {
. ' id="' . $this->id . '_clear"'
. ' type="button"'
. ' onclick="window.processModalParent(\'' . $this->id . '\'); return false;">'
. '<span class="icon-remove" aria-hidden="true"></span> ' . Text::_('JCLEAR')
. '<span class="fas fa-times" aria-hidden="true"></span> ' . Text::_('JCLEAR')
. '</button>';
}

Expand All @@ -204,7 +204,7 @@ function jSelectContact_" . $this->id . "(id, title, object) {
. ' id="' . $this->id . '_propagate"'
. ' title="' . Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_TIP') . '"'
. ' onclick="Joomla.propagateAssociation(\'' . $this->id . '\', \'' . $callbackFunctionStem . '\');">'
. '<span class="icon-refresh" aria-hidden="true"></span> ' . Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON')
. '<span class="fas fa-sync" aria-hidden="true"></span> ' . Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON')
. '</button>';
}

Expand Down
10 changes: 5 additions & 5 deletions administrator/components/com_content/src/Field/Modal/ArticleField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ function jSelectArticle_" . $this->id . "(id, title, catid, object, url, languag
. ' data-toggle="modal"'
. ' type="button"'
. ' data-target="#ModalSelect' . $modalId . '">'
. '<span class="icon-file" aria-hidden="true"></span> ' . Text::_('JSELECT')
. '<span class="fas fa-file" aria-hidden="true"></span> ' . Text::_('JSELECT')
. '</button>';
}

Expand All @@ -163,7 +163,7 @@ function jSelectArticle_" . $this->id . "(id, title, catid, object, url, languag
. ' data-toggle="modal"'
. ' type="button"'
. ' data-target="#ModalNew' . $modalId . '">'
. '<span class="icon-new" aria-hidden="true"></span> ' . Text::_('JACTION_CREATE')
. '<span class="fas fa-plus" aria-hidden="true"></span> ' . Text::_('JACTION_CREATE')
. '</button>';
}

Expand All @@ -176,7 +176,7 @@ function jSelectArticle_" . $this->id . "(id, title, catid, object, url, languag
. ' data-toggle="modal"'
. ' type="button"'
. ' data-target="#ModalEdit' . $modalId . '">'
. '<span class="icon-edit" aria-hidden="true"></span> ' . Text::_('JACTION_EDIT')
. '<span class="fas fa-pen-square" aria-hidden="true"></span> ' . Text::_('JACTION_EDIT')
. '</button>';
}

Expand All @@ -188,7 +188,7 @@ function jSelectArticle_" . $this->id . "(id, title, catid, object, url, languag
. ' id="' . $this->id . '_clear"'
. ' type="button"'
. ' onclick="window.processModalParent(\'' . $this->id . '\'); return false;">'
. '<span class="icon-remove" aria-hidden="true"></span> ' . Text::_('JCLEAR')
. '<span class="fas fa-times" aria-hidden="true"></span> ' . Text::_('JCLEAR')
. '</button>';
}

Expand All @@ -205,7 +205,7 @@ function jSelectArticle_" . $this->id . "(id, title, catid, object, url, languag
. ' id="' . $this->id . '_propagate"'
. ' title="' . Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_TIP') . '"'
. ' onclick="Joomla.propagateAssociation(\'' . $this->id . '\', \'' . $callbackFunctionStem . '\');">'
. '<span class="icon-refresh" aria-hidden="true"></span> ' . Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON')
. '<span class="fas fa-sync" aria-hidden="true"></span> ' . Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON')
. '</button>';
}

Expand Down
14 changes: 7 additions & 7 deletions administrator/components/com_contenthistory/tmpl/history/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,23 @@
<nav aria-label="toolbar">
<div class="btn-group float-right mb-3">
<button id="toolbar-load" type="submit" class="btn btn-secondary" aria-label="<?php echo Text::_('COM_CONTENTHISTORY_BUTTON_LOAD_DESC'); ?>" title="<?php echo Text::_('COM_CONTENTHISTORY_BUTTON_LOAD_DESC'); ?>" data-url="<?php echo Route::_($loadUrl); ?>">
<span class="icon-upload" aria-hidden="true"></span>
<span class="fas fa-upload" aria-hidden="true"></span>
<span class="d-none d-md-inline"><?php echo Text::_('COM_CONTENTHISTORY_BUTTON_LOAD'); ?></span>
</button>
<button id="toolbar-preview" type="button" class="btn btn-secondary" aria-label="<?php echo Text::_('COM_CONTENTHISTORY_BUTTON_PREVIEW_DESC'); ?>" title="<?php echo Text::_('COM_CONTENTHISTORY_BUTTON_PREVIEW_DESC'); ?>" data-url="<?php echo Route::_('index.php?option=com_contenthistory&view=preview&layout=preview&tmpl=component&' . Session::getFormToken() . '=1'); ?>">
<span class="icon-search" aria-hidden="true"></span>
<span class="fas fa-search" aria-hidden="true"></span>
<span class="d-none d-md-inline"><?php echo Text::_('COM_CONTENTHISTORY_BUTTON_PREVIEW'); ?></span>
</button>
<button id="toolbar-compare" type="button" class="btn btn-secondary" aria-label="<?php echo Text::_('COM_CONTENTHISTORY_BUTTON_COMPARE_DESC'); ?>" title="<?php echo Text::_('COM_CONTENTHISTORY_BUTTON_COMPARE_DESC'); ?>" data-url="<?php echo Route::_('index.php?option=com_contenthistory&view=compare&layout=compare&tmpl=component&' . Session::getFormToken() . '=1'); ?>">
<span class="icon-zoom-in" aria-hidden="true"></span>
<span class="fas fa-search-plus" aria-hidden="true"></span>
<span class="d-none d-md-inline"><?php echo Text::_('COM_CONTENTHISTORY_BUTTON_COMPARE'); ?></span>
</button>
<button onclick="if (document.adminForm.boxchecked.value==0){<?php echo $deleteMessage; ?>}else{ Joomla.submitbutton('history.keep')}" class="btn btn-secondary pointer" aria-label="<?php echo Text::_('COM_CONTENTHISTORY_BUTTON_KEEP_DESC'); ?>" title="<?php echo Text::_('COM_CONTENTHISTORY_BUTTON_KEEP_DESC'); ?>">
<span class="icon-lock" aria-hidden="true"></span>
<span class="fas fa-lock" aria-hidden="true"></span>
<span class="d-none d-md-inline"><?php echo Text::_('COM_CONTENTHISTORY_BUTTON_KEEP'); ?></span>
</button>
<button onclick="if (document.adminForm.boxchecked.value==0){<?php echo $deleteMessage; ?>}else{ Joomla.submitbutton('history.delete')}" class="btn btn-secondary pointer" aria-label="<?php echo Text::_('COM_CONTENTHISTORY_BUTTON_DELETE_DESC'); ?>" title="<?php echo Text::_('COM_CONTENTHISTORY_BUTTON_DELETE_DESC'); ?>">
<span class="icon-delete" aria-hidden="true"></span>
<span class="fas fa-times" aria-hidden="true"></span>
<span class="d-none d-md-inline"><?php echo Text::_('COM_CONTENTHISTORY_BUTTON_DELETE'); ?></span>
</button>
</div>
Expand Down Expand Up @@ -107,7 +107,7 @@
<?php echo HTMLHelper::_('date', $item->save_date, Text::_('DATE_FORMAT_LC6')); ?>
</a>
<?php if ($item->sha1_hash == $hash) : ?>
<span class="icon-featured" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('JCURRENT'); ?></span>
<span class="fas fa-star" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('JCURRENT'); ?></span>
<?php endif; ?>
</th>
<td class="d-none d-md-table-cell">
Expand All @@ -117,7 +117,7 @@
<?php if ($item->keep_forever) : ?>
<a class="btn btn-secondary btn-sm active" rel="tooltip" href="javascript:void(0);"
onclick="return Joomla.listItemTask('cb<?php echo $i; ?>','history.keep')">
<?php echo Text::_('JYES'); ?>&nbsp;<span class="icon-lock" aria-hidden="true"></span>
<?php echo Text::_('JYES'); ?>&nbsp;<span class="fas fa-lock" aria-hidden="true"></span>
</a>
<?php else : ?>
<a class="btn btn-secondary btn-sm active" rel="tooltip" href="javascript:void(0);"
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_cpanel/tmpl/cpanel/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
'url' => Route::_('index.php?option=com_cpanel&task=addModule&function=jSelectModuleType&position=' . $this->escape($this->position)),
'bodyHeight' => '70',
'modalWidth' => '80',
'footer' => '<button type="button" class="button-cancel btn btn-sm btn-danger" data-dismiss="modal" data-target="#closeBtn"><span class="icon-cancel" aria-hidden="true"></span>'
'footer' => '<button type="button" class="button-cancel btn btn-sm btn-danger" data-dismiss="modal" data-target="#closeBtn"><span class="fas fa-times" aria-hidden="true"></span>'
. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
. '<button type="button" class="button-save btn btn-sm btn-success hidden" data-target="#saveBtn"><span class="icon-save" aria-hidden="true"></span>'
. '<button type="button" class="button-save btn btn-sm btn-success hidden" data-target="#saveBtn"><span class="fas fa-copy" aria-hidden="true"></span>'
. Text::_('JSAVE') . '</button>',
)
);
Expand Down
Loading