--- web/template/actions_form.php | 5 +++-- web/template/pkg_details.php | 15 +++++++++++++++ web/template/pkg_search_results.php | 4 +++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/web/template/actions_form.php b/web/template/actions_form.php index 006f9ef..41b7860 100644 --- a/web/template/actions_form.php +++ b/web/template/actions_form.php @@ -45,8 +45,9 @@ if ($row["MaintainerUID"] == 0) { } if ($row["DeletionProposed"] == 0) { - echo "<input type='submit' class='button' name='do_ProposeDeletion'"; - echo " value='".__("Propose for deletion")."'>\n"; + # Disabled, since we require a reason to be given + #echo "<input type='submit' class='button' name='do_ProposeDeletion'"; + #echo " value='".__("Propose for deletion")."'>\n"; } else if ($atype == "Trusted User" || $atype == "Developer") { echo "<input type='submit' class='button' name='do_UnProposeDeletion'"; echo " value='".__("Cancel deletion proposal")."'>\n"; diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 9c76ab3..6c52990 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -28,6 +28,15 @@ if ($atype == "Developer" or $atype == "Trusted User") { $votes = "<a href=\"voters.php?ID=$pkgid\">$votes</a>"; } +# If the package has been proposed for deletion +if ($row["DeletionProposed"]) { + $deletion_status = __("This package has been proposed for deletion")."<br />"; + $deletion_status .= __("You can view and participate in the discussion on the aur-general mailing list"); +} else { + $deletion_status = "<a href='pkgedit.php?propose_Deletion=1&ID="; + $deletion_status .= $pkgid ."'>".__("Propose deletion of this package")."</a>"; +} + # In case of wanting to put a custom message $msg = __('unknown'); $license = empty($row['License']) ? $msg : $row['License']; @@ -53,6 +62,12 @@ $submitted_time = ($row["SubmittedTS"] == 0) ? "(unknown)" : gmdate("r", intval( <span class='f3'><?php echo $votes ?></span> </p> + <p> + <span class='f3'><?php echo $deletion_status ?></span><br /> + </p> + + + <p><span class='f3'><?php echo __('License') . ': ' . $license ?></span></p> <p> diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index f2ce5c0..a7810ce 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -107,7 +107,9 @@ for ($i = 0; $row = mysql_fetch_assoc($result); $i++) { <?php endif; ?> <option value='do_Notify'><?php print __("Notify") ?></option> <option value='do_UnNotify'><?php print __("UnNotify") ?></option> - <option value='do_ProposeDeletion'><?php print __("Propose Deletion") ?></option> + <!-- not currently allowed without a reason + <option value='do_ProposeDeletion'><?php print __("Propose Deletion") ?></option> + --> <?php if ($atype == "Trusted User" || $atype == "Developer"): ?> <option value='do_UnProposeDeletion'><?php print __("Cancel Deletion Proposal") ?></option> <?php endif; ?> -- 1.7.3