Skip to content

[4.0] Finish transition from CSS classes "label-" to "alert-" for the pre-update check #34227

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
merged 5 commits into from
May 29, 2021
Merged

[4.0] Finish transition from CSS classes "label-" to "alert-" for the pre-update check #34227

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c75a2ce
BS2 labels to BS5 alerts
richard67 May 25, 2021
bee554c
Move alert classes from label to h3
richard67 May 26, 2021
5c8e194
Fix bad accents from previous commit
richard67 May 26, 2021
d0151bd
Move alert class for extensions check from legend to h3, too
richard67 May 26, 2021
d29bcf8
space
May 28, 2021
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
18 changes: 9 additions & 9 deletions administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
'group' => 0,
),
'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PRE_UPDATE_CHECKS_FAILED' => array(
'class' => 'label-important',
'class' => 'alert-danger',
'notes' => 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PRE_UPDATE_CHECKS_FAILED_NOTES',
'group' => 4,
),
Expand Down Expand Up @@ -65,15 +65,15 @@
foreach ($this->phpOptions as $option) :
if (!$option->state)
{
$labelClass = 'important';
$labelClass = 'danger';
break;
}
endforeach;
?>
<legend class="label label-<?php echo $labelClass;?>">
<h3>
<legend>
<h3 class="alert alert-<?php echo $labelClass; ?>">
<?php
echo $labelClass === 'important' ? Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_REQUIRED_SETTINGS_WARNING') : Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_REQUIRED_SETTINGS_PASSED');
echo $labelClass === 'danger' ? Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_REQUIRED_SETTINGS_WARNING') : Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_REQUIRED_SETTINGS_PASSED');
?>
<div class="settingstoggle ms-1" data-state="closed"><?php echo Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION', '<span class="icon-chevron-right"></span>'); ?></div>
</h3>
Expand Down Expand Up @@ -128,8 +128,8 @@
endforeach;
?>

<legend class="label label-<?php echo $labelClass;?>">
<h3>
<legend>
<h3 class="alert alert-<?php echo $labelClass; ?>">
<?php
echo $labelClass === 'warning' ? Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED_SETTINGS_WARNING') : Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED_SETTINGS_PASSED');
?>
Expand Down Expand Up @@ -187,8 +187,8 @@
<?php $compatibilityDisplayNotes = $compatibilityData['notes']; ?>
<?php $compatibilityTypeGroup = $compatibilityData['group']; ?>
<fieldset id="compatibilitytype<?php echo $compatibilityTypeGroup;?>" class="col-md-12 compatibilitytypes">
<legend class="alert <?php echo $compatibilityDisplayClass;?>">
<h3>
<legend>
<h3 class="alert <?php echo $compatibilityDisplayClass; ?>">
<?php if ($compatibilityType !== "COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS") : ?>
<div class="compatibilitytoggle" data-state="closed"><?php echo Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION', '<span class="icon-chevron-right"></span>'); ?></div>
<?php endif; ?>
Expand Down