Merge branch 'devel' into multiple_nas

# Conflicts:
#	statistics/migrations/0003_auto_20180814_1921.py

abonapp/templates/abonapp/addAbon.html

@@ -11,6 +11,10 @@
     </ol>
 {% endblock %}
 
+{% block page-header %}
+    {% trans 'Add abon' %}
+{% endblock %}
+
 {% block main %}
     <div class="panel panel-default">
         <div class="panel-heading">

abonapp/templates/abonapp/buy_tariff.html

@@ -11,7 +11,9 @@
     </ol>
 {% endblock %}
 
-{% block page-header %}{% trans 'Pick a service' %}{% endblock %}
+{% block page-header %}
+    {% trans 'Pick a service' %}
+{% endblock %}
 
 {% block main %}
 

abonapp/templates/abonapp/debtors.html

@@ -10,7 +10,7 @@
 {% endblock %}
 
 {% block page-header %}
-    <h3>{% trans 'People with debts' %}</h3>
+    {% trans 'People with debts' %}
 {% endblock %}
 
 

abonapp/templates/abonapp/ext.htm

@@ -11,11 +11,9 @@
 {% endblock %}
 
 {% block page-header %}
-    <h3>{{ abon.fio|default:_("Long name") }}
-        <small>{% trans 'Ballance' %} <i class="glyphicon glyphicon-ruble"></i>
-            <b>{{ abon.ballance|floatformat:2 }}</b>
-        </small>
-    </h3>
+    <small>{% trans 'Ballance' %} <i class="glyphicon glyphicon-ruble"></i>
+        <b>{{ abon.ballance|floatformat:2 }}</b>
+    </small>
 {% endblock %}
 
 {% block main %}

abonapp/templates/abonapp/fin_report.html

@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block page-header %}
-    <h3>{% trans 'Money by days' %}</h3>
+    {% trans 'Money by days' %}
 {% endblock %}
 
 {% block main %}

abonapp/templates/abonapp/group_tariffs.html

@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block page-header %}
-    <h3>{% trans 'Belonging services for groups' %}</h3>
+    {% trans 'Belonging services for groups' %}
 {% endblock %}
 
 {% block main %}

abonapp/templates/abonapp/invoiceForPayment.html

@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block page-header %}
-    <h3>{% trans 'Debtor' %} {{ abon.fio }}</h3>
+    {% trans 'Debtor' %} {{ abon.fio }}
 {% endblock %}
 
 {% block main %}

abonapp/templates/abonapp/log.html

@@ -10,7 +10,7 @@
 {% endblock %}
 
 {% block page-header %}
-    <h3>{% trans 'History of subscriber' %}</h3>
+    {% trans 'History of subscriber' %}
 {% endblock %}
 
 {% block main %}

abonapp/templates/abonapp/peoples.html

@@ -10,7 +10,9 @@
     </ol>
 {% endblock %}
 
-{% block page-header %}{{ group.title }}{% endblock %}
+{% block page-header %}
+    {{ group.title }}
+{% endblock %}
 
 {% block main %}
     <div class="row">

accounts_app/templates/accounts/acc_list.html

@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block page-header %}
-    <h3>{% trans 'Admin accounts list' %}</h3>
+    {% trans 'Admin accounts list' %}
 {% endblock %}
 
 {% block main %}

accounts_app/templates/accounts/ext.htm

@@ -10,7 +10,7 @@
 {% endblock %}
 
 {% block page-header %}
-    <h3>{% trans 'Profile' %}</h3>
+    {% trans 'Profile' %}
 {% endblock %}
 
 {% block main %}

accounts_app/templates/accounts/perms/objects_of_type.html

@@ -13,7 +13,7 @@
 
 
 {% block page-header %}
-    <h3>{% trans 'Pick object for edit permissions' %}</h3>
+    {% trans 'Pick object for edit permissions' %}
 {% endblock %}
 
 

accounts_app/templates/accounts/perms/objects_types.html

@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block page-header %}
-    <h3>{% trans 'Pick the type of object' %}</h3>
+    {% trans 'Pick the type of object' %}
 {% endblock %}
 
 {% block main %}

accounts_app/templates/accounts/perms/perms_edit.html

@@ -16,7 +16,7 @@
 
 
 {% block page-header %}
-    <h3>{% trans 'Pick object for edit permissions' %}</h3>
+    {% trans 'Pick object for edit permissions' %}
 {% endblock %}
 
 

accounts_app/templates/accounts/settings/ext.htm

@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block page-header %}
-    <h3>{% trans 'Options' %}</h3>
+    {% trans 'Options' %}
 {% endblock %}
 
 {% block main %}

devapp/templates/devapp/add_dev.html

@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block page-header %}
-    <legend>{{ group.title|default:_('Not assigned') }}</legend>
+    {{ group.title|default:_('Not assigned') }}
 {% endblock %}
 
 {% block main %}

devapp/templates/devapp/custom_dev_page/olt_ztec320_units_uncfg.html

@@ -17,7 +17,7 @@
 {% endblock %}
 
 {% block page-header %}
-    <h3>{{ dev.comment|default:_('Not assigned') }}. {% trans 'Unregistered units' %}</h3>
+    {{ dev.comment|default:_('Not assigned') }}. {% trans 'Unregistered units' %}
 {% endblock %}
 
 {% block content %}

devapp/templates/devapp/devices.html

@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block page-header %}
-    <legend>{% trans 'Devices' %}</legend>
+    {% trans 'Devices' %}
 {% endblock %}
 
 {% block main %}

devapp/templates/devapp/devices_null_group.html

@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block page-header %}
-    <legend>{% trans 'Devices without group' %}</legend>
+    {% trans 'Devices without group' %}
 {% endblock %}
 
 {% block main %}

devapp/templates/devapp/ext.htm

@@ -17,7 +17,7 @@
 
 
 {% block page-header %}
-    <h3>{{ dev.comment|default:_('Not assigned') }}</h3>
+    {{ dev.comment|default:_('Not assigned') }}
 {% endblock %}
 
 

devapp/templates/devapp/group_list.html

@@ -8,7 +8,9 @@
     </ol>
 {% endblock %}
 
-{% block page-header %}{% trans 'Select group' %}{% endblock %}
+{% block page-header %}
+    {% trans 'Select group' %}
+{% endblock %}
 
 {% block main %}
     <div class="panel panel-default">

devapp/templates/devapp/manage_ports/add_ports.html

@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block page-header %}
-    <legend>{{ dev.comment|default:_('Not assigned') }}</legend>
+    {{ dev.comment|default:_('Not assigned') }}
 {% endblock %}
 
 {% block main %}

devapp/templates/devapp/manage_ports/fix_abon_device.html

@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block page-header %}
-    <legend>{% trans 'Fix subscriber ports conflict' %}</legend>
+    {% trans 'Fix subscriber ports conflict' %}
 {% endblock %}
 
 {% block main %}

dialing_app/templates/ext.html

@@ -11,7 +11,7 @@
 
 
 {% block page-header %}
-    <legend>{{ title }}</legend>
+    {{ title }}
 {% endblock %}
 
 

group_app/templates/group_app/ext.html

@@ -12,7 +12,7 @@
 
 
 {% block page-header %}
-    <h3>{% trans 'Groups' %}</h3>
+    {% trans 'Groups' %}
 {% endblock %}
 
 

group_app/templates/group_app/group_list.html

@@ -11,7 +11,7 @@
 
 
 {% block page-header %}
-    <h3>{% trans 'Groups' %}</h3>
+    {% trans 'Groups' %}
 {% endblock %}
 
 

ip_pool/templates/ip_pool/ip_leases_list.html

@@ -10,7 +10,9 @@
     </ol>
 {% endblock %}
 
-{% block page-header %}{% trans 'Ip leases list' %}{% endblock %}
+{% block page-header %}
+    {% trans 'Ip leases list' %}
+{% endblock %}
 
 {% block main %}
     <div class="table-responsive">

ip_pool/templates/ip_pool/net_add.html

@@ -15,7 +15,9 @@
     </ol>
 {% endblock %}
 
-{% block page-header %}{% trans 'Add new subnet' %}{% endblock %}
+{% block page-header %}
+    {% trans 'Add new subnet' %}
+{% endblock %}
 
 {% block main %}
     <form action="{% url 'ip_pool:net_add' %}" method="post">{% csrf_token %}

ip_pool/templates/ip_pool/net_edit.html

@@ -15,7 +15,9 @@
     </ol>
 {% endblock %}
 
-{% block page-header %}{{ object }}{% endblock %}
+{% block page-header %}
+    {{ object }}
+{% endblock %}
 
 {% block main %}
     <form action="{% url 'ip_pool:net_edit' object.pk %}" method="post">{% csrf_token %}

ip_pool/templates/ip_pool/network_groups_available.html

@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block page-header %}
-    <h3>{% trans 'Make that pool available in specified groups' %}</h3>
+    {% trans 'Make that pool available in specified groups' %}
 {% endblock %}
 
 {% block main %}

mapapp/templates/maps/dot.html

@@ -20,7 +20,7 @@
 
 
 {% block page-header %}
-    <h3>{% trans 'Map point' %}</h3>
+    {% trans 'Map point' %}
 {% endblock %}
 
 

mapapp/templates/maps/options.html

@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block page-header %}
-    <h3>{% trans 'Map point' %}</h3>
+    {% trans 'Map point' %}
 {% endblock %}
 
 {% block main %}

msg_app/templates/msg_app/chat.html

@@ -12,7 +12,7 @@
 
 
 {% block page-header %}
-    <h3>{{ conv.title }}</h3>
+    {{ conv.title }}
 {% endblock %}
 
 

searchapp/templates/searchapp/index.html

@@ -8,7 +8,9 @@
     </ol>
 {% endblock %}
 
-{% block page-header %}{% trans 'Search' %}{% endblock %}
+{% block page-header %}
+    {% trans 'Search' %}
+{% endblock %}
 
 {% block main %}
     <div class="panel panel-default">

tariff_app/templates/tariff_app/ext.html

@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block page-header %}
-    <h3>{% trans 'Services' %}</h3>
+    {% trans 'Services' %}
 {% endblock %}
 
 {% block main %}

tariff_app/templates/tariff_app/periodic_pays/add_edit.html

@@ -17,7 +17,7 @@
 
 {% if pay_instance %}
     {% block page-header %}
-        <h3>{{ pay_instance.name }}</h3>
+        {{ pay_instance.name }}
     {% endblock %}
     {% url 'tarifs:periodic_pay_edit' pay_instance.id as form_url %}
 {% else %}

taskapp/templates/taskapp/ext.htm

@@ -10,7 +10,7 @@
 {% endblock %}
 
 {% block page-header %}
-    <h3>{% trans 'Tasks to be performed' %}</h3>
+    {% trans 'Tasks to be performed' %}
 {% endblock %}
 
 

taskapp/templates/taskapp/tasklist_all.html

@@ -13,7 +13,7 @@
 
 
 {% block page-header %}
-    <h3>{% trans 'Records of all the tasks in the system' %}</h3>
+    {% trans 'Records of all the tasks in the system' %}
 {% endblock %}
 
 

taskapp/templates/taskapp/tasklist_empty.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block page-header %}
-    <h3>{% trans 'Tasks in which no recipients' %}</h3>
+    {% trans 'Tasks in which no recipients' %}
 {% endblock %}
 
 {% block content %}

taskapp/templates/taskapp/tasklist_failed.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block page-header %}
-    <h3>{% trans 'Tasks in which was trouble while at runtime' %}</h3>
+    {% trans 'Tasks in which was trouble while at runtime' %}
 {% endblock %}
 
 {% block content %}