diff --git a/clientsideapp/locale/ru/LC_MESSAGES/django.po b/clientsideapp/locale/ru/LC_MESSAGES/django.po index 744d0ac..f4edde6 100644 --- a/clientsideapp/locale/ru/LC_MESSAGES/django.po +++ b/clientsideapp/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-18 15:18+0300\n" +"POT-Creation-Date: 2018-09-18 20:20+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n" "Language: ru\n" @@ -84,7 +84,7 @@ msgstr "Дата платежа" msgid "Pay" msgstr "Оплатить" -#: templates/clientsideapp/debts.html:23 templates/clientsideapp/ext.html:77 +#: templates/clientsideapp/debts.html:23 templates/clientsideapp/ext.html:102 #: templates/clientsideapp/modal_service_buy.html:19 #: templates/clientsideapp/services.html:26 #: templates/clientsideapp/services.html:66 @@ -103,40 +103,40 @@ msgstr "Ещё не оплачен" msgid "You have no debt" msgstr "У вас нет долгов" -#: templates/clientsideapp/ext.html:7 templates/clientsideapp/ext.html:41 +#: templates/clientsideapp/ext.html:7 templates/clientsideapp/ext.html:43 msgid "Personal account" msgstr "Личный кабинет" -#: templates/clientsideapp/ext.html:46 +#: templates/clientsideapp/ext.html:51 msgid "Pays" msgstr "Платежи" -#: templates/clientsideapp/ext.html:51 +#: templates/clientsideapp/ext.html:59 msgid "Services" msgstr "Услуги" -#: templates/clientsideapp/ext.html:68 +#: templates/clientsideapp/ext.html:77 msgid "Other" msgstr "Другое" -#: templates/clientsideapp/ext.html:70 +#: templates/clientsideapp/ext.html:82 msgid "Show debts and pay it" msgstr "Посмотреть долги и оплатить" -#: templates/clientsideapp/ext.html:71 +#: templates/clientsideapp/ext.html:88 msgid "Show task history" msgstr "Посмотреть заявки" -#: templates/clientsideapp/ext.html:72 +#: templates/clientsideapp/ext.html:94 msgid "Quit" msgstr "Выйти" -#: templates/clientsideapp/ext.html:77 +#: templates/clientsideapp/ext.html:102 #, python-format msgid "Your balance is %(ballance)s" msgstr "Ваш балланс %(ballance)s" -#: templates/clientsideapp/ext.html:88 +#: templates/clientsideapp/ext.html:113 msgid "" "Attantion! You are is admin, and do not be active here, " "please back to admin side. Client side to you for reference only." @@ -145,6 +145,10 @@ msgstr "" "из кабинета пользователя, производите их из админки. Кабинет клиента для вас " "только для ознакомления." +#: templates/clientsideapp/ext.html:121 +msgid "You may add link to this personal page to bookmarks by pressing Ctrl+D" +msgstr "Вы можете добавить закладку на личный кабинет нажав Ctrl+D." + #: templates/clientsideapp/index.html:7 msgid "Account info" msgstr "Информация о вашей учётной записи" @@ -283,7 +287,7 @@ msgstr "Доступные для заказа услуги" msgid "No services available for ordering" msgstr "Нет доступных для заказа услуг" -#: templates/clientsideapp/tasklist.html:6 +#: templates/clientsideapp/tasklist.html:7 msgid "Task history" msgstr "История заявок" @@ -299,25 +303,25 @@ msgstr "Ожидаемый или реальный срок выполнения msgid "You didn't leave any requests for breakdowns." msgstr "Заявки по вашей учётной записи не найдены" -#: views.py:54 +#: views.py:53 #, python-format msgid "Buy the service via user side, service '%s'" msgstr "Покупка тарифного плана через личный кабинет, тариф '%s'" -#: views.py:57 +#: views.py:56 #, python-format msgid "The service '%s' wan successfully activated" msgstr "Услуга '%s' успешно подключена" -#: views.py:87 +#: views.py:86 msgid "Are you not sure that you want buy the service?" msgstr "Вы не уверены что хотите оплатить долг?" -#: views.py:89 +#: views.py:88 msgid "Your account have not enough money" msgstr "Недостаточно средств на счету" -#: views.py:92 +#: views.py:91 #, python-format msgid "%(username)s paid the debt %(amount).2f" msgstr "%(username)s заплатил долг в размере %(amount).2f" diff --git a/clientsideapp/templates/clientsideapp/ext.html b/clientsideapp/templates/clientsideapp/ext.html index 5b08ca2..b2688d3 100644 --- a/clientsideapp/templates/clientsideapp/ext.html +++ b/clientsideapp/templates/clientsideapp/ext.html @@ -38,17 +38,26 @@ @@ -92,6 +117,10 @@ {% endif %} +
+ {% blocktrans %}You may add link to this personal page to bookmarks by pressing Ctrl+D{% endblocktrans %} +
+ {% include '_messages.html' %} {% block client_main %}{% endblock %} diff --git a/static/clientside/my_clientside.js b/static/clientside/my_clientside.js index 10d40a2..da96cb9 100644 --- a/static/clientside/my_clientside.js +++ b/static/clientside/my_clientside.js @@ -1,14 +1,14 @@ function show_ModalMyContent(content){ - $('#modContent').html(content); + $('#modContent').html(content); $('#modFrm').modal(); } function show_Modal(title, content, type_class){ var cnt='' + - '' + - ''; + '' + + '' + + '' + + '' + + ''; show_ModalMyContent(cnt); } @@ -46,11 +46,11 @@ $(document).ready(function () { $.getJSON(data_url, {checked: this.checked}); }); - $('.btn-modal').on('click', function(){ - $.get(this.href, function(r){ - show_ModalMyContent(r); - }); - return false; - }); + $('.btn-modal').on('click', function(){ + $.get(this.href, function(r){ + show_ModalMyContent(r); + }); + return false; + }); });