fix: clean up package action templates (merge, delete, disown)

Signed-off-by: Kevin Morris <kevr@0cost.org>

templates/pkgbase/merge.html

@@ -28,6 +28,15 @@
             {% endfor %}
         </ul>
 
+        <p>
+            {{
+                "This action will close any pending package requests "
+                "related to it. If %sComments%s are omitted, a closure "
+                "comment will be autogenerated."
+                | tr | format("<em>", "</em>") | safe
+            }}
+        </p>
+
         <p>
             {{ "Once the package has been merged it cannot be reversed. " | tr }}
             {{ "Enter the package name you wish to merge the package into. " | tr }}
@@ -37,6 +46,16 @@
         <form id="merge-form" action="/pkgbase/{{ pkgbase.Name }}/merge" method="post">
             <fieldset>
                 <input type="hidden" name="next" value="{{ next }}" />
+
+                <p>
+                    <label for="id_comments">{{ "Comments" | tr }}:</label>
+                    <textarea id="id_comments"
+                              name="comments"
+                              rows="5" cols="50"
+                              placeholder="Related package request closure comments..."
+                    ></textarea>
+                </p>
+
                 <p>
                     <label id="merge-into" for="merge_into">
                         {{ "Merge into:" | tr }}
@@ -49,12 +68,6 @@
                     />
                 </p>
 
-                <p>
-                    <label for="id_comments">{{ "Comments" | tr }}:</label>
-                    <textarea id="id_comments" name="comments"
-                              rows="5" cols="50"></textarea>
-                </p>
-
                 <p>
                     <label class="confirmation">
                         <input type="checkbox" name="confirm" />