From 04e78908ce29a1f1a40b198338ee8a41fc92e454 Mon Sep 17 00:00:00 2001
From: bashmak <nerosketch@gmail.com>
Date: Wed, 5 Jul 2017 13:40:51 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B2?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20=D0=B2=D0=BF=D0=B8=D1=81=D1=8B?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BC=D0=B0=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D1=83=D1=81=D1=82=D1=80=D0=BE=D0=B9=D1=81=D1=82=D0=B2=D0=B0=20?=
 =?UTF-8?q?=D0=B2=D1=80=D1=83=D1=87=D0=BD=D1=83=D1=8E=20=D0=BC=D0=BE=D0=B6?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D0=B2=D1=8B=D0=B1=D1=80=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BE=D0=B5=20=D1=83=D1=81=D1=82?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B9=D1=81=D1=82=D0=B2=D0=BE=20=D0=B8=D0=B7=20?=
 =?UTF-8?q?=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 abonapp/templates/abonapp/editAbon.html | 73 +++++++++++++++----------
 1 file changed, 43 insertions(+), 30 deletions(-)

diff --git a/abonapp/templates/abonapp/editAbon.html b/abonapp/templates/abonapp/editAbon.html
index 9cb0b70..1ee030e 100644
--- a/abonapp/templates/abonapp/editAbon.html
+++ b/abonapp/templates/abonapp/editAbon.html
@@ -42,7 +42,7 @@
                         <div class="form-group-sm{% if is_bad_ip %} has-error{% endif %}">
                             <label for="id_ip" class="col-sm-4 control-label">{% trans 'Ip Address' %}</label>
                             <div class="col-sm-8">
-                                <input type="text" value="{{ ip|default:'' }}" class="form-control" name="ip" placeholder="{% trans 'Not assigned' %}" pattern="^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"{% if abon.is_dhcp %} disabled{% endif %}/>
+                                <input type="text" value="{{ ip|default:'' }}" class="form-control" name="ip" placeholder="{% trans 'Not assigned' %}" pattern="^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"{% if abon.is_dynamic_ip %} disabled{% endif %}/>
                             </div>
                         </div>
 
@@ -113,23 +113,6 @@
                             </div>
                         </div>
 
-                        <div class="form-group-sm">
-                            <div class="col-sm-offset-4 col-sm-8 btn-group btn-group-sm">
-                                {% if device %}
-                                    <a href="{% url 'devapp:view' abon_group.pk device.pk %}" target="_blank" class="btn btn-sm btn-default" title="{{ device.ip_address }}">
-                                        <span class="glyphicon glyphicon-hdd"></span> {{ device.comment|truncatechars:11 }} {{ device.ip_address }}
-                                    </a>
-                                    <a href="{% url 'abonapp:clear_dev' abon_group.pk abon.pk %}" class="btn btn-sm btn-danger">
-                                        <span class="glyphicon glyphicon-remove-circle"></span> {% trans 'Remove clutch' %}
-                                    </a>
-                                {% else %}
-                                    <a href="{% url 'abonapp:dev' abon_group.pk abon.pk %}" class="btn btn-success btn-sm btn-modal">
-                                        <span class="glyphicon glyphicon-plus"></span> {% trans 'Add clutch' %}
-                                    </a>
-                                {% endif %}
-                            </div>
-                        </div>
-
                         {% if ip %}
                         <div class="form-group-sm">
                             <div class="col-sm-offset-4 col-sm-8 btn-group btn-group-sm">
@@ -147,36 +130,66 @@
         <div class="col-sm-6">
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    <h3 class="panel-title">{% trans 'DHCP information' %}</h3>
+                    <h3 class="panel-title">{% trans 'Select the device' %}</h3>
                 </div>
+
                 <div class="panel-body">
-                    <form role="form" class="form-horizontal" action="{% url 'abonapp:opt82' abon_group.pk abon.pk %}" method="post">{% csrf_token %}
+                    <form role="form" class="form-horizontal" action="{% url 'abonapp:save_user_dev_port' abon_group.pk abon.pk %}" method="post">{% csrf_token %}
 
                         <div class="form-group-sm">
-                            <label for="id_ip" class="col-sm-2 control-label">{% trans 'Mac Address' %}</label>
-                            <div class="col-sm-10">
-                                {{ tech_form.mac }}{{ tech_form.mac.errors }}
+                        <label for="id_method" class="col-sm-2 control-label">{% trans 'Device' %}</label>
+                            <div class="col-sm-10 btn-group btn-group-sm">
+                                {% if device %}
+                                    <a href="{% url 'devapp:view' abon_group.pk device.pk %}" target="_blank" class="btn btn-sm btn-default" title="{{ device.ip_address }}">
+                                        <span class="glyphicon glyphicon-hdd"></span> {{ device.comment|truncatechars:11 }} {{ device.ip_address }}
+                                    </a>
+                                    <a href="{% url 'abonapp:clear_dev' abon_group.pk abon.pk %}" class="btn btn-sm btn-danger">
+                                        <span class="glyphicon glyphicon-remove-circle"></span> {% trans 'Remove clutch' %}
+                                    </a>
+                                {% else %}
+                                    <a href="{% url 'abonapp:dev' abon_group.pk abon.pk %}" class="btn btn-success btn-sm btn-modal">
+                                        <span class="glyphicon glyphicon-plus"></span> {% trans 'Add clutch' %}
+                                    </a>
+                                {% endif %}
                             </div>
                         </div>
 
+                        {% if device %}
                         <div class="form-group-sm">
-                            <label for="id_port" class="col-sm-2 control-label">{% trans 'Port' %}</label>
+                            <label for="id_dev_port" class="col-sm-2 control-label">{% trans 'Device port' %}</label>
                             <div class="col-sm-10">
-                                {{ tech_form.port }}{{ tech_form.port.errors }}
+                                <select id="id_dev_port" class="form-control" name="user_port">
+                                    <option value="0">{% trans 'Not assigned' %}</option>
+                                    {% for port in dev_ports %}
+                                        {% if port == abon.dev_port %}
+                                            <option value="{{ port.pk }}" selected>{{ port.descr }}</option>
+                                        {% else %}
+                                            <option value="{{ port.pk }}">{{ port.descr }}</option>
+                                        {% endif %}
+                                    {% empty %}
+                                        <option value="0">{% trans 'Ports does not exist' %}</option>
+                                    {% endfor %}
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form-group-sm">
+                            <div class="col-sm-offset-2 col-sm-10 checkbox">
+                                <label>
+                                    <input type="checkbox" name="is_dynamic_ip"{% if abon.is_dynamic_ip %} checked{% endif %}> {% trans 'Is dynamic network settings' %}
+                                </label>
                             </div>
                         </div>
-
                         <div class="form-group-sm">
                             <div class="col-sm-offset-2 col-sm-10 btn-group btn-group-sm">
                                 <button type="submit" class="btn btn-primary btn-sm">
                                     <span class="glyphicon glyphicon-floppy-disk"></span> {% trans 'Save' %}
                                 </button>
-                                <a href="{% url 'abonapp:opt82' abon_group.pk abon.pk %}?act=release" class="btn btn-danger btn-sm" title="{% trans 'Reset option82' %}">
-                                    <span class="glyphicon glyphicon-trash"></span> {% trans 'Delete' %}
-                                </a>
+                                <button class="btn btn-default" type="reset" title="Reset">
+                                    <span class="glyphicon glyphicon-repeat"></span>
+                                </button>
                             </div>
                         </div>
-
+                        {% endif %}
                     </form>
                 </div>
             </div>