update tmplates

Author: JacobCoffee

apps/agreements/templates/agreements/_actions.html

@@ -16,7 +16,7 @@
 
 {% include "agreements/_record.html" %}
 
-{% if is_staff and agreement.status == "executed" %}
+{% if is_administrator and agreement.status == "executed" %}
   <form method="post" action="{% url 'agreements:resend_executed_copy' agreement.pk %}" class="sign-form">
     {% csrf_token %}
     {% if next %}<input type="hidden" name="next" value="{{ next }}">{% endif %}
@@ -117,7 +117,7 @@ <h2 id="offline-title">{% if sign_form %}Or sign outside python.org{% else %}Sig
   </section>
 {% endif %}
 
-{% if is_staff and agreement.status == "offered" %}
+{% if is_administrator and agreement.status == "offered" %}
   <section class="staff-panel" aria-labelledby="staff-title">
     <h2 id="staff-title">PSF staff</h2>
     <p class="actions">

apps/agreements/templates/agreements/base.html

@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static sitetree %}
+{% load static sitetree agreements %}
 
 {% block page_title %}{% block title %}Agreements{% endblock %} | Python Software Foundation{% endblock %}
 {% block og_title %}PSF Agreements{% endblock %}
@@ -28,7 +28,7 @@
 {% block left_sidebar %}
 <aside class="left-sidebar">
   {% block sidebar %}{% endblock %}
-  {% if perms.agreements.manage_agreement %}
+  {% if user|can_prepare_agreements %}
     <div class="section-navigation sidebar-widget">
       <ul class="section-nav menu" role="menu">
         <li class="{% if nav == 'queue' %}current_item selected{% endif %}" role="menuitem"><a href="{% url 'agreements:queue' %}">Agreements</a></li>

apps/agreements/templates/agreements/custom_detail.html

@@ -19,12 +19,16 @@ <h1 class="page-title">{{ contract.title }}</h1>
 
   <div class="agreement-scroll" tabindex="0" aria-label="Preview"><div class="agreement-text">{{ html|safe }}</div></div>
 
+  {% if user|is_agreements_administrator %}
   <p>Making it ready to sign fixes this text as revision 1. You can then send a signing link, record a signed copy, or {% if contract.counterparty_account %}let {{ contract.counterparty_account.email }} sign on python.org{% else %}name an account that signs online{% endif %}, and still edit it until it is signed.</p>
+  {% endif %}
   <div class="actions">
+    {% if user|is_agreements_administrator %}
     <form method="post" action="{% url 'agreements:custom_offer' contract.pk %}">
       {% csrf_token %}
       <button type="submit">Make ready to sign</button>
     </form>
+    {% endif %}
     <form method="post" action="{% url 'agreements:custom_delete' contract.pk %}" class="discard-form">
       {% csrf_token %}
       <button type="submit">Discard draft</button>

apps/agreements/templates/agreements/detail.html

@@ -3,7 +3,7 @@
 {% block title %}{{ agreement.title }}: {{ agreement.counterparty_name }}{% endblock %}
 
 {% block crumbs %}
-{% if is_staff %}<li><a href="{% url 'agreements:queue' %}">Agreements</a><span class="prompt">&gt;&gt;&gt;</span></li>{% endif %}
+{% if can_prepare %}<li><a href="{% url 'agreements:queue' %}">Agreements</a><span class="prompt">&gt;&gt;&gt;</span></li>{% endif %}
 <li>{{ agreement.counterparty_name }}</li>
 {% endblock %}
 

apps/agreements/templates/agreements/orders/base.html

@@ -1,5 +1,5 @@
 {% extends "agreements/base.html" %}
-{% load static %}
+{% load static agreements %}
 
 {% block title %}Service orders{% endblock %}
 {% block body_attributes %}class="psf agreements agreement-orders"{% endblock %}
@@ -13,7 +13,7 @@
       <li class="{% if nav == 'programs' %}current_item selected{% endif %}"><a href="{% url 'agreements:program_list' %}">Programs</a></li>
       {% if user.is_authenticated %}
         <li class="{% if nav == 'orders' %}current_item selected{% endif %}"><a href="{% url 'agreements:order_list' %}">Your orders</a></li>
-        {% if perms.agreements.manage_agreement %}
+        {% if user|can_prepare_agreements %}
           <li class="{% if nav == 'staff' %}current_item selected{% endif %}"><a href="{% url 'agreements:staff_orders' %}">All orders</a></li>
           <li><a href="{% url 'agreements:queue' %}">Agreements to countersign</a></li>
         {% endif %}

apps/agreements/templates/agreements/orders/order_detail.html

@@ -17,7 +17,7 @@
   <header class="article-header">
     <h1 class="page-title">{{ order.legal_name }}</h1>
   </header>
-  <p class="order-meta">{% status_badge order.status %} {{ order.program_title }} order · Reference <code>{{ order.reference }}</code>{% if order.agreement and order.agreement.revision > 1 %} · Order Form revision {{ order.agreement.revision }}{% endif %}{% if is_staff and order.agreement %} · <a href="{{ order.agreement.get_absolute_url }}">Agreement record</a>{% endif %}</p>
+  <p class="order-meta">{% status_badge order.status %} {{ order.program_title }} order · Reference <code>{{ order.reference }}</code>{% if order.agreement and order.agreement.revision > 1 %} · Order Form revision {{ order.agreement.revision }}{% endif %}{% if can_prepare and order.agreement %} · <a href="{{ order.agreement.get_absolute_url }}">Agreement record</a>{% endif %}</p>
 
   {% if configuration_error %}
     <div class="user-feedback level-error"><p>{{ configuration_error }}</p></div>
@@ -108,22 +108,24 @@ <h2 id="sign-title">Sign on python.org</h2>
       </section>
     {% endif %}
 
-    {% if can_edit %}
+    {% if can_offer %}
       <section class="offline-signing" aria-labelledby="ready-title">
         <h2 id="ready-title">{% if draft_sign_form %}Or sign some other way{% else %}Prepare for signature{% endif %}</h2>
-        <p>Making the Order Form ready to sign fixes its text. Then {% if is_staff %}the PSF can edit it for this customer, email a one-time signing link to anyone, or record a copy signed through DocuSign or on paper{% else %}you can download it to sign through DocuSign, your procurement system, or on paper, and upload the signed copy{% endif %}. It can be withdrawn and changed until it is signed.</p>
+        <p>Making the Order Form ready to sign fixes its text. Then {% if is_administrator %}the PSF can edit it for this customer, email a one-time signing link to anyone, or record a copy signed through DocuSign or on paper{% else %}you can download it to sign through DocuSign, your procurement system, or on paper, and upload the signed copy{% endif %}. It can be withdrawn and changed until it is signed.</p>
         <div class="actions">
           <form method="post" action="{% url 'agreements:order_offer' order.pk %}">
             {% csrf_token %}
             <button type="submit">Make ready to sign</button>
           </form>
-          <form method="post" action="{% url 'agreements:order_delete' order.pk %}" class="discard-form">
-            {% csrf_token %}
-            <button type="submit">Discard draft</button>
-          </form>
         </div>
       </section>
     {% endif %}
+    {% if can_edit %}
+      <form method="post" action="{% url 'agreements:order_delete' order.pk %}" class="discard-form">
+        {% csrf_token %}
+        <button type="submit">Discard draft</button>
+      </form>
+    {% endif %}
   {% endif %}
   {% endif %}
 </article>

apps/agreements/templates/agreements/terms_edit.html

@@ -1,4 +1,5 @@
 {% extends "agreements/base.html" %}
+{% load agreements %}
 {% block title %}Edit: {{ terms.title }}{% endblock %}
 {% block crumbs %}
 <li><a href="{% url 'agreements:terms_list' %}">Terms</a><span class="prompt">&gt;&gt;&gt;</span></li>
@@ -16,15 +17,18 @@ <h1 class="page-title">Edit {{ terms.title }}</h1>
     {% csrf_token %}
     {{ form.non_field_errors }}
     {% include "agreements/_field.html" with field=form.markdown %}
+    {% if user|is_agreements_administrator %}
     <label class="choice">{{ form.under_review }} <span>{{ form.under_review.label }}: show a notice wherever these terms appear.</span></label>
     <label class="choice">{{ form.is_public }} <span>{{ form.is_public.label }}. {{ form.is_public.help_text }}</span></label>
+    {% endif %}
 
     <p class="form-actions">
       <button type="submit" name="action" value="save" class="secondaryAction">Save draft</button>
       <button type="submit" name="preview" value="1" class="secondaryAction">Preview</button>
       <a href="{% url 'agreements:terms_list' %}">Cancel</a>
     </p>
 
+    {% if user|is_agreements_administrator %}
     <fieldset class="staff-panel">
       <legend>Publish as a new version</legend>
       <div class="field-row">
@@ -33,6 +37,7 @@ <h1 class="page-title">Edit {{ terms.title }}</h1>
       {% include "agreements/_field.html" with field=form.notes %}
       <button type="submit" name="action" value="publish">Publish</button>
     </fieldset>
+    {% endif %}
   </form>
 
   {% if preview %}

apps/agreements/templates/agreements/terms_list.html

@@ -1,4 +1,5 @@
 {% extends "agreements/base.html" %}
+{% load agreements %}
 {% block title %}Terms{% endblock %}
 {% block crumbs %}<li><a href="{% url 'agreements:queue' %}">Agreements</a><span class="prompt">&gt;&gt;&gt;</span></li><li>Terms</li>{% endblock %}
 
@@ -23,10 +24,10 @@ <h1 class="page-title">Terms</h1>
     </tbody>
   </table>
   </div>
-  {% if user.is_staff and perms.agreements.manage_agreement %}
+  {% if user.is_staff and user|is_agreements_administrator %}
     <p class="help"><a href="{% url 'admin:agreements_terms_add' %}">Add a new set of terms in the admin</a>, then write and publish it here.</p>
   {% else %}
-    <p class="help">Ask an administrator to create a new set of terms, then write and publish it here.</p>
+    <p class="help">Ask an administrator to create new terms or publish your draft.</p>
   {% endif %}
 </article>
 {% endblock %}