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

7 years ago · a9227f5a5a
7 changed files with 11 additions and 19 deletions
--- a/abonapp/locale/ru/LC_MESSAGES/django.po
+++ b/abonapp/locale/ru/LC_MESSAGES/django.po
@ -1162,3 +1162,9 @@ msgstr "IP адрес уже есть"
 msgid "Last connected service"
 msgstr "Последняя подключённая услуга"
 msgid "Ballance"
 msgstr "Балланс"
 msgid "Date joined"
 msgstr "Дата создания"
--- a/abonapp/templates/abonapp/editAbon.html
+++ b/abonapp/templates/abonapp/editAbon.html
@ -6,7 +6,10 @@
        <div class="col-sm-12 col-xs-12 col-md-6">
            <div class="panel panel-default">
                <div class="panel-heading">
                    <h3 class="panel-title">{% trans 'Change subscriber' %}</h3>
                    <h3 class="panel-title">
                        {% trans 'Change subscriber' %}
                        <small>{% trans 'Date joined' %}: {{ abon.birth_day|date:'d E Y' }}</small>
                    </h3>
                </div>
                <div class="panel-body">
--- a/abonapp/templates/abonapp/peoples.html
+++ b/abonapp/templates/abonapp/peoples.html
@ -84,7 +84,7 @@
 {#                            {% endif %}#}
                        </td>
                        <td class="col-xs-1">
                            <a href="{% url 'abonapp:abon_home' human.group_id human.username %}">{{ human.username }}</a>
                            <a href="{% url 'abonapp:abon_home' human.group_id human.username %}" title="{% trans 'Date joined' %}: {{ human.birth_day|date:'d E y' }}" data-toggle="tooltip">{{ human.username }}</a>
                        </td>
                        <td class="hidden-xs">
 {#                            {% if human.statcache %}#}
--- a/static/css/custom.css
+++ b/static/css/custom.css
@ -256,14 +256,6 @@ div#loading {
    z-index: 1;
    display: none;
 }
 div#loading>div.gif {
    position: absolute;
    left: 49%;
    top: 39%;
    background-color: white;
    border-radius: 13px;
    border-style: ridge;
 }
--- a/static/img/loading.gif
+++ b/static/img/loading.gif
--- a/static/js/my.js
+++ b/static/js/my.js
@ -11,7 +11,6 @@ var cnt='<div class="modal-header '+type_class+'">' +
        '<div class="modal-body">'+content+'</div>' +
        '<div class="modal-footer"><button type="button" class="btn btn-default" data-dismiss="modal">Закрыть</button></div>';
 	show_ModalMyContent(cnt);
 	$('#loading').hide();
 }
 function showErr(errContent) {show_Modal('Ошибка', errContent, 'warning');}
@ -125,11 +124,9 @@ $(document).ajaxError(function (ev, jqXHR, ajaxSettings, thrownError) {
 		}, opt);
 		var fill_block_fn = function(){
 		    $('#loading').show();
 		    var url = $(this).attr('data-href');
 		    $.get(url, function(r){
 		        $(settings.dst_block).html(r);
 		        $('#loading').hide();
 		    });
 		};
--- a/templates/all_base.html
+++ b/templates/all_base.html
@ -16,12 +16,6 @@
 </head>
 <body>
 <div id="loading">
    <div class="gif">
        <img src="/static/img/loading.gif"/>
    </div>
 </div>
 <!-- Modal -->
 <div class="modal fade" id="modFrm" tabindex="-1" role="dialog" aria-hidden="true">
    <div class="modal-dialog">