Skip to content

[4.0] Implementing display of fieldset descriptions for fieldset children #30450

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 4 commits into from
Aug 27, 2020
Merged

[4.0] Implementing display of fieldset descriptions for fieldset children #30450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
151b0ac
[4.0] Implementing display of fieldset descriptions for fieldset
infograf768 Aug 22, 2020
353c779
scss cs
infograf768 Aug 23, 2020
83c9d5b
use @Quy suggestion
infograf768 Aug 23, 2020
562ff4a
file cs
infograf768 Aug 24, 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
5 changes: 4 additions & 1 deletion administrator/templates/atum/scss/blocks/_alerts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
}
}

.alert-parent {
margin-top: 0;
}

fieldset .alert {
&.alert-info {
margin: -1rem 0 1rem;
Expand All @@ -52,4 +56,3 @@ fieldset .alert {
transform: translateY(0);
}
}

20 changes: 19 additions & 1 deletion layouts/joomla/edit/params.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,16 @@
{
echo '<fieldset id="fieldset-' . $name . '" class="options-form ' . (!empty($fieldSet->class) ? $fieldSet->class : '') . '">';
echo '<legend>' . $label . '</legend>';

// Include the description when available
if (!empty($fieldSet->description))
{
echo '<div class="alert alert-info">';
echo '<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only">' . Text::_('INFO') . '</span> ';
echo Text::_($fieldSet->description);
echo '</div>';
}

echo '<div class="column-count-md-2 column-count-lg-3">';
}
// Tabs
Expand Down Expand Up @@ -147,7 +157,7 @@
echo '<legend>' . $label . '</legend>';

// Include the description when available
if (isset($fieldSet->description) && trim($fieldSet->description))
if (!empty($fieldSet->description))
{
echo '<div class="alert alert-info">';
echo '<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only">' . Text::_('INFO') . '</span> ';
Expand All @@ -159,6 +169,14 @@

$opentab = 2;
}
// Include the description when available
elseif (!empty($fieldSet->description))
{
echo '<div class="alert alert-info alert-parent">';
echo '<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only">' . Text::_('INFO') . '</span> ';
echo Text::_($fieldSet->description);
echo '</div>';
}
}

// We're on the deepest level => output fields
Expand Down