From c044009ca39e7eb589e53e42593b9af0fc9fe794 Mon Sep 17 00:00:00 2001
From: bashmak <nerosketch@gmail.com>
Date: Fri, 9 Jun 2017 17:40:47 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D1=91=D1=81=20?=
 =?UTF-8?q?=D0=B3=D0=B0=D0=BB=D0=BE=D1=87=D0=BA=D1=83=20=D0=B2=20=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D1=83=D1=8E=20=D0=BA=D0=BE=D0=BB=D0=BE=D0=BD=D0=BA?=
 =?UTF-8?q?=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 abonapp/templates/abonapp/peoples.html | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/abonapp/templates/abonapp/peoples.html b/abonapp/templates/abonapp/peoples.html
index 0e95b5e..8e9116d 100644
--- a/abonapp/templates/abonapp/peoples.html
+++ b/abonapp/templates/abonapp/peoples.html
@@ -18,6 +18,7 @@
                 <table class="table table-striped table-bordered">
                     <thead>
                     <tr>
+                        <th>#</th>
                         <th>
                             <a href="{% url 'abonapp:people_list' abon_group.pk %}?order_by=username&dir={{ dir|default:"down" }}">
                                 {% trans 'Sub' %}
@@ -45,7 +46,7 @@
                         </th>
                         <th width="100">
                             <a href="{% url 'abonapp:people_list' abon_group.pk %}?order_by=house&dir={{ dir|default:"down" }}">
-                                {% trans 'House' %}/{% trans 'Apartment' %}
+                                {% trans 'Apartment' %}
                             </a>
                             {% if order_by == 'house' %}<span class="glyphicon glyphicon-filter"></span>{% endif %}
                         </th>
@@ -67,11 +68,11 @@
                             {% else %}
                             <tr class="danger">
                         {% endif %}
+                        <td>{% if human.stat_cache and human.stat_cache.is_online %}
+                                <span class="glyphicon glyphicon-ok text-success"></span>
+                            {% endif %}</td>
                         <td>
                             <a href="{% url 'abonapp:abon_home' human.group.pk human.pk %}">{{ human.username }}</a>
-                            {% if human.stat_cache and human.stat_cache.is_online %}
-                                <span class="glyphicon glyphicon-ok text-success"></span>
-                            {% endif %}
                         </td>
                         <td>
                             {% if human.stat_cache %}
@@ -85,7 +86,7 @@
                         <td>{{ human.ip_address|default:_('Not assigned') }}</td>
                         <td>{{ human.fio }}</td>
                         <td>{{ human.street|default:_('Not assigned') }}</td>
-                        <td>{{ human.house|default:_('Not assigned') }}</td>
+                        <td>{{ human.house|default:'-' }}</td>
                         <td><a href="tel:{{ human.telephone }}">{{ human.telephone }}</a></td>
                         <td>
                             {% if human.active_tariff %}
@@ -108,7 +109,7 @@
                         </tr>
                     {% empty %}
                         <tr>
-                            <td colspan="11">
+                            <td colspan="12">
                                 {% trans 'Subscribers not found' %}.
                                 {% if perms.abonapp.add_abon %}
                                     <a href="{% url 'abonapp:add_abon' abon_group.pk %}">{% trans 'Add abon' %}</a>
@@ -119,7 +120,7 @@
                     </tbody>
                     <tfoot>
                     <tr>
-                        <td colspan="11" class="btn-group">
+                        <td colspan="12" class="btn-group">
                             {% if perms.abonapp.add_abon %}
                                 <a href="{% url 'abonapp:add_abon' abon_group.pk %}" class="btn btn-sm btn-default" title="Добавить">
                                     <span class="glyphicon glyphicon-plus"></span> {% trans 'Add abon' %}