Skip to content

[5.1] Use Dialog for Batch for Redirect component #42355

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 4 commits into from
Jan 30, 2024
+13 −41
Merged

[5.1] Use Dialog for Batch for Redirect component #42355

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
0f3a32c
Use Dialog for Redirect links batch
Fedik Nov 16, 2023
13d05e9
Merge branch '5.1-dev' into popup-batch3
QuyTon Nov 18, 2023
b493157
Merge branch '5.1-dev' into popup-batch3
QuyTon Dec 16, 2023
aff0d59
Merge branch '5.1-dev' into popup-batch3
Fedik Jan 29, 2024
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
6 changes: 5 additions & 1 deletion administrator/components/com_redirect/src/View/Links/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,11 @@ protected function addToolbar()

if ($canDo->get('core.create')) {
$toolbar->popupButton('batch', 'JTOOLBAR_BULK_IMPORT')
->selector('collapseModal')
->popupType('inline')
->textHeader(Text::_('COM_REDIRECT_BATCH_OPTIONS'))
->url('#joomla-dialog-batch')
->modalWidth('800px')
->modalHeight('fit-content')
->listCheck(false);
}

Expand Down
10 changes: 1 addition & 9 deletions administrator/components/com_redirect/tmpl/links/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,7 @@
&& $user->authorise('core.edit', 'com_redirect')
&& $user->authorise('core.edit.state', 'com_redirect')
) : ?>
<?php echo HTMLHelper::_(
'bootstrap.renderModal',
'collapseModal',
[
'title' => Text::_('COM_REDIRECT_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="">
Expand Down
7 changes: 6 additions & 1 deletion administrator/components/com_redirect/tmpl/links/default_batch_body.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,13 @@
<div class="control-group col-md-12 mt-3">
<label for="batch_urls" class="form-label"><?php echo Text::sprintf('COM_REDIRECT_BATCH_TIP', $separator); ?></label>
<div class="controls">
<textarea class="form-control" rows="10" value="" id="batch_urls" name="batch_urls"></textarea>
<textarea class="form-control" rows="10" id="batch_urls" name="batch_urls"></textarea>
</div>
</div>
<div class="btn-toolbar pb-3">
<joomla-toolbar-button task="links.batch" class="ms-auto">
<button type="button" class="btn btn-success"><?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?></button>
</joomla-toolbar-button>
</div>
</div>
</div>
21 changes: 0 additions & 21 deletions administrator/components/com_redirect/tmpl/links/default_batch_footer.php
View file
Open in desktop

This file was deleted.

10 changes: 1 addition & 9 deletions administrator/components/com_redirect/tmpl/links/emptystate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,7 @@
&& $user->authorise('core.edit', 'com_redirect')
&& $user->authorise('core.edit.state', 'com_redirect')
) {
$displayData['formAppend'] = HTMLHelper::_(
'bootstrap.renderModal',
'collapseModal',
[
'title' => Text::_('COM_REDIRECT_BATCH_OPTIONS'),
'footer' => $this->loadTemplate('batch_footer'),
],
$this->loadTemplate('batch_body')
);
$displayData['formAppend'] = '<template id="joomla-dialog-batch">' . $this->loadTemplate('batch_body') . '</template>';
}

$collectUrlsEnabled = RedirectHelper::collectUrlsEnabled();
Expand Down