joomla · wilsonge · Jun 14, 2018 · Jan 20, 2018 · Jan 20, 2018 · Jan 20, 2018
diff --git a/administrator/components/com_banners/tmpl/clients/default.php b/administrator/components/com_banners/tmpl/clients/default.php
@@ -130,7 +130,7 @@
 											<?php echo $item->count_published; ?></a>
 									</td>
 									<td class="center btns d-none d-lg-table-cell">
-										<a class="badge <?php if ($item->count_unpublished > 0) echo 'badge-important'; ?>" href="<?php echo JRoute::_('index.php?option=com_banners&view=banners&filter[client_id]=' . (int) $item->id . '&filter[published]=0'); ?>">
+										<a class="badge <?php if ($item->count_unpublished > 0) echo 'badge-danger'; ?>" href="<?php echo JRoute::_('index.php?option=com_banners&view=banners&filter[client_id]=' . (int) $item->id . '&filter[published]=0'); ?>">
 											<?php echo $item->count_unpublished; ?></a>
 									</td>
 									<td class="center btns d-none d-lg-table-cell">

diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php
@@ -29,7 +29,7 @@
 						<?php echo $option->label; ?>
 					</td>
 					<td>
-							<span class="label label-<?php echo $option->state ? 'success' : 'important'; ?>">
+							<span class="badge badge-<?php echo $option->state ? 'success' : 'danger'; ?>">
 								<?php echo JText::_($option->state ? 'JYES' : 'JNO'); ?>
 								<?php if ($option->notice) : ?>
 									<span class="icon-info icon-white hasTooltip" title="<?php echo $option->notice; ?>"></span>
@@ -74,7 +74,7 @@
 						<?php echo JText::_($setting->recommended ? 'JON' : 'JOFF'); ?>
 					</td>
 					<td>
-							<span class="label label-<?php echo ($setting->state === $setting->recommended) ? 'success' : 'warning'; ?>">
+							<span class="badge badge-<?php echo ($setting->state === $setting->recommended) ? 'success' : 'warning'; ?>">
 								<?php echo JText::_($setting->state ? 'JON' : 'JOFF'); ?>
 							</span>
 					</td>

diff --git a/administrator/components/com_menus/tmpl/items/default.php b/administrator/components/com_menus/tmpl/items/default.php
@@ -222,15 +222,15 @@
 													<?php if ($item->language_image) : ?>
 														<?php echo JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => JText::sprintf('COM_MENUS_GRID_UNSET_LANGUAGE', $item->language_title)), true); ?>
 													<?php else : ?>
-														<span class="label"
+														<span class="badge badge-secondary"
 														      title="<?php echo JText::sprintf('COM_MENUS_GRID_UNSET_LANGUAGE', $item->language_title); ?>"><?php echo $item->language_sef; ?></span>
 													<?php endif; ?>
 												</a>
 											<?php else : ?>
 												<?php if ($item->language_image) : ?>
 													<?php echo JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?>
 												<?php else : ?>
-													<span class="label"
+													<span class="badge badge-secondary"
 													      title="<?php echo $item->language_title; ?>"><?php echo $item->language_sef; ?></span>
 												<?php endif; ?>
 											<?php endif; ?>

diff --git a/administrator/components/com_menus/tmpl/items/modal.php b/administrator/components/com_menus/tmpl/items/modal.php
@@ -134,7 +134,7 @@
 									<?php if ($item->language_image) : ?>
 										<?php echo JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?>
 									<?php else : ?>
-										<span class="label" title="<?php echo $item->language_title; ?>"><?php echo $item->language_sef; ?></span>
+										<span class="badge badge-secondary" title="<?php echo $item->language_title; ?>"><?php echo $item->language_sef; ?></span>
 									<?php endif; ?>
 								<?php endif; ?>
 							<?php endif; ?>

diff --git a/administrator/components/com_modules/tmpl/module/edit_assignment.php b/administrator/components/com_modules/tmpl/module/edit_assignment.php
@@ -89,14 +89,14 @@
 												<?php if ($link->language_image) : ?>
 													<?php echo JHtml::_('image', 'mod_languages/' . $link->language_image . '.gif', $link->language_title, array('title' => $link->language_title), true); ?>
 												<?php else : ?>
-													<?php echo '<span class="label" title="' . $link->language_title . '">' . $link->language_sef . '</span>'; ?>
+													<?php echo '<span class="badge badge-secondary" title="' . $link->language_title . '">' . $link->language_sef . '</span>'; ?>
 												<?php endif; ?>
 											<?php endif; ?>
 											<?php if ($link->published == 0) : ?>
-												<?php echo ' <span class="label">' . JText::_('JUNPUBLISHED') . '</span>'; ?>
+												<?php echo ' <span class="badge badge-secondary">' . JText::_('JUNPUBLISHED') . '</span>'; ?>
 											<?php endif; ?>
 											<?php if ($uselessMenuItem) : ?>
-												<?php echo ' <span class="label">' . JText::_('COM_MODULES_MENU_ITEM_' . strtoupper($link->type)) . '</span>'; ?>
+												<?php echo ' <span class="badge badge-secondary">' . JText::_('COM_MODULES_MENU_ITEM_' . strtoupper($link->type)) . '</span>'; ?>
 											<?php endif; ?>
 										</label>
 									</div>

diff --git a/administrator/components/com_modules/tmpl/modules/modal.php b/administrator/components/com_modules/tmpl/modules/modal.php
@@ -91,7 +91,7 @@
 						<?php if ($item->position) : ?>
 						<a class="js-position-insert btn btn-sm btn-block btn-warning" href="#" data-position="<?php echo $this->escape($item->position); ?>" data-editor="<?php echo $this->escape($editor); ?>"><?php echo $this->escape($item->position); ?></a>
 						<?php else : ?>
-						<span class="label"><?php echo JText::_('JNONE'); ?></span>
+						<span class="badge badge-secondary"><?php echo JText::_('JNONE'); ?></span>
 						<?php endif; ?>
 					</td>
 					<td class="small d-none d-md-table-cell">

diff --git a/administrator/components/com_templates/tmpl/styles/default.php b/administrator/components/com_templates/tmpl/styles/default.php
@@ -98,14 +98,14 @@
 											<?php if ($item->image) : ?>
 												<?php echo JHtml::_('image', 'mod_languages/' . $item->image . '.gif', $item->language_title, array('title' => JText::sprintf('COM_TEMPLATES_GRID_UNSET_LANGUAGE', $item->language_title)), true); ?>
 											<?php else : ?>
-												<span class="label" title="<?php echo JText::sprintf('COM_TEMPLATES_GRID_UNSET_LANGUAGE', $item->language_title); ?>"><?php echo $item->language_sef; ?></span>
+												<span class="badge badge-secondary" title="<?php echo JText::sprintf('COM_TEMPLATES_GRID_UNSET_LANGUAGE', $item->language_title); ?>"><?php echo $item->language_sef; ?></span>
 											<?php endif; ?>
 										</a>
 									<?php else : ?>
 										<?php if ($item->image) : ?>
 											<?php echo JHtml::_('image', 'mod_languages/' . $item->image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?>
 										<?php else : ?>
-											<span class="label" title="<?php echo $item->language_title; ?>"><?php echo $item->language_sef; ?></span>
+											<span class="badge badge-secondary" title="<?php echo $item->language_title; ?>"><?php echo $item->language_sef; ?></span>
 										<?php endif; ?>
 									<?php endif; ?>
 								</td>

diff --git a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
@@ -29,9 +29,9 @@ COM_JOOMLAUPDATE_VIEW_COMPLETE_HEADING="Joomla Version Update Status"
 COM_JOOMLAUPDATE_VIEW_COMPLETE_MESSAGE="Your site has been updated. Your Joomla version is now %s."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_ACTUAL="Actual"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_COMPATIBILITY_CHECK="Joomla! %s Compatibility Check"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_BREAK="*Extensions marked with <span class='label label-important'>No</span> or <span class='label'>Missing Compatibility Tag</span> might break your website. Please consult with the developer before upgrading."
-COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_MISSING_TAG="*Extensions marked with <span class='label'>Missing Compatibility Tag</span> indicate the developer did not add a compatibility tag in the respective extension's XML."
-COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_UPDATE_REQUIRED="*Extensions marked with <span class='label label-warning'>Yes (X.X.X)</span> might require an update."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_BREAK="*Extensions marked with <span class='badge badge-danger'>No</span> or <span class='badge badge-secondary'>Missing Compatibility Tag</span> might break your website. Please consult with the developer before upgrading."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_MISSING_TAG="*Extensions marked with <span class='badge badge-secondary'>Missing Compatibility Tag</span> indicate the developer did not add a compatibility tag in the respective extension's XML."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_UPDATE_REQUIRED="*Extensions marked with <span class='badge badge-warning'>Yes (X.X.X)</span> 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_EXTENSION_COMPATIBLE="Compatible"

diff --git a/components/com_contact/tmpl/category/default_items.php b/components/com_contact/tmpl/category/default_items.php
@@ -25,7 +25,7 @@
 	<fieldset class="filters btn-toolbar">
 		<?php if ($this->params->get('filter_field')) : ?>
 			<div class="btn-group">
-				<label class="filter-search-lbl sr-only" for="filter-search"><span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span><?php echo JText::_('COM_CONTACT_FILTER_LABEL') . '&#160;'; ?></label>
+				<label class="filter-search-lbl sr-only" for="filter-search"><span class="badge badge-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span><?php echo JText::_('COM_CONTACT_FILTER_LABEL') . '&#160;'; ?></label>
 				<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo JText::_('COM_CONTACT_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo JText::_('COM_CONTACT_FILTER_SEARCH_DESC'); ?>">
 			</div>
 		<?php endif; ?>
@@ -67,7 +67,7 @@
 						<a href="<?php echo JRoute::_(ContactHelperRoute::getContactRoute($item->slug, $item->catid)); ?>">
 							<?php echo $item->name; ?></a>
 						<?php if ($this->items[$i]->published == 0) : ?>
-							<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+							<span class="badge badge-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
 						<?php endif; ?>
 						<?php echo $item->event->afterDisplayTitle; ?>
 

diff --git a/components/com_contact/tmpl/contact/default.php b/components/com_contact/tmpl/contact/default.php
@@ -26,7 +26,7 @@
 		<div class="page-header">
 			<h2>
 				<?php if ($this->item->published == 0) : ?>
-					<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+					<span class="badge badge-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
 				<?php endif; ?>
 				<span class="contact-name" itemprop="name"><?php echo $this->contact->name; ?></span>
 			</h2>

diff --git a/components/com_contact/tmpl/featured/default_items.php b/components/com_contact/tmpl/featured/default_items.php
@@ -109,7 +109,7 @@
 
 					<td class="item-title">
 						<?php if ($this->items[$i]->published == 0) : ?>
-							<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+							<span class="badge badge-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
 						<?php endif; ?>
 						<a href="<?php echo JRoute::_(ContactHelperRoute::getContactRoute($item->slug, $item->catid)); ?>" itemprop="url">
 							<span itemprop="name"><?php echo $item->name; ?></span>

diff --git a/components/com_content/tmpl/article/default.php b/components/com_content/tmpl/article/default.php
@@ -51,13 +51,13 @@
 			</h2>
 		<?php endif; ?>
 		<?php if ($this->item->state == 0) : ?>
-			<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+			<span class="badge badge-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
 		<?php endif; ?>
 		<?php if (strtotime($this->item->publish_up) > strtotime(JFactory::getDate())) : ?>
-			<span class="label label-warning"><?php echo JText::_('JNOTPUBLISHEDYET'); ?></span>
+			<span class="badge badge-warning"><?php echo JText::_('JNOTPUBLISHEDYET'); ?></span>
 		<?php endif; ?>
 		<?php if ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate()) : ?>
-			<span class="label label-warning"><?php echo JText::_('JEXPIRED'); ?></span>
+			<span class="badge badge-warning"><?php echo JText::_('JEXPIRED'); ?></span>
 		<?php endif; ?>
 	</div>
 	<?php endif; ?>

diff --git a/components/com_content/tmpl/category/default_articles.php b/components/com_content/tmpl/category/default_articles.php
@@ -184,24 +184,24 @@
 								<?php $flag = JHtml::_('image', 'mod_languages/' . $association['language']->image . '.gif', $association['language']->title_native, array('title' => $association['language']->title_native), true); ?>
 								&nbsp;<a href="<?php echo JRoute::_($association['item']); ?>"><?php echo $flag; ?></a>&nbsp;
 							<?php else : ?>
-								<?php $class = 'label label-association label-' . $association['language']->sef; ?>
+								<?php $class = 'badge badge-association badge-' . $association['language']->sef; ?>
 								&nbsp;<a class="' . <?php echo $class; ?> . '" href="<?php echo JRoute::_($association['item']); ?>"><?php echo strtoupper($association['language']->sef); ?></a>&nbsp;
 							<?php endif; ?>
 						<?php endforeach; ?>
 					<?php endif; ?>
 				<?php endif; ?>
 				<?php if ($article->state == 0) : ?>
-					<span class="list-published label label-warning">
+					<span class="list-published badge badge-warning">
 						<?php echo JText::_('JUNPUBLISHED'); ?>
 					</span>
 				<?php endif; ?>
 				<?php if (strtotime($article->publish_up) > strtotime(JFactory::getDate())) : ?>
-					<span class="list-published label label-warning">
+					<span class="list-published badge badge-warning">
 						<?php echo JText::_('JNOTPUBLISHEDYET'); ?>
 					</span>
 				<?php endif; ?>
 				<?php if ((strtotime($article->publish_down) < strtotime(JFactory::getDate())) && $article->publish_down != JFactory::getDbo()->getNullDate()) : ?>
-					<span class="list-published label label-warning">
+					<span class="list-published badge badge-warning">
 						<?php echo JText::_('JEXPIRED'); ?>
 					</span>
 				<?php endif; ?>

diff --git a/components/com_content/tmpl/featured/default_item.php b/components/com_content/tmpl/featured/default_item.php
@@ -42,13 +42,13 @@
 	<?php endif; ?>
 
 	<?php if ($this->item->state == 0) : ?>
-		<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+		<span class="badge badge-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
 	<?php endif; ?>
 	<?php if (strtotime($this->item->publish_up) > strtotime(JFactory::getDate())) : ?>
-		<span class="label label-warning"><?php echo JText::_('JNOTPUBLISHEDYET'); ?></span>
+		<span class="badge badge-warning"><?php echo JText::_('JNOTPUBLISHEDYET'); ?></span>
 	<?php endif; ?>
 	<?php if ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate()) : ?>
-		<span class="label label-warning"><?php echo JText::_('JEXPIRED'); ?></span>
+		<span class="badge badge-warning"><?php echo JText::_('JEXPIRED'); ?></span>
 	<?php endif; ?>
 
 	<?php if ($canEdit || $params->get('show_print_icon') || $params->get('show_email_icon')) : ?>

diff --git a/components/com_newsfeeds/tmpl/category/default_items.php b/components/com_newsfeeds/tmpl/category/default_items.php
@@ -23,7 +23,7 @@
                 <?php if ($this->params->get('filter_field') !== 'hide' && $this->params->get('filter_field') == '1') : ?>
                     <div class="btn-group">
                         <label class="filter-search-lbl sr-only" for="filter-search">
-                            <span class="label label-warning">
+                            <span class="badge badge-warning">
                                 <?php echo JText::_('JUNPUBLISHED'); ?>
                             </span>
                             <?php echo JText::_('COM_NEWSFEEDS_FILTER_LABEL') . '&#160;'; ?>
@@ -61,7 +61,7 @@
 					</div>
 				</span>
 				<?php if ($this->items[$i]->published == 0) : ?>
-					<span class="label label-warning">
+					<span class="badge badge-warning">
 						<?php echo JText::_('JUNPUBLISHED'); ?>
 					</span>
 				<?php endif; ?>

diff --git a/components/com_newsfeeds/tmpl/newsfeed/default.php b/components/com_newsfeeds/tmpl/newsfeed/default.php
@@ -40,7 +40,7 @@
         <?php endif; ?>
         <h2 class="<?php echo $direction; ?>">
             <?php if ($this->item->published == 0) : ?>
-                <span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+                <span class="badge badge-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
             <?php endif; ?>
             <a href="<?php echo $this->item->link; ?>" target="_blank">
                 <?php echo str_replace('&apos;', "'", $this->item->name); ?>

diff --git a/layouts/joomla/content/tags.php b/layouts/joomla/content/tags.php
@@ -23,7 +23,7 @@
 		<?php foreach ($displayData as $i => $tag) : ?>
 			<?php if (in_array($tag->access, $authorised)) : ?>
 				<?php $tagParams = new Registry($tag->params); ?>
-				<?php $link_class = $tagParams->get('tag_link_class', 'label label-info'); ?>
+				<?php $link_class = $tagParams->get('tag_link_class', 'badge badge-info'); ?>
 				<li class="list-inline-item tag-<?php echo $tag->tag_id; ?> tag-list<?php echo $i; ?>" itemprop="keywords">
 					<a href="<?php echo Route::_(TagsHelperRoute::getTagRoute($tag->tag_id . ':' . $tag->alias)); ?>" class="<?php echo $link_class; ?>">
 						<?php echo $this->escape($tag->title); ?>

diff --git a/media/com_joomlaupdate/js/default.js b/media/com_joomlaupdate/js/default.js
@@ -152,24 +152,24 @@ Joomla = window.Joomla || {};
             case PreUpdateChecker.STATE.COMPATIBLE:
                 if (extensionData.compatibleVersion == extensionData.currentVersion) {
                     // The compatible version matches the current version -> diplay success label.
-                    html = '<span class="label label-success">' + Joomla.JText._('JYES') + '</span>';
+                    html = '<span class="badge badge-success">' + Joomla.JText._('JYES') + '</span>';
                 } else {
                     // The compatible version does not match the current version => display warning label.
-                    html = '<span class="label label-warning">' + Joomla.JText._('JYES')
+                    html = '<span class="badge badge-warning">' + Joomla.JText._('JYES')
                         + ' (' + extensionData.compatibleVersion + ')</span>';
                 }
                 break;
             case PreUpdateChecker.STATE.INCOMPATIBLE:
                 // No compatible version found -> display error label
-                html = '<span class="label label-important">' + Joomla.JText._('JNO') + '</span>';
+                html = '<span class="badge badge-danger">' + Joomla.JText._('JNO') + '</span>';
                 break;
             case PreUpdateChecker.STATE.MISSING_COMPATIBILITY_TAG:
                 // Could not check compatibility state -> display warning
-                html = '<span class="label">' + Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_VERSION_MISSING') + '</span>';
+                html = '<span class="badge badge-secondary">' + Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_VERSION_MISSING') + '</span>';
                 break;
             default:
                 // An error occured -> show unknown error note
-                html = '<span class="label">' + Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN') + '</span>';
+                html = '<span class="badge badge-secondary">' + Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN') + '</span>';
         }
         // Insert the generated html
         extensionData.$element.html(html);