Skip to content

Commit

Permalink
Bootstrap 5 (#32037)
Browse files Browse the repository at this point in the history
  • Loading branch information
wilsonge authored Jan 22, 2021
1 parent f83598f commit 5785177
Show file tree
Hide file tree
Showing 489 changed files with 2,091 additions and 2,098 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ protected function getInput()
);

return '<div class="alert alert-info">'
. '<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only">'
. '<span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden">'
. Text::_('INFO')
. '</span>'
. Text::sprintf('PLG_SYSTEM_ACTIONLOGS_JOOMLA_ACTIONLOG_DISABLED_REDIRECT', $link)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
<?php if (empty($this->items)) : ?>
<div class="alert alert-info">
<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php else : ?>
<table class="table" id="logsList">
<caption class="sr-only">
<caption class="visually-hidden">
<?php echo Text::_('COM_ACTIONLOGS_TABLE_CAPTION'); ?>,
<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ public function writable($writable)
{
if ($writable)
{
return '<span class="badge badge-success">' . Text::_('COM_ADMIN_WRITABLE') . '</span>';
return '<span class="badge bg-success">' . Text::_('COM_ADMIN_WRITABLE') . '</span>';
}

return '<span class="badge badge-danger">' . Text::_('COM_ADMIN_UNWRITABLE') . '</span>';
return '<span class="badge bg-danger">' . Text::_('COM_ADMIN_UNWRITABLE') . '</span>';
}

/**
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/tmpl/help/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<form action="<?php echo Route::_('index.php?option=com_admin&amp;view=help'); ?>" method="post" name="adminForm" id="adminForm">
<div class="row mt-sm-3">
<div id="sidebar" class="col-md-3">
<button class="btn btn-sm btn-secondary my-2 options-menu d-md-none" type="button" data-toggle="collapse" data-target=".sidebar-nav" aria-controls="help-index" aria-expanded="false">
<button class="btn btn-sm btn-secondary my-2 options-menu d-md-none" type="button" data-bs-toggle="collapse" data-bs-target=".sidebar-nav" aria-controls="help-index" aria-expanded="false">
<span class="icon-align-justify" aria-hidden="true"></span>
<?php echo Text::_('JTOGGLE_SIDEBAR_MENU'); ?>
</button>
Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_admin/tmpl/profile/edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class="form-validate"
</label>
</div>
<div class="controls">
<?php echo HTMLHelper::_('select.genericlist', UsersHelper::getTwoFactorMethods(), 'jform[twofactor][method]', ['onchange' => 'Joomla.twoFactorMethodChange();', 'class' => 'custom-select'], 'value', 'text', $this->otpConfig->method, 'jform_twofactor_method', false); ?>
<?php echo HTMLHelper::_('select.genericlist', UsersHelper::getTwoFactorMethods(), 'jform[twofactor][method]', ['onchange' => 'Joomla.twoFactorMethodChange();', 'class' => 'form-select'], 'value', 'text', $this->otpConfig->method, 'jform_twofactor_method', false); ?>
</div>
</div>
<div id="com_users_twofactor_forms_container">
Expand All @@ -64,12 +64,12 @@ class="form-validate"
<?php echo Text::_('COM_ADMIN_PROFILE_OTEPS'); ?>
</legend>
<div class="alert alert-info">
<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('COM_ADMIN_PROFILE_OTEPS_DESC'); ?>
</div>
<?php if (empty($this->otpConfig->otep)) : ?>
<div class="alert alert-warning">
<span class="icon-exclamation-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
<span class="icon-exclamation-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('WARNING'); ?></span>
<?php echo Text::_('COM_ADMIN_PROFILE_OTEPS_WAIT_DESC'); ?>
</div>
<?php else : ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
?>
<div class="sysinfo">
<table class="table">
<caption class="sr-only">
<caption class="visually-hidden">
<?php echo Text::_('COM_ADMIN_CONFIGURATION_FILE'); ?>
</caption>
<thead>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
?>
<div class="sysinfo">
<table class="table">
<caption class="sr-only">
<caption class="visually-hidden">
<?php echo Text::_('COM_ADMIN_DIRECTORY_PERMISSIONS'); ?>
</caption>
<thead>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
?>
<div class="sysinfo">
<table class="table">
<caption class="sr-only">
<caption class="visually-hidden">
<?php echo Text::_('COM_ADMIN_PHP_SETTINGS'); ?>
</caption>
<thead>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
?>
<div class="sysinfo">
<table class="table">
<caption class="sr-only">
<caption class="visually-hidden">
<?php echo Text::_('COM_ADMIN_SYSTEM_INFORMATION'); ?>
</caption>
<thead>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<?php $itemTypeField = $data['view']->filterForm->getField('itemtype'); ?>
<div class="js-stools-container-selector">
<div class="js-stools-field-selector js-stools-itemtype">
<div class="sr-only"><?php echo $itemTypeField->label; ?></div>
<div class="visually-hidden"><?php echo $itemTypeField->label; ?></div>
<?php echo $itemTypeField->input; ?>
</div>
</div>
Expand All @@ -100,7 +100,7 @@
<?php $languageField = $data['view']->filterForm->getField('language'); ?>
<div class="js-stools-container-selector">
<div class="js-stools-field-selector js-stools-language">
<div class="sr-only"><?php echo $languageField->label; ?></div>
<div class="visually-hidden"><?php echo $languageField->label; ?></div>
<?php echo $languageField->input; ?>
</div>
</div>
Expand All @@ -110,7 +110,7 @@
<?php echo LayoutHelper::render('joomla.searchtools.default.selector', $data); ?>
</div>
<?php endif; ?>
<div class="js-stools-container-bar ml-auto">
<div class="js-stools-container-bar ms-auto">
<div class="btn-toolbar">
<?php echo $this->sublayout('bar', $data); ?>
<?php echo $this->sublayout('list', $data); ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ protected function getInput()
. ' type="button"'
. ' id="select-change"'
. ' class="btn btn-secondary' . ($value ? '' : ' hidden') . '"'
. ' data-toggle="modal"'
. ' data-bs-toggle="modal"'
. ' data-select="' . Text::_('COM_ASSOCIATIONS_SELECT_TARGET') . '"'
. ' data-change="' . Text::_('COM_ASSOCIATIONS_CHANGE_TARGET') . '"'
. ' data-target="#associationSelect' . $this->id . 'Modal">'
. ' data-bs-target="#associationSelect' . $this->id . 'Modal">'
. '<span class="icon-file" aria-hidden="true"></span> '
. '<span id="select-change-text"></span>'
. '</button>';
Expand Down Expand Up @@ -97,7 +97,7 @@ protected function getInput()
'width' => '800px',
'bodyHeight' => 70,
'modalWidth' => 80,
'footer' => '<button type="button" class="btn btn-secondary" data-dismiss="modal">'
'footer' => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">'
. Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>',
)
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
$additional = '<strong>' . Text::sprintf('COM_MENUS_MENU_SPRINTF', $menutypeTitle) . '</strong><br>';
}

$labelClass = 'badge-secondary';
$labelClass = 'bg-secondary';
$target = $langCode . ':' . $items[$langCode]['id'] . ':edit';
$allow = $canEditReference
&& self::allowEdit($extensionName, $typeName, $items[$langCode]['id'])
Expand All @@ -313,7 +313,7 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId

$title = Text::_('COM_ASSOCIATIONS_NO_ASSOCIATION');
$additional = $addLink ? Text::_('COM_ASSOCIATIONS_ADD_NEW_ASSOCIATION') : '';
$labelClass = 'badge-warning';
$labelClass = 'bg-warning text-dark';
$target = $langCode . ':0:add';
$allow = $canCreate;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<h3 class="target-text"><?php echo Text::_('COM_ASSOCIATIONS_ASSOCIATED_ITEM'); ?></h3>
</div>
<div class="langtarget">
<div class="sr-only">
<div class="visually-hidden">
<?php echo $this->form->getLabel('itemlanguage'); ?>
</div>
<?php echo $this->form->getInput('itemlanguage'); ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@
<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
<?php if ($this->state->get('itemtype') == '' || $this->state->get('language') == '') : ?>
<div class="alert alert-info">
<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('COM_ASSOCIATIONS_NOTICE_NO_SELECTORS'); ?>
</div>
<?php elseif (empty($this->items)) : ?>
<div class="alert alert-info">
<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php else : ?>
<table class="table" id="associationsList">
<caption class="sr-only">
<caption class="visually-hidden">
<?php echo Text::_('COM_ASSOCIATIONS_TABLE_CAPTION'); ?>,
<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
Expand Down Expand Up @@ -106,7 +106,7 @@
</td>
<?php endif; ?>
<th scope="row" class="has-context">
<div class="float-left break-word">
<div class="float-start break-word">
<?php if (isset($item->level)) : ?>
<?php echo LayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level)); ?>
<?php endif; ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
<?php if (empty($this->items)) : ?>
<div class="alert alert-info">
<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php else : ?>
<table class="table" id="associationsList">
<caption class="sr-only">
<caption class="visually-hidden">
<?php echo Text::_('COM_ASSOCIATIONS_TABLE_CAPTION'); ?>,
<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_banners/forms/banner.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
name="state"
type="list"
label="JSTATUS"
class="custom-select-color-state"
class="form-select-color-state"
size="1"
default="1"
validate="options"
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_banners/forms/client.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
name="state"
type="list"
label="JSTATUS"
class="custom-select-color-state"
class="form-select-color-state"
size="1"
default="1"
validate="options"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protected function getInput()

return '<div class="input-group"><input class="form-control" type="text" name="' . $this->name . '" id="' . $this->id . '" value="'
. htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly">'
. '<span class="input-group-append"><button type="button" class="btn btn-secondary" ' . $onclick . '>'
. '<span class="icon-sync" aria-hidden="true"></span> ' . Text::_('COM_BANNERS_RESET_CLICKS') . '</button></span></div>';
. '<button type="button" class="btn btn-secondary" ' . $onclick . '>'
. '<span class="icon-sync" aria-hidden="true"></span> ' . Text::_('COM_BANNERS_RESET_CLICKS') . '</button></div>';
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protected function getInput()

return '<div class="input-group"><input class="form-control" type="text" name="' . $this->name . '" id="' . $this->id . '" value="'
. htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly">'
. '<span class="input-group-append"><button type="button" class="btn btn-secondary" ' . $onclick . '>'
. '<span class="icon-sync" aria-hidden="true"></span> ' . Text::_('COM_BANNERS_RESET_IMPMADE') . '</button></span></div>';
. '<button type="button" class="btn btn-secondary" ' . $onclick . '>'
. '<span class="icon-sync" aria-hidden="true"></span> ' . Text::_('COM_BANNERS_RESET_IMPMADE') . '</button></div>';
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function clients()
'<label id="batch-client-lbl" for="batch-client-id">',
Text::_('COM_BANNERS_BATCH_CLIENT_LABEL'),
'</label>',
'<select class="custom-select" name="batch[client_id]" id="batch-client-id">',
'<select class="form-select" name="batch[client_id]" id="batch-client-id">',
'<option value="">' . Text::_('COM_BANNERS_BATCH_CLIENT_NOCHANGE') . '</option>',
'<option value="0">' . Text::_('COM_BANNERS_NO_CLIENT') . '</option>',
HTMLHelper::_('select.options', static::clientlist(), 'value', 'text'),
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_banners/tmpl/banners/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
?>
<?php if (empty($this->items)) : ?>
<div class="alert alert-info">
<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php else : ?>
<table class="table" id="articleList">
<caption class="sr-only">
<caption class="visually-hidden">
<?php echo Text::_('COM_BANNERS_BANNERS_TABLE_CAPTION'); ?>,
<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/** @var \Joomla\Component\Banners\Administrator\View\Banners\HtmlView $this */

?>
<button type="button" class="btn btn-secondary" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-client-id').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
<button type="button" class="btn btn-secondary" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-client-id').value='';document.getElementById('batch-language-id').value=''" data-bs-dismiss="modal">
<?php echo Text::_('JCANCEL'); ?>
</button>
<button type="submit" class="btn btn-success" onclick="Joomla.submitbutton('banner.batch');return false;">
Expand Down
12 changes: 6 additions & 6 deletions administrator/components/com_banners/tmpl/clients/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
?>
<?php if (empty($this->items)) : ?>
<div class="alert alert-info">
<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php else : ?>
<table class="table">
<caption class="sr-only">
<caption class="visually-hidden">
<?php echo Text::_('COM_BANNERS_CLIENTS_TABLE_CAPTION'); ?>,
<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
Expand All @@ -70,19 +70,19 @@
</th>
<th scope="col" class="w-3 text-center d-none d-md-table-cell">
<span class="icon-check" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?>"></span>
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?></span>
<span class="visually-hidden"><?php echo Text::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?></span>
</th>
<th scope="col" class="w-3 text-center d-none d-md-table-cell">
<span class="icon-times" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?>"></span>
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?></span>
<span class="visually-hidden"><?php echo Text::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?></span>
</th>
<th scope="col" class="w-3 text-center d-none d-md-table-cell">
<span class="icon-folder icon-fw" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?>"></span>
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?></span>
<span class="visually-hidden"><?php echo Text::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?></span>
</th>
<th scope="col" class="w-3 text-center d-none d-md-table-cell">
<span class="icon-trash" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?>"></span>
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?></span>
<span class="visually-hidden"><?php echo Text::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?></span>
</th>
<th scope="col" class="w-10 d-none d-md-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', 'COM_BANNERS_HEADING_PURCHASETYPE', 'a.purchase_type', $listDirn, $listOrder); ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class="form-horizontal form-validate"
<?php echo $this->form->renderField($field->fieldname); ?>
<?php endforeach; ?>

<button class="sr-only"
<button class="visually-hidden"
id="exportBtn"
type="button"
onclick="this.form.submit();window.top.setTimeout('window.parent.Joomla.Modal.getCurrent().close()', 700);">
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_banners/tmpl/tracks/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
<?php echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]); ?>
<?php if (empty($this->items)) : ?>
<div class="alert alert-info">
<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php else : ?>
<table class="table">
<caption class="sr-only">
<caption class="visually-hidden">
<?php echo Text::_('COM_BANNERS_TRACKS_TABLE_CAPTION'); ?>,
<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
Expand Down
Loading

0 comments on commit 5785177

Please sign in to comment.