diff --git a/warehouse/admin/templates/admin/organization_applications/detail.html b/warehouse/admin/templates/admin/organization_applications/detail.html index 94bc387de9b6..ea521964acbe 100644 --- a/warehouse/admin/templates/admin/organization_applications/detail.html +++ b/warehouse/admin/templates/admin/organization_applications/detail.html @@ -336,7 +336,7 @@ -
-
- {% trans %}Organization account name{% endtrans %} -

{{ organization_application.name }}

-
-
- {% trans %}Organization display name{% endtrans %} -

{{ organization_application.display_name }}

-
-
- {% trans %}️Organization URL{% endtrans %} -

{{ organization_application.link_url }}

-
-
- {% trans %}️Organization description{% endtrans %} -

{{ organization_application.description }}

-
-
- {% trans %}️Organization type{% endtrans %} -

{{ organization_application.orgtype.value }}

-
-
- {% trans %}️Organization membership size{% endtrans %} -

- {{ organization_application.membership_size.value if organization_application.membership_size else "" }} -

-
-
- {% trans %}️Anticipated usage{% endtrans %} -

{{ organization_application.usage if organization_application.usage else "" }}

-
-
- {% trans %}Date submitted{% endtrans %} -

{{ humanize(organization_application.submitted) }}

-
+

+ {% trans org_name=organization_application.display_name %}Organization request for {{ org_name }}{% endtrans %} +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Organization request details
{% trans %}Request status{% endtrans %} + {% if organization_application.status == 'declined' %} + {% trans %}Declined{% endtrans %}: +
+ {% trans %}This organization request has been declined{% endtrans %} + {% elif organization_application.status == 'moreinformationneeded' %} + {% trans %}More information needed{% endtrans %}: +
+ {% trans %}Please provide more information below{% endtrans %} + {% else %} + {% trans %}Request submitted{% endtrans %}: +
+ {% trans %}You will receive an email when the organization has been approved{% endtrans %} + {% endif %} +
{% trans %}Organization account name{% endtrans %}{{ organization_application.name }}
{% trans %}Organization display name{% endtrans %}{{ organization_application.display_name }}
{% trans %}️Organization URL{% endtrans %}{{ organization_application.link_url }}
{% trans %}️Organization description{% endtrans %}{{ organization_application.description }}
{% trans %}️Organization type{% endtrans %}{{ organization_application.orgtype.value }}
{% trans %}️Organization membership size{% endtrans %}{{ organization_application.membership_size.value if organization_application.membership_size else "" }}
{% trans %}️Anticipated usage{% endtrans %}{{ organization_application.usage if organization_application.usage else "" }}
{% trans %}Date submitted{% endtrans %}{{ humanize(organization_application.submitted) }}
{% if information_requests %} -
-

Information Requests

- {% for information_request in information_requests %} -
-
{{ information_request.payload.message }}
- From PyPI Staff - {{ humanize(information_request.created) }} -
-
- {% if information_request.additional.response %} -
+
+
+

Information requests

+ {% for information_request in information_requests|reverse %} +
+
+ {% trans %}️PyPI Staff{% endtrans %} +
{{ information_request.payload.message }}
+ {{ humanize(information_request.created) }} +
+
+ {% if information_request.additional.response %} +
+
+ {% trans %}️Your response{% endtrans %}
{{ information_request.additional.response }}
- Your Response {{ humanize(information_request.additional.response_time|parse_isoformat) }} + {{ humanize(information_request.additional.response_time|parse_isoformat) }}
- {% elif information_request.id in response_forms %} - - - -
- -

- {{ response_forms[information_request.id].response(id="response_form-" + information_request.id.__str__() + "-response", - class_="form-group__field", - aria_describedby="response_form-" + information_request.id.__str__() + "-errors", - ) }} -

-
- {{ field_errors(response_forms[information_request.id].response) }} -
+
+ {% elif information_request.id in response_forms and loop.last %} + + + +
+ + {{ response_forms[information_request.id].response(id="response_form-" + information_request.id.__str__() + "-response", + class_="form-group__field form-group__field--full-width", + rows="4", + aria_describedby="response_form-" + information_request.id.__str__() + "-errors", + ) }} +
+ {{ field_errors(response_forms[information_request.id].response) }}
- - - {% endif %} -
+
+ + + {% endif %} {% endfor %}
{% endif %}