diff --git a/tests/django_admin/admin/base.html b/tests/django_admin/admin/base.html index b5fe1b8..f0e74af 100644 --- a/tests/django_admin/admin/base.html +++ b/tests/django_admin/admin/base.html @@ -59,14 +59,10 @@ {% endif %} {% endif %} {% if user.has_usable_password %} - - {% translate 'Change password' %} - + {% translate 'Change password' %} / {% endif %} - - {% translate 'Log out' %} - + {% translate 'Log out' %} {% endblock %} {% endif %} diff --git a/tests/django_admin/admin/change_list.html b/tests/django_admin/admin/change_list.html index a29b361..b967395 100644 --- a/tests/django_admin/admin/change_list.html +++ b/tests/django_admin/admin/change_list.html @@ -97,9 +97,7 @@

{% translate 'Filter' %}

{% if cl.has_active_filters %}

- - ✖ {% translate "Clear all filters" %} - + ✖ {% translate "Clear all filters" %}

{% endif %} {% for spec in cl.filter_specs %} diff --git a/tests/django_admin/admin/change_list_results.html b/tests/django_admin/admin/change_list_results.html index 12ae1a6..a43e3ea 100644 --- a/tests/django_admin/admin/change_list_results.html +++ b/tests/django_admin/admin/change_list_results.html @@ -30,9 +30,7 @@ {% endif %}
{% if header.sortable %} - - {{ header.text|capfirst }} - + {{ header.text|capfirst }} {% else %} {{ header.text|capfirst }} {% endif %} diff --git a/tests/django_admin/admin/delete_confirmation.html b/tests/django_admin/admin/delete_confirmation.html index 96f86db..2b2717e 100644 --- a/tests/django_admin/admin/delete_confirmation.html +++ b/tests/django_admin/admin/delete_confirmation.html @@ -75,9 +75,7 @@ {% endif %} - - {% translate "No, take me back" %} - + {% translate "No, take me back" %}
{% endif %} diff --git a/tests/django_admin/admin/delete_selected_confirmation.html b/tests/django_admin/admin/delete_selected_confirmation.html index 7b87bcb..6ca5d5d 100644 --- a/tests/django_admin/admin/delete_selected_confirmation.html +++ b/tests/django_admin/admin/delete_selected_confirmation.html @@ -71,9 +71,7 @@ - - {% translate "No, take me back" %} - + {% translate "No, take me back" %} {% endif %} diff --git a/tests/django_admin/admin/index.html b/tests/django_admin/admin/index.html index 957bc81..4046a9d 100644 --- a/tests/django_admin/admin/index.html +++ b/tests/django_admin/admin/index.html @@ -31,9 +31,7 @@ {% if entry.is_deletion or not entry.get_admin_url %} {{ entry.object_repr }} {% else %} - - {{ entry.object_repr }} - + {{ entry.object_repr }} {% endif %}
{% if entry.content_type %} diff --git a/tests/django_admin/registration/password_change_done.html b/tests/django_admin/registration/password_change_done.html index a035040..27a1a2e 100644 --- a/tests/django_admin/registration/password_change_done.html +++ b/tests/django_admin/registration/password_change_done.html @@ -7,9 +7,7 @@ / {% endif %} {% translate 'Change password' %} / - - {% translate 'Log out' %} - + {% translate 'Log out' %} {% endblock %} {% block breadcrumbs %}
diff --git a/tests/django_admin/registration/password_change_form.html b/tests/django_admin/registration/password_change_form.html index e445528..058fecc 100644 --- a/tests/django_admin/registration/password_change_form.html +++ b/tests/django_admin/registration/password_change_form.html @@ -11,9 +11,7 @@ / {% endif %} {% translate 'Change password' %} / - - {% translate 'Log out' %} - + {% translate 'Log out' %} {% endblock %} {% block breadcrumbs %}
diff --git a/tests/django_cms/admin/cms/mail/base.html b/tests/django_cms/admin/cms/mail/base.html index d1ce925..90e6e0e 100644 --- a/tests/django_cms/admin/cms/mail/base.html +++ b/tests/django_cms/admin/cms/mail/base.html @@ -61,9 +61,7 @@

Generated by - - django cms - + django cms {% now "d.m.Y H:i:s" %}.

diff --git a/tests/django_cms/admin/cms/page/permissions.html b/tests/django_cms/admin/cms/page/permissions.html index b1e7e36..a0d7ca4 100644 --- a/tests/django_cms/admin/cms/page/permissions.html +++ b/tests/django_cms/admin/cms/page/permissions.html @@ -13,9 +13,7 @@ {% trans "Can change permissions" %} {% trans "Can move" %} {% trans "Can view" %} - - {% trans "Grant on" %} - + {% trans "Grant on" %} diff --git a/tests/django_cms/admin/cms/page/submit_row.html b/tests/django_cms/admin/cms/page/submit_row.html index 0a35328..f159527 100644 --- a/tests/django_cms/admin/cms/page/submit_row.html +++ b/tests/django_cms/admin/cms/page/submit_row.html @@ -7,9 +7,7 @@ {% endif %}

{% if show_delete_link %} - - {% trans "Delete" %} - + {% trans "Delete" %} {% endif %} {% if show_buttons %} - - {% filter escapejs %}{% trans "last change on" %}{% endfilter %}: - + {% filter escapejs %}{% trans "last change on" %}{% endfilter %}: {{ page.changed_date|date:"Y-m-d H:i:s" }}

{% endif %} {% if page.get_template_display %}

- - {% filter escapejs %}{% trans "template" %}{% endfilter %}: - + {% filter escapejs %}{% trans "template" %}{% endfilter %}: {{ page.get_template_display }}

{% endif %} {% if metadata %}

- - {% filter escapejs %}{% trans "meta" %}{% endfilter %}: - + {% filter escapejs %}{% trans "meta" %}{% endfilter %}: {{ metadata }}

{% endif %} {% if page.site %}

- - {% filter escapejs %}{% trans "site" %}{% endfilter %}: - + {% filter escapejs %}{% trans "site" %}{% endfilter %}: {{ page.site }}

{% endif %} diff --git a/tests/django_cms/admin/cms/page/tree/legend.html b/tests/django_cms/admin/cms/page/tree/legend.html index e098e66..a0d65b4 100644 --- a/tests/django_cms/admin/cms/page/tree/legend.html +++ b/tests/django_cms/admin/cms/page/tree/legend.html @@ -4,9 +4,7 @@
- - {% trans "Legend" %} - + {% trans "Legend" %}
- {% endif %} -
-
- {% for item in cms_toolbar.get_right_items %} - {{ item.render }} - {% endfor %} + + +
    + + + {% endif %} +
    +
    + {% for item in cms_toolbar.get_right_items %} + {{ item.render }} + {% endfor %} +
    + {# end: toolbar #} + {% block toolbar_bottom %}{% endblock toolbar_bottom %}
    - {# end: toolbar #} - {% block toolbar_bottom %}{% endblock toolbar_bottom %} - diff --git a/tests/django_cms/cms/toolbar/toolbar_with_structure.html b/tests/django_cms/cms/toolbar/toolbar_with_structure.html index 4854c8e..23134ea 100644 --- a/tests/django_cms/cms/toolbar/toolbar_with_structure.html +++ b/tests/django_cms/cms/toolbar/toolbar_with_structure.html @@ -45,64 +45,61 @@
    - - - - - -
    -
    -
    -
    -
    -
    -
    -
    -
    - + + + + +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    - - {# start: structure #} -
    -
    - {% if cms_renderer.load_structure %} - {% for placeholder in cms_renderer.get_rendered_editable_placeholders %} -
    - {% include cms_toolbar.templates.dragbar_template with placeholder=placeholder %} -
    -
    - {% trans "Drop a plugin here" %} + {# start: structure #} +
    +
    + {% if cms_renderer.load_structure %} + {% for placeholder in cms_renderer.get_rendered_editable_placeholders %} +
    + {% include cms_toolbar.templates.dragbar_template with placeholder=placeholder %} +
    +
    + {% trans "Drop a plugin here" %} +
    + {% for plugin in placeholder.get_cached_plugins %} + {% include cms_toolbar.templates.drag_item_template with plugin=plugin %} + {% endfor %}
    - {% for plugin in placeholder.get_cached_plugins %} - {% include cms_toolbar.templates.drag_item_template with plugin=plugin %} - {% endfor %}
    -
    - {% endfor %} - {% endif %} -
    -
    - {# end: structure #} - {% if cms_toolbar.redirect_url %} -
    -
    -

    {% trans "This page has no preview!" %}

    -

    - {% trans "It is being redirected to:" %} - - {{ cms_toolbar.redirect_url }} - -

    + {% endfor %} + {% endif %}
    - {% endif %} - -{% endblock toolbar_bottom %} + + {% endblock toolbar_bottom %} diff --git a/tests/django_cms/cms/welcome.html b/tests/django_cms/cms/welcome.html index f7ca4b9..b503ef8 100644 --- a/tests/django_cms/cms/welcome.html +++ b/tests/django_cms/cms/welcome.html @@ -63,9 +63,7 @@

    {% trans "Installation Notes" %}

    - - {% trans "django CMS" %} - + {% trans "django CMS" %} {% trans "Support" %} diff --git a/tests/django_ledger/account_create_child.html b/tests/django_ledger/account_create_child.html index d29a58f..0d84e25 100644 --- a/tests/django_ledger/account_create_child.html +++ b/tests/django_ledger/account_create_child.html @@ -6,9 +6,7 @@

    -

    - {{ page_title }} -

    +

    {{ page_title }}

    {{ account }}

    diff --git a/tests/django_ledger/account_detail.html b/tests/django_ledger/account_detail.html index f4d0472..fd32dc7 100644 --- a/tests/django_ledger/account_detail.html +++ b/tests/django_ledger/account_detail.html @@ -8,12 +8,8 @@ {% block view_content %}
    -

    - {{ account.code }}: {{ account.name }} -

    -

    - {% trans 'Account Transaction List Report' %} -

    +

    {{ account.code }}: {{ account.name }}

    +

    {% trans 'Account Transaction List Report' %}

    {% if view_date %} {{ from_date | date:'m/d/Y' }} diff --git a/tests/django_ledger/balance_sheet.html b/tests/django_ledger/balance_sheet.html index 8514cb6..7f9b993 100644 --- a/tests/django_ledger/balance_sheet.html +++ b/tests/django_ledger/balance_sheet.html @@ -24,21 +24,13 @@
    {% if entity %} -

    - {% session_entity_name %} -

    +

    {% session_entity_name %}

    {% elif ledger %} -

    - {{ ledger.name }} -

    +

    {{ ledger.name }}

    {% elif unit_model %} -

    - {{ ledger.name }} -

    +

    {{ ledger.name }}

    {% endif %} -

    - {% trans 'Balance Sheet' %} -

    +

    {% trans 'Balance Sheet' %}

    {% if unit_model %}

    {{ unit_model.name }} {% trans 'Unit' %} diff --git a/tests/django_ledger/bank_account_list.html b/tests/django_ledger/bank_account_list.html index 128fc39..ee0e99f 100644 --- a/tests/django_ledger/bank_account_list.html +++ b/tests/django_ledger/bank_account_list.html @@ -8,9 +8,7 @@
    - - {% icon 'carbon:add-alt' 24 %} - + {% icon 'carbon:add-alt' 24 %} {% trans 'New Bank Account' %}
    diff --git a/tests/django_ledger/bill_create.html b/tests/django_ledger/bill_create.html index 6c1b696..63dca76 100644 --- a/tests/django_ledger/bill_create.html +++ b/tests/django_ledger/bill_create.html @@ -9,9 +9,7 @@ {% if po_model %}

    {% trans 'Bill for' %} {{ po_model.po_number }}

    -

    - {% trans 'Bill for' %} {{ po_model.po_title }} -

    +

    {% trans 'Bill for' %} {{ po_model.po_title }}

    {% for po_item in po_items %}

    {{ po_item }} diff --git a/tests/django_ledger/bill_delete.html b/tests/django_ledger/bill_delete.html index 08b0aef..e2fc517 100644 --- a/tests/django_ledger/bill_delete.html +++ b/tests/django_ledger/bill_delete.html @@ -28,9 +28,7 @@ class="button is-primary"> {% trans 'Go Back' %} - +

    diff --git a/tests/django_ledger/bill_detail.html b/tests/django_ledger/bill_detail.html index e715783..f7fa2dc 100644 --- a/tests/django_ledger/bill_detail.html +++ b/tests/django_ledger/bill_detail.html @@ -139,12 +139,8 @@ - - {% trans 'Total' %} - - - {% currency_symbol %}{{ total_amount_due | currency_format }} - + {% trans 'Total' %} + {% currency_symbol %}{{ total_amount_due | currency_format }} diff --git a/tests/django_ledger/bill_list.html b/tests/django_ledger/bill_list.html index 0ecf282..18ec04a 100644 --- a/tests/django_ledger/bill_list.html +++ b/tests/django_ledger/bill_list.html @@ -9,25 +9,19 @@
    {% if month %} -

    - {{ month | date:'F Y' }} -

    +

    {{ month | date:'F Y' }}

    {% elif year %}

    Year {{ year | date:'Y' }} Bills

    {% else %} -

    - {% trans 'Latest Bills' %} -

    +

    {% trans 'Latest Bills' %}

    {% endif %}
    - - {% icon 'carbon:add-alt' 60 %} - + {% icon 'carbon:add-alt' 60 %}
    diff --git a/tests/django_ledger/bill_void.html b/tests/django_ledger/bill_void.html index 2c9b678..ee8794e 100644 --- a/tests/django_ledger/bill_void.html +++ b/tests/django_ledger/bill_void.html @@ -25,9 +25,7 @@ class="button is-primary"> {% trans 'Go Back' %} - +

    diff --git a/tests/django_ledger/customer_list.html b/tests/django_ledger/customer_list.html index 8b45b3c..34576c3 100644 --- a/tests/django_ledger/customer_list.html +++ b/tests/django_ledger/customer_list.html @@ -8,9 +8,7 @@
    - - {% icon 'carbon:add-alt' 24 %} - + {% icon 'carbon:add-alt' 24 %} {% trans 'New Customer' %}
    diff --git a/tests/django_ledger/data_import_job_txs.html b/tests/django_ledger/data_import_job_txs.html index 366bfa3..d41c933 100644 --- a/tests/django_ledger/data_import_job_txs.html +++ b/tests/django_ledger/data_import_job_txs.html @@ -14,9 +14,7 @@ {% data_import_job_txs_imported %}
    - - Back - + Back
    diff --git a/tests/django_ledger/entity_delete.html b/tests/django_ledger/entity_delete.html index 829e054..019773a 100644 --- a/tests/django_ledger/entity_delete.html +++ b/tests/django_ledger/entity_delete.html @@ -23,9 +23,7 @@ {% trans 'Go Back' %} - +
    diff --git a/tests/django_ledger/expense_list.html b/tests/django_ledger/expense_list.html index b465560..05f77d1 100644 --- a/tests/django_ledger/expense_list.html +++ b/tests/django_ledger/expense_list.html @@ -8,15 +8,11 @@
    -

    - {% trans 'The Things I Pay For' %} -

    +

    {% trans 'The Things I Pay For' %}

    - - {% icon 'carbon:add-alt' 60 %} - + {% icon 'carbon:add-alt' 60 %}
    diff --git a/tests/django_ledger/home.html b/tests/django_ledger/home.html index 6ef2d21..92e559b 100644 --- a/tests/django_ledger/home.html +++ b/tests/django_ledger/home.html @@ -14,9 +14,7 @@
    - - {% icon "ic:baseline-add-circle-outline" 48 %} - + {% icon "ic:baseline-add-circle-outline" 48 %}

    {% trans 'New Entity' %}

    diff --git a/tests/django_ledger/includes/card_bill.html b/tests/django_ledger/includes/card_bill.html index cd1b24e..a170873 100644 --- a/tests/django_ledger/includes/card_bill.html +++ b/tests/django_ledger/includes/card_bill.html @@ -30,9 +30,7 @@ {% else %}

    Is Progressible: - - {% icon 'maki:roadblock-11' 24 %} - + {% icon 'maki:roadblock-11' 24 %} {% endif %}

    You Still Owe: @@ -123,9 +121,7 @@ {% else %}

    Is Accrued: - - {% icon 'maki:roadblock-11' 24 %} - + {% icon 'maki:roadblock-11' 24 %}

    {% endif %}

    @@ -178,12 +174,8 @@ {% else %}

    - - {% icon "ic:baseline-add-circle-outline" 48 %} - + {% icon "ic:baseline-add-circle-outline" 48 %} -

    - {% trans 'New Bill' %} -

    +

    {% trans 'New Bill' %}

    {% endif %} diff --git a/tests/django_ledger/includes/card_invoice.html b/tests/django_ledger/includes/card_invoice.html index 71aa559..de44b5a 100644 --- a/tests/django_ledger/includes/card_invoice.html +++ b/tests/django_ledger/includes/card_invoice.html @@ -31,9 +31,7 @@ {% else %}

    Is Progressible: - - {% icon 'maki:roadblock-11' 24 %} - + {% icon 'maki:roadblock-11' 24 %} {% endif %}

    Owed to You: {% currency_symbol %}{{ invoice.get_amount_open | currency_format }} @@ -118,9 +116,7 @@ {% else %}

    Is Progressible: - - {% icon 'maki:roadblock-11' 24 %} - + {% icon 'maki:roadblock-11' 24 %}

    {% endif %}

    @@ -158,12 +154,8 @@ {% else %}

    - - {% icon "ic:baseline-add-circle-outline" 48 %} - + {% icon "ic:baseline-add-circle-outline" 48 %} -

    - {% trans 'New Invoice' %} -

    +

    {% trans 'New Invoice' %}

    {% endif %} diff --git a/tests/django_ledger/includes/card_po.html b/tests/django_ledger/includes/card_po.html index 21e1c8e..2161a29 100644 --- a/tests/django_ledger/includes/card_po.html +++ b/tests/django_ledger/includes/card_po.html @@ -22,9 +22,7 @@ {% if po_model.for_inventory %} {% icon 'ant-design:check-circle-filled' 24 %} {% else %} - - {% icon 'maki:roadblock-11' 24 %} - + {% icon 'maki:roadblock-11' 24 %} {% endif %}

    @@ -33,9 +31,7 @@ {% icon 'ant-design:check-circle-filled' 24 %} {{ po_model.fulfillment_date | date }} {% else %} - - {% icon 'maki:roadblock-11' 24 %} - + {% icon 'maki:roadblock-11' 24 %} {% endif %}

    @@ -58,12 +54,8 @@ {% else %}
    - - {% icon "ic:baseline-add-circle-outline" 48 %} - + {% icon "ic:baseline-add-circle-outline" 48 %} -

    - {% trans 'New PO' %} -

    +

    {% trans 'New PO' %}

    {% endif %} diff --git a/tests/django_ledger/includes/page_header.html b/tests/django_ledger/includes/page_header.html index abf81a8..12597e7 100644 --- a/tests/django_ledger/includes/page_header.html +++ b/tests/django_ledger/includes/page_header.html @@ -18,9 +18,7 @@
    {% endif %}
    -

    - {{ header_title }} -

    +

    {{ header_title }}

    {% if header_subtitle %}

    {{ header_subtitle }}

    {% endif %}
    diff --git a/tests/django_ledger/income_statement.html b/tests/django_ledger/income_statement.html index 93db5f3..210f23a 100644 --- a/tests/django_ledger/income_statement.html +++ b/tests/django_ledger/income_statement.html @@ -24,22 +24,16 @@
    {% if entity %} -

    - {% session_entity_name %} -

    +

    {% session_entity_name %}

    {% elif ledger %} -

    - {{ ledger.name }} -

    +

    {{ ledger.name }}

    {% endif %} {% if unit_model %}

    {{ unit_model.name }} {% trans 'Unit' %}

    {% endif %} -

    - {% trans 'Income Statement' %} -

    +

    {% trans 'Income Statement' %}

    {% if quarter %} {{ year }} | Q{{ quarter }} diff --git a/tests/django_ledger/inventory_item_list.html b/tests/django_ledger/inventory_item_list.html index 500e2b9..d9cdb09 100644 --- a/tests/django_ledger/inventory_item_list.html +++ b/tests/django_ledger/inventory_item_list.html @@ -8,15 +8,11 @@
    -

    - {% trans 'My Inventory Items' %} -

    +

    {% trans 'My Inventory Items' %}

    - - {% icon 'carbon:add-alt' 60 %} - + {% icon 'carbon:add-alt' 60 %}
    diff --git a/tests/django_ledger/invoice_delete.html b/tests/django_ledger/invoice_delete.html index c2c7dee..36c1369 100644 --- a/tests/django_ledger/invoice_delete.html +++ b/tests/django_ledger/invoice_delete.html @@ -26,9 +26,7 @@ class="button is-primary"> {% trans 'Go Back' %} - +

    diff --git a/tests/django_ledger/invoice_detail.html b/tests/django_ledger/invoice_detail.html index 2b5d02d..815ffb1 100644 --- a/tests/django_ledger/invoice_detail.html +++ b/tests/django_ledger/invoice_detail.html @@ -124,12 +124,8 @@ - - {% trans 'Total' %} - - - {% currency_symbol %}{{ total_amount_due | currency_format }} - + {% trans 'Total' %} + {% currency_symbol %}{{ total_amount_due | currency_format }} diff --git a/tests/django_ledger/invoice_list.html b/tests/django_ledger/invoice_list.html index 8027bd2..c6347ea 100644 --- a/tests/django_ledger/invoice_list.html +++ b/tests/django_ledger/invoice_list.html @@ -9,25 +9,19 @@
    {% if month %} -

    - {{ month | date:'F Y' }} -

    +

    {{ month | date:'F Y' }}

    {% elif year %}

    Year {{ year | date:'Y' }} {% trans 'Invoices' %}

    {% else %} -

    - {% trans 'Latest Invoices' %} -

    +

    {% trans 'Latest Invoices' %}

    {% endif %}
    - - {% icon 'carbon:add-alt' 60 %} - + {% icon 'carbon:add-alt' 60 %}
    diff --git a/tests/django_ledger/invoice_update.html b/tests/django_ledger/invoice_update.html index 311eb87..49c6a37 100644 --- a/tests/django_ledger/invoice_update.html +++ b/tests/django_ledger/invoice_update.html @@ -153,9 +153,7 @@ {% if invoice.ledger.posted %} {% icon 'ant-design:check-circle-filled' 24 %} {% else %} - - {% icon 'maki:roadblock-11' 24 %} - + {% icon 'maki:roadblock-11' 24 %} {% endif %}

    diff --git a/tests/django_ledger/pns_list.html b/tests/django_ledger/pns_list.html index 6c2e053..9c18d31 100644 --- a/tests/django_ledger/pns_list.html +++ b/tests/django_ledger/pns_list.html @@ -8,15 +8,11 @@

    -

    - {% trans 'Products & Services List' %} -

    +

    {% trans 'Products & Services List' %}

    - - {% icon 'carbon:add-alt' 60 %} - + {% icon 'carbon:add-alt' 60 %}
    diff --git a/tests/django_ledger/po_delete.html b/tests/django_ledger/po_delete.html index f64ee0b..96a93bc 100644 --- a/tests/django_ledger/po_delete.html +++ b/tests/django_ledger/po_delete.html @@ -26,9 +26,7 @@ class="button is-primary"> {% trans 'Go Back' %} - +
    diff --git a/tests/django_ledger/po_detail.html b/tests/django_ledger/po_detail.html index 3ec1572..af797f3 100644 --- a/tests/django_ledger/po_detail.html +++ b/tests/django_ledger/po_detail.html @@ -45,9 +45,7 @@
    -

    - {{ po_model.po_title }} -

    +

    {{ po_model.po_title }}

    @@ -89,9 +87,7 @@ - - Total PO Amount - + Total PO Amount {% currency_symbol %}{{ total_amount_due | currency_format }} diff --git a/tests/django_ledger/po_list.html b/tests/django_ledger/po_list.html index b536cfd..f05aca2 100644 --- a/tests/django_ledger/po_list.html +++ b/tests/django_ledger/po_list.html @@ -9,25 +9,19 @@
    {% if month %} -

    - {{ month | date:'F Y' }} -

    +

    {{ month | date:'F Y' }}

    {% elif year %}

    Year {{ year | date:'Y' }} Bills

    {% else %} -

    - {% trans 'Latest Purchase Orders' %} -

    +

    {% trans 'Latest Purchase Orders' %}

    {% endif %}
    - - {% icon 'carbon:add-alt' 60 %} - + {% icon 'carbon:add-alt' 60 %}
    diff --git a/tests/django_ledger/po_update.html b/tests/django_ledger/po_update.html index a0fb82f..8852765 100644 --- a/tests/django_ledger/po_update.html +++ b/tests/django_ledger/po_update.html @@ -5,9 +5,7 @@ {% block view_content %}
    -

    - {% trans 'Update Purchase Order' %} -

    +

    {% trans 'Update Purchase Order' %}

    {{ po_model.po_number }}

    @@ -62,9 +60,7 @@
    {{ form.markdown_notes }}
    diff --git a/tests/django_ledger/product_list.html b/tests/django_ledger/product_list.html index b418a8e..6ffade7 100644 --- a/tests/django_ledger/product_list.html +++ b/tests/django_ledger/product_list.html @@ -8,15 +8,11 @@
    -

    - {% trans 'Products & Services List' %} -

    +

    {% trans 'Products & Services List' %}

    - - {% icon 'carbon:add-alt' 60 %} - + {% icon 'carbon:add-alt' 60 %}
    diff --git a/tests/django_ledger/tags/accounts_table.html b/tests/django_ledger/tags/accounts_table.html index ea528cf..4d13597 100644 --- a/tests/django_ledger/tags/accounts_table.html +++ b/tests/django_ledger/tags/accounts_table.html @@ -6,9 +6,7 @@ {% if title %} -

    - {{ title }} -

    +

    {{ title }}

    @@ -23,65 +21,37 @@ {% trans 'Role' %} {% trans 'Parent' %} {% trans 'Code' %} - - {% trans 'Account Name' %} - - - {% trans 'Balance Type' %} - - - {% trans 'Active' %} - - - {% trans 'Locked' %} - - - {% trans 'Actions' %} - + {% trans 'Account Name' %} + {% trans 'Balance Type' %} + {% trans 'Active' %} + {% trans 'Locked' %} + {% trans 'Actions' %} {% for account in accounts %} - - {{ account.get_role_display }} - - - {{ account.parent.code }} - - - {{ account.code }} - - - {{ account.name }} - + {{ account.get_role_display }} + {{ account.parent.code }} + {{ account.code }} + {{ account.name }} {% if account.is_debit %} - - {% icon 'bi:arrow-bar-down' 24 %} - + {% icon 'bi:arrow-bar-down' 24 %} {% elif account.is_credit %} - - {% icon 'bi:arrow-bar-up' 24 %} - + {% icon 'bi:arrow-bar-up' 24 %} {% endif %} {% if account.active %} - - {% icon 'ant-design:check-circle-filled' 24 %} - + {% icon 'ant-design:check-circle-filled' 24 %} {% endif %} {% if account.locked %} - - {% icon 'bi:lock-fill' 24 %} - + {% icon 'bi:lock-fill' 24 %} {% elif not account.locked %} - - {% icon 'bx:bx-lock-open-alt' 24 %} - + {% icon 'bx:bx-lock-open-alt' 24 %} {% endif %} @@ -90,9 +60,7 @@
    diff --git a/tests/django_ledger/tags/balance_sheet.html b/tests/django_ledger/tags/balance_sheet.html index 36efb8b..a2a1249 100644 --- a/tests/django_ledger/tags/balance_sheet.html +++ b/tests/django_ledger/tags/balance_sheet.html @@ -27,9 +27,7 @@ {% for acc in tx_digest.group_account.GROUP_ASSETS %} {{ acc.code }} - - {{ acc.name }} - + {{ acc.name }} {% if by_unit %} {% if acc.unit_name %}{{ acc.unit_name }}{% endif %} @@ -42,15 +40,11 @@ {% icon 'bi:arrow-bar-up' 24 %} {% endif %} - - {% currency_symbol %}{{ acc.balance | currency_format }} - + {% currency_symbol %}{{ acc.balance | currency_format }} {% endfor %} - - {% trans 'Total Assets' %} - + {% trans 'Total Assets' %} {% if by_unit %}{% endif %} @@ -70,12 +64,8 @@ {# LIABILITIES #} {% for acc in tx_digest.group_account.GROUP_LIABILITIES %} - - {{ acc.code }} - - - {{ acc.name }} - + {{ acc.code }} + {{ acc.name }} {% if by_unit %} {% if acc.unit_name %}{{ acc.unit_name }}{% endif %} @@ -88,15 +78,11 @@ {% icon 'bi:arrow-bar-up' 24 %} {% endif %} - - {% currency_symbol %}{{ acc.balance | currency_format }} - + {% currency_symbol %}{{ acc.balance | currency_format }} {% endfor %} - - {% trans 'Total Liabilities' %} - + {% trans 'Total Liabilities' %} {% if by_unit %}{% endif %} diff --git a/tests/django_ledger/tags/bank_accounts_table.html b/tests/django_ledger/tags/bank_accounts_table.html index 37c5050..28600d1 100644 --- a/tests/django_ledger/tags/bank_accounts_table.html +++ b/tests/django_ledger/tags/bank_accounts_table.html @@ -25,9 +25,7 @@ {% if bank_acc.active %} {% icon 'ant-design:check-circle-filled' 24 %} {% else %} - - {% icon 'maki:roadblock-11' 24 %} - + {% icon 'maki:roadblock-11' 24 %} {% endif %} diff --git a/tests/django_ledger/tags/bill_item_formset.html b/tests/django_ledger/tags/bill_item_formset.html index 494884a..60eaab3 100644 --- a/tests/django_ledger/tags/bill_item_formset.html +++ b/tests/django_ledger/tags/bill_item_formset.html @@ -30,12 +30,8 @@ {% endfor %} {{ f.item_model }} - - {{ f.unit_cost }} - - - {{ f.quantity }} - + {{ f.unit_cost }} + {{ f.quantity }} {{ f.entity_unit }} {% currency_symbol %}{{ f.instance.total_amount | currency_format }} diff --git a/tests/django_ledger/tags/bill_table.html b/tests/django_ledger/tags/bill_table.html index 38a386c..6205ad3 100644 --- a/tests/django_ledger/tags/bill_table.html +++ b/tests/django_ledger/tags/bill_table.html @@ -19,35 +19,21 @@ {{ bill.bill_number }} {{ bill.date }} - - {{ bill.vendor.vendor_name }} - - - ${{ bill.amount_due | currency_format }} - - - ${{ bill.amount_paid | currency_format }} - + {{ bill.vendor.vendor_name }} + ${{ bill.amount_due | currency_format }} + ${{ bill.amount_paid | currency_format }} {% if bill.paid %} - - {% icon 'bi:check-circle-fill' 24 %} - + {% icon 'bi:check-circle-fill' 24 %} {% else %} - - {% icon 'clarity:no-access-solid' 24 %} - + {% icon 'clarity:no-access-solid' 24 %} {% endif %} {% if bill.is_past_due %} - - {% icon 'bi:check-circle-fill' 24 %} - + {% icon 'bi:check-circle-fill' 24 %} {% else %} - - {% icon 'clarity:no-access-solid' 24 %} - + {% icon 'clarity:no-access-solid' 24 %} {% endif %} @@ -56,9 +42,7 @@
    diff --git a/tests/django_ledger/tags/data_import_job_list_table.html b/tests/django_ledger/tags/data_import_job_list_table.html index ff004d4..b461fd0 100644 --- a/tests/django_ledger/tags/data_import_job_list_table.html +++ b/tests/django_ledger/tags/data_import_job_list_table.html @@ -37,9 +37,7 @@ aria-haspopup="true" onclick="djLedger.toggleDropdown('customer-action-{{ job.uuid }}')" aria-controls="dropdown-menu"> - - Actions - + Actions {% icon 'bi:arrow-down' 24 %}
    diff --git a/tests/django_ledger/tags/feedback_button.html b/tests/django_ledger/tags/feedback_button.html index 7a91393..04d9184 100644 --- a/tests/django_ledger/tags/feedback_button.html +++ b/tests/django_ledger/tags/feedback_button.html @@ -38,9 +38,7 @@
    - + @@ -75,9 +73,7 @@
    diff --git a/tests/django_ledger/tags/jes_table.html b/tests/django_ledger/tags/jes_table.html index 4eaac25..bac6e1d 100644 --- a/tests/django_ledger/tags/jes_table.html +++ b/tests/django_ledger/tags/jes_table.html @@ -22,34 +22,24 @@ {% if je.posted %} {% icon 'ant-design:check-circle-filled' 24 %} {% else %} - - {% icon 'maki:roadblock-11' 24 %} - + {% icon 'maki:roadblock-11' 24 %} {% endif %} {% if je.locked %} - - {% icon 'bi:lock-fill' 24 %} - + {% icon 'bi:lock-fill' 24 %} {% else %} - - {% icon 'bx:bx-lock-open-alt' 24 %} - + {% icon 'bx:bx-lock-open-alt' 24 %} {% endif %} - - {{ je.created | timesince }} - + {{ je.created | timesince }} diff --git a/tests/django_ledger/tags/pns_table.html b/tests/django_ledger/tags/pns_table.html index dc8b602..3e898f4 100644 --- a/tests/django_ledger/tags/pns_table.html +++ b/tests/django_ledger/tags/pns_table.html @@ -19,18 +19,14 @@ {{ pns.uom }} {{ pns.sku }} {{ pns.upc }} - - {{ pns.earnings_account }} - + {{ pns.earnings_account }} diff --git a/tests/django_ledger/unit_create.html b/tests/django_ledger/unit_create.html index 74da145..82a403f 100644 --- a/tests/django_ledger/unit_create.html +++ b/tests/django_ledger/unit_create.html @@ -8,9 +8,7 @@
    -

    - {% trans 'Create Entity Unit' %} -

    +

    {% trans 'Create Entity Unit' %}

    diff --git a/tests/django_ledger/unit_detail.html b/tests/django_ledger/unit_detail.html index 0e679f1..708189b 100644 --- a/tests/django_ledger/unit_detail.html +++ b/tests/django_ledger/unit_detail.html @@ -8,9 +8,7 @@
    -

    - {{ unit.name }} -

    +

    {{ unit.name }}

    diff --git a/tests/django_ledger/unit_list.html b/tests/django_ledger/unit_list.html index c781729..cffd4fe 100644 --- a/tests/django_ledger/unit_list.html +++ b/tests/django_ledger/unit_list.html @@ -8,15 +8,11 @@
    -

    - {% trans 'Entity Units List' %} -

    +

    {% trans 'Entity Units List' %}

    - - {% icon 'carbon:add-alt' 60 %} - + {% icon 'carbon:add-alt' 60 %}
    diff --git a/tests/django_ledger/unit_update.html b/tests/django_ledger/unit_update.html index 184e79b..6e2482b 100644 --- a/tests/django_ledger/unit_update.html +++ b/tests/django_ledger/unit_update.html @@ -8,9 +8,7 @@
    -

    - {% trans 'Update Entity Unit' %} -

    +

    {% trans 'Update Entity Unit' %}

    diff --git a/tests/django_ledger/uom_list.html b/tests/django_ledger/uom_list.html index 40233ef..0000655 100644 --- a/tests/django_ledger/uom_list.html +++ b/tests/django_ledger/uom_list.html @@ -8,15 +8,11 @@
    -

    - {% trans 'Unit of Measures List' %} -

    +

    {% trans 'Unit of Measures List' %}

    - - {% icon 'carbon:add-alt' 60 %} - + {% icon 'carbon:add-alt' 60 %}
    diff --git a/tests/django_ledger/vendor_list.html b/tests/django_ledger/vendor_list.html index c8962de..a05b9d9 100644 --- a/tests/django_ledger/vendor_list.html +++ b/tests/django_ledger/vendor_list.html @@ -8,9 +8,7 @@
    - - {% icon 'carbon:add-alt' 24 %} - + {% icon 'carbon:add-alt' 24 %} {% trans 'New Vendor' %}
    diff --git a/tests/django_oscar/oscar/500.html b/tests/django_oscar/oscar/500.html index 5841d00..b7df5d0 100644 --- a/tests/django_oscar/oscar/500.html +++ b/tests/django_oscar/oscar/500.html @@ -14,9 +14,7 @@ This incident has been logged and will be addressed by an engineer as soon as possible.

    - - Return to previous page - + Return to previous page
    Go to homepage

    diff --git a/tests/django_oscar/oscar/basket/partials/basket_content.html b/tests/django_oscar/oscar/basket/partials/basket_content.html index 85f8b6a..94fb96f 100644 --- a/tests/django_oscar/oscar/basket/partials/basket_content.html +++ b/tests/django_oscar/oscar/basket/partials/basket_content.html @@ -58,9 +58,7 @@

    - - {{ line.description }} - + {{ line.description }}

    {{ session.availability.message }} @@ -162,9 +160,7 @@ {% trans "Add voucher" %} {% trans "or" %} - - {% trans "cancel" %} - + {% trans "cancel" %}

    diff --git a/tests/django_oscar/oscar/basket/partials/basket_totals.html b/tests/django_oscar/oscar/basket/partials/basket_totals.html index 07f1eff..62b5232 100644 --- a/tests/django_oscar/oscar/basket/partials/basket_totals.html +++ b/tests/django_oscar/oscar/basket/partials/basket_totals.html @@ -146,9 +146,7 @@ -{{ shipping_discount|currency:basket.currency }} - - {% trans "Shipping total (after discounts)" %} - + {% trans "Shipping total (after discounts)" %} {% if not show_tax_separately and shipping_charge.is_tax_known %} {{ shipping_charge.incl_tax|currency:basket.currency }} @@ -172,9 +170,7 @@ {% for surcharge in surcharges %} - - {{ surcharge.surcharge.name }} - + {{ surcharge.surcharge.name }} {% if not show_tax_separately and surcharge.price.is_tax_known %} {{ surcharge.price.incl_tax|currency:basket.currency }} @@ -189,49 +185,33 @@ {% block tax_totals %} {% if show_tax_separately %} - -   - +   -

    - {% trans "Tax" %} -

    +

    {% trans "Tax" %}

    - - {% trans "Basket" %} - - - {{ basket.total_tax|currency:basket.currency }} - + {% trans "Basket" %} + {{ basket.total_tax|currency:basket.currency }} - - {% trans "Shipping" %} - - - {{ shipping_charge.tax|currency:basket.currency }} - + {% trans "Shipping" %} + {{ shipping_charge.tax|currency:basket.currency }} {% endif %} {% endblock %} {% block post_order_action_totals %} {% if basket.post_order_actions %} - -   - +   -

    - {% trans "Post order actions" %} -

    +

    {% trans "Post order actions" %}

    {% trans "These will be applied once your order is placed." %} @@ -241,9 +221,7 @@ {% for discount in basket.post_order_actions %} - - {{ discount.name }} - + {{ discount.name }}

    {{ discount.description }} @@ -255,16 +233,12 @@ {% endblock %} {% block order_total %} - -   - +   -

    - {% trans "Order total" %} -

    +

    {% trans "Order total" %}

    diff --git a/tests/django_oscar/oscar/catalogue/browse.html b/tests/django_oscar/oscar/catalogue/browse.html index 2a3e8dc..af0c568 100644 --- a/tests/django_oscar/oscar/catalogue/browse.html +++ b/tests/django_oscar/oscar/catalogue/browse.html @@ -60,75 +60,71 @@ {% endif %} {% endblock %} {% block content %} -
    - {# Render other search params as hidden inputs #} - {% for value in selected_facets %} - - {% endfor %} - - {% if paginator.count %} - {% if paginator.num_pages > 1 %} - {% blocktrans with start=page_obj.start_index end=page_obj.end_index count num_results=paginator.count %} - {{ num_results }} - result - showing - {{ start }} - to - {{ end }} - . - {% plural %} - {{ num_results }} - results - showing - {{ start }} - to - {{ end }} - . - {% endblocktrans %} + + {# Render other search params as hidden inputs #} + {% for value in selected_facets %} + + {% endfor %} + + {% if paginator.count %} + {% if paginator.num_pages > 1 %} + {% blocktrans with start=page_obj.start_index end=page_obj.end_index count num_results=paginator.count %} + {{ num_results }} + result - showing + {{ start }} + to + {{ end }} + . + {% plural %} + {{ num_results }} + results - showing + {{ start }} + to + {{ end }} + . + {% endblocktrans %} + {% else %} + {% blocktrans count num_results=paginator.count %} + {{ num_results }} + result. + {% plural %} + {{ num_results }} + results. + {% endblocktrans %} + {% endif %} + {% if form %} +
    + {% include "oscar/partials/form_field.html" with field=form.sort_by style='horizontal' %} +
    + {% endif %} {% else %} - {% blocktrans count num_results=paginator.count %} - {{ num_results }} - result. - {% plural %} - - {{ num_results }} - - results. - {% endblocktrans %} +

    + {% trans " + 0 + results." %} +

    {% endif %} - {% if form %} -
    - {% include "oscar/partials/form_field.html" with field=form.sort_by style='horizontal' %} + + {% if products %} +
    +
    +
      + {% for product in products %} +
    1. + {% render_product product %} +
      2. + {% endfor %} +
    + {% include "oscar/partials/pagination.html" %}
    - {% endif %} +
    {% else %} -

    - {% trans " - - 0 - - results." %} +

    + {% trans "No products found." %}

    {% endif %} - -{% if products %} -
    -
    -
      - {% for product in products %} -
    1. - {% render_product product %} -
      2. - {% endfor %} -
    - {% include "oscar/partials/pagination.html" %} -
    -
    -{% else %} -

    - {% trans "No products found." %} -

    -{% endif %} {% endblock content %} {% block onbodyload %} -{{ block.super }} -oscar.search.init(); + {{ block.super }} + oscar.search.init(); {% endblock %} diff --git a/tests/django_oscar/oscar/catalogue/category.html b/tests/django_oscar/oscar/catalogue/category.html index b2f164a..be6b55c 100644 --- a/tests/django_oscar/oscar/catalogue/category.html +++ b/tests/django_oscar/oscar/catalogue/category.html @@ -26,9 +26,7 @@ {% for category in category.get_ancestors %}
  • - - {{ category.name }} - + {{ category.name }}
    • {% endfor %}
  • diff --git a/tests/django_oscar/oscar/catalogue/detail.html b/tests/django_oscar/oscar/catalogue/detail.html index 346b2f3..41175d2 100644 --- a/tests/django_oscar/oscar/catalogue/detail.html +++ b/tests/django_oscar/oscar/catalogue/detail.html @@ -17,9 +17,7 @@ {% with category=product.get_categories.first %} {% for c in category.get_ancestors_and_self %}
  • - - {{ c.name }} - + {{ c.name }}
    • {% endfor %}
  • @@ -81,9 +79,7 @@ {% for child in product.children.public %} {% purchase_info_for_product request child as child_session %} {% if child_session.availability.is_available_to_buy %} - - {{ child.get_title }} - + {{ child.get_title }}
    {% endif %} {% endfor %} @@ -127,49 +123,29 @@ {% if session.price.is_tax_known %} - - {% trans "Price (incl. tax)" %} - - - {{ session.price.incl_tax|currency:session.price.currency }} - + {% trans "Price (incl. tax)" %} + {{ session.price.incl_tax|currency:session.price.currency }} - - {% trans "Tax" %} - - - {{ session.price.tax|currency:session.price.currency }} - + {% trans "Tax" %} + {{ session.price.tax|currency:session.price.currency }} {% endif %} - - {% trans "Availability" %} - - - {{ session.availability.message }} - + {% trans "Availability" %} + {{ session.availability.message }} {% endif %} {% for av in product.get_attribute_values %} - - {{ av.attribute.name }} - - - {{ av.value_as_html }} - + {{ av.attribute.name }} + {{ av.value_as_html }} {% endfor %} {% iffeature "reviews" %} - - {% trans "Number of reviews" %} - - - {{ product.num_approved_reviews }} - + {% trans "Number of reviews" %} + {{ product.num_approved_reviews }} {% endiffeature %} @@ -184,9 +160,7 @@ {% trans "See all reviews" %} {% endif %} -

    - {% trans "Customer Reviews" %} -

    +

    {% trans "Customer Reviews" %}

    • {% if product.num_approved_reviews == 0 %}

    @@ -194,9 +168,7 @@ {% url 'catalogue:reviews-add' product_slug=product.slug product_pk=product.id as add_review_url %} {% blocktrans %} This product does not have any reviews yet - - - be the first to write one - + be the first to write one . {% endblocktrans %} {% else %} @@ -218,9 +190,7 @@ {% with recommended_products=product.sorted_recommended_products|slice:":6" %} {% if recommended_products %}

    -

    - {% trans "Recommended items" %} -

    +

    {% trans "Recommended items" %}

    diff --git a/tests/django_oscar/oscar/catalogue/reviews/review_detail.html b/tests/django_oscar/oscar/catalogue/reviews/review_detail.html index 8bcb6d1..77e57f6 100644 --- a/tests/django_oscar/oscar/catalogue/reviews/review_detail.html +++ b/tests/django_oscar/oscar/catalogue/reviews/review_detail.html @@ -12,15 +12,11 @@ {% with category=product.categories.all.0 %} {% for c in category.get_ancestors_and_self %}

  • - - {{ c.name }} - + {{ c.name }}
    • {% endfor %}
  • - - {{ product.title }} - + {{ product.title }}
  • diff --git a/tests/django_oscar/oscar/catalogue/reviews/review_form.html b/tests/django_oscar/oscar/catalogue/reviews/review_form.html index f54c580..1b4f003 100644 --- a/tests/django_oscar/oscar/catalogue/reviews/review_form.html +++ b/tests/django_oscar/oscar/catalogue/reviews/review_form.html @@ -44,9 +44,7 @@ {% trans "Save review" %} {% trans "or" %} - - {% trans "cancel" %} - + {% trans "cancel" %} diff --git a/tests/django_oscar/oscar/catalogue/reviews/review_list.html b/tests/django_oscar/oscar/catalogue/reviews/review_list.html index 52c47ca..eea2ab1 100644 --- a/tests/django_oscar/oscar/catalogue/reviews/review_list.html +++ b/tests/django_oscar/oscar/catalogue/reviews/review_list.html @@ -13,15 +13,11 @@ {% with category=product.categories.all.0 %} {% for c in category.get_ancestors_and_self %}
  • - - {{ c.name }} - + {{ c.name }}
    • {% endfor %}
  • - - {{ product.title }} - + {{ product.title }}
    • {% endwith %}
  • @@ -39,9 +35,7 @@ {% if reviews %}
    {% include "oscar/partials/form_fields_inline.html" with form=form %} - +
    {% for review in reviews %} diff --git a/tests/django_oscar/oscar/catalogue/reviews/review_product.html b/tests/django_oscar/oscar/catalogue/reviews/review_product.html index 8a9b163..9feb4ab 100644 --- a/tests/django_oscar/oscar/catalogue/reviews/review_product.html +++ b/tests/django_oscar/oscar/catalogue/reviews/review_product.html @@ -12,9 +12,7 @@

    - - {{ product.get_title }} - + {{ product.get_title }}

    {% include "oscar/catalogue/partials/stock_record.html" %} {% include "oscar/catalogue/reviews/partials/review_stars.html" %} diff --git a/tests/django_oscar/oscar/checkout/layout.html b/tests/django_oscar/oscar/checkout/layout.html index e15919e..daf7133 100644 --- a/tests/django_oscar/oscar/checkout/layout.html +++ b/tests/django_oscar/oscar/checkout/layout.html @@ -25,9 +25,7 @@ {% for page in flatpages %}
  • -3 %}visited + 3 %}visited {% else %} -disabled + disabled {% endif %} {% endif %} {% endif %} "> {% if step == 4 %} - - -{% trans "3. Payment" %} - + + + {% trans "3. Payment" %} + {% else %} -{% trans "3. Payment" %} + {% trans "3. Payment" %} {% endif %}
  • -{% trans "4. Preview" %} + {% trans "4. Preview" %}
  • -{% trans "5. Confirmation" %} + {% trans "5. Confirmation" %}
    • {% endspaceless %} diff --git a/tests/django_oscar/oscar/checkout/shipping_address.html b/tests/django_oscar/oscar/checkout/shipping_address.html index 098fe8e..8a70d79 100644 --- a/tests/django_oscar/oscar/checkout/shipping_address.html +++ b/tests/django_oscar/oscar/checkout/shipping_address.html @@ -94,9 +94,7 @@ {% trans "Continue" %} {% trans "or" %} - - {% trans "return to basket" %} - + {% trans "return to basket" %} diff --git a/tests/django_oscar/oscar/checkout/thank_you.html b/tests/django_oscar/oscar/checkout/thank_you.html index e7310c7..14f3e08 100644 --- a/tests/django_oscar/oscar/checkout/thank_you.html +++ b/tests/django_oscar/oscar/checkout/thank_you.html @@ -173,9 +173,7 @@
    -

    - {% trans 'Totals' %} -

    +

    {% trans 'Totals' %}

    {% include 'oscar/order/partials/basket_totals.html' %}
    @@ -185,9 +183,7 @@ {% block order_tracking %} {% if not order.user %}
    -

    - {% trans "Tracking your order" %} -

    +

    {% trans "Tracking your order" %}

    {% trans "You can track the status of your order" %} diff --git a/tests/django_oscar/oscar/communication/email/email_detail.html b/tests/django_oscar/oscar/communication/email/email_detail.html index 72c4bd9..2c1761a 100644 --- a/tests/django_oscar/oscar/communication/email/email_detail.html +++ b/tests/django_oscar/oscar/communication/email/email_detail.html @@ -2,9 +2,7 @@ {% load i18n %} {% block extra_breadcrumbs %}

  • - - {% trans 'Email history' %} - + {% trans 'Email history' %}
    • {% endblock %} {% block tabcontent %} diff --git a/tests/django_oscar/oscar/customer/address/address_delete.html b/tests/django_oscar/oscar/customer/address/address_delete.html index 0c6c298..b95860b 100644 --- a/tests/django_oscar/oscar/customer/address/address_delete.html +++ b/tests/django_oscar/oscar/customer/address/address_delete.html @@ -2,9 +2,7 @@ {% load i18n %} {% block extra_breadcrumbs %}
  • - - {% trans 'Address book' %} - + {% trans 'Address book' %}
    • {% endblock %} {% block tabcontent %} @@ -21,9 +19,7 @@ {% trans 'Delete' %} {% trans 'or' %} - - {% trans 'cancel' %} - + {% trans 'cancel' %} {% endblock tabcontent %} diff --git a/tests/django_oscar/oscar/customer/address/address_form.html b/tests/django_oscar/oscar/customer/address/address_form.html index 6b66494..cf73ee6 100644 --- a/tests/django_oscar/oscar/customer/address/address_form.html +++ b/tests/django_oscar/oscar/customer/address/address_form.html @@ -2,9 +2,7 @@ {% load i18n %} {% block extra_breadcrumbs %}
  • - - {% trans 'Address book' %} - + {% trans 'Address book' %}
    • {% endblock %} {% block tabcontent %} diff --git a/tests/django_oscar/oscar/customer/alerts/alert_list.html b/tests/django_oscar/oscar/customer/alerts/alert_list.html index 59db620..8c44791 100644 --- a/tests/django_oscar/oscar/customer/alerts/alert_list.html +++ b/tests/django_oscar/oscar/customer/alerts/alert_list.html @@ -20,9 +20,7 @@ {% with product=alert.product %} {% if product.is_public %} - - {{ product.get_title }} - + {{ product.get_title }} {% else %} {{ product.get_title }} {% endif %} diff --git a/tests/django_oscar/oscar/customer/anon_order.html b/tests/django_oscar/oscar/customer/anon_order.html index 9f00b4b..9d9b6a2 100644 --- a/tests/django_oscar/oscar/customer/anon_order.html +++ b/tests/django_oscar/oscar/customer/anon_order.html @@ -58,18 +58,10 @@ - - - - + + + + {% iffeature "reviews" %} {% endiffeature %} @@ -85,18 +77,10 @@ {{ line.description }} {% endif %} - - - - + + + + {% iffeature "reviews" %} - + {% endfor %} @@ -124,28 +106,16 @@ {% trans 'Totals' %} - - + + - - + + - - + +
    {% trans 'Product' %} - {% trans 'Status' %} - - {% trans 'Quantity' %} - - {% trans 'Line price excl. tax' %} - - {% trans 'Line price incl. tax' %} - {% trans 'Status' %}{% trans 'Quantity' %}{% trans 'Line price excl. tax' %}{% trans 'Line price incl. tax' %} - {{ line.shipping_status|default:"-" }} - - {{ line.quantity }} - - {{ line.line_price_before_discounts_excl_tax|currency:order.currency }} - - {{ line.line_price_before_discounts_incl_tax|currency:order.currency }} - {{ line.shipping_status|default:"-" }}{{ line.quantity }}{{ line.line_price_before_discounts_excl_tax|currency:order.currency }}{{ line.line_price_before_discounts_incl_tax|currency:order.currency }} {% if line.product|is_review_permitted:user %} @@ -112,9 +96,7 @@ {% for discount in order.discounts.all %}
    {{ discount.description }} - -{{ discount.amount|currency:order.currency }} - -{{ discount.amount|currency:order.currency }}
    - {% trans 'Basket total (inc. tax)' %} - - {{ order.basket_total_incl_tax|currency:order.currency }} - {% trans 'Basket total (inc. tax)' %}{{ order.basket_total_incl_tax|currency:order.currency }}
    - {% trans 'Shipping charge (inc. tax)' %} - - {{ order.shipping_incl_tax|currency:order.currency }} - {% trans 'Shipping charge (inc. tax)' %}{{ order.shipping_incl_tax|currency:order.currency }}
    - {% trans 'Order total' %} - - {{ order.total_incl_tax|currency:order.currency }} - {% trans 'Order total' %}{{ order.total_incl_tax|currency:order.currency }}
    {% endblock content %} diff --git a/tests/django_oscar/oscar/customer/baseaccountpage.html b/tests/django_oscar/oscar/customer/baseaccountpage.html index 0d42872..69f2fd9 100644 --- a/tests/django_oscar/oscar/customer/baseaccountpage.html +++ b/tests/django_oscar/oscar/customer/baseaccountpage.html @@ -11,9 +11,7 @@ {% trans 'Home' %}
  • - - {% trans 'Account' %} - + {% trans 'Account' %}
    • {% block extra_breadcrumbs %}{% endblock %}
  • diff --git a/tests/django_oscar/oscar/customer/login_registration.html b/tests/django_oscar/oscar/customer/login_registration.html index 6da4063..8ef4270 100644 --- a/tests/django_oscar/oscar/customer/login_registration.html +++ b/tests/django_oscar/oscar/customer/login_registration.html @@ -24,9 +24,7 @@ {% csrf_token %} {% include "oscar/partials/form_fields.html" with form=login_form %}

    - - {% trans "I've forgotten my password" %} - + {% trans "I've forgotten my password" %}

    • {% endblock %} {% block tabcontent %} @@ -36,9 +34,7 @@ {% if product %} {% if product.is_public %}

    - - {{ line.description }} - + {{ line.description }}

    {% else %}

    @@ -155,12 +151,8 @@ {% endblock %} {% block order_total %} - - {% trans 'Order total' %} - - - {{ order.total_incl_tax|currency:order.currency }} - + {% trans 'Order total' %} + {{ order.total_incl_tax|currency:order.currency }} {% endblock order_total %} @@ -185,20 +177,12 @@ {{ order.shipping_method }}

    -

    - {% trans 'Shipping Address' %} -

    +

    {% trans 'Shipping Address' %}

    - - - + + + - - + +
    - {% trans 'Address' %} - - {% trans 'Contact Number' %} - - {% trans 'Shipping Notes' %} - {% trans 'Address' %}{% trans 'Contact Number' %}{% trans 'Shipping Notes' %}
    @@ -207,12 +191,8 @@
    {% endfor %}     		- {{ order.shipping_address.phone_number|default:"-" }} - - {{ order.shipping_address.notes|linebreaks }} - {{ order.shipping_address.phone_number|default:"-" }}{{ order.shipping_address.notes|linebreaks }}
    {% endblock tabcontent %} diff --git a/tests/django_oscar/oscar/customer/order/order_list.html b/tests/django_oscar/oscar/customer/order/order_list.html index c31b070..31bf213 100644 --- a/tests/django_oscar/oscar/customer/order/order_list.html +++ b/tests/django_oscar/oscar/customer/order/order_list.html @@ -18,9 +18,7 @@ {% trans 'Home' %}
  • - - {% trans 'Account' %} - + {% trans 'Account' %}
  • {% trans 'Order history' %} diff --git a/tests/django_oscar/oscar/customer/profile/profile_delete.html b/tests/django_oscar/oscar/customer/profile/profile_delete.html index 3f036d1..61a1787 100644 --- a/tests/django_oscar/oscar/customer/profile/profile_delete.html +++ b/tests/django_oscar/oscar/customer/profile/profile_delete.html @@ -19,9 +19,7 @@ {% trans "Delete" %} {% trans "or" %} - - {% trans "cancel" %} - + {% trans "cancel" %} . diff --git a/tests/django_oscar/oscar/customer/wishlists/wishlists_delete.html b/tests/django_oscar/oscar/customer/wishlists/wishlists_delete.html index 5a20f42..f73a434 100644 --- a/tests/django_oscar/oscar/customer/wishlists/wishlists_delete.html +++ b/tests/django_oscar/oscar/customer/wishlists/wishlists_delete.html @@ -7,9 +7,7 @@ {% trans 'Home' %}
  • - - {% trans 'Account' %} - + {% trans 'Account' %}
  • diff --git a/tests/django_oscar/oscar/customer/wishlists/wishlists_delete_product.html b/tests/django_oscar/oscar/customer/wishlists/wishlists_delete_product.html index be3059e..c9552f0 100644 --- a/tests/django_oscar/oscar/customer/wishlists/wishlists_delete_product.html +++ b/tests/django_oscar/oscar/customer/wishlists/wishlists_delete_product.html @@ -7,9 +7,7 @@ {% trans 'Home' %}
  • - - {% trans 'Account' %} - + {% trans 'Account' %}
  • @@ -40,9 +38,7 @@ {% trans 'Remove' %} {% trans 'or' %} - - {% trans 'cancel' %} - + {% trans 'cancel' %} {% endblock tabcontent %} diff --git a/tests/django_oscar/oscar/customer/wishlists/wishlists_detail.html b/tests/django_oscar/oscar/customer/wishlists/wishlists_detail.html index 3c5b2a7..16af629 100644 --- a/tests/django_oscar/oscar/customer/wishlists/wishlists_detail.html +++ b/tests/django_oscar/oscar/customer/wishlists/wishlists_detail.html @@ -9,9 +9,7 @@ {% trans 'Home' %}
  • - - {% trans 'Account' %} - + {% trans 'Account' %}
  • diff --git a/tests/django_oscar/oscar/customer/wishlists/wishlists_form.html b/tests/django_oscar/oscar/customer/wishlists/wishlists_form.html index 9fc7a18..3bdc313 100644 --- a/tests/django_oscar/oscar/customer/wishlists/wishlists_form.html +++ b/tests/django_oscar/oscar/customer/wishlists/wishlists_form.html @@ -7,9 +7,7 @@ {% trans 'Home' %}
  • - - {% trans 'Account' %} - + {% trans 'Account' %}
  • diff --git a/tests/django_oscar/oscar/dashboard/catalogue/attribute_option_group_delete.html b/tests/django_oscar/oscar/dashboard/catalogue/attribute_option_group_delete.html index e3adece..0ead220 100644 --- a/tests/django_oscar/oscar/dashboard/catalogue/attribute_option_group_delete.html +++ b/tests/django_oscar/oscar/dashboard/catalogue/attribute_option_group_delete.html @@ -15,9 +15,7 @@