diff --git a/administrator/components/com_admin/src/Service/HTML/Directory.php b/administrator/components/com_admin/src/Service/HTML/Directory.php index 41b1c4e5a2a7e..f5de97a6ca568 100644 --- a/administrator/components/com_admin/src/Service/HTML/Directory.php +++ b/administrator/components/com_admin/src/Service/HTML/Directory.php @@ -31,10 +31,10 @@ public function writable($writable) { if ($writable) { - return '' . Text::_('COM_ADMIN_WRITABLE') . ''; + return '' . Text::_('COM_ADMIN_WRITABLE') . ''; } - return '' . Text::_('COM_ADMIN_UNWRITABLE') . ''; + return '' . Text::_('COM_ADMIN_UNWRITABLE') . ''; } /** diff --git a/administrator/components/com_associations/src/Helper/AssociationsHelper.php b/administrator/components/com_associations/src/Helper/AssociationsHelper.php index 70639130ca4e6..c5042cb8bb432 100644 --- a/administrator/components/com_associations/src/Helper/AssociationsHelper.php +++ b/administrator/components/com_associations/src/Helper/AssociationsHelper.php @@ -299,7 +299,7 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId $additional = '' . Text::sprintf('COM_MENUS_MENU_SPRINTF', $menutypeTitle) . '
'; } - $labelClass = 'badge-secondary'; + $labelClass = 'bg-secondary'; $target = $langCode . ':' . $items[$langCode]['id'] . ':edit'; $allow = $canEditReference && self::allowEdit($extensionName, $typeName, $items[$langCode]['id']) @@ -313,7 +313,7 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId $title = Text::_('COM_ASSOCIATIONS_NO_ASSOCIATION'); $additional = $addLink ? Text::_('COM_ASSOCIATIONS_ADD_NEW_ASSOCIATION') : ''; - $labelClass = 'badge-warning'; + $labelClass = 'bg-warning text-dark'; $target = $langCode . ':0:add'; $allow = $canCreate; } diff --git a/administrator/components/com_categories/src/Service/HTML/AdministratorService.php b/administrator/components/com_categories/src/Service/HTML/AdministratorService.php index adc414a140b7d..0a48842e8485e 100644 --- a/administrator/components/com_categories/src/Service/HTML/AdministratorService.php +++ b/administrator/components/com_categories/src/Service/HTML/AdministratorService.php @@ -94,7 +94,7 @@ public function association($catid, $extension = 'com_content') $url = Route::_('index.php?option=com_categories&task=category.edit&id=' . (int) $item->id . '&extension=' . $extension); $tooltip = '' . htmlspecialchars($item->language_title, ENT_QUOTES, 'UTF-8') . '
' . htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); - $classes = 'badge badge-secondary'; + $classes = 'badge bg-secondary'; $item->link = '' . $text . '' . ''; diff --git a/administrator/components/com_checkin/tmpl/checkin/default.php b/administrator/components/com_checkin/tmpl/checkin/default.php index 080db90183cac..eb301cf4280b1 100644 --- a/administrator/components/com_checkin/tmpl/checkin/default.php +++ b/administrator/components/com_checkin/tmpl/checkin/default.php @@ -55,7 +55,7 @@ - + diff --git a/administrator/components/com_config/src/Model/ApplicationModel.php b/administrator/components/com_config/src/Model/ApplicationModel.php index 426b3b6f575ec..543e04dd5ebd6 100644 --- a/administrator/components/com_config/src/Model/ApplicationModel.php +++ b/administrator/components/com_config/src/Model/ApplicationModel.php @@ -1149,7 +1149,7 @@ public function storePermissions($permission = null) // Current group is a Super User group, so calculated setting is "Allowed (Super User)". if ($isSuperUserGroupAfter) { - $result['class'] = 'badge badge-success'; + $result['class'] = 'badge bg-success'; $result['text'] = '' . Text::_('JLIB_RULES_ALLOWED_ADMIN'); } // Not super user. @@ -1160,13 +1160,13 @@ public function storePermissions($permission = null) // If recursive calculated setting is "Denied" or null. Calculated permission is "Not Allowed (Inherited)". if ($inheritedGroupRule === null || $inheritedGroupRule === false) { - $result['class'] = 'badge badge-danger'; + $result['class'] = 'badge bg-danger'; $result['text'] = Text::_('JLIB_RULES_NOT_ALLOWED_INHERITED'); } // If recursive calculated setting is "Allowed". Calculated permission is "Allowed (Inherited)". else { - $result['class'] = 'badge badge-success'; + $result['class'] = 'badge bg-success'; $result['text'] = Text::_('JLIB_RULES_ALLOWED_INHERITED'); } @@ -1181,13 +1181,13 @@ public function storePermissions($permission = null) // If there is an explicit permission "Not Allowed". Calculated permission is "Not Allowed". if ($assetRule === false) { - $result['class'] = 'badge badge-danger'; + $result['class'] = 'badge bg-danger'; $result['text'] = Text::_('JLIB_RULES_NOT_ALLOWED'); } // If there is an explicit permission is "Allowed". Calculated permission is "Allowed". elseif ($assetRule === true) { - $result['class'] = 'badge badge-success'; + $result['class'] = 'badge bg-success'; $result['text'] = Text::_('JLIB_RULES_ALLOWED'); } @@ -1196,7 +1196,7 @@ public function storePermissions($permission = null) // Global configuration with "Not Set" permission. Calculated permission is "Not Allowed (Default)". if (empty($parentGroupId) && $isGlobalConfig === true && $assetRule === null) { - $result['class'] = 'badge badge-danger'; + $result['class'] = 'badge bg-danger'; $result['text'] = Text::_('JLIB_RULES_NOT_ALLOWED_DEFAULT'); } @@ -1207,7 +1207,7 @@ public function storePermissions($permission = null) */ elseif ($inheritedGroupParentAssetRule === false || $inheritedParentGroupRule === false) { - $result['class'] = 'badge badge-danger'; + $result['class'] = 'badge bg-danger'; $result['text'] = '' . Text::_('JLIB_RULES_NOT_ALLOWED_LOCKED'); } } diff --git a/administrator/components/com_contact/src/Service/HTML/AdministratorService.php b/administrator/components/com_contact/src/Service/HTML/AdministratorService.php index 34e1acf050b80..ad2277bfde0f8 100644 --- a/administrator/components/com_contact/src/Service/HTML/AdministratorService.php +++ b/administrator/components/com_contact/src/Service/HTML/AdministratorService.php @@ -93,7 +93,7 @@ public function association($contactid) $url = Route::_('index.php?option=com_contact&task=contact.edit&id=' . (int) $item->id); $tooltip = '' . htmlspecialchars($item->language_title, ENT_QUOTES, 'UTF-8') . '
' . htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8') . '
' . Text::sprintf('JCATEGORY_SPRINTF', $item->category_title); - $classes = 'badge badge-secondary'; + $classes = 'badge bg-secondary'; $item->link = '' . $text . '' . ''; diff --git a/administrator/components/com_content/src/Service/HTML/AdministratorService.php b/administrator/components/com_content/src/Service/HTML/AdministratorService.php index 70078a1cfa07d..82691d820b8e9 100644 --- a/administrator/components/com_content/src/Service/HTML/AdministratorService.php +++ b/administrator/components/com_content/src/Service/HTML/AdministratorService.php @@ -93,7 +93,7 @@ public function association($articleid) $url = Route::_('index.php?option=com_content&task=article.edit&id=' . (int) $item->id); $tooltip = '' . htmlspecialchars($item->language_title, ENT_QUOTES, 'UTF-8') . '
' . htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8') . '
' . Text::sprintf('JCATEGORY_SPRINTF', $item->category_title); - $classes = 'badge badge-secondary'; + $classes = 'badge bg-secondary'; $item->link = '' . $text . '' . ''; diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php index 2e5365fa4d55b..1cb2e2cbe0d4b 100644 --- a/administrator/components/com_content/tmpl/articles/default.php +++ b/administrator/components/com_content/tmpl/articles/default.php @@ -357,18 +357,18 @@ ?> - + hits; ?> vote) : ?> - + rating_count; ?> - + rating; ?> diff --git a/administrator/components/com_content/tmpl/featured/default.php b/administrator/components/com_content/tmpl/featured/default.php index 9e065f45fd567..9ead48f23a9fd 100644 --- a/administrator/components/com_content/tmpl/featured/default.php +++ b/administrator/components/com_content/tmpl/featured/default.php @@ -357,18 +357,18 @@ ?> - + hits; ?> vote) : ?> - + rating_count; ?> - + rating; ?> diff --git a/administrator/components/com_finder/tmpl/statistics/default.php b/administrator/components/com_finder/tmpl/statistics/default.php index 41ab748f0d6b6..2726038bc966b 100644 --- a/administrator/components/com_finder/tmpl/statistics/default.php +++ b/administrator/components/com_finder/tmpl/statistics/default.php @@ -36,7 +36,7 @@ ?> - link_count, 0, Text::_('DECIMALS_SEPARATOR'), Text::_('THOUSANDS_SEPARATOR')); ?> + link_count, 0, Text::_('DECIMALS_SEPARATOR'), Text::_('THOUSANDS_SEPARATOR')); ?> @@ -45,7 +45,7 @@ - data->link_count, 0, Text::_('DECIMALS_SEPARATOR'), Text::_('THOUSANDS_SEPARATOR')); ?> + data->link_count, 0, Text::_('DECIMALS_SEPARATOR'), Text::_('THOUSANDS_SEPARATOR')); ?> diff --git a/administrator/components/com_installer/tmpl/languages/default.php b/administrator/components/com_installer/tmpl/languages/default.php index 406acd9866bde..64ca34b656804 100644 --- a/administrator/components/com_installer/tmpl/languages/default.php +++ b/administrator/components/com_installer/tmpl/languages/default.php @@ -86,13 +86,13 @@ class="" version, $minorVersion) !== 0 || strpos($language->version, $currentShortVersion) !== 0) : ?> - version; ?> + version; ?> - version; ?> + version; ?> diff --git a/administrator/components/com_installer/tmpl/update/default.php b/administrator/components/com_installer/tmpl/update/default.php index 6873515d6d091..b1368d9382891 100644 --- a/administrator/components/com_installer/tmpl/update/default.php +++ b/administrator/components/com_installer/tmpl/update/default.php @@ -102,7 +102,7 @@ isMissingDownloadKey): ?> - + type_translated; ?> - current_version; ?> + current_version; ?> - version; ?> + version; ?> changelogurl)) : ?> diff --git a/administrator/components/com_installer/tmpl/updatesites/default.php b/administrator/components/com_installer/tmpl/updatesites/default.php index 4d1ec52462501..d57119fdadb21 100644 --- a/administrator/components/com_installer/tmpl/updatesites/default.php +++ b/administrator/components/com_installer/tmpl/updatesites/default.php @@ -109,12 +109,12 @@
downloadKey['valid']) : ?> - + downloadKey['value']; ?> downloadKey['supported']) : ?> - + version, $minorVersion) !== 0 || strpos($row->version, $currentShortVersion) !== 0) : ?> - version; ?> + version; ?> - version; ?> + version; ?> diff --git a/administrator/components/com_mails/tmpl/templates/default.php b/administrator/components/com_mails/tmpl/templates/default.php index b98fd7243cf87..79b5a09079555 100644 --- a/administrator/components/com_mails/tmpl/templates/default.php +++ b/administrator/components/com_mails/tmpl/templates/default.php @@ -89,7 +89,7 @@ image) : ?> image . '.gif', $language->title_native, array('title' => $language->title_native), true); ?> - lang_code; ?> + lang_code; ?> @@ -100,7 +100,7 @@ image) : ?> image . '.gif', $language->title_native, array('title' => $language->title_native), true); ?> - lang_code; ?> + lang_code; ?> diff --git a/administrator/components/com_menus/src/Service/HTML/Menus.php b/administrator/components/com_menus/src/Service/HTML/Menus.php index fc12e1ba701d0..4fac4b103af72 100644 --- a/administrator/components/com_menus/src/Service/HTML/Menus.php +++ b/administrator/components/com_menus/src/Service/HTML/Menus.php @@ -93,7 +93,7 @@ public function association($itemid) $url = Route::_('index.php?option=com_menus&task=item.edit&id=' . (int) $item->id); $tooltip = '' . htmlspecialchars($item->language_title, ENT_QUOTES, 'UTF-8') . '
' . htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8') . '
' . Text::sprintf('COM_MENUS_MENU_SPRINTF', $item->menu_title); - $classes = 'badge badge-secondary'; + $classes = 'badge bg-secondary'; $item->link = '' . $text . '' . ''; @@ -136,6 +136,6 @@ public function visibility($params) $show_menu = $registry->get('menu_show'); - return ($show_menu === 0) ? '' . Text::_('COM_MENUS_LABEL_HIDDEN') . '' : ''; + return ($show_menu === 0) ? '' . Text::_('COM_MENUS_LABEL_HIDDEN') . '' : ''; } } diff --git a/administrator/components/com_menus/tmpl/item/edit_modules.php b/administrator/components/com_menus/tmpl/item/edit_modules.php index 3b3037f580d06..036ec3ee850bc 100644 --- a/administrator/components/com_menus/tmpl/item/edit_modules.php +++ b/administrator/components/com_menus/tmpl/item/edit_modules.php @@ -110,35 +110,35 @@ class="btn btn-link module-edit-link" menuid)) : ?> except) : ?> - + - + menuid > 0) : ?> - + menuid < 0) : ?> - + - + published) : ?> - + - + diff --git a/administrator/components/com_menus/tmpl/items/default.php b/administrator/components/com_menus/tmpl/items/default.php index f4014ee70d2ab..17272a6126518 100644 --- a/administrator/components/com_menus/tmpl/items/default.php +++ b/administrator/components/com_menus/tmpl/items/default.php @@ -202,7 +202,7 @@ type === 'component' && !$item->enabled) : ?>
- + enabled === null ? 'JLIB_APPLICATION_ERROR_COMPONENT_NOT_FOUND' : 'COM_MENUS_LABEL_DISABLED'); ?>
@@ -221,7 +221,7 @@ language_image) : ?> language_image . '.gif', $item->language_title, array('title' => Text::sprintf('COM_MENUS_GRID_UNSET_LANGUAGE', $item->language_title)), true); ?> - language; ?> @@ -229,7 +229,7 @@ language_image) : ?> language_image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?> - language; ?> diff --git a/administrator/components/com_menus/tmpl/items/modal.php b/administrator/components/com_menus/tmpl/items/modal.php index 53f385fc007aa..f4c6afef18278 100644 --- a/administrator/components/com_menus/tmpl/items/modal.php +++ b/administrator/components/com_menus/tmpl/items/modal.php @@ -137,7 +137,7 @@ type === 'component' && !$item->enabled) : ?>
- + enabled === null ? 'JLIB_APPLICATION_ERROR_COMPONENT_NOT_FOUND' : 'COM_MENUS_LABEL_DISABLED'); ?>
@@ -154,7 +154,7 @@ language_image) : ?> language_image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?> - language; ?> + language; ?> diff --git a/administrator/components/com_modules/tmpl/module/edit.php b/administrator/components/com_modules/tmpl/module/edit.php index 13562ae544716..8de621743b13a 100644 --- a/administrator/components/com_modules/tmpl/module/edit.php +++ b/administrator/components/com_modules/tmpl/module/edit.php @@ -80,7 +80,7 @@ ?>
- + item->client_id == 0 ? Text::_('JSITE') : Text::_('JADMINISTRATOR'); ?>
diff --git a/administrator/components/com_modules/tmpl/module/edit_assignment.php b/administrator/components/com_modules/tmpl/module/edit_assignment.php index 935b7ad5281b1..d9138e3575aaf 100644 --- a/administrator/components/com_modules/tmpl/module/edit_assignment.php +++ b/administrator/components/com_modules/tmpl/module/edit_assignment.php @@ -105,14 +105,14 @@ language_image) : ?> language_image . '.gif', $link->language_title, array('title' => $link->language_title), true); ?> - language_title . '">' . $link->language_sef . ''; ?> + language_title . '">' . $link->language_sef . ''; ?> published == 0) : ?> - ' . Text::_('JUNPUBLISHED') . ''; ?> + ' . Text::_('JUNPUBLISHED') . ''; ?> - ' . Text::_('COM_MODULES_MENU_ITEM_' . strtoupper($link->type)) . ''; ?> + ' . Text::_('COM_MODULES_MENU_ITEM_' . strtoupper($link->type)) . ''; ?> diff --git a/administrator/components/com_modules/tmpl/modules/default.php b/administrator/components/com_modules/tmpl/modules/default.php index 1616363af474b..2012d714e1d35 100644 --- a/administrator/components/com_modules/tmpl/modules/default.php +++ b/administrator/components/com_modules/tmpl/modules/default.php @@ -149,11 +149,11 @@ position) : ?> - + position; ?> - + diff --git a/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php b/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php index 835543fbf1b94..0b620ba53c22a 100644 --- a/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php +++ b/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php @@ -97,7 +97,7 @@ public function association($newsfeedid) $url = Route::_('index.php?option=com_newsfeeds&task=newsfeed.edit&id=' . (int) $item->id); $tooltip = '' . htmlspecialchars($item->language_title, ENT_QUOTES, 'UTF-8') . '
' . htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8') . '
' . Text::sprintf('JCATEGORY_SPRINTF', $item->category_title); - $classes = 'badge badge-secondary'; + $classes = 'badge bg-secondary'; $item->link = '' . $text . '' . ''; diff --git a/administrator/components/com_plugins/tmpl/plugin/edit.php b/administrator/components/com_plugins/tmpl/plugin/edit.php index 5cf75ad839d92..16bfd40846d7a 100644 --- a/administrator/components/com_plugins/tmpl/plugin/edit.php +++ b/administrator/components/com_plugins/tmpl/plugin/edit.php @@ -55,10 +55,10 @@ ?>
- + form->getValue('folder'); ?> / - + form->getValue('element'); ?>
diff --git a/administrator/components/com_privacy/src/Service/HTML/Privacy.php b/administrator/components/com_privacy/src/Service/HTML/Privacy.php index c8875a0a1fceb..6da3ed3869f5c 100644 --- a/administrator/components/com_privacy/src/Service/HTML/Privacy.php +++ b/administrator/components/com_privacy/src/Service/HTML/Privacy.php @@ -34,17 +34,17 @@ public function statusLabel($status) switch ($status) { case 2: - return '' . Text::_('COM_PRIVACY_STATUS_COMPLETED') . ''; + return '' . Text::_('COM_PRIVACY_STATUS_COMPLETED') . ''; case 1: - return '' . Text::_('COM_PRIVACY_STATUS_CONFIRMED') . ''; + return '' . Text::_('COM_PRIVACY_STATUS_CONFIRMED') . ''; case -1: - return '' . Text::_('COM_PRIVACY_STATUS_INVALID') . ''; + return '' . Text::_('COM_PRIVACY_STATUS_INVALID') . ''; default: case 0: - return '' . Text::_('COM_PRIVACY_STATUS_PENDING') . ''; + return '' . Text::_('COM_PRIVACY_STATUS_PENDING') . ''; } } } diff --git a/administrator/components/com_privacy/tmpl/requests/default.php b/administrator/components/com_privacy/tmpl/requests/default.php index 12187ff002274..9b00b18d487d1 100644 --- a/administrator/components/com_privacy/tmpl/requests/default.php +++ b/administrator/components/com_privacy/tmpl/requests/default.php @@ -91,7 +91,7 @@ status == 1 && $urgentRequestDate >= $itemRequestedAt) : ?> - + escape($item->email)); ?> diff --git a/administrator/components/com_tags/tmpl/tags/default.php b/administrator/components/com_tags/tmpl/tags/default.php index c69846e87adb3..3f6803d54a67e 100644 --- a/administrator/components/com_tags/tmpl/tags/default.php +++ b/administrator/components/com_tags/tmpl/tags/default.php @@ -240,7 +240,7 @@ - + countTaggedItems; ?> diff --git a/administrator/components/com_templates/tmpl/style/edit.php b/administrator/components/com_templates/tmpl/style/edit.php index 5b98836f531db..321c748326e15 100644 --- a/administrator/components/com_templates/tmpl/style/edit.php +++ b/administrator/components/com_templates/tmpl/style/edit.php @@ -40,7 +40,7 @@
- + item->client_id == 0 ? Text::_('JSITE') : Text::_('JADMINISTRATOR'); ?>
diff --git a/administrator/components/com_templates/tmpl/styles/default.php b/administrator/components/com_templates/tmpl/styles/default.php index 5f4ed1a930c3a..4f9096696ce5f 100644 --- a/administrator/components/com_templates/tmpl/styles/default.php +++ b/administrator/components/com_templates/tmpl/styles/default.php @@ -101,14 +101,14 @@ image) : ?> image . '.gif', $item->language_title, array('title' => Text::sprintf('COM_TEMPLATES_GRID_UNSET_LANGUAGE', $item->language_title)), true); ?> - home; ?> + home; ?> image) : ?> image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?> - home; ?> + home; ?> diff --git a/administrator/components/com_templates/tmpl/template/default_updated_files.php b/administrator/components/com_templates/tmpl/template/default_updated_files.php index 6424ef0885fc9..aad36437ae84d 100644 --- a/administrator/components/com_templates/tmpl/template/default_updated_files.php +++ b/administrator/components/com_templates/tmpl/template/default_updated_files.php @@ -64,13 +64,13 @@ modified_date)) : ?> - + modified_date, Text::_('DATE_FORMAT_FILTER_DATETIME')); ?> - action; ?> + action; ?> diff --git a/administrator/components/com_templates/tmpl/templates/default.php b/administrator/components/com_templates/tmpl/templates/default.php index c3c6838bc3b20..97406ad078be2 100644 --- a/administrator/components/com_templates/tmpl/templates/default.php +++ b/administrator/components/com_templates/tmpl/templates/default.php @@ -103,9 +103,9 @@ pluginState) : ?> updated)) : ?> - updated); ?> + updated); ?> - + diff --git a/administrator/components/com_users/tmpl/users/default.php b/administrator/components/com_users/tmpl/users/default.php index 747d3ab630559..e1c4c55b378ea 100644 --- a/administrator/components/com_users/tmpl/users/default.php +++ b/administrator/components/com_users/tmpl/users/default.php @@ -129,7 +129,7 @@
note_count, $item->id); ?> requireReset == '1') : ?> - + diff --git a/administrator/language/en-GB/com_joomlaupdate.ini b/administrator/language/en-GB/com_joomlaupdate.ini index e6b1f8fcdded1..f9318f07f7ffa 100644 --- a/administrator/language/en-GB/com_joomlaupdate.ini +++ b/administrator/language/en-GB/com_joomlaupdate.ini @@ -47,9 +47,9 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_COMPATIBILITY_CHECK="Joomla! %s Compatibility Chec COM_JOOMLAUPDATE_VIEW_DEFAULT_COMPATIBLE_UPDATE_WARNING="Extensions marked with X.X.X have an extension update available for the current version of Joomla which is not marked as compatible with the updated version of Joomla. You should contact the extension developer for more information." COM_JOOMLAUPDATE_VIEW_DEFAULT_DB_NOT_SUPPORTED="Your database type is not supported" COM_JOOMLAUPDATE_VIEW_DEFAULT_DB_NOT_SUPPORTED_DESC="An update to Joomla %1$s was found, but your current database type is not supported by the new version.
For further details take a look at the minimum requirements for Joomla %1$s." -COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_BREAK="Extensions marked with No or Missing Compatibility Tag might break your website. Please consult with the developer before updating." -COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_MISSING_TAG="Extensions marked with Missing Compatibility Tag indicate the developer has not included compatibility information." -COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_UPDATE_REQUIRED="Extensions marked with Yes (X.X.X) might require an update." +COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_BREAK="Extensions marked with No or Missing Compatibility Tag might break your website. Please consult with the developer before updating." +COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_MISSING_TAG="Extensions marked with Missing Compatibility Tag indicate the developer has not included compatibility information." +COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_UPDATE_REQUIRED="Extensions marked with Yes (X.X.X) might require an update." COM_JOOMLAUPDATE_VIEW_DEFAULT_DIRECTIVE="Directive" COM_JOOMLAUPDATE_VIEW_DEFAULT_DOWNLOAD_IN_PROGRESS="Downloading update file. Please wait ..." COM_JOOMLAUPDATE_VIEW_DEFAULT_EXPLANATION_AND_LINK_TO_DOCS="The pre-update check provides you with information about the readiness of your server, settings and installed extensions for the update.
You can find more information about this page and how to prepare for updating Joomla in the pre-update check documentation." diff --git a/administrator/language/en-GB/com_privacy.ini b/administrator/language/en-GB/com_privacy.ini index 66bb78452f5fc..98382cbd56354 100644 --- a/administrator/language/en-GB/com_privacy.ini +++ b/administrator/language/en-GB/com_privacy.ini @@ -34,12 +34,12 @@ COM_PRIVACY_CORE_CAPABILITY_COMMUNICATION_WITH_JOOMLA_ORG="When a network connec ; The placeholder for this key is the configured log path for the site. COM_PRIVACY_CORE_CAPABILITY_LOGGING_IP_ADDRESS="Joomla's logging system records the IP address of the visitor which led to a message being written to its log files. These log files are used to record various activity on a Joomla site, including information related to core updates, invalid login attempts, unhandled errors, and development information such as the use of deprecated APIs. The format of these log files may be customised by any extension which configures a logger, therefore you are encouraged to download and review the log files for your website which may be found at `%s`." COM_PRIVACY_CORE_CAPABILITY_SESSION_IP_ADDRESS_AND_COOKIE="All requests to a Joomla website start a session which stores the IP address in the session data and creates a session cookie in the user's browser. The IP address is used as a security measure to help protect against potential session hijacking attacks and this information is deleted once the session has expired and its data purged. The session cookie's name is based on a randomly generated hash and therefore does not have a constant identifier. The session cookie is destroyed once the session has expired or the user has exited their browser." -COM_PRIVACY_DASHBOARD_BADGE_ACTIVE_REQUESTS_0="0 Active Requests" -COM_PRIVACY_DASHBOARD_BADGE_ACTIVE_REQUESTS_1="1 Active Request" -COM_PRIVACY_DASHBOARD_BADGE_ACTIVE_REQUESTS_MORE="%d Active Requests" -COM_PRIVACY_DASHBOARD_BADGE_TOTAL_REQUESTS_0="0 Total Requests" -COM_PRIVACY_DASHBOARD_BADGE_TOTAL_REQUESTS_1="1 Total Request" -COM_PRIVACY_DASHBOARD_BADGE_TOTAL_REQUESTS_MORE="%d Total Requests" +COM_PRIVACY_DASHBOARD_BADGE_ACTIVE_REQUESTS_0="0 Active Requests" +COM_PRIVACY_DASHBOARD_BADGE_ACTIVE_REQUESTS_1="1 Active Request" +COM_PRIVACY_DASHBOARD_BADGE_ACTIVE_REQUESTS_MORE="%d Active Requests" +COM_PRIVACY_DASHBOARD_BADGE_TOTAL_REQUESTS_0="0 Total Requests" +COM_PRIVACY_DASHBOARD_BADGE_TOTAL_REQUESTS_1="1 Total Request" +COM_PRIVACY_DASHBOARD_BADGE_TOTAL_REQUESTS_MORE="%d Total Requests" COM_PRIVACY_DASHBOARD_HEADING_CHECK="Check" COM_PRIVACY_DASHBOARD_HEADING_REQUEST_COUNT="# of Requests" COM_PRIVACY_DASHBOARD_HEADING_REQUEST_STATUS="Status" diff --git a/administrator/modules/mod_menu/tmpl/default_submenu.php b/administrator/modules/mod_menu/tmpl/default_submenu.php index 708e8bc31702a..6da1885f3a7f4 100644 --- a/administrator/modules/mod_menu/tmpl/default_submenu.php +++ b/administrator/modules/mod_menu/tmpl/default_submenu.php @@ -114,7 +114,7 @@ } elseif (substr($iconImage, 0, 6) == 'image:') { - $iconImage = ' ' . substr($iconImage, 6) . ''; + $iconImage = ' ' . substr($iconImage, 6) . ''; } else { diff --git a/administrator/modules/mod_messages/tmpl/default.php b/administrator/modules/mod_messages/tmpl/default.php index 981d77a502b5f..2c7294ce96e92 100644 --- a/administrator/modules/mod_messages/tmpl/default.php +++ b/administrator/modules/mod_messages/tmpl/default.php @@ -27,7 +27,7 @@ 0) : ?> - + diff --git a/administrator/modules/mod_post_installation_messages/tmpl/default.php b/administrator/modules/mod_post_installation_messages/tmpl/default.php index 44a4a415052f0..2771f2b660fe1 100644 --- a/administrator/modules/mod_post_installation_messages/tmpl/default.php +++ b/administrator/modules/mod_post_installation_messages/tmpl/default.php @@ -21,7 +21,7 @@
0) : ?> - +
diff --git a/administrator/modules/mod_privacy_dashboard/tmpl/default.php b/administrator/modules/mod_privacy_dashboard/tmpl/default.php index 467151a6eca16..773e055c41cd3 100644 --- a/administrator/modules/mod_privacy_dashboard/tmpl/default.php +++ b/administrator/modules/mod_privacy_dashboard/tmpl/default.php @@ -43,7 +43,7 @@ status); ?> - count; ?> + count; ?> diff --git a/administrator/modules/mod_privacy_status/tmpl/default.php b/administrator/modules/mod_privacy_status/tmpl/default.php index 905b8b969bc95..35bc270b8ccc3 100644 --- a/administrator/modules/mod_privacy_status/tmpl/default.php +++ b/administrator/modules/mod_privacy_status/tmpl/default.php @@ -24,17 +24,17 @@ - + - + - + @@ -53,17 +53,17 @@ - + - + - + @@ -79,12 +79,12 @@ - + - + @@ -101,12 +101,12 @@ - + - + @@ -124,12 +124,12 @@ - + - + diff --git a/administrator/modules/mod_submenu/src/Menu/Menu.php b/administrator/modules/mod_submenu/src/Menu/Menu.php index bc15988867a69..c9fdecc3363d4 100644 --- a/administrator/modules/mod_submenu/src/Menu/Menu.php +++ b/administrator/modules/mod_submenu/src/Menu/Menu.php @@ -182,7 +182,7 @@ public static function preprocess($parent) } elseif (substr($iconImage, 0, 6) === 'image:') { - $iconImage = ' ' . substr($iconImage, 6) . ''; + $iconImage = ' ' . substr($iconImage, 6) . ''; } $item->iconImage = $iconImage; diff --git a/administrator/templates/atum/error_full.php b/administrator/templates/atum/error_full.php index 65510793016f1..2525cd1fe00e1 100644 --- a/administrator/templates/atum/error_full.php +++ b/administrator/templates/atum/error_full.php @@ -157,7 +157,7 @@

- error->getCode(); ?> + error->getCode(); ?> error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
debug) : ?> diff --git a/administrator/templates/atum/error_login.php b/administrator/templates/atum/error_login.php index a673c1490dcde..ed484db3f3643 100644 --- a/administrator/templates/atum/error_login.php +++ b/administrator/templates/atum/error_login.php @@ -137,7 +137,7 @@

- error->getCode(); ?> + error->getCode(); ?> error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
debug) : ?> diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index ca2fbfb237f11..c4d259b1ab11c 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -203,6 +203,9 @@ $warning-txt: #000; $danger-bg: #900; $danger-txt: #fff; +$info-bg: $gray-300; +$info-txt: $white; + // Input Group $input-group-addon-color: var(--white); $input-group-addon-bg: $base-color; diff --git a/administrator/templates/atum/scss/blocks/_layout.scss b/administrator/templates/atum/scss/blocks/_layout.scss index 3bc68b099b08a..9bec636db87d8 100644 --- a/administrator/templates/atum/scss/blocks/_layout.scss +++ b/administrator/templates/atum/scss/blocks/_layout.scss @@ -7,6 +7,7 @@ border: 1px solid var(--bluegray); > legend { + float: none; width: auto; padding: 0 .5rem; font-weight: $font-weight-bold; diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_badge.scss b/administrator/templates/atum/scss/vendor/bootstrap/_badge.scss index 0e41888184347..962b35fbca819 100644 --- a/administrator/templates/atum/scss/vendor/bootstrap/_badge.scss +++ b/administrator/templates/atum/scss/vendor/bootstrap/_badge.scss @@ -5,30 +5,29 @@ @include media-breakpoint-down(md) { white-space: normal; } -} - -.badge-warning { - color: $warning-txt; - background-color: $warning-bg; - border: 1px solid lighten($warning-txt, 30%); -} - -.badge-success { - color: $success-txt; - background-color: $success-bg; - border: 1px solid lighten($success-txt, 20%); -} - -.badge-danger { - color: $danger-txt; - background-color: $danger-bg; - border: 1px solid lighten($danger-txt, 30%); -} -.badge-secondary, -.badge-info { - color: var(--atum-text-dark); - background-color: $gray-300; - border: 1px solid lighten($atum-text-dark, 30%); + &.bg-warning { + color: $warning-txt; + background-color: $warning-bg !important; + border: 1px solid lighten($warning-txt, 30%); + } + + &.bg-success { + color: $success-txt; + background-color: $success-bg !important; + border: 1px solid lighten($success-txt, 20%); + } + + &.bg-danger { + color: $danger-txt; + background-color: $danger-bg !important; + border: 1px solid lighten($danger-txt, 30%); + } + + &.bg-secondary, + &.bg-info { + color: var(--atum-text-dark); + background-color: $gray-300 !important; + border: 1px solid lighten($atum-text-dark, 30%); + } } - diff --git a/build/media_source/com_cpanel/js/admin-system-loader.es6.js b/build/media_source/com_cpanel/js/admin-system-loader.es6.js index 75e53eff50044..b66f40f0e2b94 100644 --- a/build/media_source/com_cpanel/js/admin-system-loader.es6.js +++ b/build/media_source/com_cpanel/js/admin-system-loader.es6.js @@ -38,7 +38,7 @@ elem.classList.add('float-end'); elem.classList.add('badge'); - elem.classList.add('badge-warning'); + elem.classList.add('bg-warning text-dark'); elem.innerHTML = response.data; element.parentNode.replaceChild(elem, element); diff --git a/components/com_config/tmpl/modules/default.php b/components/com_config/tmpl/modules/default.php index fe4f600060225..8ced51b1035b1 100644 --- a/components/com_config/tmpl/modules/default.php +++ b/components/com_config/tmpl/modules/default.php @@ -67,10 +67,10 @@
- item['title']; ?> + item['title']; ?>    - item['module']; ?> + item['module']; ?>
diff --git a/components/com_contact/tmpl/categories/default_items.php b/components/com_contact/tmpl/categories/default_items.php index d8f56acecf57e..d18c34fc3e59a 100644 --- a/components/com_contact/tmpl/categories/default_items.php +++ b/components/com_contact/tmpl/categories/default_items.php @@ -23,7 +23,7 @@ escape($item->title); ?> params->get('show_cat_items_cat') == 1) :?> - +   numitems; ?> diff --git a/components/com_contact/tmpl/category/default_children.php b/components/com_contact/tmpl/category/default_children.php index 0a313178bfedf..ed2ed64012e80 100644 --- a/components/com_contact/tmpl/category/default_children.php +++ b/components/com_contact/tmpl/category/default_children.php @@ -26,7 +26,7 @@ params->get('show_cat_items') == 1) : ?> - numitems; ?> + numitems; ?> diff --git a/components/com_contact/tmpl/category/default_items.php b/components/com_contact/tmpl/category/default_items.php index 99dc7d5156ce3..95e29e866d7ac 100644 --- a/components/com_contact/tmpl/category/default_items.php +++ b/components/com_contact/tmpl/category/default_items.php @@ -103,28 +103,28 @@ class="inputbox" onchange="document.adminForm.submit();" published == 0) : ?>
- +
publish_up) > strtotime(Factory::getDate())) : ?>
- +
publish_down) && strtotime($item->publish_down) < strtotime(Factory::getDate())) : ?>
- +
published == -2) : ?>
- +
diff --git a/components/com_contact/tmpl/contact/default.php b/components/com_contact/tmpl/contact/default.php index 48a6f71b9a58a..e3a0e3c266982 100644 --- a/components/com_contact/tmpl/contact/default.php +++ b/components/com_contact/tmpl/contact/default.php @@ -34,7 +34,7 @@

item->published == 0) : ?> - + item->name; ?>

diff --git a/components/com_contact/tmpl/featured/default_items.php b/components/com_contact/tmpl/featured/default_items.php index 57b9afb539857..3a6fd92731237 100644 --- a/components/com_contact/tmpl/featured/default_items.php +++ b/components/com_contact/tmpl/featured/default_items.php @@ -133,7 +133,7 @@ class="inputbox" onchange="document.adminForm.submit();" published == 0) : ?>
- +
diff --git a/components/com_content/tmpl/article/default.php b/components/com_content/tmpl/article/default.php index 99ffbb1c364c6..c09b97246bbae 100644 --- a/components/com_content/tmpl/article/default.php +++ b/components/com_content/tmpl/article/default.php @@ -56,13 +56,13 @@ escape($this->item->title); ?> item->state == ContentComponent::CONDITION_UNPUBLISHED) : ?> - + - + - +
diff --git a/components/com_content/tmpl/categories/default_items.php b/components/com_content/tmpl/categories/default_items.php index 5147fbbd6d610..908c1bdc14a40 100644 --- a/components/com_content/tmpl/categories/default_items.php +++ b/components/com_content/tmpl/categories/default_items.php @@ -24,7 +24,7 @@ escape($item->title); ?> params->get('show_cat_num_articles_cat') == 1) :?> - +   numitems; ?> diff --git a/components/com_content/tmpl/category/blog_children.php b/components/com_content/tmpl/category/blog_children.php index a780a349c99c4..5d4a8907ca208 100644 --- a/components/com_content/tmpl/category/blog_children.php +++ b/components/com_content/tmpl/category/blog_children.php @@ -29,7 +29,7 @@ isRtl()) : ?>

params->get('show_cat_num_articles', 1)) : ?> - + getNumItems(true); ?> @@ -44,7 +44,7 @@

escape($child->title); ?> params->get('show_cat_num_articles', 1)) : ?> - +   getNumItems(true); ?> diff --git a/components/com_content/tmpl/category/default_articles.php b/components/com_content/tmpl/category/default_articles.php index 2404c2ef662b0..50e8d3026ef88 100644 --- a/components/com_content/tmpl/category/default_articles.php +++ b/components/com_content/tmpl/category/default_articles.php @@ -188,7 +188,7 @@ image . '.gif', $association['language']->title_native, array('title' => $association['language']->title_native), true); ?>    - sef; ?> + sef; ?>  sef); ?>  @@ -212,7 +212,7 @@ image . '.gif', $association['language']->title_native, array('title' => $association['language']->title_native), true); ?>    - sef; ?> + sef; ?>  sef); ?>  @@ -221,21 +221,21 @@ state == ContentComponent::CONDITION_UNPUBLISHED) : ?>
- +
publish_up > $currentDate) : ?>
- +
publish_down) && $article->publish_down < $currentDate) : ?>
- +
@@ -273,7 +273,7 @@ params->get('list_show_hits', 1)) : ?> - + params->get('show_headings')) : ?> hits; ?> @@ -284,7 +284,7 @@ params->get('list_show_votes', 0) && $this->vote) : ?> - + params->get('show_headings')) : ?> rating_count; ?> @@ -295,7 +295,7 @@ params->get('list_show_ratings', 0) && $this->vote) : ?> - + params->get('show_headings')) : ?> rating; ?> diff --git a/components/com_content/tmpl/category/default_children.php b/components/com_content/tmpl/category/default_children.php index 15bec8fbdee8d..779a1e0e79c1e 100644 --- a/components/com_content/tmpl/category/default_children.php +++ b/components/com_content/tmpl/category/default_children.php @@ -29,7 +29,7 @@ isRtl()) : ?>

params->get('show_cat_num_articles', 1)) : ?> - + getNumItems(true); ?> @@ -44,7 +44,7 @@

escape($child->title); ?> params->get('show_cat_num_articles', 1)) : ?> - + getNumItems(true); ?> diff --git a/components/com_content/tmpl/featured/default_item.php b/components/com_content/tmpl/featured/default_item.php index c58c5769612b5..fb17a63404023 100644 --- a/components/com_content/tmpl/featured/default_item.php +++ b/components/com_content/tmpl/featured/default_item.php @@ -52,13 +52,13 @@ item->state == ContentComponent::CONDITION_UNPUBLISHED) : ?> - + - + - + diff --git a/components/com_newsfeeds/tmpl/categories/default_items.php b/components/com_newsfeeds/tmpl/categories/default_items.php index 199f866169d31..a762475053450 100644 --- a/components/com_newsfeeds/tmpl/categories/default_items.php +++ b/components/com_newsfeeds/tmpl/categories/default_items.php @@ -24,7 +24,7 @@ escape($item->title); ?> params->get('show_cat_items_cat') == 1) : ?> - +   numitems; ?> diff --git a/components/com_newsfeeds/tmpl/category/default_children.php b/components/com_newsfeeds/tmpl/category/default_children.php index 75a1d46f24f43..7c7e074964c60 100644 --- a/components/com_newsfeeds/tmpl/category/default_children.php +++ b/components/com_newsfeeds/tmpl/category/default_children.php @@ -33,7 +33,7 @@ params->get('show_cat_items') == 1) : ?> - +   numitems; ?> diff --git a/components/com_newsfeeds/tmpl/category/default_items.php b/components/com_newsfeeds/tmpl/category/default_items.php index 316c4cc9c282f..b92f8c2b321ff 100644 --- a/components/com_newsfeeds/tmpl/category/default_items.php +++ b/components/com_newsfeeds/tmpl/category/default_items.php @@ -30,7 +30,7 @@ params->get('filter_field') !== 'hide' && $this->params->get('filter_field') == '1') : ?>
items[$i]->published == 0) : ?> - + diff --git a/components/com_newsfeeds/tmpl/newsfeed/default.php b/components/com_newsfeeds/tmpl/newsfeed/default.php index 8355998149d85..88d32c8d86697 100644 --- a/components/com_newsfeeds/tmpl/newsfeed/default.php +++ b/components/com_newsfeeds/tmpl/newsfeed/default.php @@ -46,7 +46,7 @@

item->published == 0) : ?> - + item->name); ?> diff --git a/components/com_tags/tmpl/tag/list_items.php b/components/com_tags/tmpl/tag/list_items.php index ca23a3918df47..ad4f0876ffbe3 100644 --- a/components/com_tags/tmpl/tag/list_items.php +++ b/components/com_tags/tmpl/tag/list_items.php @@ -92,7 +92,7 @@ class="inputbox" onchange="document.adminForm.submit();" core_state == 0) : ?> - + diff --git a/components/com_tags/tmpl/tags/default_items.php b/components/com_tags/tmpl/tags/default_items.php index 421646bcb7ab9..265102559a671 100644 --- a/components/com_tags/tmpl/tags/default_items.php +++ b/components/com_tags/tmpl/tags/default_items.php @@ -126,7 +126,7 @@ class="inputbox" onchange="document.adminForm.submit();" params->get('all_tags_show_tag_hits')) : ?> - + hits); ?> diff --git a/layouts/joomla/content/blog_style_default_item_title.php b/layouts/joomla/content/blog_style_default_item_title.php index d48cd3e1327a0..b2a5ec482e854 100644 --- a/layouts/joomla/content/blog_style_default_item_title.php +++ b/layouts/joomla/content/blog_style_default_item_title.php @@ -37,15 +37,15 @@ state == 0) : ?> - + publish_up > $currentDate) : ?> - + publish_down !== null && $displayData->publish_down < $currentDate) : ?> - +

diff --git a/layouts/joomla/content/info_block/associations.php b/layouts/joomla/content/info_block/associations.php index b136111e2f25e..1be640cc0944c 100644 --- a/layouts/joomla/content/info_block/associations.php +++ b/layouts/joomla/content/info_block/associations.php @@ -26,7 +26,7 @@ image . '.gif', $association['language']->title_native, array('title' => $association['language']->title_native), true); ?>    - sef; ?> + sef; ?>  sef); ?>  diff --git a/layouts/joomla/content/tags.php b/layouts/joomla/content/tags.php index b3e4626fcdd1b..6c057ef4b6a0c 100644 --- a/layouts/joomla/content/tags.php +++ b/layouts/joomla/content/tags.php @@ -22,7 +22,7 @@ $tag) : ?> access, $authorised)) : ?> params); ?> - get('tag_link_class', 'badge badge-info'); ?> + get('tag_link_class', 'badge bg-info'); ?>
  • escape($tag->title); ?> diff --git a/layouts/joomla/form/field/rules.php b/layouts/joomla/form/field/rules.php index 5ee37ce81bcab..c9bff48b0d21e 100644 --- a/layouts/joomla/form/field/rules.php +++ b/layouts/joomla/form/field/rules.php @@ -175,7 +175,7 @@ class="custom-select novalidate" // Current group is a Super User group, so calculated setting is "Allowed (Super User)". if ($isSuperUserGroup) { - $result['class'] = 'badge badge-success'; + $result['class'] = 'badge bg-success'; $result['text'] = '' . Text::_('JLIB_RULES_ALLOWED_ADMIN'); } else @@ -185,13 +185,13 @@ class="custom-select novalidate" // If recursive calculated setting is "Denied" or null. Calculated permission is "Not Allowed (Inherited)". if ($inheritedGroupRule === null || $inheritedGroupRule === false) { - $result['class'] = 'badge badge-danger'; + $result['class'] = 'badge bg-danger'; $result['text'] = Text::_('JLIB_RULES_NOT_ALLOWED_INHERITED'); } // If recursive calculated setting is "Allowed". Calculated permission is "Allowed (Inherited)". else { - $result['class'] = 'badge badge-success'; + $result['class'] = 'badge bg-success'; $result['text'] = Text::_('JLIB_RULES_ALLOWED_INHERITED'); } @@ -206,13 +206,13 @@ class="custom-select novalidate" // If there is an explicit permission "Not Allowed". Calculated permission is "Not Allowed". if ($assetRule === false) { - $result['class'] = 'badge badge-danger'; + $result['class'] = 'badge bg-danger'; $result['text'] = Text::_('JLIB_RULES_NOT_ALLOWED'); } // If there is an explicit permission is "Allowed". Calculated permission is "Allowed". elseif ($assetRule === true) { - $result['class'] = 'badge badge-success'; + $result['class'] = 'badge bg-success'; $result['text'] = Text::_('JLIB_RULES_ALLOWED'); } @@ -221,7 +221,7 @@ class="custom-select novalidate" // Global configuration with "Not Set" permission. Calculated permission is "Not Allowed (Default)". if (empty($group->parent_id) && $isGlobalConfig === true && $assetRule === null) { - $result['class'] = 'badge badge-danger'; + $result['class'] = 'badge bg-danger'; $result['text'] = Text::_('JLIB_RULES_NOT_ALLOWED_DEFAULT'); } @@ -232,7 +232,7 @@ class="custom-select novalidate" */ elseif ($inheritedGroupParentAssetRule === false || $inheritedParentGroupRule === false) { - $result['class'] = 'badge badge-danger'; + $result['class'] = 'badge bg-danger'; $result['text'] = ''. Text::_('JLIB_RULES_NOT_ALLOWED_LOCKED'); } } diff --git a/layouts/joomla/installer/changelog.php b/layouts/joomla/installer/changelog.php index 635d96ae9e47d..31d6ca1d2dcb8 100644 --- a/layouts/joomla/installer/changelog.php +++ b/layouts/joomla/installer/changelog.php @@ -23,26 +23,26 @@ function ($items, $changeType) { switch ($changeType) { case 'security': - $class = 'badge-danger'; + $class = 'bg-danger'; break; case 'fix': - $class = 'badge-dark'; + $class = 'bg-dark'; break; case 'language': - $class = 'badge-jlanguage'; + $class = 'bg-jlanguage'; break; case 'addition': - $class = 'badge-success'; + $class = 'bg-success'; break; case 'change': - $class = 'badge-warning'; + $class = 'bg-warning text-dark'; break; case 'remove': - $class = 'badge-light'; + $class = 'bg-light text-dark'; break; default: case 'note': - $class = 'badge-info'; + $class = 'bg-info'; break; } diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php index 43b5be6ed5dc0..a3dc9050491f8 100644 --- a/modules/mod_breadcrumbs/tmpl/default.php +++ b/modules/mod_breadcrumbs/tmpl/default.php @@ -14,7 +14,7 @@ ?>