From f386456bf485889143ae9bcb968e7fa8bafa5e21 Mon Sep 17 00:00:00 2001
From: Dmitry Novikov <nerosketch@gmail.com>
Date: Wed, 5 Sep 2018 14:47:52 +0300
Subject: [PATCH] refactoring template multiple loads

---
 abonapp/templates/abonapp/addAbon.html                       | 3 +--
 abonapp/templates/abonapp/editAbon.html                      | 3 +--
 abonapp/templates/abonapp/group_list.html                    | 3 +--
 abonapp/templates/abonapp/modal_abonamount.html              | 3 +--
 abonapp/templates/abonapp/modal_add_lease.html               | 3 +--
 abonapp/templates/abonapp/modal_export.html                  | 3 +--
 abonapp/templates/abonapp/modal_passport_view.html           | 3 +--
 abonapp/templates/abonapp/modal_periodic_pay.html            | 3 +--
 abonapp/templates/abonapp/payHistory.html                    | 3 +--
 abonapp/templates/abonapp/peoples.html                       | 3 +--
 accounts_app/templates/accounts/create_acc.html              | 3 +--
 accounts_app/templates/accounts/login.html                   | 2 +-
 .../templates/accounts/perms/change_global_perms.html        | 3 +--
 .../templates/accounts/perms/object/objects_types.html       | 3 +--
 accounts_app/templates/accounts/perms/object/perms_edit.html | 3 +--
 accounts_app/templates/accounts/settings/ch_info.html        | 3 +--
 clientsideapp/templates/clientsideapp/ext.html               | 2 +-
 clientsideapp/templates/clientsideapp/tasklist.html          | 3 +--
 devapp/templates/devapp/add_dev.html                         | 3 +--
 devapp/templates/devapp/dev.html                             | 3 +--
 devapp/templates/devapp/devices.html                         | 3 +--
 devapp/templates/devapp/devices_null_group.html              | 3 +--
 devapp/templates/devapp/fix_dev_group.html                   | 3 +--
 .../templates/devapp/manage_ports/modal_add_edit_port.html   | 2 +-
 devapp/templates/devapp/modal_device_extra_edit.html         | 3 +--
 dialing_app/templates/index.html                             | 3 +--
 dialing_app/templates/modal_send_sms.html                    | 2 +-
 dialing_app/templates/vmail.html                             | 3 +--
 group_app/templates/group_app/add_group.html                 | 3 +--
 group_app/templates/group_app/edit_group.html                | 3 +--
 group_app/templates/group_app/group_list.html                | 3 +--
 ip_pool/templates/ip_pool/ext.html                           | 3 +--
 ip_pool/templates/ip_pool/net_add.html                       | 4 +---
 ip_pool/templates/ip_pool/net_edit.html                      | 4 +---
 mapapp/templates/maps/add_device.html                        | 3 +--
 mapapp/templates/maps/dot.html                               | 5 +----
 mapapp/templates/maps/modal_add_device.html                  | 2 +-
 mapapp/templates/maps/modal_add_dot.html                     | 2 +-
 nas_app/templates/nas_app/nasmodel_add.html                  | 3 +--
 nas_app/templates/nas_app/nasmodel_update.html               | 3 +--
 tariff_app/templates/tariff_app/editTarif.html               | 3 +--
 tariff_app/templates/tariff_app/periodic_pays/add_edit.html  | 3 +--
 tariff_app/templates/tariff_app/tarifs.html                  | 3 +--
 taskapp/templates/taskapp/add_edit_task.html                 | 4 +---
 taskapp/templates/taskapp/comments/task_comments.html        | 3 +--
 taskapp/templates/taskapp/tasklist.html                      | 3 +--
 taskapp/templates/taskapp/tasklist_all.html                  | 3 +--
 templates/all_base.html                                      | 2 +-
 48 files changed, 48 insertions(+), 94 deletions(-)

diff --git a/abonapp/templates/abonapp/addAbon.html b/abonapp/templates/abonapp/addAbon.html
index 73dc210..b93ec39 100644
--- a/abonapp/templates/abonapp/addAbon.html
+++ b/abonapp/templates/abonapp/addAbon.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
diff --git a/abonapp/templates/abonapp/editAbon.html b/abonapp/templates/abonapp/editAbon.html
index f0807e9..bdfe305 100644
--- a/abonapp/templates/abonapp/editAbon.html
+++ b/abonapp/templates/abonapp/editAbon.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'nullcont.htm,abonapp/ext.htm' %}
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 {% block content %}
 
     <div class="row">
diff --git a/abonapp/templates/abonapp/group_list.html b/abonapp/templates/abonapp/group_list.html
index 22d124b..6e64e1d 100644
--- a/abonapp/templates/abonapp/group_list.html
+++ b/abonapp/templates/abonapp/group_list.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
-{% load i18n %}
-{% load dpagination %}
+{% load dpagination i18n %}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
diff --git a/abonapp/templates/abonapp/modal_abonamount.html b/abonapp/templates/abonapp/modal_abonamount.html
index 5107c80..7a575d9 100644
--- a/abonapp/templates/abonapp/modal_abonamount.html
+++ b/abonapp/templates/abonapp/modal_abonamount.html
@@ -1,5 +1,4 @@
-{% load i18n %}
-{% load bootstrap3 %}
+{% load bootstrap3 i18n %}
 <form role="form" action="{% url 'abonapp:abon_amount' group_id abon.username %}" method="post"> {% csrf_token %}
     <div class="modal-header primary">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
diff --git a/abonapp/templates/abonapp/modal_add_lease.html b/abonapp/templates/abonapp/modal_add_lease.html
index c0b7f42..5707935 100644
--- a/abonapp/templates/abonapp/modal_add_lease.html
+++ b/abonapp/templates/abonapp/modal_add_lease.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'nullcont.htm,abonapp/ext.htm' %}
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 {% block content %}
 <form role="form" action="{% url 'abonapp:lease_add' group.id uname %}" method="post"> {% csrf_token %}
     <div class="modal-header primary">
diff --git a/abonapp/templates/abonapp/modal_export.html b/abonapp/templates/abonapp/modal_export.html
index 1444209..f34b890 100644
--- a/abonapp/templates/abonapp/modal_export.html
+++ b/abonapp/templates/abonapp/modal_export.html
@@ -1,5 +1,4 @@
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 <form role="form" action="{% url 'abonapp:abon_export' gid %}?f=csv" method="post"> {% csrf_token %}
     <div class="modal-header primary">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
diff --git a/abonapp/templates/abonapp/modal_passport_view.html b/abonapp/templates/abonapp/modal_passport_view.html
index 80bceed..9503d19 100644
--- a/abonapp/templates/abonapp/modal_passport_view.html
+++ b/abonapp/templates/abonapp/modal_passport_view.html
@@ -1,5 +1,4 @@
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 <form role="form" action="{% url 'abonapp:passport_view' group.pk abon.username %}" method="post"> {% csrf_token %}
     <div class="modal-header primary">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
diff --git a/abonapp/templates/abonapp/modal_periodic_pay.html b/abonapp/templates/abonapp/modal_periodic_pay.html
index 8379cef..b30801b 100644
--- a/abonapp/templates/abonapp/modal_periodic_pay.html
+++ b/abonapp/templates/abonapp/modal_periodic_pay.html
@@ -1,5 +1,4 @@
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 <form action="{% url 'abonapp:add_periodic_pay' gid uname %}" method="post">{% csrf_token %}
     <div class="modal-header primary">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
diff --git a/abonapp/templates/abonapp/payHistory.html b/abonapp/templates/abonapp/payHistory.html
index 3666b11..93e74f9 100644
--- a/abonapp/templates/abonapp/payHistory.html
+++ b/abonapp/templates/abonapp/payHistory.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'nullcont.htm,abonapp/ext.htm' %}
-{% load i18n %}
-{% load guardian_tags %}
+{% load i18n guardian_tags %}
 {% block content %}
 
     <table class="table table-striped table-bordered">
diff --git a/abonapp/templates/abonapp/peoples.html b/abonapp/templates/abonapp/peoples.html
index 688f810..de9e206 100644
--- a/abonapp/templates/abonapp/peoples.html
+++ b/abonapp/templates/abonapp/peoples.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
-{% load i18n %}
-{% load dpagination %}
+{% load i18n dpagination %}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
diff --git a/accounts_app/templates/accounts/create_acc.html b/accounts_app/templates/accounts/create_acc.html
index a89d878..6b8e0bf 100644
--- a/accounts_app/templates/accounts/create_acc.html
+++ b/accounts_app/templates/accounts/create_acc.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-{% load globaltags %}
-{% load i18n %}
+{% load globaltags i18n %}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
diff --git a/accounts_app/templates/accounts/login.html b/accounts_app/templates/accounts/login.html
index da95408..f297ac9 100644
--- a/accounts_app/templates/accounts/login.html
+++ b/accounts_app/templates/accounts/login.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>{% load i18n %}{% load acc_tags %}{% load bootstrap3 %}
+<!DOCTYPE html>{% load i18n acc_tags bootstrap3 %}
 <html lang="{{ LANGUAGE_CODE }}">
 <head>
     <meta charset="UTF-8">
diff --git a/accounts_app/templates/accounts/perms/change_global_perms.html b/accounts_app/templates/accounts/perms/change_global_perms.html
index 5df36a3..9d07b76 100644
--- a/accounts_app/templates/accounts/perms/change_global_perms.html
+++ b/accounts_app/templates/accounts/perms/change_global_perms.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'nullcont.htm,accounts/perms/ext.html' %}
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
diff --git a/accounts_app/templates/accounts/perms/object/objects_types.html b/accounts_app/templates/accounts/perms/object/objects_types.html
index 93203c9..6f2fa69 100644
--- a/accounts_app/templates/accounts/perms/object/objects_types.html
+++ b/accounts_app/templates/accounts/perms/object/objects_types.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'nullcont.htm,accounts/perms/ext.html' %}
-{% load i18n %}
-{% load acc_tags %}
+{% load i18n acc_tags %}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
diff --git a/accounts_app/templates/accounts/perms/object/perms_edit.html b/accounts_app/templates/accounts/perms/object/perms_edit.html
index 1d0f5aa..86fe3f2 100644
--- a/accounts_app/templates/accounts/perms/object/perms_edit.html
+++ b/accounts_app/templates/accounts/perms/object/perms_edit.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
diff --git a/accounts_app/templates/accounts/settings/ch_info.html b/accounts_app/templates/accounts/settings/ch_info.html
index 8d38752..b716525 100644
--- a/accounts_app/templates/accounts/settings/ch_info.html
+++ b/accounts_app/templates/accounts/settings/ch_info.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'nullcont.htm,accounts/settings/ext.htm' %}
-{% load globaltags %}
-{% load i18n %}
+{% load globaltags i18n %}
 {% block content %}
 
     <form role="form" action="{% url 'acc_app:setup_info' %}" method="post">{% csrf_token %}
diff --git a/clientsideapp/templates/clientsideapp/ext.html b/clientsideapp/templates/clientsideapp/ext.html
index 145c9a4..5b08ca2 100644
--- a/clientsideapp/templates/clientsideapp/ext.html
+++ b/clientsideapp/templates/clientsideapp/ext.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>{% load globaltags %}{% load i18n %}
+<!DOCTYPE HTML>{% load globaltags i18n %}
 <html lang="{{ LANGUAGE_CODE }}">
 <head>
     <meta charset="utf-8">
diff --git a/clientsideapp/templates/clientsideapp/tasklist.html b/clientsideapp/templates/clientsideapp/tasklist.html
index a060bb0..055b74b 100644
--- a/clientsideapp/templates/clientsideapp/tasklist.html
+++ b/clientsideapp/templates/clientsideapp/tasklist.html
@@ -1,6 +1,5 @@
 {% extends 'clientsideapp/ext.html' %}
-{% load i18n %}
-{% load tasktags %}
+{% load i18n tasktags %}
 {% block client_main %}
 
 <div class="page-header">
diff --git a/devapp/templates/devapp/add_dev.html b/devapp/templates/devapp/add_dev.html
index 6ce2712..af23896 100644
--- a/devapp/templates/devapp/add_dev.html
+++ b/devapp/templates/devapp/add_dev.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
diff --git a/devapp/templates/devapp/dev.html b/devapp/templates/devapp/dev.html
index 46de83c..74a6f6e 100644
--- a/devapp/templates/devapp/dev.html
+++ b/devapp/templates/devapp/dev.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'nullcont.htm,devapp/ext.htm' %}
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 {% block content %}
 
 <div class="panel panel-default">
diff --git a/devapp/templates/devapp/devices.html b/devapp/templates/devapp/devices.html
index 99294dd..2db0b3b 100644
--- a/devapp/templates/devapp/devices.html
+++ b/devapp/templates/devapp/devices.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-{% load i18n %}
-{% load dpagination %}
+{% load i18n dpagination %}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
diff --git a/devapp/templates/devapp/devices_null_group.html b/devapp/templates/devapp/devices_null_group.html
index f0d2fce..f8e4c73 100644
--- a/devapp/templates/devapp/devices_null_group.html
+++ b/devapp/templates/devapp/devices_null_group.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-{% load i18n %}
-{% load dpagination %}
+{% load i18n dpagination %}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
diff --git a/devapp/templates/devapp/fix_dev_group.html b/devapp/templates/devapp/fix_dev_group.html
index 788070f..3c8d613 100644
--- a/devapp/templates/devapp/fix_dev_group.html
+++ b/devapp/templates/devapp/fix_dev_group.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
diff --git a/devapp/templates/devapp/manage_ports/modal_add_edit_port.html b/devapp/templates/devapp/manage_ports/modal_add_edit_port.html
index b98f2b2..89921d3 100644
--- a/devapp/templates/devapp/manage_ports/modal_add_edit_port.html
+++ b/devapp/templates/devapp/manage_ports/modal_add_edit_port.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 
 {% if port_id %}
     {% url 'devapp:edit_port' gid did port_id as frm_url %}
diff --git a/devapp/templates/devapp/modal_device_extra_edit.html b/devapp/templates/devapp/modal_device_extra_edit.html
index 87bc6ae..a29bc9e 100644
--- a/devapp/templates/devapp/modal_device_extra_edit.html
+++ b/devapp/templates/devapp/modal_device_extra_edit.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 {% block main %}
 <form action="{% url 'devapp:extra_data_edit' group_id object.pk %}" method="post">{% csrf_token %}
     <div class="modal-header primary">
diff --git a/dialing_app/templates/index.html b/dialing_app/templates/index.html
index ed74882..1a12cb7 100644
--- a/dialing_app/templates/index.html
+++ b/dialing_app/templates/index.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'nullcont.htm,ext.html' %}
-{% load i18n %}
-{% load telephone_filters %}
+{% load i18n telephone_filters %}
 {% block content %}
     <div class="table-responsive">
         <table class="table table-striped table-bordered">
diff --git a/dialing_app/templates/modal_send_sms.html b/dialing_app/templates/modal_send_sms.html
index 15f7339..0a87dc9 100644
--- a/dialing_app/templates/modal_send_sms.html
+++ b/dialing_app/templates/modal_send_sms.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 <form action="{% url 'dialapp:send_sms' %}?path={{ path|default:'' }}" method="post"> {% csrf_token %}
     <div class="modal-header primary">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
diff --git a/dialing_app/templates/vmail.html b/dialing_app/templates/vmail.html
index 34d1549..e1c3636 100644
--- a/dialing_app/templates/vmail.html
+++ b/dialing_app/templates/vmail.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'nullcont.htm,ext.html' %}
-{% load i18n %}
-{% load telephone_filters %}
+{% load i18n telephone_filters %}
 {% block content %}
 
     <div class="table-responsive">
diff --git a/group_app/templates/group_app/add_group.html b/group_app/templates/group_app/add_group.html
index ee733d1..271f2d8 100644
--- a/group_app/templates/group_app/add_group.html
+++ b/group_app/templates/group_app/add_group.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'nullcont.htm,group_app/ext.html' %}
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3%}
 {% block active_text %}{% trans 'Add group' %}{% endblock %}
 {% block content %}
 <form action="{% url 'group_app:add' %}" method="post">{% csrf_token %}
diff --git a/group_app/templates/group_app/edit_group.html b/group_app/templates/group_app/edit_group.html
index 7f1ec12..e58a709 100644
--- a/group_app/templates/group_app/edit_group.html
+++ b/group_app/templates/group_app/edit_group.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'nullcont.htm,group_app/ext.html' %}
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 {% block active_text %}{% trans 'Edit group' %}{% endblock %}
 {% block content %}
 <form action="{% url 'group_app:edit' object.pk %}" method="post">{% csrf_token %}
diff --git a/group_app/templates/group_app/group_list.html b/group_app/templates/group_app/group_list.html
index 60bb3ec..81c2b71 100644
--- a/group_app/templates/group_app/group_list.html
+++ b/group_app/templates/group_app/group_list.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
-{% load i18n %}
-{% load dpagination %}
+{% load i18n dpagination%}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
diff --git a/ip_pool/templates/ip_pool/ext.html b/ip_pool/templates/ip_pool/ext.html
index 99f6069..48cbbe3 100644
--- a/ip_pool/templates/ip_pool/ext.html
+++ b/ip_pool/templates/ip_pool/ext.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-{% load i18n %}
-{% load ip_pool_tags %}
+{% load i18n ip_pool_tags %}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
diff --git a/ip_pool/templates/ip_pool/net_add.html b/ip_pool/templates/ip_pool/net_add.html
index 2b0213a..2218585 100644
--- a/ip_pool/templates/ip_pool/net_add.html
+++ b/ip_pool/templates/ip_pool/net_add.html
@@ -1,7 +1,5 @@
 {% extends 'base.html' %}
-{% load i18n %}
-{% load bootstrap3 %}
-{% load globaltags %}
+{% load i18n bootstrap3 globaltags %}
 
 {#{% block additional_link %}#}
 {#    <script src="/static/js/cidr.js"></script>#}
diff --git a/ip_pool/templates/ip_pool/net_edit.html b/ip_pool/templates/ip_pool/net_edit.html
index 656ec9c..cf8d6da 100644
--- a/ip_pool/templates/ip_pool/net_edit.html
+++ b/ip_pool/templates/ip_pool/net_edit.html
@@ -1,7 +1,5 @@
 {% extends 'base.html' %}
-{% load i18n %}
-{% load bootstrap3 %}
-{% load globaltags %}
+{% load i18n bootstrap3 globaltags %}
 
 {#{% block additional_link %}#}
 {#    <script src="/static/js/cidr.js"></script>#}
diff --git a/mapapp/templates/maps/add_device.html b/mapapp/templates/maps/add_device.html
index 4f4fa11..b068725 100644
--- a/mapapp/templates/maps/add_device.html
+++ b/mapapp/templates/maps/add_device.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
diff --git a/mapapp/templates/maps/dot.html b/mapapp/templates/maps/dot.html
index 75d0cfd..20f1506 100644
--- a/mapapp/templates/maps/dot.html
+++ b/mapapp/templates/maps/dot.html
@@ -1,8 +1,5 @@
 {% extends 'base.html' %}
-{% load i18n %}
-{% load bootstrap3 %}
-{% load globaltags %}
-
+{% load i18n bootstrap3 globaltags %}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
diff --git a/mapapp/templates/maps/modal_add_device.html b/mapapp/templates/maps/modal_add_device.html
index cb37c12..64d6704 100644
--- a/mapapp/templates/maps/modal_add_device.html
+++ b/mapapp/templates/maps/modal_add_device.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 <form action="{% url 'mapapp:add_dev' dot_id %}" method="post">{% csrf_token %}
     <div class="modal-header primary">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
diff --git a/mapapp/templates/maps/modal_add_dot.html b/mapapp/templates/maps/modal_add_dot.html
index 33d639a..926dae6 100644
--- a/mapapp/templates/maps/modal_add_dot.html
+++ b/mapapp/templates/maps/modal_add_dot.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% load bootstrap3 %}{% load globaltags %}
+{% load i18n bootstrap3 globaltags %}
 <form action="{% url 'mapapp:modal_add_dot' %}" class="form-ajax" method="post" enctype="multipart/form-data">{% csrf_token %}
     <input type="hidden" name="MAX_FILE_SIZE" value="{% global_var 'FILE_UPLOAD_MAX_MEMORY_SIZE' %}"/>
     <div class="modal-header primary">
diff --git a/nas_app/templates/nas_app/nasmodel_add.html b/nas_app/templates/nas_app/nasmodel_add.html
index 56e0cf8..3a72f37 100644
--- a/nas_app/templates/nas_app/nasmodel_add.html
+++ b/nas_app/templates/nas_app/nasmodel_add.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
diff --git a/nas_app/templates/nas_app/nasmodel_update.html b/nas_app/templates/nas_app/nasmodel_update.html
index c2ffcb5..a657bce 100644
--- a/nas_app/templates/nas_app/nasmodel_update.html
+++ b/nas_app/templates/nas_app/nasmodel_update.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
diff --git a/tariff_app/templates/tariff_app/editTarif.html b/tariff_app/templates/tariff_app/editTarif.html
index 8be8cd1..d701828 100644
--- a/tariff_app/templates/tariff_app/editTarif.html
+++ b/tariff_app/templates/tariff_app/editTarif.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
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 1747958..b80049e 100644
--- a/tariff_app/templates/tariff_app/periodic_pays/add_edit.html
+++ b/tariff_app/templates/tariff_app/periodic_pays/add_edit.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
diff --git a/tariff_app/templates/tariff_app/tarifs.html b/tariff_app/templates/tariff_app/tarifs.html
index c564035..db8abbe 100644
--- a/tariff_app/templates/tariff_app/tarifs.html
+++ b/tariff_app/templates/tariff_app/tarifs.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'nullcont.htm,tariff_app/ext.html' %}
-{% load i18n %}
-{% load dpagination %}
+{% load i18n dpagination %}
 {% block content %}
 
     <div class="table-responsive">
diff --git a/taskapp/templates/taskapp/add_edit_task.html b/taskapp/templates/taskapp/add_edit_task.html
index 15db21d..ca6009c 100644
--- a/taskapp/templates/taskapp/add_edit_task.html
+++ b/taskapp/templates/taskapp/add_edit_task.html
@@ -1,7 +1,5 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-{% load i18n %}
-{% load bootstrap3 %}
-{% load globaltags %}
+{% load i18n bootstrap3 globaltags %}
 
 
 {% block breadcrumb %}
diff --git a/taskapp/templates/taskapp/comments/task_comments.html b/taskapp/templates/taskapp/comments/task_comments.html
index 504ee96..bef9b70 100644
--- a/taskapp/templates/taskapp/comments/task_comments.html
+++ b/taskapp/templates/taskapp/comments/task_comments.html
@@ -1,5 +1,4 @@
-{% load i18n %}
-{% load bootstrap3 %}
+{% load i18n bootstrap3 %}
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">{% trans 'Task comments' %}</h3>
diff --git a/taskapp/templates/taskapp/tasklist.html b/taskapp/templates/taskapp/tasklist.html
index 4800b74..f721cae 100644
--- a/taskapp/templates/taskapp/tasklist.html
+++ b/taskapp/templates/taskapp/tasklist.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'nullcont.htm,taskapp/ext.htm' %}
-{% load i18n %}
-{% load tasktags %}
+{% load i18n tasktags %}
 {% block content %}
 
     <div class="table-responsive">
diff --git a/taskapp/templates/taskapp/tasklist_all.html b/taskapp/templates/taskapp/tasklist_all.html
index 515fcba..570db01 100644
--- a/taskapp/templates/taskapp/tasklist_all.html
+++ b/taskapp/templates/taskapp/tasklist_all.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-{% load i18n %}
-{% load tasktags %}
+{% load i18n tasktags %}
 
 
 {% block breadcrumb %}
diff --git a/templates/all_base.html b/templates/all_base.html
index 9796691..ba0470a 100644
--- a/templates/all_base.html
+++ b/templates/all_base.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>{% load globaltags %}{% load i18n %}
+<!DOCTYPE html>{% load i18n globaltags %}
 <html lang="{{ LANGUAGE_CODE }}">
 <head>
     <title>{% global_var 'COMPANY_NAME' %} - {% trans 'Admin side' %}</title>