Merge branch 'master' into devel

# Conflicts: # clientsideapp/locale/ru/LC_MESSAGES/django.po # static/clientside/my_clientside.js
8 years ago · 9060524d40
3 changed files with 68 additions and 35 deletions
--- 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 <b>%(ballance)s</b>"
 msgstr "Ваш балланс <b>%(ballance)s</b>"

-#: templates/clientsideapp/ext.html:88
+#: templates/clientsideapp/ext.html:113
 msgid ""
 "<strong>Attantion!</strong> 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 "Вы можете добавить закладку на личный кабинет нажав <b>Ctrl+D</b>."
+
 #: 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"
--- a/clientsideapp/templates/clientsideapp/ext.html
+++ b/clientsideapp/templates/clientsideapp/ext.html
@ -38,17 +38,26 @@
            <ul class="nav navbar-nav">

                <li{% if client_side_home == request.path %} class="active"{% endif %}>
-                <a href="{{ client_side_home }}">{% trans 'Personal account' %}</a>
+                    <a href="{{ client_side_home }}">
+                        <span class="glyphicon glyphicon-user"></span>
+                        {% trans 'Personal account' %}
+                    </a>
                </li>

                {% url 'client_side:pays' as client_side_pays %}
                <li{% if client_side_pays == request.path %} class="active"{% endif %}>
-                <a href="{{ client_side_pays }}">{% trans 'Pays' %}</a>
+                    <a href="{{ client_side_pays }}">
+                        <span class="glyphicon glyphicon-ruble"></span>
+                        {% trans 'Pays' %}
+                    </a>
                </li>

                {% url 'client_side:services' as client_side_services %}
                <li{% if client_side_services == request.path %} class="active"{% endif %}>
-                <a href="{{ client_side_services }}">{% trans 'Services' %}</a>
+                    <a href="{{ client_side_services }}">
+                        <span class="glyphicon glyphicon-book"></span>
+                        {% trans 'Services' %}
+                    </a>
                </li>

 {#                <li class="dropdown">#}
@ -67,9 +76,25 @@
                <li class="dropdown">
                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans 'Other' %} <b class="caret"></b></a>
                    <ul class="dropdown-menu">
-                        <li><a href="{% url 'client_side:debts' %}">{% trans 'Show debts and pay it' %}</a></li>
-                        <li><a href="{% url 'client_side:task_history' %}">{% trans 'Show task history' %}</a></li>
-                        <li><a href="{% url 'acc_app:logout' %}">{% trans 'Quit' %}</a></li>
+                        <li>
+                            <a href="{% url 'client_side:debts' %}">
+                                <span class="glyphicon glyphicon-ruble"></span>
+                                {% trans 'Show debts and pay it' %}
+                            </a>
+                        </li>
+                        <li>
+                            <a href="{% url 'client_side:task_history' %}">
+                                <span class="glyphicon glyphicon-tasks"></span>
+                                {% trans 'Show task history' %}
+                            </a>
+                        </li>
+                        <li>
+                            <a href="{% url 'acc_app:logout' %}">
+                                <span class="glyphicon glyphicon-log-out"></span>
+                                {% trans 'Quit' %}
+                            </a>
+                        </li>
+
                    </ul>
                </li>
            </ul>
@ -92,6 +117,10 @@
    </div>
    {% endif %}

+    <div class="alert alert-info">
+        {% blocktrans %}You may add link to this personal page to bookmarks by pressing Ctrl+D{% endblocktrans %}
+    </div>
+
    {% include '_messages.html' %}

    {% block client_main %}{% endblock %}
--- 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='<div class="modal-header '+type_class+'">' +
-            '<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>' +
-            '<h4 class="modal-title"><span class="glyphicon glyphicon-warning-sign"></span>'+title+'</h4>' +
-        '</div>' +
-        '<div class="modal-body">'+content+'</div>' +
-        '<div class="modal-footer"><button type="button" class="btn btn-default" data-dismiss="modal">Закрыть</button></div>';
+			'<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>' +
+			'<h4 class="modal-title"><span class="glyphicon glyphicon-warning-sign"></span>'+title+'</h4>' +
+		'</div>' +
+		'<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);
 }

@ -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;
+	});

 });