Skip to content
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

Jump to bottom

[5.1] Use Dialog for Batch windows #42328

Merged
merged 12 commits into from Nov 16, 2023
Merged

[5.1] Use Dialog for Batch windows #42328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b885ad3
Batch: banners
Fedik Nov 9, 2023
5343b19
Batch: contacts
Fedik Nov 9, 2023
ea49f20
Batch: newsfeed
Fedik Nov 9, 2023
d93f520
Batch: fields
Fedik Nov 9, 2023
64bed81
Batch: field groups
Fedik Nov 9, 2023
0e7e634
Batch: menu
Fedik Nov 9, 2023
3695cae
Batch: modules
Fedik Nov 9, 2023
5cd2917
Batch: tags
Fedik Nov 9, 2023
bf1bbf1
Batch: users
Fedik Nov 9, 2023
6b7061f
Update build/media_source/com_fields/js/admin-fields-default-batch.es…
Fedik Nov 10, 2023
7bee5b3
Merge branch '5.1-dev' into popup-batch2
LadySolveig Nov 14, 2023
5936220
Merge branch '5.1-dev' into popup-batch2
LadySolveig Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion administrator/components/com_banners/src/View/Banners/HtmlView.php
View file
Open in desktop
Expand Up @@ -195,7 +195,11 @@ protected function addToolbar(): void
&& $user->authorise('core.edit.state', 'com_banners')
) {
$childBar->popupButton('batch', 'JTOOLBAR_BATCH')
->selector('collapseModal')
->popupType('inline')
->textHeader(Text::_('COM_BANNERS_BATCH_OPTIONS'))
->url('#joomla-dialog-batch')
->modalWidth('800px')
->modalHeight('fit-content')
->listCheck(true);
}
}
Expand Down
10 changes: 1 addition & 9 deletions administrator/components/com_banners/tmpl/banners/default.php
View file
Open in desktop
Expand Up @@ -182,15 +182,7 @@
&& $user->authorise('core.edit', 'com_banners')
&& $user->authorise('core.edit.state', 'com_banners')
) : ?>
<?php echo HTMLHelper::_(
'bootstrap.renderModal',
'collapseModal',
[
'title' => Text::_('COM_BANNERS_BATCH_OPTIONS'),
'footer' => $this->loadTemplate('batch_footer')
],
$this->loadTemplate('batch_body')
); ?>
<template id="joomla-dialog-batch"><?php echo $this->loadTemplate('batch_body'); ?></template>
<?php endif; ?>
<?php endif; ?>

Expand Down
7 changes: 6 additions & 1 deletion administrator/components/com_banners/tmpl/banners/default_batch_body.php
View file
Open in desktop
Expand Up @@ -12,14 +12,14 @@

use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Multilanguage;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Layout\LayoutHelper;

/** @var \Joomla\Component\Banners\Administrator\View\Banners\HtmlView $this */

$published = (int) $this->state->get('filter.published');
?>


<div class="p-3">
<div class="row">
<?php if (Multilanguage::isEnabled()) : ?>
Expand All @@ -45,3 +45,8 @@
<?php endif; ?>
</div>
</div>
<div class="btn-toolbar p-3">
<joomla-toolbar-button task="banner.batch" class="ms-auto">
<button type="button" class="btn btn-success"><?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?></button>
</joomla-toolbar-button>
</div>
23 changes: 0 additions & 23 deletions administrator/components/com_banners/tmpl/banners/default_batch_footer.php
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion administrator/components/com_contact/src/View/Contacts/HtmlView.php
View file
Open in desktop
Expand Up @@ -188,7 +188,11 @@ protected function addToolbar()
&& $user->authorise('core.edit.state', 'com_contact')
) {
$childBar->popupButton('batch', 'JTOOLBAR_BATCH')
->selector('collapseModal')
->popupType('inline')
->textHeader(Text::_('COM_CONTACT_BATCH_OPTIONS'))
->url('#joomla-dialog-batch')
->modalWidth('800px')
->modalHeight('fit-content')
->listCheck(true);
}
}
Expand Down
10 changes: 1 addition & 9 deletions administrator/components/com_contact/tmpl/contacts/default.php
View file
Open in desktop
Expand Up @@ -190,15 +190,7 @@
&& $user->authorise('core.edit', 'com_contact')
&& $user->authorise('core.edit.state', 'com_contact')
) : ?>
<?php echo HTMLHelper::_(
'bootstrap.renderModal',
'collapseModal',
[
'title' => Text::_('COM_CONTACT_BATCH_OPTIONS'),
'footer' => $this->loadTemplate('batch_footer'),
],
$this->loadTemplate('batch_body')
); ?>
<template id="joomla-dialog-batch"><?php echo $this->loadTemplate('batch_body'); ?></template>
<?php endif; ?>
<?php endif; ?>
<input type="hidden" name="task" value="">
Expand Down
6 changes: 6 additions & 0 deletions administrator/components/com_contact/tmpl/contacts/default_batch_body.php
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@
defined('_JEXEC') or die;

use Joomla\CMS\Language\Multilanguage;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Layout\LayoutHelper;

$published = (int) $this->state->get('filter.published');
Expand Down Expand Up @@ -52,3 +53,8 @@
</div>
</div>
</div>
<div class="btn-toolbar p-3">
<joomla-toolbar-button task="contact.batch" class="ms-auto">
<button type="button" class="btn btn-success"><?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?></button>
</joomla-toolbar-button>
</div>
21 changes: 0 additions & 21 deletions administrator/components/com_contact/tmpl/contacts/default_batch_footer.php
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion administrator/components/com_fields/src/View/Fields/HtmlView.php
View file
Open in desktop
Expand Up @@ -175,7 +175,11 @@ protected function addToolbar()
// Add a batch button
if ($canDo->get('core.create') && $canDo->get('core.edit') && $canDo->get('core.edit.state')) {
$childBar->popupButton('batch', 'JTOOLBAR_BATCH')
->selector('collapseModal')
->popupType('inline')
->textHeader(Text::_('COM_FIELDS_VIEW_FIELDS_BATCH_OPTIONS'))
->url('#joomla-dialog-batch')
->modalWidth('800px')
->modalHeight('fit-content')
->listCheck(true);
}
}
Expand Down
6 changes: 5 additions & 1 deletion administrator/components/com_fields/src/View/Groups/HtmlView.php
View file
Open in desktop
Expand Up @@ -177,7 +177,11 @@ protected function addToolbar()
// Add a batch button
if ($canDo->get('core.create') && $canDo->get('core.edit') && $canDo->get('core.edit.state')) {
$childBar->popupButton('batch', 'JTOOLBAR_BATCH')
->selector('collapseModal')
->popupType('inline')
->textHeader(Text::_('COM_FIELDS_VIEW_GROUPS_BATCH_OPTIONS'))
->url('#joomla-dialog-batch')
->modalWidth('800px')
->modalHeight('fit-content')
->listCheck(true);
}
}
Expand Down
10 changes: 1 addition & 9 deletions administrator/components/com_fields/tmpl/fields/default.php
View file
Open in desktop
Expand Up @@ -205,15 +205,7 @@
&& $user->authorise('core.edit', $component)
&& $user->authorise('core.edit.state', $component)
) : ?>
<?php echo HTMLHelper::_(
'bootstrap.renderModal',
'collapseModal',
[
'title' => Text::_('COM_FIELDS_VIEW_FIELDS_BATCH_OPTIONS'),
'footer' => $this->loadTemplate('batch_footer')
],
$this->loadTemplate('batch_body')
); ?>
<template id="joomla-dialog-batch"><?php echo $this->loadTemplate('batch_body'); ?></template>
<?php endif; ?>
<?php endif; ?>
<input type="hidden" name="task" value="">
Expand Down
5 changes: 5 additions & 0 deletions administrator/components/com_fields/tmpl/fields/default_batch_body.php
View file
Open in desktop
Expand Up @@ -64,3 +64,8 @@
</div>
</div>
</div>
<div class="btn-toolbar p-3">
<joomla-toolbar-button task="field.batch" class="ms-auto">
<button type="button" class="btn btn-success"><?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?></button>
</joomla-toolbar-button>
</div>
21 changes: 0 additions & 21 deletions administrator/components/com_fields/tmpl/fields/default_batch_footer.php
View file
Open in desktop

This file was deleted.

10 changes: 1 addition & 9 deletions administrator/components/com_fields/tmpl/groups/default.php
View file
Open in desktop
Expand Up @@ -173,15 +173,7 @@
&& $user->authorise('core.edit', $component)
&& $user->authorise('core.edit.state', $component)
) : ?>
<?php echo HTMLHelper::_(
'bootstrap.renderModal',
'collapseModal',
[
'title' => Text::_('COM_FIELDS_VIEW_GROUPS_BATCH_OPTIONS'),
'footer' => $this->loadTemplate('batch_footer')
],
$this->loadTemplate('batch_body')
); ?>
<template id="joomla-dialog-batch"><?php echo $this->loadTemplate('batch_body'); ?></template>
<?php endif; ?>
<?php endif; ?>
<input type="hidden" name="task" value="">
Expand Down
6 changes: 6 additions & 0 deletions administrator/components/com_fields/tmpl/groups/default_batch_body.php
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@
defined('_JEXEC') or die;

use Joomla\CMS\Language\Multilanguage;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Layout\LayoutHelper;
?>

Expand All @@ -30,3 +31,8 @@
</div>
</div>
</div>
<div class="btn-toolbar p-3">
<joomla-toolbar-button task="group.batch" class="ms-auto">
<button type="button" class="btn btn-success"><?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?></button>
</joomla-toolbar-button>
</div>
21 changes: 0 additions & 21 deletions administrator/components/com_fields/tmpl/groups/default_batch_footer.php
View file
Open in desktop

This file was deleted.

9 changes: 6 additions & 3 deletions administrator/components/com_menus/src/View/Items/HtmlView.php
View file
Open in desktop
Expand Up @@ -355,9 +355,12 @@ protected function addToolbar()
&& $user->authorise('core.edit', 'com_menus')
&& $user->authorise('core.edit.state', 'com_menus')
) {
$childBar->popupButton('batch')
->text('JTOOLBAR_BATCH')
->selector('collapseModal')
$childBar->popupButton('batch', 'JTOOLBAR_BATCH')
->popupType('inline')
->textHeader(Text::_('COM_MENUS_BATCH_OPTIONS'))
->url('#joomla-dialog-batch')
->modalWidth('800px')
->modalHeight('fit-content')
->listCheck(true);
}
}
Expand Down
10 changes: 1 addition & 9 deletions administrator/components/com_menus/tmpl/items/default.php
View file
Open in desktop
Expand Up @@ -269,15 +269,7 @@

<?php // Load the batch processing form if user is allowed ?>
<?php if ($user->authorise('core.create', 'com_menus') || $user->authorise('core.edit', 'com_menus')) : ?>
<?php echo HTMLHelper::_(
'bootstrap.renderModal',
'collapseModal',
[
'title' => Text::_('COM_MENUS_BATCH_OPTIONS'),
'footer' => $this->loadTemplate('batch_footer')
],
$this->loadTemplate('batch_body')
); ?>
<template id="joomla-dialog-batch"><?php echo $this->loadTemplate('batch_body'); ?></template>
<?php endif; ?>
<?php endif; ?>

Expand Down
8 changes: 8 additions & 0 deletions administrator/components/com_menus/tmpl/items/default_batch_body.php
View file
Open in desktop
Expand Up @@ -86,3 +86,11 @@
</div>
<?php endif; ?>
</div>
<?php if ((strlen($menuType) && $menuType != '*' && $clientId == 0) || ($published >= 0 && $clientId == 1)) : ?>
<div class="btn-toolbar p-3">
<joomla-toolbar-button task="item.batch" class="ms-auto">
<button type="button" class="btn btn-success"><?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?></button>
</joomla-toolbar-button>
</div>
<?php endif; ?>

27 changes: 0 additions & 27 deletions administrator/components/com_menus/tmpl/items/default_batch_footer.php
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion administrator/components/com_modules/src/View/Modules/HtmlView.php
View file
Open in desktop
Expand Up @@ -218,7 +218,11 @@ protected function addToolbar()
&& $user->authorise('core.edit.state', 'com_modules')
) {
$childBar->popupButton('batch', 'JTOOLBAR_BATCH')
->selector('collapseModal')
->popupType('inline')
->textHeader(Text::_('COM_MODULES_BATCH_OPTIONS'))
->url('#joomla-dialog-batch')
->modalWidth('800px')
->modalHeight('fit-content')
->listCheck(true);
}

Expand Down
10 changes: 1 addition & 9 deletions administrator/components/com_modules/tmpl/modules/default.php
View file
Open in desktop
Expand Up @@ -203,15 +203,7 @@
&& $user->authorise('core.edit', 'com_modules')
&& $user->authorise('core.edit.state', 'com_modules')
) : ?>
<?php echo HTMLHelper::_(
'bootstrap.renderModal',
'collapseModal',
[
'title' => Text::_('COM_MODULES_BATCH_OPTIONS'),
'footer' => $this->loadTemplate('batch_footer'),
],
$this->loadTemplate('batch_body')
); ?>
<template id="joomla-dialog-batch"><?php echo $this->loadTemplate('batch_body'); ?></template>
<?php endif; ?>
<input type="hidden" name="task" value="">
<input type="hidden" name="boxchecked" value="0">
Expand Down
5 changes: 5 additions & 0 deletions administrator/components/com_modules/tmpl/modules/default_batch_body.php
View file
Open in desktop
Expand Up @@ -81,3 +81,8 @@
</div>
</div>
</div>
<div class="btn-toolbar p-3">
<joomla-toolbar-button task="module.batch" class="ms-auto">
<button type="button" class="btn btn-success"><?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?></button>
</joomla-toolbar-button>
</div>