From 9f2fc00eb564f25e06b5034e9bb50bf8fd7145c7 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sun, 24 Jan 2021 17:19:13 +0000
Subject: [PATCH] [4.0] badge --> bg BS5 (#32138)

---
 .../com_installer/tmpl/database/default.php   |  2 +-
 .../joomlaupdate/default_preupdatecheck.php   |  4 ++--
 .../modules/mod_popular/tmpl/default.php      |  2 +-
 .../com_modules/js/admin-module-edit.es6.js   | 22 +++++++++----------
 .../js/extensionupdatecheck.es6.js            |  2 +-
 .../js/jupdatecheck.es6.js                    |  2 +-
 .../js/overridecheck.es6.js                   |  2 +-
 installation/template/error.php               |  2 +-
 plugins/editors/tinymce/forms/setoptions.xml  |  2 +-
 templates/cassiopeia/error.php                |  2 +-
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/administrator/components/com_installer/tmpl/database/default.php b/administrator/components/com_installer/tmpl/database/default.php
index 832c0854aaa8d..a51533197c2b6 100644
--- a/administrator/components/com_installer/tmpl/database/default.php
+++ b/administrator/components/com_installer/tmpl/database/default.php
@@ -92,7 +92,7 @@
 												<?php echo $extension->type_translated; ?>
 											</td>
 											<td class="d-none d-md-table-cell">
-												<span class="badge badge-<?php echo count($item['results']['error']) ? 'danger' : ($item['errorsCount'] ? 'warning' : 'success'); ?>" tabindex="0">
+												<span class="badge bg-<?php echo count($item['results']['error']) ? 'danger' : ($item['errorsCount'] ? 'warning' : 'success'); ?>" tabindex="0">
 													<?php echo Text::plural('COM_INSTALLER_MSG_DATABASE_ERRORS', $item['errorsCount']); ?>
 												</span>
 												<div role="tooltip" id="tip<?php echo $i; ?>">
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php
index d07328af9af89..62fb84a9492cc 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php
@@ -73,7 +73,7 @@
 								<?php echo $option->label; ?>
 							</th>
 							<td>
-								<span class="badge badge-<?php echo $option->state ? 'success' : 'danger'; ?>">
+								<span class="badge bg-<?php echo $option->state ? 'success' : 'danger'; ?>">
 									<?php echo Text::_($option->state ? 'JYES' : 'JNO'); ?>
 									<?php if ($option->notice) : ?>
 										<span class="icon-info-circle icon-white" title="<?php echo $option->notice; ?>"></span>
@@ -119,7 +119,7 @@
 								<?php echo Text::_($setting->recommended ? 'JON' : 'JOFF'); ?>
 							</td>
 							<td>
-								<span class="badge badge-<?php echo ($setting->state === $setting->recommended) ? 'success' : 'warning'; ?>">
+								<span class="badge bg-<?php echo ($setting->state === $setting->recommended) ? 'success' : 'warning'; ?>">
 									<?php echo Text::_($setting->state ? 'JON' : 'JOFF'); ?>
 								</span>
 							</td>
diff --git a/administrator/modules/mod_popular/tmpl/default.php b/administrator/modules/mod_popular/tmpl/default.php
index d17f8c353a4c3..6992abc8befe8 100644
--- a/administrator/modules/mod_popular/tmpl/default.php
+++ b/administrator/modules/mod_popular/tmpl/default.php
@@ -44,7 +44,7 @@
 					<?php endif; ?>
 				</th>
 				<td>
-					<span class="badge badge-<?php echo $hits_class; ?>"><?php echo $item->hits; ?></span>
+					<span class="badge bg-<?php echo $hits_class; ?>"><?php echo $item->hits; ?></span>
 				</td>
 				<td>
 					<?php echo HTMLHelper::_('date', $item->publish_up, Text::_('DATE_FORMAT_LC4')); ?>
diff --git a/build/media_source/com_modules/js/admin-module-edit.es6.js b/build/media_source/com_modules/js/admin-module-edit.es6.js
index ca62d7a77a1de..93feea32a4b1e 100644
--- a/build/media_source/com_modules/js/admin-module-edit.es6.js
+++ b/build/media_source/com_modules/js/admin-module-edit.es6.js
@@ -39,53 +39,53 @@ Joomla = window.Joomla || {};
             }
           });
           if (updMenus === '-') {
-            tmpMenu.innerHTML = `<span class="badge badge-danger">${Joomla.JText._('JNO')}</span>`;
+            tmpMenu.innerHTML = `<span class="badge bg-danger">${Joomla.JText._('JNO')}</span>`;
             if (!tmpRow.classList.contains('no') || tmpRow.classList.length === 0) { tmpRow.classList.add('no'); }
           }
           if (parseInt(updMenus, 10) === 0) {
-            tmpMenu.innerHTML = `<span class="badge badge-info">${Joomla.JText._('JALL')}</span>`;
+            tmpMenu.innerHTML = `<span class="badge bg-info">${Joomla.JText._('JALL')}</span>`;
             if (tmpRow.classList.contains('no')) { tmpRow.classList.remove('no'); }
           }
           if (parseInt(updMenus, 10) > 0) {
             if (window.parent.inMenus.indexOf(window.parent.menuId) >= 0) {
               if (window.parent.numMenus === window.parent.inMenus.length) {
-                tmpMenu.innerHTML = `<span class="badge badge-info">${Joomla.JText._('JALL')}</span>`;
+                tmpMenu.innerHTML = `<span class="badge bg-info">${Joomla.JText._('JALL')}</span>`;
                 if (tmpRow.classList.contains('no') || tmpRow.classList.length === 0) { tmpRow.classList.remove('no'); }
               } else {
-                tmpMenu.innerHTML = `<span class="badge badge-success">${Joomla.JText._('JYES')}</span>`;
+                tmpMenu.innerHTML = `<span class="badge bg-success">${Joomla.JText._('JYES')}</span>`;
                 if (tmpRow.classList.contains('no')) { tmpRow.classList.remove('no'); }
               }
             }
             if (window.parent.inMenus.indexOf(window.parent.menuId) < 0) {
-              tmpMenu.innerHTML = `<span class="badge badge-danger">${Joomla.JText._('JNO')}</span>`;
+              tmpMenu.innerHTML = `<span class="badge bg-danger">${Joomla.JText._('JNO')}</span>`;
               if (!tmpRow.classList.contains('no')) { tmpRow.classList.add('no'); }
             }
           }
           if (parseInt(updMenus, 10) < 0) {
             if (window.parent.inMenus.indexOf(window.parent.menuId) >= 0) {
               if (window.parent.numMenus === window.parent.inMenus.length) {
-                tmpMenu.innerHTML = `<span class="badge badge-info">${Joomla.JText._('JALL')}</span>`;
+                tmpMenu.innerHTML = `<span class="badge bg-info">${Joomla.JText._('JALL')}</span>`;
                 if (tmpRow.classList.contains('no')) { tmpRow.classList.remove('no'); }
               } else {
-                tmpMenu.innerHTML = `<span class="badge badge-success">${Joomla.JText._('JYES')}</span>`;
+                tmpMenu.innerHTML = `<span class="badge bg-success">${Joomla.JText._('JYES')}</span>`;
                 if (tmpRow.classList.contains('no')) { tmpRow.classList.remove('no'); }
               }
             }
             if (window.parent.inMenus.indexOf(window.parent.menuId) < 0) {
-              tmpMenu.innerHTML = `<span class="badge badge-danger">${Joomla.JText._('JNO')}</span>`;
+              tmpMenu.innerHTML = `<span class="badge bg-danger">${Joomla.JText._('JNO')}</span>`;
               if (!tmpRow.classList.contains('no') || tmpRow.classList.length === 0) { tmpRow.classList.add('no'); }
             }
           }
           if (parseInt(updStatus, 10) === 1) {
-            tmpStatus.innerHTML = `<span class="badge badge-success">${Joomla.JText._('JYES')}</span>`;
+            tmpStatus.innerHTML = `<span class="badge bg-success">${Joomla.JText._('JYES')}</span>`;
             if (tmpRow.classList.contains('unpublished')) { tmpRow.classList.remove('unpublished'); }
           }
           if (parseInt(updStatus, 10) === 0) {
-            tmpStatus.innerHTML = `<span class="badge badge-danger">${Joomla.JText._('JNO')}</span>`;
+            tmpStatus.innerHTML = `<span class="badge bg-danger">${Joomla.JText._('JNO')}</span>`;
             if (!tmpRow.classList.contains('unpublished') || tmpRow.classList.length === 0) { tmpRow.classList.add('unpublished'); }
           }
           if (parseInt(updStatus, 10) === -2) {
-            tmpStatus.innerHTML = `<span class="badge badge-default">${Joomla.JText._('JTRASHED')}</span>`;
+            tmpStatus.innerHTML = `<span class="badge bg-secondary">${Joomla.JText._('JTRASHED')}</span>`;
             if (!tmpRow.classList.contains('unpublished') || tmpRow.classList.length === 0) { tmpRow.classList.add('unpublished'); }
           }
           if (document.formvalidator.isValid(document.getElementById('module-form'))) {
diff --git a/build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js b/build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
index d7d70de646870..e6c0094a4dc03 100644
--- a/build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
+++ b/build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
@@ -39,7 +39,7 @@
               // No updates
               update('success', Joomla.Text._('PLG_QUICKICON_EXTENSIONUPDATE_UPTODATE'));
             } else {
-              update('danger', Joomla.Text._('PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND').replace('%s', `<span class="badge badge-light">${updateInfoList.length}</span>`));
+              update('danger', Joomla.Text._('PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND').replace('%s', `<span class="badge bg-light">${updateInfoList.length}</span>`));
             }
           } else {
             // An error occurred
diff --git a/build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js b/build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
index fca29d9ef753c..5f9ba219e6338 100644
--- a/build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
+++ b/build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
@@ -42,7 +42,7 @@
               const updateInfo = updateInfoList.shift();
 
               if (updateInfo.version !== options.version) {
-                update('danger', Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND').replace('%s', `<span class="badge badge-light"> \u200E ${updateInfo.version}</span>`));
+                update('danger', Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND').replace('%s', `<span class="badge bg-light"> \u200E ${updateInfo.version}</span>`));
               } else {
                 update('success', Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_UPTODATE'));
               }
diff --git a/build/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js b/build/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js
index e69815ed9aee2..922aefa56f5f3 100644
--- a/build/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js
+++ b/build/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js
@@ -46,7 +46,7 @@
                 // Scroll to page top
                 window.scrollTo(0, 0);
 
-                update('danger', Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND').replace('%s', `<span class="badge badge-light">${updateInfoList.length}</span>`), '');
+                update('danger', Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND').replace('%s', `<span class="badge bg-light">${updateInfoList.length}</span>`), '');
               }
             } else {
               // An error occurred
diff --git a/installation/template/error.php b/installation/template/error.php
index 34e7586a8e69b..bab59abdc1f19 100644
--- a/installation/template/error.php
+++ b/installation/template/error.php
@@ -72,7 +72,7 @@
 								</div>
 								<div class="alert-text">
 									<h2><?php echo Text::_('JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST'); ?></h2>
-									<p class="form-text text-muted small"><span class="badge badge-default"><?php echo $this->error->getCode(); ?></span> <?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></p>
+									<p class="form-text text-muted small"><span class="badge bg-secondary"><?php echo $this->error->getCode(); ?></span> <?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></p>
 								</div>
 							</div>
 							<?php if ($this->debug) : ?>
diff --git a/plugins/editors/tinymce/forms/setoptions.xml b/plugins/editors/tinymce/forms/setoptions.xml
index 5cf9722ee088c..387538e63455f 100644
--- a/plugins/editors/tinymce/forms/setoptions.xml
+++ b/plugins/editors/tinymce/forms/setoptions.xml
@@ -6,7 +6,7 @@
 		label="PLG_TINY_FIELD_SETACCESS_LABEL"
 		multiple="true"
 		class="access-select"
-		labelclass="badge badge-success"
+		labelclass="badge bg-success"
 		layout="joomla.form.field.list-fancy-select"
 	/>
 
diff --git a/templates/cassiopeia/error.php b/templates/cassiopeia/error.php
index 1b7829295e5c3..aff04b9145f54 100644
--- a/templates/cassiopeia/error.php
+++ b/templates/cassiopeia/error.php
@@ -152,7 +152,7 @@
 				<hr>
 				<p><?php echo Text::_('JERROR_LAYOUT_PLEASE_CONTACT_THE_SYSTEM_ADMINISTRATOR'); ?></p>
 				<blockquote>
-					<span class="badge badge-secondary"><?php echo $this->error->getCode(); ?></span> <?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
+					<span class="badge bg-secondary"><?php echo $this->error->getCode(); ?></span> <?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
 				</blockquote>
 				<?php if ($this->debug) : ?>
 					<div>