From 9d46ec4d212f970510fb17ccdd8f6375edf602e1 Mon Sep 17 00:00:00 2001
From: bashmak <nerosketch@gmail.com>
Date: Mon, 21 Aug 2017 12:29:39 +0300
Subject: [PATCH 1/2] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D1=81=D0=B2=D0=B5=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 63b0309..81336ec 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # djing
-Попытка интернет биллинга. djing сокращение от django-billing. Это web интерфейс управления абонентами интернет-провайдера.
+Попытка интернет биллинга. djing сокращение от **dj**ango-bill**ing**. Это web интерфейс управления абонентами интернет-провайдера.
 Сейчас идёт тестирвоание работы на Mikrotik, функционал пока минимальный, т.к. пишу в свободное время. Работа планируется в реальных условиях и на реальных абонентах.
 Использовано python 3, django 1.9, bootstrap 3, и другое в файле requirements.txt
 

From 9567bd164c525b4aa5607fc0bfa4576b9afc3ef3 Mon Sep 17 00:00:00 2001
From: bashmak <nerosketch@gmail.com>
Date: Mon, 21 Aug 2017 12:46:28 +0300
Subject: [PATCH 2/2] =?UTF-8?q?=D0=9F=D0=BE=D0=BB=D0=B5=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D1=81=D0=BA=D0=BE=D0=B3?=
 =?UTF-8?q?=D0=BE=20=D1=83=D1=81=D1=82=D1=80=D0=BE=D0=B9=D1=81=D1=82=D0=B2?=
 =?UTF-8?q?=D0=B0=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=8F=D0=B7=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D0=B7=D0=B0=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 devapp/templates/devapp/add_dev.html | 12 ++++++++++++
 devapp/templates/devapp/dev.html     |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/devapp/templates/devapp/add_dev.html b/devapp/templates/devapp/add_dev.html
index 0646437..635c47b 100644
--- a/devapp/templates/devapp/add_dev.html
+++ b/devapp/templates/devapp/add_dev.html
@@ -94,6 +94,18 @@
                     </div>
                 </div>
 
+                <div class="form-group">
+                    <label for="id_parent_dev">{% trans 'Parent device' %}</label>
+
+                    <div class="input-group selectajax" data-dst="/dev/search_dev">
+                        <span class="input-group-addon"><span class="glyphicon glyphicon-hdd"></span></span>
+                        <input type="hidden" name="parent_dev" class="selectajax-hid"{% if selected_parent_dev %} value="{{ selected_parent_dev.pk }}"{% endif %}>
+                            <button class="selectajax-btn form-control btn btn-default hidden"></button>
+                            <input type="text" class="form-control dropdown-toggle selectajax-inp" data-toggle="dropdown" id="id_parent_dev" placeholder="{% trans 'Find the device' %}" required>
+                        <ul class="dropdown-menu selectajax-ul"></ul>{{ form.parent_dev.errors }}
+                    </div>
+                </div>
+
                 <div class="btn-group">
                     <button type="submit" class="btn btn-sm btn-primary">
                         <span class="glyphicon glyphicon-save"></span> {% trans 'Save' %}
diff --git a/devapp/templates/devapp/dev.html b/devapp/templates/devapp/dev.html
index 43e627d..f7daeda 100644
--- a/devapp/templates/devapp/dev.html
+++ b/devapp/templates/devapp/dev.html
@@ -89,10 +89,10 @@
                         <input type="hidden" name="parent_dev" class="selectajax-hid"{% if selected_parent_dev %} value="{{ selected_parent_dev.pk }}"{% endif %}>
                         {% if selected_parent_dev %}
                             <button class="selectajax-btn form-control btn btn-default">{{ selected_parent_dev.comment }}</button>
-                            <input type="text" class="form-control dropdown-toggle selectajax-inp hidden" data-toggle="dropdown" id="id_parent_dev" placeholder="{% trans 'Find the device' %}">
+                            <input type="text" class="form-control dropdown-toggle selectajax-inp hidden" data-toggle="dropdown" id="id_parent_dev" placeholder="{% trans 'Find the device' %}" required>
                         {% else %}
                             <button class="selectajax-btn form-control btn btn-default hidden"></button>
-                            <input type="text" class="form-control dropdown-toggle selectajax-inp" data-toggle="dropdown" id="id_parent_dev" placeholder="{% trans 'Find the device' %}">
+                            <input type="text" class="form-control dropdown-toggle selectajax-inp" data-toggle="dropdown" id="id_parent_dev" placeholder="{% trans 'Find the device' %}" required>
                         {% endif %}
                         <ul class="dropdown-menu selectajax-ul"></ul>{{ form.parent_dev.errors }}
                     </div>