From dc284bc28a86056d82ec316d5662804c3ece5cb5 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Thu, 16 Aug 2018 17:34:29 +0300 Subject: [PATCH] Fix section page-header in templates --- abonapp/templates/abonapp/buy_tariff.html | 4 +++- abonapp/templates/abonapp/debtors.html | 2 +- abonapp/templates/abonapp/ext.htm | 8 +++----- abonapp/templates/abonapp/fin_report.html | 2 +- abonapp/templates/abonapp/group_tariffs.html | 2 +- abonapp/templates/abonapp/invoiceForPayment.html | 2 +- abonapp/templates/abonapp/log.html | 2 +- abonapp/templates/abonapp/peoples.html | 4 +++- accounts_app/templates/accounts/acc_list.html | 2 +- accounts_app/templates/accounts/ext.htm | 2 +- .../templates/accounts/perms/objects_of_type.html | 2 +- accounts_app/templates/accounts/perms/objects_types.html | 2 +- accounts_app/templates/accounts/perms/perms_edit.html | 2 +- accounts_app/templates/accounts/settings/ext.htm | 2 +- devapp/templates/devapp/add_dev.html | 2 +- .../devapp/custom_dev_page/olt_ztec320_units_uncfg.html | 2 +- devapp/templates/devapp/devices.html | 2 +- devapp/templates/devapp/devices_null_group.html | 2 +- devapp/templates/devapp/ext.htm | 2 +- devapp/templates/devapp/group_list.html | 4 +++- devapp/templates/devapp/manage_ports/add_ports.html | 2 +- devapp/templates/devapp/manage_ports/fix_abon_device.html | 2 +- dialing_app/templates/ext.html | 2 +- group_app/templates/group_app/ext.html | 2 +- group_app/templates/group_app/group_list.html | 2 +- ip_pool/templates/ip_pool/ip_leases_list.html | 4 +++- ip_pool/templates/ip_pool/net_add.html | 4 +++- ip_pool/templates/ip_pool/net_edit.html | 4 +++- ip_pool/templates/ip_pool/network_groups_available.html | 2 +- mapapp/templates/maps/dot.html | 2 +- mapapp/templates/maps/options.html | 2 +- msg_app/templates/msg_app/chat.html | 2 +- searchapp/templates/searchapp/index.html | 4 +++- tariff_app/templates/tariff_app/ext.html | 2 +- .../templates/tariff_app/periodic_pays/add_edit.html | 2 +- taskapp/templates/taskapp/ext.htm | 2 +- taskapp/templates/taskapp/tasklist_all.html | 2 +- taskapp/templates/taskapp/tasklist_empty.html | 2 +- taskapp/templates/taskapp/tasklist_failed.html | 2 +- 39 files changed, 55 insertions(+), 43 deletions(-) diff --git a/abonapp/templates/abonapp/buy_tariff.html b/abonapp/templates/abonapp/buy_tariff.html index 6baf93f..fb2d366 100644 --- a/abonapp/templates/abonapp/buy_tariff.html +++ b/abonapp/templates/abonapp/buy_tariff.html @@ -11,7 +11,9 @@ {% endblock %} -{% block page-header %}{% trans 'Pick a service' %}{% endblock %} +{% block page-header %} + {% trans 'Pick a service' %} +{% endblock %} {% block main %} diff --git a/abonapp/templates/abonapp/debtors.html b/abonapp/templates/abonapp/debtors.html index acb2636..01d1a2b 100644 --- a/abonapp/templates/abonapp/debtors.html +++ b/abonapp/templates/abonapp/debtors.html @@ -10,7 +10,7 @@ {% endblock %} {% block page-header %} -

{% trans 'People with debts' %}

+ {% trans 'People with debts' %} {% endblock %} diff --git a/abonapp/templates/abonapp/ext.htm b/abonapp/templates/abonapp/ext.htm index c2b4d63..31ea0de 100644 --- a/abonapp/templates/abonapp/ext.htm +++ b/abonapp/templates/abonapp/ext.htm @@ -11,11 +11,9 @@ {% endblock %} {% block page-header %} -

{{ abon.fio|default:_("Long name") }} - {% trans 'Ballance' %} - {{ abon.ballance|floatformat:2 }} - -

+ {% trans 'Ballance' %} + {{ abon.ballance|floatformat:2 }} + {% endblock %} {% block main %} diff --git a/abonapp/templates/abonapp/fin_report.html b/abonapp/templates/abonapp/fin_report.html index aa6c286..09ec971 100644 --- a/abonapp/templates/abonapp/fin_report.html +++ b/abonapp/templates/abonapp/fin_report.html @@ -9,7 +9,7 @@ {% endblock %} {% block page-header %} -

{% trans 'Money by days' %}

+ {% trans 'Money by days' %} {% endblock %} {% block main %} diff --git a/abonapp/templates/abonapp/group_tariffs.html b/abonapp/templates/abonapp/group_tariffs.html index 851bec5..e03547d 100644 --- a/abonapp/templates/abonapp/group_tariffs.html +++ b/abonapp/templates/abonapp/group_tariffs.html @@ -11,7 +11,7 @@ {% endblock %} {% block page-header %} -

{% trans 'Belonging services for groups' %}

+ {% trans 'Belonging services for groups' %} {% endblock %} {% block main %} diff --git a/abonapp/templates/abonapp/invoiceForPayment.html b/abonapp/templates/abonapp/invoiceForPayment.html index 7ffa0a7..e927a8d 100644 --- a/abonapp/templates/abonapp/invoiceForPayment.html +++ b/abonapp/templates/abonapp/invoiceForPayment.html @@ -12,7 +12,7 @@ {% endblock %} {% block page-header %} -

{% trans 'Debtor' %} {{ abon.fio }}

+ {% trans 'Debtor' %} {{ abon.fio }} {% endblock %} {% block main %} diff --git a/abonapp/templates/abonapp/log.html b/abonapp/templates/abonapp/log.html index c665365..32d9730 100644 --- a/abonapp/templates/abonapp/log.html +++ b/abonapp/templates/abonapp/log.html @@ -10,7 +10,7 @@ {% endblock %} {% block page-header %} -

{% trans 'History of subscriber' %}

+ {% trans 'History of subscriber' %} {% endblock %} {% block main %} diff --git a/abonapp/templates/abonapp/peoples.html b/abonapp/templates/abonapp/peoples.html index 31d0742..688f810 100644 --- a/abonapp/templates/abonapp/peoples.html +++ b/abonapp/templates/abonapp/peoples.html @@ -10,7 +10,9 @@ {% endblock %} -{% block page-header %}{{ group.title }}{% endblock %} +{% block page-header %} + {{ group.title }} +{% endblock %} {% block main %}
diff --git a/accounts_app/templates/accounts/acc_list.html b/accounts_app/templates/accounts/acc_list.html index e2315cf..d13190f 100644 --- a/accounts_app/templates/accounts/acc_list.html +++ b/accounts_app/templates/accounts/acc_list.html @@ -9,7 +9,7 @@ {% endblock %} {% block page-header %} -

{% trans 'Admin accounts list' %}

+ {% trans 'Admin accounts list' %} {% endblock %} {% block main %} diff --git a/accounts_app/templates/accounts/ext.htm b/accounts_app/templates/accounts/ext.htm index d5bb280..618cc04 100644 --- a/accounts_app/templates/accounts/ext.htm +++ b/accounts_app/templates/accounts/ext.htm @@ -10,7 +10,7 @@ {% endblock %} {% block page-header %} -

{% trans 'Profile' %}

+ {% trans 'Profile' %} {% endblock %} {% block main %} diff --git a/accounts_app/templates/accounts/perms/objects_of_type.html b/accounts_app/templates/accounts/perms/objects_of_type.html index 77a213e..d9d13c4 100644 --- a/accounts_app/templates/accounts/perms/objects_of_type.html +++ b/accounts_app/templates/accounts/perms/objects_of_type.html @@ -13,7 +13,7 @@ {% block page-header %} -

{% trans 'Pick object for edit permissions' %}

+ {% trans 'Pick object for edit permissions' %} {% endblock %} diff --git a/accounts_app/templates/accounts/perms/objects_types.html b/accounts_app/templates/accounts/perms/objects_types.html index 648fc49..a4f84cb 100644 --- a/accounts_app/templates/accounts/perms/objects_types.html +++ b/accounts_app/templates/accounts/perms/objects_types.html @@ -12,7 +12,7 @@ {% endblock %} {% block page-header %} -

{% trans 'Pick the type of object' %}

+ {% trans 'Pick the type of object' %} {% endblock %} {% block main %} diff --git a/accounts_app/templates/accounts/perms/perms_edit.html b/accounts_app/templates/accounts/perms/perms_edit.html index ddd9767..39ad662 100644 --- a/accounts_app/templates/accounts/perms/perms_edit.html +++ b/accounts_app/templates/accounts/perms/perms_edit.html @@ -16,7 +16,7 @@ {% block page-header %} -

{% trans 'Pick object for edit permissions' %}

+ {% trans 'Pick object for edit permissions' %} {% endblock %} diff --git a/accounts_app/templates/accounts/settings/ext.htm b/accounts_app/templates/accounts/settings/ext.htm index 2943855..c62ea2b 100644 --- a/accounts_app/templates/accounts/settings/ext.htm +++ b/accounts_app/templates/accounts/settings/ext.htm @@ -11,7 +11,7 @@ {% endblock %} {% block page-header %} -

{% trans 'Options' %}

+ {% trans 'Options' %} {% endblock %} {% block main %} diff --git a/devapp/templates/devapp/add_dev.html b/devapp/templates/devapp/add_dev.html index f1e0af1..6ce2712 100644 --- a/devapp/templates/devapp/add_dev.html +++ b/devapp/templates/devapp/add_dev.html @@ -12,7 +12,7 @@ {% endblock %} {% block page-header %} - {{ group.title|default:_('Not assigned') }} + {{ group.title|default:_('Not assigned') }} {% endblock %} {% block main %} diff --git a/devapp/templates/devapp/custom_dev_page/olt_ztec320_units_uncfg.html b/devapp/templates/devapp/custom_dev_page/olt_ztec320_units_uncfg.html index 4fb45c0..5f6d054 100644 --- a/devapp/templates/devapp/custom_dev_page/olt_ztec320_units_uncfg.html +++ b/devapp/templates/devapp/custom_dev_page/olt_ztec320_units_uncfg.html @@ -17,7 +17,7 @@ {% endblock %} {% block page-header %} -

{{ dev.comment|default:_('Not assigned') }}. {% trans 'Unregistered units' %}

+ {{ dev.comment|default:_('Not assigned') }}. {% trans 'Unregistered units' %} {% endblock %} {% block content %} diff --git a/devapp/templates/devapp/devices.html b/devapp/templates/devapp/devices.html index 5a99633..99294dd 100644 --- a/devapp/templates/devapp/devices.html +++ b/devapp/templates/devapp/devices.html @@ -11,7 +11,7 @@ {% endblock %} {% block page-header %} - {% trans 'Devices' %} + {% trans 'Devices' %} {% endblock %} {% block main %} diff --git a/devapp/templates/devapp/devices_null_group.html b/devapp/templates/devapp/devices_null_group.html index 21c3af5..f0d2fce 100644 --- a/devapp/templates/devapp/devices_null_group.html +++ b/devapp/templates/devapp/devices_null_group.html @@ -11,7 +11,7 @@ {% endblock %} {% block page-header %} - {% trans 'Devices without group' %} + {% trans 'Devices without group' %} {% endblock %} {% block main %} diff --git a/devapp/templates/devapp/ext.htm b/devapp/templates/devapp/ext.htm index d8421b9..e3f3a89 100644 --- a/devapp/templates/devapp/ext.htm +++ b/devapp/templates/devapp/ext.htm @@ -17,7 +17,7 @@ {% block page-header %} -

{{ dev.comment|default:_('Not assigned') }}

+ {{ dev.comment|default:_('Not assigned') }} {% endblock %} diff --git a/devapp/templates/devapp/group_list.html b/devapp/templates/devapp/group_list.html index 8b1f31d..e124712 100644 --- a/devapp/templates/devapp/group_list.html +++ b/devapp/templates/devapp/group_list.html @@ -8,7 +8,9 @@ {% endblock %} -{% block page-header %}{% trans 'Select group' %}{% endblock %} +{% block page-header %} + {% trans 'Select group' %} +{% endblock %} {% block main %}
diff --git a/devapp/templates/devapp/manage_ports/add_ports.html b/devapp/templates/devapp/manage_ports/add_ports.html index f1b3736..4d6f16f 100644 --- a/devapp/templates/devapp/manage_ports/add_ports.html +++ b/devapp/templates/devapp/manage_ports/add_ports.html @@ -12,7 +12,7 @@ {% endblock %} {% block page-header %} - {{ dev.comment|default:_('Not assigned') }} + {{ dev.comment|default:_('Not assigned') }} {% endblock %} {% block main %} diff --git a/devapp/templates/devapp/manage_ports/fix_abon_device.html b/devapp/templates/devapp/manage_ports/fix_abon_device.html index 1887812..a24ed38 100644 --- a/devapp/templates/devapp/manage_ports/fix_abon_device.html +++ b/devapp/templates/devapp/manage_ports/fix_abon_device.html @@ -12,7 +12,7 @@ {% endblock %} {% block page-header %} - {% trans 'Fix subscriber ports conflict' %} + {% trans 'Fix subscriber ports conflict' %} {% endblock %} {% block main %} diff --git a/dialing_app/templates/ext.html b/dialing_app/templates/ext.html index 3282f5d..e635502 100644 --- a/dialing_app/templates/ext.html +++ b/dialing_app/templates/ext.html @@ -11,7 +11,7 @@ {% block page-header %} - {{ title }} + {{ title }} {% endblock %} diff --git a/group_app/templates/group_app/ext.html b/group_app/templates/group_app/ext.html index 5e2aa50..48956ea 100644 --- a/group_app/templates/group_app/ext.html +++ b/group_app/templates/group_app/ext.html @@ -12,7 +12,7 @@ {% block page-header %} -

{% trans 'Groups' %}

+ {% trans 'Groups' %} {% endblock %} diff --git a/group_app/templates/group_app/group_list.html b/group_app/templates/group_app/group_list.html index 5411490..60bb3ec 100644 --- a/group_app/templates/group_app/group_list.html +++ b/group_app/templates/group_app/group_list.html @@ -11,7 +11,7 @@ {% block page-header %} -

{% trans 'Groups' %}

+ {% trans 'Groups' %} {% endblock %} diff --git a/ip_pool/templates/ip_pool/ip_leases_list.html b/ip_pool/templates/ip_pool/ip_leases_list.html index 078fd74..ee9a88f 100644 --- a/ip_pool/templates/ip_pool/ip_leases_list.html +++ b/ip_pool/templates/ip_pool/ip_leases_list.html @@ -10,7 +10,9 @@ {% endblock %} -{% block page-header %}{% trans 'Ip leases list' %}{% endblock %} +{% block page-header %} + {% trans 'Ip leases list' %} +{% endblock %} {% block main %}
diff --git a/ip_pool/templates/ip_pool/net_add.html b/ip_pool/templates/ip_pool/net_add.html index 9c9d573..2b0213a 100644 --- a/ip_pool/templates/ip_pool/net_add.html +++ b/ip_pool/templates/ip_pool/net_add.html @@ -15,7 +15,9 @@ {% endblock %} -{% block page-header %}{% trans 'Add new subnet' %}{% endblock %} +{% block page-header %} + {% trans 'Add new subnet' %} +{% endblock %} {% block main %}
{% csrf_token %} diff --git a/ip_pool/templates/ip_pool/net_edit.html b/ip_pool/templates/ip_pool/net_edit.html index c2b27d5..656ec9c 100644 --- a/ip_pool/templates/ip_pool/net_edit.html +++ b/ip_pool/templates/ip_pool/net_edit.html @@ -15,7 +15,9 @@ {% endblock %} -{% block page-header %}{{ object }}{% endblock %} +{% block page-header %} + {{ object }} +{% endblock %} {% block main %} {% csrf_token %} diff --git a/ip_pool/templates/ip_pool/network_groups_available.html b/ip_pool/templates/ip_pool/network_groups_available.html index c12af06..59bbd50 100644 --- a/ip_pool/templates/ip_pool/network_groups_available.html +++ b/ip_pool/templates/ip_pool/network_groups_available.html @@ -11,7 +11,7 @@ {% endblock %} {% block page-header %} -

{% trans 'Make that pool available in specified groups' %}

+ {% trans 'Make that pool available in specified groups' %} {% endblock %} {% block main %} diff --git a/mapapp/templates/maps/dot.html b/mapapp/templates/maps/dot.html index 5779e81..75ef90c 100644 --- a/mapapp/templates/maps/dot.html +++ b/mapapp/templates/maps/dot.html @@ -20,7 +20,7 @@ {% block page-header %} -

{% trans 'Map point' %}

+ {% trans 'Map point' %} {% endblock %} diff --git a/mapapp/templates/maps/options.html b/mapapp/templates/maps/options.html index c5583f3..cb8025c 100644 --- a/mapapp/templates/maps/options.html +++ b/mapapp/templates/maps/options.html @@ -9,7 +9,7 @@ {% endblock %} {% block page-header %} -

{% trans 'Map point' %}

+ {% trans 'Map point' %} {% endblock %} {% block main %} diff --git a/msg_app/templates/msg_app/chat.html b/msg_app/templates/msg_app/chat.html index 0b77be7..57f7ad3 100644 --- a/msg_app/templates/msg_app/chat.html +++ b/msg_app/templates/msg_app/chat.html @@ -12,7 +12,7 @@ {% block page-header %} -

{{ conv.title }}

+ {{ conv.title }} {% endblock %} diff --git a/searchapp/templates/searchapp/index.html b/searchapp/templates/searchapp/index.html index d51a5ae..5118ace 100644 --- a/searchapp/templates/searchapp/index.html +++ b/searchapp/templates/searchapp/index.html @@ -8,7 +8,9 @@ {% endblock %} -{% block page-header %}{% trans 'Search' %}{% endblock %} +{% block page-header %} + {% trans 'Search' %} +{% endblock %} {% block main %}
diff --git a/tariff_app/templates/tariff_app/ext.html b/tariff_app/templates/tariff_app/ext.html index 4b9ca16..8124fd7 100644 --- a/tariff_app/templates/tariff_app/ext.html +++ b/tariff_app/templates/tariff_app/ext.html @@ -9,7 +9,7 @@ {% endblock %} {% block page-header %} -

{% trans 'Services' %}

+ {% trans 'Services' %} {% endblock %} {% block main %} diff --git a/tariff_app/templates/tariff_app/periodic_pays/add_edit.html b/tariff_app/templates/tariff_app/periodic_pays/add_edit.html index 8be7124..bcfc6a6 100644 --- a/tariff_app/templates/tariff_app/periodic_pays/add_edit.html +++ b/tariff_app/templates/tariff_app/periodic_pays/add_edit.html @@ -17,7 +17,7 @@ {% if pay_instance %} {% block page-header %} -

{{ pay_instance.name }}

+ {{ pay_instance.name }} {% endblock %} {% url 'tarifs:periodic_pay_edit' pay_instance.id as form_url %} {% else %} diff --git a/taskapp/templates/taskapp/ext.htm b/taskapp/templates/taskapp/ext.htm index 1105e95..218cd72 100644 --- a/taskapp/templates/taskapp/ext.htm +++ b/taskapp/templates/taskapp/ext.htm @@ -10,7 +10,7 @@ {% endblock %} {% block page-header %} -

{% trans 'Tasks to be performed' %}

+ {% trans 'Tasks to be performed' %} {% endblock %} diff --git a/taskapp/templates/taskapp/tasklist_all.html b/taskapp/templates/taskapp/tasklist_all.html index 654b30b..515fcba 100644 --- a/taskapp/templates/taskapp/tasklist_all.html +++ b/taskapp/templates/taskapp/tasklist_all.html @@ -13,7 +13,7 @@ {% block page-header %} -

{% trans 'Records of all the tasks in the system' %}

+ {% trans 'Records of all the tasks in the system' %} {% endblock %} diff --git a/taskapp/templates/taskapp/tasklist_empty.html b/taskapp/templates/taskapp/tasklist_empty.html index 7ede78c..6d1da12 100644 --- a/taskapp/templates/taskapp/tasklist_empty.html +++ b/taskapp/templates/taskapp/tasklist_empty.html @@ -2,7 +2,7 @@ {% load i18n %} {% block page-header %} -

{% trans 'Tasks in which no recipients' %}

+ {% trans 'Tasks in which no recipients' %} {% endblock %} {% block content %} diff --git a/taskapp/templates/taskapp/tasklist_failed.html b/taskapp/templates/taskapp/tasklist_failed.html index 4de081b..4243e1e 100644 --- a/taskapp/templates/taskapp/tasklist_failed.html +++ b/taskapp/templates/taskapp/tasklist_failed.html @@ -2,7 +2,7 @@ {% load i18n %} {% block page-header %} -

{% trans 'Tasks in which was trouble while at runtime' %}

+ {% trans 'Tasks in which was trouble while at runtime' %} {% endblock %} {% block content %}