Skip to content

[4.0] Remove double spaces #32931

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
Quy merged 1 commit into from
Mar 29, 2021
Merged

[4.0] Remove double spaces #32931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion administrator/components/com_menus/tmpl/menus/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
<td class="text-center d-none d-lg-table-cell itemnumber">
<?php if (isset($this->modules[$item->menutype])) : ?>
<div class="dropdown">
<button type="button" class="btn btn-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown">
<button type="button" class="btn btn-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown">
<?php echo Text::_('COM_MENUS_MODULES'); ?>
<span class="caret"></span>
</button>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_modules/tmpl/module/edit_assignment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
<div class="hidden" id="treeselectmenu">
<div class="nav-hover treeselect-menu">
<div class="dropdown">
<button type="button" data-bs-toggle="dropdown" class="dropdown-toggle btn btn-sm btn-light">
<button type="button" data-bs-toggle="dropdown" class="dropdown-toggle btn btn-sm btn-light">
<span class="caret"></span>
<span class="visually-hidden"><?php echo Text::sprintf('JGLOBAL_TOGGLE_DROPDOWN'); ?></span>
</button>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_users/tmpl/users/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<div class="btn-group">
<?php echo HTMLHelper::_('users.addNote', $item->id); ?>
<?php if ($item->note_count > 0) : ?>
<button type="button" class="btn btn-secondary btn-sm dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<button type="button" class="btn btn-secondary btn-sm dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="visually-hidden"><?php echo Text::_('JGLOBAL_TOGGLE_DROPDOWN'); ?></span>
</button>
<div class="dropdown-menu">
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_workflow/tmpl/transition/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

?>

<form action="<?php echo Route::_('index.php?option=com_workflow&view=transition&workflow_id=' . $this->workflowID . '&extension=' . $this->input->getCmd('extension') . '&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="workflow-form" aria-label="<?php echo Text::_('COM_WORKFLOW_TRANSITION_FORM_' . ( (int) $this->item->id === 0 ? 'NEW' : 'EDIT'), true); ?>" class="form-validate">
<form action="<?php echo Route::_('index.php?option=com_workflow&view=transition&workflow_id=' . $this->workflowID . '&extension=' . $this->input->getCmd('extension') . '&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="workflow-form" aria-label="<?php echo Text::_('COM_WORKFLOW_TRANSITION_FORM_' . ( (int) $this->item->id === 0 ? 'NEW' : 'EDIT'), true); ?>" class="form-validate">
<div>
<?php echo LayoutHelper::render('joomla.edit.title_alias', $this); ?>

Expand Down
2 changes: 1 addition & 1 deletion administrator/modules/mod_menu/tmpl/default_submenu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@

if ($current->level > 2)
{
$dataToggle = ' data-bs-toggle="dropdown"';
$dataToggle = ' data-bs-toggle="dropdown"';
}
}
else
Expand Down
2 changes: 1 addition & 1 deletion administrator/modules/mod_user/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
$hideLinks = $app->input->getBool('hidemainmenu');
?>
<div class="header-item-content dropdown header-profile d-flex">
<button class="dropdown-toggle d-flex flex-column align-items-stretch <?php echo ($hideLinks ? 'disabled' : ''); ?>" data-bs-toggle="dropdown" type="button" <?php echo ($hideLinks ? 'disabled' : ''); ?>
<button class="dropdown-toggle d-flex flex-column align-items-stretch <?php echo ($hideLinks ? 'disabled' : ''); ?>" data-bs-toggle="dropdown" type="button" <?php echo ($hideLinks ? 'disabled' : ''); ?>
title="<?php echo Text::_('MOD_USER_MENU'); ?>">
<div class="d-flex align-items-end mx-auto">
<span class="icon-user-circle" aria-hidden="true"></span>
Expand Down
2 changes: 1 addition & 1 deletion administrator/templates/atum/html/layouts/chromes/body.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<?php if ($canEdit || $canChange) : ?>
<?php $dropdownPosition = Factory::getLanguage()->isRTL() ? 'start' : 'end'; ?>
<div class="module-actions dropdown">
<button type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn" id="dropdownMenuButton-<?php echo $id; ?>">
<button type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn" id="dropdownMenuButton-<?php echo $id; ?>">
<span class="icon-cog" aria-hidden="true"></span>
<span class="visually-hidden"><?php echo Text::sprintf('JACTION_EDIT_MODULE', $module->title); ?></span>
</button>
Expand Down
2 changes: 1 addition & 1 deletion administrator/templates/atum/html/layouts/chromes/well.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<?php if ($canEdit || $canChange) : ?>
<?php $dropdownPosition = Factory::getLanguage()->isRTL() ? 'start' : 'end'; ?>
<div class="module-actions dropdown">
<button type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn" id="dropdownMenuButton-<?php echo $id; ?>">
<button type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn" id="dropdownMenuButton-<?php echo $id; ?>">
<span class="icon-cog" aria-hidden="true"></span>
<span class="visually-hidden"><?php echo Text::sprintf('JACTION_EDIT_MODULE', $module->title); ?></span>
</button>
Expand Down
2 changes: 1 addition & 1 deletion administrator/templates/atum/login.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<div class="d-flex align-items-center">
<div class="logo">
<img src="<?php echo $logoBrandLarge; ?>" <?php echo $logoBrandLargeAlt; ?>>
<img class="logo-collapsed" src="<?php echo $logoBrandSmall; ?>" <?php echo $logoBrandSmallAlt; ?>>
<img class="logo-collapsed" src="<?php echo $logoBrandSmall; ?>" <?php echo $logoBrandSmallAlt; ?>>
</div>
</div>
<jdoc:include type="modules" name="title" />
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Form/Field/ModulepositionField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ protected function getInput()
// The current user display field.
$html[] = '<div class="input-append">';
$html[] = parent::getInput()
. '<a class="btn" title="' . Text::_('COM_MODULES_CHANGE_POSITION_TITLE') . '" href="' . $link
. '" data-bs-toggle="modal" data-bs-target="#modulePositionModal">'
. '<a class="btn" title="' . Text::_('COM_MODULES_CHANGE_POSITION_TITLE') . '" href="' . $link
. '" data-bs-toggle="modal" data-bs-target="#modulePositionModal">'
. Text::_('COM_MODULES_CHANGE_POSITION_BUTTON') . '</a>';

$html[] = HTMLHelper::_(
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/HTML/Helpers/ActionsDropdown.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static function render($item = '')
{
$html = array();

$html[] = '<button data-bs-toggle="dropdown" class="dropdown-toggle btn btn-sm btn-secondary">';
$html[] = '<button data-bs-toggle="dropdown" class="dropdown-toggle btn btn-sm btn-secondary">';
$html[] = '<span class="caret"></span>';

if ($item)
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/HTML/Helpers/Dropdown.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public static function start()
}

$dropDownList = '<div class="btn-group" style="margin-left:6px;display:none">
<a href="#" data-bs-toggle="dropdown" class="dropdown-toggle btn btn-secondary btn-sm">
<a href="#" data-bs-toggle="dropdown" class="dropdown-toggle btn btn-secondary btn-sm">
<span class="caret"></span>
</a>
<ul class="dropdown-menu">';
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_languages/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
</ul>
</div>
<?php else : ?>
<ul class="mod-languages__list <?php echo $params->get('inline', 1) ? 'lang-inline' : 'lang-block'; ?>" dir="<?php echo $app->getLanguage()->isRtl() ? 'rtl' : 'ltr'; ?>">
<ul class="mod-languages__list <?php echo $params->get('inline', 1) ? 'lang-inline' : 'lang-block'; ?>" dir="<?php echo $app->getLanguage()->isRtl() ? 'rtl' : 'ltr'; ?>">
<?php foreach ($list as $language) : ?>
<?php if (!$language->active) : ?>
<li>
Expand Down