diff --git a/administrator/components/com_banners/tmpl/clients/default.php b/administrator/components/com_banners/tmpl/clients/default.php index e865235293385..8977edf378378 100644 --- a/administrator/components/com_banners/tmpl/clients/default.php +++ b/administrator/components/com_banners/tmpl/clients/default.php @@ -130,7 +130,7 @@ count_published; ?> - + count_unpublished; ?> diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php index d9ccdc4cf6505..79f5333238a09 100644 --- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php +++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php @@ -29,7 +29,7 @@ label; ?> - + state ? 'JYES' : 'JNO'); ?> notice) : ?> @@ -74,7 +74,7 @@ recommended ? 'JON' : 'JOFF'); ?> - + state ? 'JON' : 'JOFF'); ?> diff --git a/administrator/components/com_menus/tmpl/items/default.php b/administrator/components/com_menus/tmpl/items/default.php index 1e0be52daa85b..3e8e4ba9e733a 100644 --- a/administrator/components/com_menus/tmpl/items/default.php +++ b/administrator/components/com_menus/tmpl/items/default.php @@ -222,7 +222,7 @@ language_image) : ?> language_image . '.gif', $item->language_title, array('title' => JText::sprintf('COM_MENUS_GRID_UNSET_LANGUAGE', $item->language_title)), true); ?> - language_sef; ?> @@ -230,7 +230,7 @@ language_image) : ?> language_image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?> - language_sef; ?> diff --git a/administrator/components/com_menus/tmpl/items/modal.php b/administrator/components/com_menus/tmpl/items/modal.php index 8bd18893ab63e..f6d09932f51c6 100644 --- a/administrator/components/com_menus/tmpl/items/modal.php +++ b/administrator/components/com_menus/tmpl/items/modal.php @@ -134,7 +134,7 @@ language_image) : ?> language_image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?> - language_sef; ?> + language_sef; ?> diff --git a/administrator/components/com_modules/tmpl/module/edit_assignment.php b/administrator/components/com_modules/tmpl/module/edit_assignment.php index a96bef6096272..39f3077603eb4 100644 --- a/administrator/components/com_modules/tmpl/module/edit_assignment.php +++ b/administrator/components/com_modules/tmpl/module/edit_assignment.php @@ -89,14 +89,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) : ?> - ' . JText::_('JUNPUBLISHED') . ''; ?> + ' . JText::_('JUNPUBLISHED') . ''; ?> - ' . JText::_('COM_MODULES_MENU_ITEM_' . strtoupper($link->type)) . ''; ?> + ' . JText::_('COM_MODULES_MENU_ITEM_' . strtoupper($link->type)) . ''; ?> diff --git a/administrator/components/com_modules/tmpl/modules/modal.php b/administrator/components/com_modules/tmpl/modules/modal.php index e5af39e065387..540039470971c 100644 --- a/administrator/components/com_modules/tmpl/modules/modal.php +++ b/administrator/components/com_modules/tmpl/modules/modal.php @@ -91,7 +91,7 @@ position) : ?> escape($item->position); ?> - + diff --git a/administrator/components/com_templates/tmpl/styles/default.php b/administrator/components/com_templates/tmpl/styles/default.php index 1a0c007105c83..94b238c591f34 100644 --- a/administrator/components/com_templates/tmpl/styles/default.php +++ b/administrator/components/com_templates/tmpl/styles/default.php @@ -98,14 +98,14 @@ image) : ?> image . '.gif', $item->language_title, array('title' => JText::sprintf('COM_TEMPLATES_GRID_UNSET_LANGUAGE', $item->language_title)), true); ?> - language_sef; ?> + language_sef; ?> image) : ?> image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?> - language_sef; ?> + language_sef; ?> diff --git a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini index c2220201f26db..491609ee13353 100644 --- 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 No or Missing Compatibility Tag might break your website. Please consult with the developer before upgrading." -COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_MISSING_TAG="*Extensions marked with Missing Compatibility Tag 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 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 upgrading." +COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_MISSING_TAG="*Extensions marked with Missing Compatibility Tag 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 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_EXTENSION_COMPATIBLE="Compatible" diff --git a/components/com_contact/tmpl/category/default_items.php b/components/com_contact/tmpl/category/default_items.php index 568c6bf9de827..65c2ff8e9ba81 100644 --- a/components/com_contact/tmpl/category/default_items.php +++ b/components/com_contact/tmpl/category/default_items.php @@ -25,7 +25,7 @@
params->get('filter_field')) : ?>
- +
@@ -67,7 +67,7 @@ name; ?> items[$i]->published == 0) : ?> - + event->afterDisplayTitle; ?> diff --git a/components/com_contact/tmpl/contact/default.php b/components/com_contact/tmpl/contact/default.php index 6ae7f0e2aef4e..3ae90932a2c26 100644 --- a/components/com_contact/tmpl/contact/default.php +++ b/components/com_contact/tmpl/contact/default.php @@ -26,7 +26,7 @@

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

diff --git a/components/com_contact/tmpl/featured/default_items.php b/components/com_contact/tmpl/featured/default_items.php index 118cdade2ebe7..2366fab897ea3 100644 --- a/components/com_contact/tmpl/featured/default_items.php +++ b/components/com_contact/tmpl/featured/default_items.php @@ -109,7 +109,7 @@ items[$i]->published == 0) : ?> - +
  - sef; ?> + sef; ?>  sef); ?>  state == 0) : ?> - + publish_up) > strtotime(JFactory::getDate())) : ?> - + publish_down) < strtotime(JFactory::getDate())) && $article->publish_down != JFactory::getDbo()->getNullDate()) : ?> - + diff --git a/components/com_content/tmpl/featured/default_item.php b/components/com_content/tmpl/featured/default_item.php index 0b02ca0189ad5..60e68b11621b8 100644 --- a/components/com_content/tmpl/featured/default_item.php +++ b/components/com_content/tmpl/featured/default_item.php @@ -42,13 +42,13 @@ item->state == 0) : ?> - + item->publish_up) > strtotime(JFactory::getDate())) : ?> - + item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate()) : ?> - + 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 index f58fef7835d6c..4c39a39d3604b 100644 --- a/components/com_newsfeeds/tmpl/category/default_items.php +++ b/components/com_newsfeeds/tmpl/category/default_items.php @@ -23,7 +23,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 f6f77ddb6c7bf..c0dcc077b636f 100644 --- a/components/com_newsfeeds/tmpl/newsfeed/default.php +++ b/components/com_newsfeeds/tmpl/newsfeed/default.php @@ -40,7 +40,7 @@

item->published == 0) : ?> - + item->name); ?> diff --git a/layouts/joomla/content/tags.php b/layouts/joomla/content/tags.php index 3864b8280e719..5679a954c6c43 100644 --- a/layouts/joomla/content/tags.php +++ b/layouts/joomla/content/tags.php @@ -23,7 +23,7 @@ $tag) : ?> access, $authorised)) : ?> params); ?> - get('tag_link_class', 'label label-info'); ?> + get('tag_link_class', 'badge badge-info'); ?>
  • escape($tag->title); ?> diff --git a/media/com_joomlaupdate/js/default.js b/media/com_joomlaupdate/js/default.js index 42afecb19a846..a2c77c8c18243 100644 --- 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 = '' + Joomla.JText._('JYES') + ''; + html = '' + Joomla.JText._('JYES') + ''; } else { // The compatible version does not match the current version => display warning label. - html = '' + Joomla.JText._('JYES') + html = '' + Joomla.JText._('JYES') + ' (' + extensionData.compatibleVersion + ')'; } break; case PreUpdateChecker.STATE.INCOMPATIBLE: // No compatible version found -> display error label - html = '' + Joomla.JText._('JNO') + ''; + html = '' + Joomla.JText._('JNO') + ''; break; case PreUpdateChecker.STATE.MISSING_COMPATIBILITY_TAG: // Could not check compatibility state -> display warning - html = '' + Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_VERSION_MISSING') + ''; + html = '' + Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_VERSION_MISSING') + ''; break; default: // An error occured -> show unknown error note - html = '' + Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN') + ''; + html = '' + Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN') + ''; } // Insert the generated html extensionData.$element.html(html); diff --git a/media/com_joomlaupdate/js/default.min.js b/media/com_joomlaupdate/js/default.min.js index 3dd50b1fbce0c..399f6341b87de 100644 --- a/media/com_joomlaupdate/js/default.min.js +++ b/media/com_joomlaupdate/js/default.min.js @@ -1 +1 @@ -Joomla=window.Joomla||{},function(){"use strict";Joomla.extractionMethodHandler=function(e,t){var n="direct"===e.value?"none":"table-row";document.getElementById(t+"_hostname").style.display=n,document.getElementById(t+"_port").style.display=n,document.getElementById(t+"_username").style.display=n,document.getElementById(t+"_password").style.display=n,document.getElementById(t+"_directory").style.display=n},Joomla.submitbuttonUpload=function(){var e=document.getElementById("uploadForm");""==e.install_package.value?alert(Joomla.JText._("COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE"),!0):e.submit()},document.addEventListener("DOMContentLoaded",function(){var e=document.getElementById("extraction_method"),t=document.getElementById("upload_method"),n=document.getElementById("uploadButton"),o=document.getElementById("downloadMessage");e&&e.addEventListener("change",function(t){Joomla.extractionMethodHandler(e,"row_ftp")}),t&&t.addEventListener("change",function(e){Joomla.extractionMethodHandler(t,"upload_ftp")}),n&&n.addEventListener("click",function(e){o&&(o.style.display="block")})})}(),function(e,t,n){var o={config:{serverUrl:"index.php?option=com_joomlaupdate&task=update.fetchextensioncompatibility",selector:".extension-check"},STATE:{INCOMPATIBLE:0,COMPATIBLE:1,MISSING_COMPATIBILITY_TAG:2,SERVER_ERROR:3},run:function(){o.joomlaTargetVersion=t.getElementById("joomlaupdate-wrapper").getAttribute("data-joomla-target-version"),e(o.config.selector).each(function(){o.checkCompatibility(e(this),o.setResultView)})},checkCompatibility:function(t,n){var a={$element:t,state:o.STATE.SERVER_ERROR,compatibleVersion:0};e.getJSON(o.config.serverUrl,{"joomla-target-version":o.joomlaTargetVersion,"extension-id":t.data("extensionId")}).done(function(e){a.state=e.data.state,a.compatibleVersion=e.data.compatibleVersion,a.currentVersion=t.data("extensionCurrentVersion")}).always(function(e){n(a)})},setResultView:function(e){var t="";switch(e.state){case o.STATE.COMPATIBLE:t=e.compatibleVersion==e.currentVersion?''+Joomla.JText._("JYES")+"":''+Joomla.JText._("JYES")+" ("+e.compatibleVersion+")";break;case o.STATE.INCOMPATIBLE:t=''+Joomla.JText._("JNO")+"";break;case o.STATE.MISSING_COMPATIBILITY_TAG:t=''+Joomla.JText._("COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_VERSION_MISSING")+"";break;default:t=''+Joomla.JText._("COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN")+""}e.$element.html(t)}};e(o.run)}(jQuery,document,window); \ No newline at end of file +Joomla=window.Joomla||{},function(){"use strict";Joomla.extractionMethodHandler=function(e,t){var n="direct"===e.value?"none":"table-row";document.getElementById(t+"_hostname").style.display=n,document.getElementById(t+"_port").style.display=n,document.getElementById(t+"_username").style.display=n,document.getElementById(t+"_password").style.display=n,document.getElementById(t+"_directory").style.display=n},Joomla.submitbuttonUpload=function(){var e=document.getElementById("uploadForm");""==e.install_package.value?alert(Joomla.JText._("COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE"),!0):e.submit()},document.addEventListener("DOMContentLoaded",function(){var e=document.getElementById("extraction_method"),t=document.getElementById("upload_method"),n=document.getElementById("uploadButton"),o=document.getElementById("downloadMessage");e&&e.addEventListener("change",function(t){Joomla.extractionMethodHandler(e,"row_ftp")}),t&&t.addEventListener("change",function(e){Joomla.extractionMethodHandler(t,"upload_ftp")}),n&&n.addEventListener("click",function(e){o&&(o.style.display="block")})})}(),function(e,t,n){var o={config:{serverUrl:"index.php?option=com_joomlaupdate&task=update.fetchextensioncompatibility",selector:".extension-check"},STATE:{INCOMPATIBLE:0,COMPATIBLE:1,MISSING_COMPATIBILITY_TAG:2,SERVER_ERROR:3},run:function(){o.joomlaTargetVersion=t.getElementById("joomlaupdate-wrapper").getAttribute("data-joomla-target-version"),e(o.config.selector).each(function(){o.checkCompatibility(e(this),o.setResultView)})},checkCompatibility:function(t,n){var a={$element:t,state:o.STATE.SERVER_ERROR,compatibleVersion:0};e.getJSON(o.config.serverUrl,{"joomla-target-version":o.joomlaTargetVersion,"extension-id":t.data("extensionId")}).done(function(e){a.state=e.data.state,a.compatibleVersion=e.data.compatibleVersion,a.currentVersion=t.data("extensionCurrentVersion")}).always(function(e){n(a)})},setResultView:function(e){var t="";switch(e.state){case o.STATE.COMPATIBLE:t=e.compatibleVersion==e.currentVersion?''+Joomla.JText._("JYES")+"":''+Joomla.JText._("JYES")+" ("+e.compatibleVersion+")";break;case o.STATE.INCOMPATIBLE:t=''+Joomla.JText._("JNO")+"";break;case o.STATE.MISSING_COMPATIBILITY_TAG:t=''+Joomla.JText._("COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_VERSION_MISSING")+"";break;default:t=''+Joomla.JText._("COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN")+""}e.$element.html(t)}};e(o.run)}(jQuery,document,window); \ No newline at end of file diff --git a/modules/mod_languages/tmpl/default.php b/modules/mod_languages/tmpl/default.php index e4fe79d747645..d31f929a23c34 100644 --- a/modules/mod_languages/tmpl/default.php +++ b/modules/mod_languages/tmpl/default.php @@ -72,7 +72,7 @@ image) : ?> image . '.gif', $language->title_native, array('title' => $language->title_native), true); ?> - sef); ?> + sef); ?> get('full_name', 1) ? $language->title_native : strtoupper($language->sef); ?> diff --git a/plugins/editors/tinymce/form/setoptions.xml b/plugins/editors/tinymce/form/setoptions.xml index be914d6ad0fdb..f0203b92a58da 100644 --- a/plugins/editors/tinymce/form/setoptions.xml +++ b/plugins/editors/tinymce/form/setoptions.xml @@ -6,7 +6,7 @@ label="PLG_TINY_FIELD_SETACCESS_LABEL" multiple="true" class="access-select" - labelclass="label label-success" + labelclass="badge badge-success" /> ($totalTime * 0.25)) { - $labelClass = 'badge-important'; + $labelClass = 'badge-danger'; } elseif ($totalQueryTime < ($totalTime * 0.15)) { @@ -1734,14 +1734,14 @@ public function logger(LogEntry $entry) protected function displayLogs() { $priorities = array( - Log::EMERGENCY => 'EMERGENCY', - Log::ALERT => 'ALERT', - Log::CRITICAL => 'CRITICAL', - Log::ERROR => 'ERROR', + Log::EMERGENCY => 'EMERGENCY', + Log::ALERT => 'ALERT', + Log::CRITICAL => 'CRITICAL', + Log::ERROR => 'ERROR', Log::WARNING => 'WARNING', Log::NOTICE => 'NOTICE', Log::INFO => 'INFO', - Log::DEBUG => 'DEBUG', + Log::DEBUG => 'DEBUG', ); $out = '';