Skip to content

[4.0] wrap message container output in an array and implode it so it prevents obsolete spaces #30760

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
richard67 merged 12 commits into from
Oct 21, 2020
Merged

[4.0] wrap message container output in an array and implode it so it prevents obsolete spaces #30760

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5968de3
move joomla-alert from message to it's own JLayout
hans2103 Sep 25, 2020
1ce10bb
Update message.php
hans2103 Sep 25, 2020
98e488d
remove extra jlayout file
hans2103 Sep 25, 2020
e440e42
add the else statement when msgList is empty. that's easy
hans2103 Sep 25, 2020
0d92d34
rewrite current PHP code so all html will be put directly after each …
hans2103 Oct 17, 2020
24bda34
Update layouts/joomla/system/message.php
hans2103 Oct 17, 2020
d8ba890
Update layouts/joomla/system/message.php
hans2103 Oct 17, 2020
a0562d6
move wrapper
hans2103 Oct 21, 2020
88f1568
put if-else in a wrapper
hans2103 Oct 21, 2020
e7c460d
changed array into string to prevent implode
hans2103 Oct 21, 2020
3450d60
:recycle: clean code
hans2103 Oct 21, 2020
c498183
Merge branch '4.0-dev' into feature/trim-system-message
hans2103 Oct 21, 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
42 changes: 20 additions & 22 deletions layouts/joomla/system/message.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;

$msgList = $displayData['msgList'];
$msgList = $displayData['msgList'];
$msgOutput = '';

$alert = [
CMSApplication::MSG_EMERGENCY => 'danger',
Expand Down Expand Up @@ -43,25 +44,22 @@
->useStyle('webcomponent.joomla-alert')
->useScript('webcomponent.joomla-alert');

if (is_array($msgList) && !empty($msgList)) :
foreach ($msgList as $type => $msgs) :
$msgOutput .= '<joomla-alert type="' . ($alert[$type] ?? $type) . '" dismiss="true">';
if (!empty($msgs)) :
$msgOutput .= '<div class="alert-heading">';
$msgOutput .= '<span class="' . $type . '"></span>';
$msgOutput .= '<span class="sr-only">' . Text::_($type) . '</span>';
$msgOutput .= '</div>';
$msgOutput .= '<div class="alert-wrapper">';
foreach ($msgs as $msg) :
$msgOutput .= '<div class="alert-message">' . $msg . '</div>';
endforeach;
$msgOutput .= '</div>';
endif;
$msgOutput .= '</joomla-alert>';
endforeach;
endif;
?>
<div id="system-message-container" aria-live="polite">
<div id="system-message">
<?php if (is_array($msgList) && !empty($msgList)) : ?>
<?php foreach ($msgList as $type => $msgs) : ?>
<joomla-alert type="<?php echo $alert[$type] ?? $type; ?>" dismiss="true">
<?php if (!empty($msgs)) : ?>
<div class="alert-heading">
<span class="<?php echo $type; ?>"></span>
<span class="sr-only"><?php echo Text::_($type); ?></span>
</div>
<div class="alert-wrapper">
<?php foreach ($msgs as $msg) : ?>
<div class="alert-message"><?php echo $msg; ?></div>
<?php endforeach; ?>
</div>
<?php endif; ?>
</joomla-alert>
<?php endforeach; ?>
<?php endif; ?>
</div>
</div>
<div id="system-message-container" aria-live="polite"><div id="system-message"><?php echo $msgOutput; ?></div></div>