diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini
index 8ce9d51c961f3..8d51820bd8c15 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini
@@ -10,6 +10,6 @@ PLG_QUICKICON_EXTENSIONUPDATE_GROUP_DESC="The group of this plugin (this value i
PLG_QUICKICON_EXTENSIONUPDATE_GROUP_LABEL="Group"
PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND="Updates are available! %s"
PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND_BUTTON="View Updates"
-PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND_MESSAGE="%s Extension Update(s) are available:"
+PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND_MESSAGE="%s Extension Update(s) are available."
PLG_QUICKICON_EXTENSIONUPDATE_UPTODATE="Extensions are up to date."
PLG_QUICKICON_EXTENSIONUPDATE_XML_DESCRIPTION="Checks for updates of your installed third-party extensions and notifies you when you visit the Control Panel page."
diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
index 3892948912ac5..60599f7abce7e 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
@@ -8,8 +8,8 @@ PLG_QUICKICON_JOOMLAUPDATE_CHECKING="Checking Joomla ..."
PLG_QUICKICON_JOOMLAUPDATE_ERROR="Unknown Joomla ..."
PLG_QUICKICON_JOOMLAUPDATE_GROUP_DESC="The group of this plugin (this value is compared with the group value used in Quick Icons modules to inject icons)."
PLG_QUICKICON_JOOMLAUPDATE_GROUP_LABEL="Group"
-PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND="Joomla %s, Update now!"
+PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND="Joomla %s Update now!"
PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND_BUTTON="Update Now"
-PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND_MESSAGE="Joomla %s is available:"
+PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND_MESSAGE="Joomla %s is available."
PLG_QUICKICON_JOOMLAUPDATE_UPTODATE="Joomla is up to date."
PLG_QUICKICON_JOOMLAUPDATE_XML_DESCRIPTION="Checks for Joomla updates and notifies you when you visit the Control Panel page."
diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss
index cdd8ce7a3ad83..99f351a691984 100644
--- a/administrator/templates/atum/scss/_variables.scss
+++ b/administrator/templates/atum/scss/_variables.scss
@@ -182,6 +182,7 @@ $quickicon-box-shadow: $atum-box-shadow;
$quickicon-box-shadow-hover: 0 0 8px 0 rgba($black, .3);
$quickicon-box-shadow-success: 0 0 3px 0 var(--success);
$quickicon-box-shadow-danger: 0 0 3px 0 var(--danger);
+$quickicon-box-shadow-warning: 0 0 3px 0 var(--warning);
// Gutter
$grid-gutter-width: 15px;
diff --git a/administrator/templates/atum/scss/blocks/_quickicons.scss b/administrator/templates/atum/scss/blocks/_quickicons.scss
index d207900698819..059884467ceb1 100644
--- a/administrator/templates/atum/scss/blocks/_quickicons.scss
+++ b/administrator/templates/atum/scss/blocks/_quickicons.scss
@@ -47,6 +47,11 @@
font-size: 2.5rem;
}
+ &.warning {
+ color: var(--warning);
+ box-shadow: $quickicon-box-shadow-warning;
+ }
+
&.danger {
color: var(--danger);
box-shadow: $quickicon-box-shadow-danger;
diff --git a/administrator/templates/atum/scss/template-rtl.scss b/administrator/templates/atum/scss/template-rtl.scss
index 60c1678891b0b..6fee4b017736b 100644
--- a/administrator/templates/atum/scss/template-rtl.scss
+++ b/administrator/templates/atum/scss/template-rtl.scss
@@ -249,7 +249,11 @@ body {
float: right;
}
-
.field-media-input {
margin-right: 220px;
}
+
+// Quickicon specific
+.message-alert {
+ text-align: left !important;
+}
diff --git a/administrator/templates/atum/scss/template.scss b/administrator/templates/atum/scss/template.scss
index 544f3ee9e5403..c48fe3c0185be 100644
--- a/administrator/templates/atum/scss/template.scss
+++ b/administrator/templates/atum/scss/template.scss
@@ -109,3 +109,8 @@
display: inline-block;
list-style: none;
}
+
+// Quickicon specific
+.message-alert {
+ text-align: right !important;
+}
\ No newline at end of file
diff --git a/build/media_src/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js b/build/media_src/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
index 7c6158300b04e..18c04ed9a0145 100644
--- a/build/media_src/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
+++ b/build/media_src/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
@@ -31,7 +31,7 @@
} else {
const messages = {
warning: [
- `${Joomla.JText._('PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND_MESSAGE').replace('%s', `${updateInfoList.length}`)}`,
+ `
` + `${Joomla.JText._('PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND_MESSAGE').replace('%s', `
${updateInfoList.length}`)}
`,
],
};
@@ -41,7 +41,7 @@
// Scroll to page top
window.scrollTo(0, 0);
- link.classList.add('danger');
+ link.classList.add('warning');
for (let i = 0, len = linkSpan.length; i < len; i += 1) {
linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND').replace('%s', `
${updateInfoList.length}`);
}
diff --git a/build/media_src/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js b/build/media_src/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
index b408c7a4f5b87..c6795c63040cd 100644
--- a/build/media_src/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
+++ b/build/media_src/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
@@ -22,20 +22,21 @@
const updateInfoList = JSON.parse(response);
if (updateInfoList instanceof Array) {
- if (updateInfoList.length === 0) {
+ const updateInfo = updateInfoList.shift();
+
+ if (updateInfo.version === options.version) {
// No updates
link.classList.add('success');
linkSpans.forEach((span) => {
span.innerHTML = Joomla.JText._('PLG_QUICKICON_JOOMLAUPDATE_UPTODATE');
});
} else {
- const updateInfo = updateInfoList.shift();
if (updateInfo.version !== options.version) {
const messages = {
warning: [
- `${Joomla.JText._('PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND_MESSAGE').replace('%s', `
${updateInfoList.length}`)}`
- + `