fix mobile view & admis side is available only debug mode & other tiny fixes

abonapp/locale/ru/LC_MESSAGES/django.po

@@ -877,7 +877,7 @@ msgstr "Графики"
 
 #: abonapp/templates/abonapp/ext.html:26
 msgid "Sub information"
-msgstr "Информация абонента"
+msgstr "Инфо."
 
 msgid "Streets"
 msgstr "Улицы"

abonapp/templates/abonapp/editAbon.html

@@ -4,13 +4,13 @@
 {% block content %}
 
     <div class="row">
-        <div class="col-sm-6 col-xs-8">
+        <div class="col-sm-12 col-xs-12 col-md-6">
             <div class="panel panel-default">
                 <div class="panel-heading">
                     <h3 class="panel-title">{% trans 'Change subscriber' %}</h3>
                 </div>
                 <div class="panel-body">
-                    <form role="form" class="form-horizontal" action="{% url 'abonapp:abon_home' abon_group.pk abon.pk %}" method="post">{% csrf_token %}
+                    <form role="form" autocomplete="off" class="form-horizontal" action="{% url 'abonapp:abon_home' abon_group.pk abon.pk %}" method="post">{% csrf_token %}
 
                         <div class="form-group-sm">
                             <label for="id_username" class="col-sm-4 control-label">{% trans 'login' %}</label>
@@ -111,7 +111,7 @@
                                 </button>
                                 {% if perms.taskapp.add_task %}
                                     <a href="{% url 'taskapp:add' %}?uid={{ abon.username }}" class="btn btn-sm btn-success" title="{% trans 'Add new task' %}">
-                                        <span class="glyphicon glyphicon-plus"></span> {% trans 'Add new task' %}
+					    <span class="glyphicon glyphicon-plus"></span> <span class="hidden-xs">{% trans 'Add new task' %}</span>
                                     </a>
                                 {% endif %}
                             </div>
@@ -131,7 +131,7 @@
                 </div>
             </div>
         </div>
-        <div class="col-sm-6 col-xs-4">
+        <div class="col-sm-12 col-xs-12 col-md-6">
             {% if perms.abonapp.change_abon %}
             <div class="panel panel-default">
                 <div class="panel-heading">
@@ -145,11 +145,11 @@
                         <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="{% trans 'Mac Address' %} {{ device.mac_addr }}">
+				                    <a href="{% url 'devapp:view' abon_group.pk device.pk %}" target="_blank" class="btn btn-sm btn-default" title="{% trans 'Mac Address' %}: {{ device.mac_addr|default:_('Not assigned') }}">
                                         <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' %}
+					    <span class="glyphicon glyphicon-remove-circle"></span> <span class="hidden-xs hidden-md hidden-sm">{% trans 'Remove clutch' %}</span>
                                     </a>
                                 {% else %}
                                     <a href="{% url 'abonapp:dev' abon_group.pk abon.pk %}" class="btn btn-success btn-sm btn-modal">
@@ -185,14 +185,11 @@
                             </div>
                         </div>
                         <div class="form-group-sm">
-                            <div class="col-sm-offset-2 col-sm-10 btn-group btn-group-sm">
+                            <div class="col-sm-10 col-sm-offset-2">
                                 <button type="submit" class="btn btn-primary btn-sm">
                                     <span class="glyphicon glyphicon-floppy-disk"></span> {% trans 'Save' %}
-                                </button>
-                                <button class="btn btn-default" type="reset" title="Reset">
-                                    <span class="glyphicon glyphicon-repeat"></span>
-                                </button>
-                            </div>
+			        </button>
+			    </div>
                         </div>
                         {% endif %}
                     </form>

abonapp/templates/abonapp/ext.htm

@@ -19,7 +19,7 @@
         </h2>
     </div>
 
-    <ul class="nav nav-tabs">
+    <ul class="nav nav-tabs nav-justified">
 
         {% url 'abonapp:abon_home' abon_group.pk abon.pk as abon_home %}
         <li{% if abon_home == request.path %} class="active"{% endif %}>

abonapp/templates/abonapp/peoples.html

@@ -19,7 +19,7 @@
                 <table class="table table-striped table-bordered">
                     <thead>
                     <tr>
-                        <th class="hidden-xs">#</th>
+                        <th>#</th>
                         <th class="col-xs-1">
                             <a href="{% url 'abonapp:people_list' abon_group.pk %}?{% url_replace request order_by=username dir=dir|default:"down" %}">
                                 {% trans 'Sub' %}
@@ -59,7 +59,7 @@
                             </a>
                             {% if order_by == 'ballance' %}<span class="glyphicon glyphicon-filter"></span>{% endif %}
                         </th>
-                        <th class="col-xs-1">#</th>
+                        <th class="hidden-xs">#</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -70,7 +70,7 @@
                             {% else %}
                             <tr class="danger">
                         {% endif %}
-                        <td class="hidden-xs">{% if human.stat_cache and human.stat_cache.is_online %}
+                        <td>{% if human.stat_cache and human.stat_cache.is_online %}
                                 <span class="glyphicon glyphicon-ok text-success"></span>
                             {% else %}
                                 <span class="glyphicon glyphicon-remove-sign text-muted"></span>
@@ -103,7 +103,7 @@
                             {% endif %}
                         </td>
                         <td class="hidden-xs">{{ human.ballance }}</td>
-                        <td>
+                        <td class="hidden-xs">
                             {% if can_del_trf %}
                                 <a href="{% url 'abonapp:del_abon' %}?id={{ human.pk }}" class="btn btn-danger btn-sm">
                                     <span class="glyphicon glyphicon-remove"></span>

abonapp/views.py

@@ -286,7 +286,9 @@ def abonhome(request, gid, uid):
                 raise PermissionDenied
             frm = forms.AbonForm(request.POST, instance=abon)
             if frm.is_valid():
-                abon.ip_address = request.POST.get('ip')
+                newip = request.POST.get('ip')
+                if newip:
+                    abon.ip_address = newip
                 frm.save()
                 messages.success(request, _('edit abon success msg'))
             else:

accounts_app/locale/ru/LC_MESSAGES/django.po

@@ -26,7 +26,7 @@ msgstr "У пользователей должен быть номер теле
 #: accounts_app/templates/accounts/group.html:7
 #: accounts_app/templates/accounts/group_list.html:7
 msgid "Administrators"
-msgstr "Администраторы"
+msgstr "Сотрудники"
 
 #: accounts_app/templates/accounts/group.html:8
 #: accounts_app/templates/accounts/group_list.html:8

devapp/templates/devapp/devices.html

@@ -15,26 +15,26 @@
         <table class="table table-striped table-bordered">
             <thead>
             <tr>
-                <th>
+                <th class="col-xs-3">
                     <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>
+                <th class="col-xs-4">
                     <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>{% trans 'Mac address' %}</th>
-                <th width="250">
+                <th class="col-xs-2">{% trans 'Mac address' %}</th>
+                <th class="col-xs-2">
                     <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 width="100">Do</th>
+                <th class="col-xs-1">Do</th>
             </tr>
             </thead>
 
@@ -46,14 +46,14 @@
                     <td>{{ dev.comment }}</td>
                     <td>{{ dev.mac_addr }}</td>
                     <td>{{ dev.get_devtype_display }}</td>
-                    <td class="btn-group btn-group-sm">
+                    <td class="btn-group btn-group-xs btn-group-justified">
                         {% if can_del_dev %}
-                            <a href="{% url 'devapp:del' dev.user_group.pk dev.pk %}" class="btn btn-default btn-sm">
+                            <a href="{% url 'devapp:del' dev.user_group.pk dev.pk %}" class="btn btn-danger">
                                 <span class="glyphicon glyphicon-remove"></span>
                             </a>
                         {% endif %}
                         {% if can_ch_dev %}
-                            <a href="{% url 'devapp:edit' dev.user_group.pk dev.id %}" class="btn btn-default btn-sm">
+                            <a href="{% url 'devapp:edit' dev.user_group.pk dev.id %}" class="btn btn-default">
                                 <span class="glyphicon glyphicon-edit"></span>
                             </a>
                         {% endif %}
@@ -82,4 +82,4 @@
 
     {% include 'toolbar_page.html' with pag=devices %}
 
-{% endblock %}
+{% endblock %}

devapp/templates/devapp/ext.htm

@@ -19,7 +19,7 @@
         <h2>{{ dev.comment|default:_('Not assigned') }}</h2>
     </div>
 
-    <ul class="nav nav-tabs">
+    <ul class="nav nav-tabs nav-justified">
 
         {% url 'devapp:view' dev.user_group.pk|default:0 dev.pk as devapp_view %}
         <li{% if devapp_view == request.path %} class="active"{% endif %}>

devapp/templates/devapp/group_list.html

@@ -34,7 +34,7 @@
                 <td 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 %}
                     <a href="{% url 'devapp:devices_null_group' %}" class="btn btn-primary btn-sm">
@@ -48,4 +48,4 @@
 
     {% include 'toolbar_page.html' with pag=groups %}
 
-{% endblock %}
+{% endblock %}

djing/urls.py

@@ -1,5 +1,4 @@
 from django.conf.urls import url, include
-from django.contrib import admin
 
 from . import settings
 from .views import home
@@ -17,13 +16,14 @@ urlpatterns = [
     url(r'^tasks/', include('taskapp.urls', namespace='taskapp')),
     url(r'^client/', include('clientsideapp.urls', namespace='client_side')),
     url(r'^msg/', include('msg_app.urls', namespace='msg_app')),
-    url(r'^dialing/', include('dialing_app.urls', namespace='dialapp')),
-    url(r'^admin/', admin.site.urls)
+    url(r'^dialing/', include('dialing_app.urls', namespace='dialapp'))
 ]
 
 if settings.DEBUG:
     from django.conf.urls.static import static
     from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+    from django.contrib import admin
 
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
     urlpatterns += staticfiles_urlpatterns()
+    urlpatterns += [url(r'^admin/', admin.site.urls)]

static/css/custom.css

@@ -250,3 +250,11 @@ a.navbar-brand {
     padding-left: 88px;
 }
 
+
+@media (max-width: 767px) {
+  .nav-tabs.nav-justified > li {
+    float: left;
+    width: 50%;
+  }
+}
+

taskapp/locale/ru/LC_MESSAGES/django.po

@@ -163,7 +163,7 @@ msgstr "Создать"
 #: taskapp/templates/taskapp/tasklist_all.html:93
 #: taskapp/templates/taskapp/tasklist_all.html:94
 msgid "Add new task"
-msgstr "Добавьте новую задачу"
+msgstr "Добавьте задачу"
 
 #: taskapp/templates/taskapp/add_edit_task.html:27
 #: taskapp/templates/taskapp/tasklist.html:13

taskapp/templates/taskapp/ext.htm

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

taskapp/templates/taskapp/footer_btns.html

@@ -1,11 +1,14 @@
 {% load i18n %}
-{% if perms.taskapp.add_task %}
-<a href="{% url 'taskapp:add' %}" class="btn btn-sm btn-success">
-    <span class="glyphicon glyphicon-plus"></span> {% trans 'Add new task' %}
-</a>
-{% endif %}
-{% if perms.taskapp.can_viewall %}
-<a href="{% url 'taskapp:all_tasks' %}" class="btn btn-sm btn-info">
-    <span class="glyphicon glyphicon-baby-formula"></span> {% trans 'View all tasks' %}
-</a>
-{% endif %}
+<div class="btn-group btn-group-sm">
+  {% if perms.taskapp.add_task %}
+    <a href="{% url 'taskapp:add' %}" class="btn btn-sm btn-success">
+      <span class="glyphicon glyphicon-plus"></span> {% trans 'Add new task' %}
+    </a>
+  {% endif %}
+  {% if perms.taskapp.can_viewall %}
+    <a href="{% url 'taskapp:all_tasks' %}" class="btn btn-sm btn-info">
+      <span class="glyphicon glyphicon-baby-formula"></span> {% trans 'View all tasks' %}
+    </a>
+  {% endif %}
+</div>
+

taskapp/templates/taskapp/tasklist.html

@@ -6,13 +6,13 @@
         <table class="table table-striped table-bordered">
             <thead>
             <tr>
-                <th>#</th>
+                <th class="hidden-xs">#</th>
                 <th class="col-sm-3">{% trans 'Name' %}</th>
                 <th class="col-sm-1">{% trans 'Address' %}</th>
                 <th class="col-sm-1">{% trans 'The nature of the damage' %}</th>
                 <th class="col-sm-4">{% trans 'Description' %}</th>
                 <th class="col-sm-1">{% trans 'Task author' %}</th>
-                <th class="col-sm-1">{% trans 'Date of create' %}</th>
+                <th class="col-sm-1 hidden-xs">{% trans 'Date of create' %}</th>
                 <th class="col-sm-1">{% trans 'Actions' %}</th>
             </tr>
             </thead>
@@ -33,7 +33,7 @@
                     {% endif %}
                 {% endif %}
 
-                <td><a href="{% url 'taskapp:view' task.pk %}" target="_blank">{{ task.pk }}</a></td>
+                <td class="hidden-xs"><a href="{% url 'taskapp:view' task.pk %}" target="_blank">{{ task.pk }}</a></td>
 
                 {% if task.abon and task.abon.group %}
 		    <td><a href="{% url 'abonapp:abon_home' task.abon.group.pk task.abon.pk %}" target="_blank" title="{{ task.abon.description|default:'' }}" data-toggle="tooltip">{{ task.abon.get_full_name }}</a></td>
@@ -52,7 +52,7 @@
                         {% trans 'Author does not exist' %}
                     {% endif %}
 		</td>
-                <td>{{ task.time_of_create|date:'d E H:i' }}</td>
+                <td class="hidden-xs">{{ task.time_of_create|date:'d E H:i' }}</td>
 
                 <td class="btn-group btn-group-xs btn-group-justified">
                     <a href="{% url 'taskapp:finish' task.pk %}" class="btn btn-success" data-toggle="tooltip" title="{% trans 'Complete' %}">

taskapp/templates/taskapp/tasklist_all.html

@@ -18,14 +18,14 @@
         <table class="table table-striped table-bordered">
             <thead>
             <tr>
-                <th>#</th>
+                <th class="hidden-xs">#</th>
                 <th class="col-sm-3">{% trans 'Name' %}</th>
                 <th class="col-sm-1">{% trans 'Address' %}</th>
                 <th class="col-sm-1">{% trans 'The nature of the damage' %}</th>
                 <th class="col-sm-3">{% trans 'Description' %}</th>
                 <th class="col-sm-1">{% trans 'Task author' %}</th>
                 <th class="col-sm-1">{% trans 'Condition' %}</th>
-                <th class="col-sm-1">{% trans 'Date of create' %}</th>
+                <th class="col-sm-1 hidden-xs">{% trans 'Date of create' %}</th>
                 <th class="col-sm-1">{% trans 'Actions' %}</th>
             </tr>
             </thead>
@@ -46,7 +46,7 @@
                     {% endif %}
                 {% endif %}
 
-                <td><a href="{% url 'taskapp:view' task.pk %}" target="_blank">{{ task.pk }}</a></td>
+                <td class="hidden-xs"><a href="{% url 'taskapp:view' task.pk %}" target="_blank">{{ task.pk }}</a></td>
 
                 {% if task.abon and task.abon.group %}
                     <td><a href="{% url 'abonapp:abon_home' task.abon.group.pk task.abon.pk %}" target="_blank">{{ task.abon.get_full_name }}</a></td>
@@ -67,7 +67,7 @@
 		    {% endif %}
 		</td>
                 <td>{{ task.get_state_display }}</td>
-                <td>{{ task.time_of_create|date:'d E H:i' }}</td>
+                <td class="hidden-xs">{{ task.time_of_create|date:'d E H:i' }}</td>
 
                 <td class="btn-group btn-group-sm btn-group-justified">
                     {% if perms.taskapp.change_task %}

taskapp/templates/taskapp/tasklist_failed.html

@@ -6,13 +6,13 @@
         <table class="table table-striped table-bordered">
             <thead>
             <tr>
-                <th>#</th>
+                <th class="hidden-xs">#</th>
                 <th class="col-sm-3">{% trans 'Name' %}</th>
                 <th class="col-sm-1">{% trans 'Address' %}</th>
                 <th class="col-sm-1">{% trans 'The nature of the damage' %}</th>
                 <th class="col-sm-4">{% trans 'Description' %}</th>
                 <th class="col-sm-1">{% trans 'Task author' %}</th>
-                <th class="col-sm-1">{% trans 'Date of create' %}</th>
+                <th class="col-sm-1 hidden-xs">{% trans 'Date of create' %}</th>
                 <th class="col-sm-1">{% trans 'Actions' %}</th>
             </tr>
             </thead>
@@ -33,7 +33,7 @@
                     {% endif %}
                 {% endif %}
 
-                <td><a href="{% url 'taskapp:view' task.pk %}" target="_blank">{{ task.pk }}</a></td>
+                <td class="hidden-xs"><a href="{% url 'taskapp:view' task.pk %}" target="_blank">{{ task.pk }}</a></td>
 
                 {% if task.abon and task.abon.group %}
                     <td><a href="{% url 'abonapp:abon_home' task.abon.group.pk task.abon.pk %}" target="_blank">{{ task.abon.get_full_name }}</a></td>
@@ -47,9 +47,9 @@
                 <td>{{ task.descr }}</td>
                 <td><a href="{% url 'acc_app:other_profile' task.author.pk %}" data-toggle="tooltip"
                        title="{{ task.author.get_full_name }}">{{ task.author.username }}</a></td>
-                <td>{{ task.time_of_create|date:'d E H:i' }}</td>
+                <td class="hidden-xs">{{ task.time_of_create|date:'d E H:i' }}</td>
 
-                <td class="btn-group btn-group-sm">
+                <td class="btn-group btn-group-sm btn-group-justified">
                     <a href="{% url 'taskapp:finish' task.pk %}" class="btn btn-success" title="{% trans 'Complete' %}" data-toggle="tooltip">
                         <span class="glyphicon glyphicon-ok"></span>
                     </a>

taskapp/templates/taskapp/tasklist_finish.html

@@ -6,13 +6,13 @@
         <table class="table table-striped table-bordered">
             <thead>
             <tr>
-                <th>#</th>
+                <th class="hidden-xs">#</th>
                 <th class="col-sm-3">{% trans 'Name' %}</th>
                 <th class="col-sm-2">{% trans 'Address' %}</th>
                 <th class="col-sm-1">{% trans 'The nature of the damage' %}</th>
                 <th class="col-sm-4">{% trans 'Description' %}</th>
                 <th class="col-sm-1">{% trans 'Task author' %}</th>
-                <th class="col-sm-1">{% trans 'Date of create' %}</th>
+                <th class="col-sm-1 hidden-xs">{% trans 'Date of create' %}</th>
                 <th>#</th>
             </tr>
             </thead>
@@ -33,7 +33,7 @@
                     {% endif %}
                 {% endif %}
 
-                <td><a href="{% url 'taskapp:view' task.pk %}" target="_blank">{{ task.pk }}</a></td>
+                <td class="hidden-xs"><a href="{% url 'taskapp:view' task.pk %}" target="_blank">{{ task.pk }}</a></td>
 
                 {% if task.abon and task.abon.group %}
                     <td><a href="{% url 'abonapp:abon_home' task.abon.group.pk task.abon.pk %}" target="_blank">{{ task.abon.get_full_name }}</a></td>
@@ -45,9 +45,8 @@
 
                 <td>{{ task.get_mode_display }}</td>
                 <td>{{ task.descr }}</td>
-                <td><a href="{% url 'acc_app:other_profile' task.author.pk %}" data-toggle="tooltip"
-                       title="{{ task.author.get_full_name }}">{{ task.author.username }}</a></td>
-                <td>{{ task.time_of_create|date:'d E H:i' }}</td>
+                <td><a href="{% url 'acc_app:other_profile' task.author.pk %}" data-toggle="tooltip" title="{{ task.author.get_full_name }}">{{ task.author.username }}</a></td>
+                <td class="hidden-xs">{{ task.time_of_create|date:'d E H:i' }}</td>
 
                 <td>
                     {% if perms.taskapp.change_task %}

taskapp/templates/taskapp/tasklist_own.html

@@ -6,13 +6,13 @@
         <table class="table table-striped table-bordered">
             <thead>
             <tr>
-                <th>#</th>
+                <th class="hidden-xs">#</th>
                 <th class="col-sm-3">{% trans 'Name' %}</th>
                 <th class="col-sm-1">{% trans 'Address' %}</th>
                 <th class="col-sm-1">{% trans 'The nature of the damage' %}</th>
                 <th class="col-sm-4">{% trans 'Description' %}</th>
                 <th class="col-sm-1">{% trans 'Condition' %}</th>
-                <th class="col-sm-1">{% trans 'Date of create' %}</th>
+                <th class="col-sm-1 hidden-xs">{% trans 'Date of create' %}</th>
                 <th class="col-sm-1">{% trans 'Actions' %}</th>
             </tr>
             </thead>
@@ -33,7 +33,7 @@
                     {% endif %}
                 {% endif %}
 
-                <td><a href="{% url 'taskapp:view' task.id %}" target="_blank">{{ task.id }}</a></td>
+                <td class="hidden-xs"><a href="{% url 'taskapp:view' task.id %}" target="_blank">{{ task.id }}</a></td>
 
                 {% if task.abon and task.abon.group %}
                     <td><a href="{% url 'abonapp:abon_home' task.abon.group.pk task.abon.pk %}" target="_blank">{{ task.abon.get_full_name }}</a></td>
@@ -46,7 +46,7 @@
                 <td>{{ task.get_mode_display }}</td>
                 <td>{{ task.descr }}</td>
                 <td>{{ task.get_state_display }}</td>
-                <td>{{ task.time_of_create|date:'d E H:i' }}</td>
+                <td class="hidden-xs">{{ task.time_of_create|date:'d E H:i' }}</td>
 
                 <td class="btn-group btn-group-justified">
                     {% if perms.taskapp.change_task %}