external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
Kevin Morris 2022-01-17 11:53:05 -08:00
parent d94e2dc9d7
commit c07c40bcb6
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
5 changed files with 65 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
po/aurweb.pot
View file

@ -2321,3 +2321,16 @@ msgstr ""
#: aurweb/scripts/notify.py #: aurweb/scripts/notify.py
msgid "AUR Server Error" msgid "AUR Server Error"
msgstr "" msgstr ""
#: templates/pkgbase/merge.html
#: templates/packages/delete.html
#: templates/packages/disown.html
msgid "Related package request closure comments..."
msgstr ""
#: templates/pkgbase/merge.html
#: templates/packages/delete.html
msgid "This action will close any pending package requests "
"related to it. If %sComments%s are omitted, a closure "
"comment will be autogenerated."
msgstr ""

24
templates/packages/delete.html
View file

@ -27,6 +27,15 @@
{% endfor %} {% endfor %}
</ul> </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> <p>
{{ {{
"Deletion of a package is permanent. " "Deletion of a package is permanent. "
@ -36,6 +45,15 @@
<form action="/pkgbase/{{ pkgbase.Name }}/delete" method="post"> <form action="/pkgbase/{{ pkgbase.Name }}/delete" method="post">
<fieldset> <fieldset>
<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> <p>
<label class="confirmation"> <label class="confirmation">
<input type="checkbox" name="confirm" value="1" /> <input type="checkbox" name="confirm" value="1" />
@ -43,12 +61,6 @@
</label> </label>
</p> </p>
<p>
<label for="id_comments">{{ "Comments" | tr }}:</label>
<textarea id="id_comments" name="comments"
rows="5" cols="50"></textarea>
</p>
<p> <p>
<input class="button" <input class="button"
type="submit" type="submit"

16
templates/packages/disown.html
View file

@ -27,6 +27,15 @@
{% endfor %} {% endfor %}
</ul> </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> <p>
{{ {{
"By selecting the checkbox, you confirm that you want to " "By selecting the checkbox, you confirm that you want to "
@ -38,8 +47,11 @@
<fieldset> <fieldset>
<p> <p>
<label for="id_comments">{{ "Comments" | tr }}:</label> <label for="id_comments">{{ "Comments" | tr }}:</label>
<textarea id="id_comments" name="comments" <textarea id="id_comments"
rows="5" cols="50"></textarea> name="comments"
rows="5" cols="50"
placeholder="Related package request closure comments..."
></textarea>
</p> </p>
<p> <p>

25
templates/pkgbase/merge.html
View file

@ -28,6 +28,15 @@
{% endfor %} {% endfor %}
</ul> </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> <p>
{{ "Once the package has been merged it cannot be reversed. " | tr }} {{ "Once the package has been merged it cannot be reversed. " | tr }}
{{ "Enter the package name you wish to merge the package into. " | 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"> <form id="merge-form" action="/pkgbase/{{ pkgbase.Name }}/merge" method="post">
<fieldset> <fieldset>
<input type="hidden" name="next" value="{{ next }}" /> <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> <p>
<label id="merge-into" for="merge_into"> <label id="merge-into" for="merge_into">
{{ "Merge into:" | tr }} {{ "Merge into:" | tr }}
@ -49,12 +68,6 @@
/> />
</p> </p>
<p>
<label for="id_comments">{{ "Comments" | tr }}:</label>
<textarea id="id_comments" name="comments"
rows="5" cols="50"></textarea>
</p>
<p> <p>
<label class="confirmation"> <label class="confirmation">
<input type="checkbox" name="confirm" /> <input type="checkbox" name="confirm" />

3
web/html/css/aurweb.css
View file

@ -144,8 +144,7 @@ span.hover-help {
cursor:help; cursor:help;
} }
label.confirmation, label.confirmation {
#merge-into {
width: auto; width: auto;
} }