Merge branch 'devel' of https://github.com/nerosketch/djing into devel

8 years ago · 29a6daa495
48 changed files with 48 additions and 94 deletions
--- 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">
--- 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">
--- 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">
--- 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>
--- 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">
--- 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>
--- 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>
--- 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>
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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 %}
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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 %}
--- 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">
--- 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">
--- 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>
--- 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">
--- 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 %}
--- 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 %}
--- 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">
--- 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">
--- 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>#}
--- 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>#}
--- 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">
--- 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">
--- 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>
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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 %}
--- 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>
--- 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">
--- 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 %}
--- 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>