diff --git a/apps/agreements/templates/agreements/_nav.html b/apps/agreements/templates/agreements/_nav.html new file mode 100644 index 000000000..f720676ec --- /dev/null +++ b/apps/agreements/templates/agreements/_nav.html @@ -0,0 +1,25 @@ +{% load agreements %} +{# One navigation for every agreements page; `nav` marks the current item. #} + +{% if not token and user|can_prepare_agreements %} + +{% endif %} diff --git a/apps/agreements/templates/agreements/base.html b/apps/agreements/templates/agreements/base.html index 76ebb6c5d..ea8e9923b 100644 --- a/apps/agreements/templates/agreements/base.html +++ b/apps/agreements/templates/agreements/base.html @@ -4,7 +4,7 @@ {% block page_title %}{% block title %}Agreements{% endblock %} | Python Software Foundation{% endblock %} {% block og_title %}PSF Agreements{% endblock %} -{% block body_attributes %}class="psf agreements"{% endblock %} +{% block body_attributes %}class="psf agreements default-page"{% endblock %} {% block section-logo %}{% endblock %} @@ -27,17 +27,7 @@ {% block left_sidebar %} {% endblock left_sidebar %} diff --git a/apps/agreements/templates/agreements/detail.html b/apps/agreements/templates/agreements/detail.html index ab6fe0468..130922d83 100644 --- a/apps/agreements/templates/agreements/detail.html +++ b/apps/agreements/templates/agreements/detail.html @@ -3,8 +3,17 @@ {% block title %}{{ agreement.title }}: {{ agreement.counterparty_name }}{% endblock %} {% block crumbs %} -{% if can_prepare %}
  • Agreements>>>
    • {% endif %} -
  • {{ agreement.counterparty_name }}
    • +{% if can_prepare %} +
  • Agreements>>>
    • +
  • {{ agreement.counterparty_name }}
    • +{% elif agreement.order %} +
  • Programs>>>
    • +
  • Your orders>>>
    • +
  • {{ agreement.order.legal_name }}>>>
    • +
  • Agreement
    • +{% else %} +
  • {{ agreement.counterparty_name }}
    • +{% endif %} {% endblock %} {% block content %} diff --git a/apps/agreements/templates/agreements/orders/base.html b/apps/agreements/templates/agreements/orders/base.html index c11acf652..510ca8305 100644 --- a/apps/agreements/templates/agreements/orders/base.html +++ b/apps/agreements/templates/agreements/orders/base.html @@ -1,25 +1,12 @@ {% extends "agreements/base.html" %} -{% load static agreements %} +{% load static %} {% block title %}Service orders{% endblock %} -{% block body_attributes %}class="psf agreements agreement-orders"{% endblock %} +{% block body_attributes %}class="psf agreements agreement-orders default-page"{% endblock %} {% block head %}{{ block.super }}{% endblock %} {% block crumbs %}
  • Service orders
    • {% endblock %} -{% block left_sidebar %} - {% endblock %} diff --git a/apps/agreements/templates/agreements/orders/order_detail.html b/apps/agreements/templates/agreements/orders/order_detail.html index b00509cda..a85c9a862 100644 --- a/apps/agreements/templates/agreements/orders/order_detail.html +++ b/apps/agreements/templates/agreements/orders/order_detail.html @@ -5,7 +5,7 @@ {% block crumbs %}
  • Programs>>>
    • {% if nav == "staff" %} -
  • Orders>>>
    • +
  • All orders>>>
    • {% else %}
  • Your orders>>>
    • {% endif %} diff --git a/apps/agreements/templates/agreements/terms.html b/apps/agreements/templates/agreements/terms.html index 4d5655c0b..af5b84f17 100644 --- a/apps/agreements/templates/agreements/terms.html +++ b/apps/agreements/templates/agreements/terms.html @@ -1,6 +1,16 @@ {% extends "agreements/base.html" %} {% block title %}{{ terms.title }}{% endblock %} -{% block crumbs %}
  • {{ terms.title }}
    • {% endblock %} +{% block crumbs %} +{% if token %} +
  • Agreement to sign>>>
    • +{% elif can_edit %} +
  • Agreements>>>
    • +
  • Terms>>>
    • +{% else %} +
  • Programs>>>
    • +{% endif %} +
  • {{ terms.title }}
    • +{% endblock %} {% block sidebar %}
    diff --git a/apps/agreements/templates/agreements/terms_compare.html b/apps/agreements/templates/agreements/terms_compare.html index 9408dbab7..6f3ae739d 100644 --- a/apps/agreements/templates/agreements/terms_compare.html +++ b/apps/agreements/templates/agreements/terms_compare.html @@ -1,6 +1,7 @@ {% extends "agreements/base.html" %} {% block title %}Compare: {{ terms.title }}{% endblock %} {% block crumbs %} +
  • Agreements>>>
  • Terms>>>
  • {{ terms.title }}>>>
  • Compare
    • diff --git a/apps/agreements/templates/agreements/terms_edit.html b/apps/agreements/templates/agreements/terms_edit.html index 6e37555c9..5c4a3242c 100644 --- a/apps/agreements/templates/agreements/terms_edit.html +++ b/apps/agreements/templates/agreements/terms_edit.html @@ -2,6 +2,7 @@ {% load agreements %} {% block title %}Edit: {{ terms.title }}{% endblock %} {% block crumbs %} +
  • Agreements>>>
  • Terms>>>
  • {{ terms.title }}
    • {% endblock %} diff --git a/apps/agreements/views/agreements.py b/apps/agreements/views/agreements.py index 06c68286d..2affbb896 100644 --- a/apps/agreements/views/agreements.py +++ b/apps/agreements/views/agreements.py @@ -51,11 +51,14 @@ def detail(request: HttpRequest, pk: UUID, status: int = 200, **bound: BaseForm """Review an agreement and act on it.""" agreement = _agreement_or_404(request, pk) html, metadata_hidden = documents.render_agreement_preview(documents.final_markdown(agreement)) + forms = action_forms(request, agreement, **bound) + # Only order agreements appear under "Your orders"; custom contracts have no list to mark. + nav = "queue" if forms["can_prepare"] else "orders" if hasattr(agreement, "order") else None context = { - **action_forms(request, agreement, **bound), + **forms, "html": html, "metadata_hidden": metadata_hidden, - "nav": "queue", + "nav": nav, } return render(request, "agreements/detail.html", context, status=status) diff --git a/apps/agreements/views/terms.py b/apps/agreements/views/terms.py index 5915b8410..088563482 100644 --- a/apps/agreements/views/terms.py +++ b/apps/agreements/views/terms.py @@ -75,6 +75,7 @@ def terms(request: HttpRequest, slug: str, version: str | None = None) -> HttpRe """Read one published version of terms; without a version, the current one.""" terms, shown = _readable_terms(request, slug, version) html, toc = documents.render_html(shown.markdown) + staff = can_prepare(request.user) response = render( request, "agreements/terms.html", @@ -84,8 +85,9 @@ def terms(request: HttpRequest, slug: str, version: str | None = None) -> HttpRe "is_current": shown == terms.current_version, "html": html, "toc": toc, - "can_edit": can_prepare(request.user), - "can_read_current": terms.is_public or can_prepare(request.user), + "can_edit": staff, + "can_read_current": terms.is_public or staff, + "nav": "terms" if staff else "programs", }, ) return _terms_cache(request, response, terms)