diff --git a/abonapp/locale/ru/LC_MESSAGES/django.po b/abonapp/locale/ru/LC_MESSAGES/django.po index b0cf066..4a46d07 100644 --- 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 "Дата создания" diff --git a/abonapp/templates/abonapp/editAbon.html b/abonapp/templates/abonapp/editAbon.html index 253195c..f7116ed 100644 --- a/abonapp/templates/abonapp/editAbon.html +++ b/abonapp/templates/abonapp/editAbon.html @@ -6,7 +6,10 @@
-

{% trans 'Change subscriber' %}

+

+ {% trans 'Change subscriber' %} + {% trans 'Date joined' %}: {{ abon.birth_day|date:'d E Y' }} +

diff --git a/abonapp/templates/abonapp/peoples.html b/abonapp/templates/abonapp/peoples.html index e5be88d..a74ca9e 100644 --- a/abonapp/templates/abonapp/peoples.html +++ b/abonapp/templates/abonapp/peoples.html @@ -84,7 +84,7 @@ {# {% endif %}#} - {{ human.username }} + {{ human.username }} {# {% if human.statcache %}#} diff --git a/static/css/custom.css b/static/css/custom.css index 3903f00..08519f7 100644 --- 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; -} diff --git a/static/img/loading.gif b/static/img/loading.gif deleted file mode 100644 index 3ca78de..0000000 Binary files a/static/img/loading.gif and /dev/null differ diff --git a/static/js/my.js b/static/js/my.js index 91649f7..82a5def 100644 --- a/static/js/my.js +++ b/static/js/my.js @@ -11,7 +11,6 @@ var cnt='
' + '
'+content+'
' + '
'; 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(); }); }; diff --git a/templates/all_base.html b/templates/all_base.html index ba0470a..7f99d4a 100644 --- a/templates/all_base.html +++ b/templates/all_base.html @@ -16,12 +16,6 @@ -
-
- -
-
-