Merge branch 'devel' of https://github.com/nerosketch/djing into devel

# Conflicts:
#	devapp/templates/devapp/devices.html

abonapp/locale/ru/LC_MESSAGES/django.po

@@ -1005,3 +1005,10 @@ msgstr "Может пинговать"
 
 msgid "Can view additional telephones"
 msgstr "Может видеть дополнительные телефоны"
+
+
+#: abonapp/views.py:694
+#, python-format
+msgid "IP Conflict! %d/%d results"
+msgstr "IP Конфликт! ping %d из %d"
+

abonapp/templates/abonapp/group_list.html

@@ -60,17 +60,17 @@
                 <td colspan="4" class="btn-group">
                     {% if perms.abonapp.add_abongroup %}
                     <a href="{% url 'abonapp:add_group' %}" class="btn btn-success btn-sm">
-                        <span class="glyphicon glyphicon-plus"></span> {% trans 'Add group' %}
+			    <span class="glyphicon glyphicon-plus"></span> <span class="hidden-xs">{% trans 'Add group' %}</span>
                     </a>
                     {% endif %}
 		    {% if perms.abonapp.can_view_abonlog %}
                     <a href="{% url 'abonapp:log' %}" class="btn btn-default btn-sm">
-                        <span class="glyphicon glyphicon-record"></span> {% trans 'Subscribers actions' %}
+			    <span class="glyphicon glyphicon-record"></span> <span class="hidden-xs">{% trans 'Subscribers actions' %}</span>
                     </a>
 		    {% endif %}
 		    {% if perms.abonapp.can_view_invoiceforpayment %}
                     <a href="{% url 'abonapp:debtors' %}" class="btn btn-default btn-sm">
-                        <span class="glyphicon glyphicon-exclamation-sign"></span> {% trans 'List of debtors' %}
+			    <span class="glyphicon glyphicon-exclamation-sign"></span> <span class="hidden-xs">{% trans 'List of debtors' %}</span>
                     </a>
 		    {% endif %}
                 </td>

abonapp/views.py

@@ -689,12 +689,14 @@ def abon_ping(request):
         else:
             if type(ping_result) is tuple:
                 loses_percent = (ping_result[0] / ping_result[1] if ping_result[1] != 0 else 1)
-                if loses_percent > 0.5:
+                print(ping_result, loses_percent)
+                if loses_percent > 1.0:
+                    text = '<span class="glyphicon glyphicon-exclamation-sign"></span> %s' % _('IP Conflict! %d/%d results') % ping_result
+                elif loses_percent > 0.5:
                     text = '<span class="glyphicon glyphicon-ok"></span> %s' % _('ok ping, %d/%d loses') % ping_result
                     status = True
                 else:
-                    text = '<span class="glyphicon glyphicon-exclamation-sign"></span> %s' % _(
-                        'no ping, %d/%d loses') % ping_result
+                    text = '<span class="glyphicon glyphicon-exclamation-sign"></span> %s' % _('no ping, %d/%d loses') % ping_result
             else:
                 text = '<span class="glyphicon glyphicon-ok"></span> %s' % _('ping ok') + ' ' + str(ping_result)
                 status = True

devapp/locale/ru/LC_MESSAGES/django.po

@@ -309,3 +309,7 @@ msgstr "Устройство"
 
 msgid "Can toggle ports"
 msgstr "Может переключать порты"
+
+msgid "Plugin output"
+msgstr "Вывод мониторинга"
+

devapp/templates/devapp/devices.html

@@ -16,27 +16,27 @@
             <thead>
             <tr>
                 <th>#</th>
-                <th class="col-xs-3">
+                <th class="col-md-2">
                     <a href="{% url 'devapp:devs' group.pk %}?order_by=ip_address&dir={{ dir|default:"down" }}">
                         {% trans 'Ip address' %}
                     </a>
                     {% if order_by == 'ip_address' %}<span class="glyphicon glyphicon-filter"></span>{% endif %}
                 </th>
-                <th class="col-xs-3">
+                <th class="col-md-5">
                     <a href="{% url 'devapp:devs' group.pk %}?order_by=comment&dir={{ dir|default:"down" }}">
                         {% trans 'Comment' %}
                     </a>
                     {% if order_by == 'comment' %}<span class="glyphicon glyphicon-filter"></span>{% endif %}
                 </th>
-                <th class="col-xs-2">{% trans 'Mac address' %}</th>
-                <th class="col-xs-1">{% trans 'Plugin output' %}</th>
-                <th class="col-xs-2">
+                <th class="col-md-3">{% trans 'Mac address' %}</th>
+		<th class="col-md-3 hidden-xs hidden-sm">{% trans 'Plugin output' %}</th>
+                <th class="col-md-1">
                     <a href="{% url 'devapp:devs' group.pk %}?order_by=devtype&dir={{ dir|default:"down" }}">
                         {% trans 'Device type' %}
                     </a>
                     {% if order_by == 'devtype' %}<span class="glyphicon glyphicon-filter"></span>{% endif %}
                 </th>
-                <th class="col-xs-1">Do</th>
+                <th class="col-md-1">Do</th>
             </tr>
             </thead>
 

djing/urls.py

@@ -1,6 +1,6 @@
 from django.conf.urls import url, include
+from django.conf import settings
 
-from . import settings
 from .views import home
 
 

taskapp/templates/taskapp/ext.htm

@@ -14,7 +14,7 @@
         <h2>{% trans 'Tasks to be performed' %}</h2>
     </div>
 
-    <ul class="nav nav-tabs nav-justified">
+    <ul class="nav nav-tabs">
 
         {% url 'taskapp:home' as taskhome %}
         <li{% if taskhome == request.path %} class="active"{% endif %}>