In addition to naming the package base that is going to be removed or merged, list every single package that is affected. Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> --- web/html/pkgdel.php | 9 ++++++++- web/html/pkgmerge.php | 10 +++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/web/html/pkgdel.php b/web/html/pkgdel.php index d1026ce..39fe81a 100644 --- a/web/html/pkgdel.php +++ b/web/html/pkgdel.php @@ -20,8 +20,15 @@ if ($atype == "Trusted User" || $atype == "Developer"): ?> <div class="box"> <h2><?= __('Delete Package: %s', htmlspecialchars($pkgbase_name)) ?></h2> <p> - <?= __('Use this form to delete the package (%s%s%s) from the AUR. ', + <?= __('Use this form to delete the package base %s%s%s and the following packages from the AUR: ', '<strong>', htmlspecialchars($pkgbase_name), '</strong>'); ?> + </p> + <ul> + <?php foreach(pkgbase_get_pkgnames($base_id) as $pkgname): ?> + <li><?= htmlspecialchars($pkgname) ?></li> + <?php endforeach; ?> + </ul> + <p> <?= __('Deletion of a package is permanent. '); ?> <?= __('Select the checkbox to confirm action.') ?> </p> diff --git a/web/html/pkgmerge.php b/web/html/pkgmerge.php index 9ffd5e7..dbc5eac 100644 --- a/web/html/pkgmerge.php +++ b/web/html/pkgmerge.php @@ -20,8 +20,16 @@ if ($atype == "Trusted User" || $atype == "Developer"): ?> <div class="box"> <h2><?= __('Merge Package: %s', htmlspecialchars($pkgbase_name)) ?></h2> <p> - <?= __('Use this form to merge the package (%s%s%s) into another package. ', + <?= __('Use this form to merge the package base %s%s%s into another package. ', '<strong>', htmlspecialchars($pkgbase_name), '</strong>'); ?> + <?= __('The following packages will be deleted: '); ?> + </p> + <ul> + <?php foreach(pkgbase_get_pkgnames($base_id) as $pkgname): ?> + <li><?= htmlspecialchars($pkgname) ?></li> + <?php endforeach; ?> + </ul> + <p> <?= __('Once the package has been merged it cannot be reversed. '); ?> <?= __('Enter the package name you wish to merge the package into. '); ?> <?= __('Select the checkbox to confirm action.') ?> -- 1.9.1