Skip to content

[4.0] Fix Alert multiple error display #30401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rdeutz merged 2 commits into from
Aug 21, 2020
Merged

[4.0] Fix Alert multiple error display #30401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfd24f3
[4.0] Fix Alert double error display in Installation
infograf768 Aug 17, 2020
131d19a
seperating multiple messages with border top
infograf768 Aug 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
background: var(--alert-accent-color, transparent);
}

.alert-wrapper {
width: 100%;
}

.alert-link {
color: var(--success, inherit);
}
Expand Down Expand Up @@ -90,5 +94,9 @@
padding: .3rem .3rem .3rem 2rem;
}
}

.alert-message:not(:first-of-type) {
border-top: 1px solid var(--alert-accent-color);
}
}
}
7 changes: 4 additions & 3 deletions build/media_source/system/js/core.es6/message.es6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,12 @@
}

// Add messages to the message box
messageWrapper = document.createElement('div');
messageWrapper.className = 'alert-wrapper';
typeMessages.forEach((typeMessage) => {
messageWrapper = document.createElement('div');
messageWrapper.innerHTML = `<div class="alert-message">${typeMessage}</div>`;
messagesBox.appendChild(messageWrapper);
messageWrapper.innerHTML += `<div class="alert-message">${typeMessage}</div>`;
});
messagesBox.appendChild(messageWrapper);

messageContainer.appendChild(messagesBox);
});
Expand Down
2 changes: 1 addition & 1 deletion layouts/joomla/system/message.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<joomla-alert type="<?php echo $alert[$type] ?? $type; ?>" dismiss="true">
<?php if (!empty($msgs)) : ?>
<div class="alert-heading"><?php echo Text::_($type); ?></div>
<div>
<div class="alert-wrapper">
<?php foreach ($msgs as $msg) : ?>
<div class="alert-message"><?php echo $msg; ?></div>
<?php endforeach; ?>
Expand Down
8 changes: 8 additions & 0 deletions templates/cassiopeia/scss/vendor/joomla-custom-elements/joomla-alert.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
background: var(--alert-accent-color, transparent);
}

.alert-wrapper {
width: 100%;
}

.alert-link {
color: var(--success, inherit);
}
Expand Down Expand Up @@ -90,5 +94,9 @@
padding: .3rem .3rem .3rem 2rem;
}
}

.alert-message:not(:first-of-type) {
border-top: 1px solid var(--alert-accent-color);
}
}
}