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 %}
-
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') }}
{% 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' %}
{% 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' %}
{% 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') }}
{% 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' %}
{% 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 }}
{% 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 %}