diff --git a/commcare_connect/templates/403.html b/commcare_connect/templates/403.html index b9cfc06d58..5d06c5a915 100644 --- a/commcare_connect/templates/403.html +++ b/commcare_connect/templates/403.html @@ -1,9 +1,12 @@ {% extends "base.html" %} - {% block title %}Forbidden (403){% endblock %} - {% block content %} -

Forbidden (403)

- -

{% if exception %}{{ exception }}{% else %}You're not allowed to access this page.{% endif %}

+

Forbidden (403)

+

+ {% if exception %} + {{ exception }} + {% else %} + You're not allowed to access this page. + {% endif %} +

{% endblock content %} diff --git a/commcare_connect/templates/404.html b/commcare_connect/templates/404.html index 4e82d3d83a..3689b58249 100644 --- a/commcare_connect/templates/404.html +++ b/commcare_connect/templates/404.html @@ -1,9 +1,12 @@ {% extends "base.html" %} - {% block title %}Page not found{% endblock %} - {% block content %} -

Page not found

- -

{% if exception %}{{ exception }}{% else %}This is not the page you were looking for.{% endif %}

+

Page not found

+

+ {% if exception %} + {{ exception }} + {% else %} + This is not the page you were looking for. + {% endif %} +

{% endblock content %} diff --git a/commcare_connect/templates/500.html b/commcare_connect/templates/500.html index fec31eee60..25390cac9d 100644 --- a/commcare_connect/templates/500.html +++ b/commcare_connect/templates/500.html @@ -1,11 +1,9 @@ {% extends "base.html" %} - {% block title %}Server Error{% endblock %} - {% block content %} -

Ooops!!! 500

- -

Looks like something went wrong!

- -

We track these errors automatically, but if the problem persists feel free to contact us. In the meantime, try refreshing.

+

Ooops!!! 500

+

Looks like something went wrong!

+

+ We track these errors automatically, but if the problem persists feel free to contact us. In the meantime, try refreshing. +

{% endblock content %} diff --git a/commcare_connect/templates/account/account_inactive.html b/commcare_connect/templates/account/account_inactive.html index 31b4d8d435..1d39781bc5 100644 --- a/commcare_connect/templates/account/account_inactive.html +++ b/commcare_connect/templates/account/account_inactive.html @@ -1,13 +1,11 @@ {% extends "account/base.html" %} - {% load i18n %} - -{% block head_title %}{% translate "Account Inactive" %}{% endblock %} - +{% block head_title %} + {% translate "Account Inactive" %} +{% endblock %} {% block inner %}

{% translate "Account Inactive" %}

-

{% translate "This account is inactive." %}

{% endblock %} diff --git a/commcare_connect/templates/account/base.html b/commcare_connect/templates/account/base.html index 75676d4717..8a5b11c948 100644 --- a/commcare_connect/templates/account/base.html +++ b/commcare_connect/templates/account/base.html @@ -1,18 +1,24 @@ {% load static i18n %} - - {% block title %}Connect - {% block head_title %}{% endblock head_title %}{% endblock title %} + + {% block title %} + Connect - + {% block head_title %} + {% endblock head_title %} + {% endblock title %} + {% load static %} {% block css %} - - + + {% endblock %} - {% block javascript %} {{ GTM_VARS_JSON|json_script:"gtm-data" }} @@ -26,8 +32,12 @@
- Compact Logo - Compact Logo + Compact Logo + Compact Logo
@@ -40,16 +50,22 @@

10 +

-
- {% block inner %} - {% endblock %} +
+ {% block inner %}{% endblock %}
-
- Compact Logo +
+ Compact Logo
-
- Compact Logo +
+ Compact Logo
diff --git a/commcare_connect/templates/account/email.html b/commcare_connect/templates/account/email.html index 23220ac1a1..3156571b3f 100644 --- a/commcare_connect/templates/account/email.html +++ b/commcare_connect/templates/account/email.html @@ -1,107 +1,107 @@ {% extends "base.html" %} {% load i18n %} {% load crispy_forms_tags %} - {% block content %} -
- -

{% translate "Edit Name" %}

-
-
-
{% translate "Loading..." %}
+
+

{% translate "Edit Name" %}

+
+
+
{% translate "Loading..." %}
+
-
- - -
-

{% translate "E-mail Addresses" %}

- - {% if user.emailaddress_set.all %} -

{% translate 'The following e-mail addresses are associated with your account:' %}

- -
- {% csrf_token %} -
- {% for emailaddress in user.emailaddress_set.all %} -
- + +
+

{% translate "E-mail Addresses" %}

+ {% if user.emailaddress_set.all %} +

+ {% translate 'The following e-mail addresses are associated with your account:' %} +

+ + {% csrf_token %} +
+ {% for emailaddress in user.emailaddress_set.all %} +
+ +
+ {% endfor %} +
+ + +
- {% endfor %} - -
- - -
+ + {% else %} + - - - {% else %} - - {% endif %} - -
- - -
-

{% translate "Add E-mail Address" %}

- -
-
- {% csrf_token %} - {% crispy form %} -
- + {% endif %} +
+ +
+

{% translate "Add E-mail Address" %}

+
+ + {% csrf_token %} + {% crispy form %} +
+ +
+
- -
+
- -
{% endblock content %} - - {% block inline_javascript %} {{ block.super }} - {% endcomment %} - {% endblock inline_javascript %} + + {% endcomment %} + {% endblock inline_javascript %} diff --git a/commcare_connect/templates/base_table.html b/commcare_connect/templates/base_table.html index 6e861c7de8..ea6dafb3fd 100644 --- a/commcare_connect/templates/base_table.html +++ b/commcare_connect/templates/base_table.html @@ -1,147 +1,139 @@ {% load django_tables2 %} {% load i18n %} {% block table-wrapper %} -{% load sort_link %} -
- {% block table %} -
- - {% block table.thead %} - {% if table.show_header %} - - - {% for column in table.columns %} -
- {% if column.orderable %} - {% sortable_header column.name column.header table.use_view_url %} - {% else %} - {{ column.header }} + {% load sort_link %} +
+ {% block table %} +
+ + {% block table.thead %} + {% if table.show_header %} + + + {% for column in table.columns %} + + {% endfor %} + + {% endif %} - - {% endfor %} - - - {% endif %} - {% endblock table.thead %} - + {% endblock table.thead %} {% block table.tbody %} -
- {% for row in table.paginated_rows %} - {% block table.tbody.row %} -
- {% for column, cell in row.items %} - + {% for column, cell in row.items %} + - {% endfor %} - - {% endblock table.tbody.row %} + + {% endfor %} + + {% endblock table.tbody.row %} {% empty %} - {% if table.empty_text %} - {% block table.tbody.empty_text %} - - + {% if table.empty_text %} + {% block table.tbody.empty_text %} + + + + {% endblock table.tbody.empty_text %} + {% endif %} + {% endfor %} + {% block table.tfoot %} + {% if table.has_footer %} + + {% for column in table.columns %} + + {% endfor %} - {% endblock table.tbody.empty_text %} - {% endif %} - {% endfor %} - {% block table.tfoot %} - {% if table.has_footer %} - - {% for column in table.columns %} - - {% endfor %} - - {% endif %} - {% endblock table.tfoot %} - + {% endif %} + {% endblock table.tfoot %} + {% endblock table.tbody %} - - -
+ {% if column.orderable %} + {% sortable_header column.name column.header table.use_view_url %} + {% else %} + {{ column.header }} + {% endif %} +
- {% if column.localize == None %} - {{ cell }} - {% else %} - {% if column.localize %} - {{ cell|localize }} +
+ {% for row in table.paginated_rows %} + {% block table.tbody.row %} +
+ {% if column.localize == None %} + {{ cell }} {% else %} - {{ cell|unlocalize }} + {% if column.localize %} + {{ cell|localize }} + {% else %} + {{ cell|unlocalize }} + {% endif %} {% endif %} - {% endif %} -
- {{ table.empty_text }} -
{{ table.empty_text }}
{{ column.footer }} +
{{column.footer }}
-
- {% endblock table %} - {% block pagination %} - {% if table.page and table.paginator.count > DEFAULT_PAGE_SIZE %} -
-
- {% if table.page.has_previous %} -
+
+ {% endblock table %} + {% block pagination %} + {% if table.page and table.paginator.count > DEFAULT_PAGE_SIZE %} +
+
+ {% if table.page.has_previous %} + - {% else %} -
{% endif %} - -
- - -
-
- {% endif %} - - {% endblock pagination %} -
-{% endblock table-wrapper %} - -{% block inline_js %} - -{% endblock inline_js %} + + {% endblock inline_js %} diff --git a/commcare_connect/templates/components/avatar.html b/commcare_connect/templates/components/avatar.html index b96df4ca6c..c2ca45699a 100644 --- a/commcare_connect/templates/components/avatar.html +++ b/commcare_connect/templates/components/avatar.html @@ -1,6 +1,4 @@ -
+
{{ initials_text }}
diff --git a/commcare_connect/templates/components/badges/badge_sm_dropdown.html b/commcare_connect/templates/components/badges/badge_sm_dropdown.html index 658d8789ed..8a0247b256 100644 --- a/commcare_connect/templates/components/badges/badge_sm_dropdown.html +++ b/commcare_connect/templates/components/badges/badge_sm_dropdown.html @@ -1,71 +1,25 @@ - + +{{ list|length|add:-2 }} - -
+

{{ title|default:'Flags' }}

- {% for item in list %} -

{{ item }}

- {% endfor %} + {% for item in list %}

{{ item }}

{% endfor %}
diff --git a/commcare_connect/templates/components/breadcrumbs.html b/commcare_connect/templates/components/breadcrumbs.html index 06b1fd0ff1..e0e96be324 100644 --- a/commcare_connect/templates/components/breadcrumbs.html +++ b/commcare_connect/templates/components/breadcrumbs.html @@ -1,8 +1,8 @@ diff --git a/commcare_connect/templates/components/cards/user_status_card.html b/commcare_connect/templates/components/cards/user_status_card.html index eef643ab11..264e594649 100644 --- a/commcare_connect/templates/components/cards/user_status_card.html +++ b/commcare_connect/templates/components/cards/user_status_card.html @@ -1,6 +1,6 @@ {% load i18n %} - -
+

User Status Details

{% if opportunity_access.suspended %} @@ -10,25 +10,20 @@

User Status Details

- {% translate "Revoke Suspension" %} - + {% else %} - + {% endif %} {% endif %}
- {% if opportunity_access.suspended %}
{% if opportunity_access.suspension_date %} @@ -45,43 +40,53 @@

User Status Details

{% endif %} - -
+

Suspend User

-
- {% csrf_token %} -
- -
- - - - - - - - - - - - - - - -
{% translate "Deliveries waiting for Approval" %}{{ pending_completed_work_count }}
{% translate "Payment Accrued" %}{{ opportunity_access.payment_accrued }}
{% translate "Payment Pending Disbursement" %}{{ pending_payment }}
-

{% translate "You will not be able to approve payments for the user or pay the user after suspension." %}

+ action="{% url "opportunity:suspend_user" org_slug=request.org.slug opp_id=opportunity_access.opportunity.opportunity_id pk=opportunity_access.opportunity_access_id %}" + @submit="showSuspendModal = false"> + {% csrf_token %} +
+ +
+ + + + + + + + + + + + + + + +
{% translate "Deliveries waiting for Approval" %}{{ pending_completed_work_count }}
{% translate "Payment Accrued" %}{{ opportunity_access.payment_accrued }}
{% translate "Payment Pending Disbursement" %}{{ pending_payment }}
+

+ {% translate "You will not be able to approve payments for the user or pay the user after suspension." %} +

- +
diff --git a/commcare_connect/templates/components/confirm_modal.html b/commcare_connect/templates/components/confirm_modal.html index 50c08fc6aa..81ec34ea01 100644 --- a/commcare_connect/templates/components/confirm_modal.html +++ b/commcare_connect/templates/components/confirm_modal.html @@ -1,5 +1,4 @@ {% load i18n %} - - -