diff --git a/abonapp/locale/ru/LC_MESSAGES/django.mo b/abonapp/locale/ru/LC_MESSAGES/django.mo deleted file mode 100644 index c7f75f5..0000000 Binary files a/abonapp/locale/ru/LC_MESSAGES/django.mo and /dev/null differ diff --git a/abonapp/templates/abonapp/editAbon.html b/abonapp/templates/abonapp/editAbon.html index 904dede..1c3ae50 100644 --- a/abonapp/templates/abonapp/editAbon.html +++ b/abonapp/templates/abonapp/editAbon.html @@ -12,59 +12,59 @@
{% csrf_token %}
- -
+ +
{{ form.username }}{{ form.username.errors }}
- -
+ +
{{ form.fio }}{{ form.fio.errors }}
- -
+ +
{{ form.telephone }}{{ form.telephone.errors }}
- + -
+
{{ form.street }}{{ form.street.errors }}
- + -
+
{{ form.house }}{{ form.house.errors }}
- -
+ +
{{ form.is_active }}
- -
+ +
{{ form.group }}{{ form.group.errors }}
- -
+ +
{{ form.password }}{{ form.password.errors }} @@ -77,14 +77,14 @@
- -
+ +
{{ form.description }}{{ form.description.errors }}
-
+
diff --git a/abonapp/views.py b/abonapp/views.py index 78fc228..7a9440e 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -8,7 +8,7 @@ from django.contrib.auth.decorators import login_required, permission_required from django.utils import timezone from django.http import HttpResponse from django.contrib import messages -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from tariff_app.models import Tariff from agent import NasFailedResult, Transmitter, NasNetworkError diff --git a/accounts_app/locale/ru/LC_MESSAGES/django.mo b/accounts_app/locale/ru/LC_MESSAGES/django.mo deleted file mode 100644 index a305f52..0000000 Binary files a/accounts_app/locale/ru/LC_MESSAGES/django.mo and /dev/null differ diff --git a/accounts_app/templates/accounts/login.html b/accounts_app/templates/accounts/login.html index fdd17b1..4574387 100644 --- a/accounts_app/templates/accounts/login.html +++ b/accounts_app/templates/accounts/login.html @@ -11,8 +11,7 @@ background-color: #ececec; } .form-signin { - max-width: 35%; - min-width: 222px; + width: 478px; margin: 10% auto; position: relative; } @@ -50,10 +49,10 @@
diff --git a/devapp/dev_types.py b/devapp/dev_types.py index efb91af..b1b4221 100644 --- a/devapp/dev_types.py +++ b/devapp/dev_types.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- from mydefs import RuTimedelta, safe_int +from datetime import timedelta from .base_intr import DevBase, SNMPBaseWorker, BasePort @@ -77,7 +78,7 @@ class DLinkDevice(DevBase, SNMPBaseWorker): def uptime(self): uptimestamp = safe_int(self.get_item(oids['uptime'])) - tm = RuTimedelta(seconds=uptimestamp/100) or RuTimedelta() + tm = RuTimedelta(timedelta(seconds=uptimestamp/100)) or RuTimedelta() return tm diff --git a/devapp/models.py b/devapp/models.py index 32a961d..75812df 100644 --- a/devapp/models.py +++ b/devapp/models.py @@ -18,6 +18,7 @@ class Device(models.Model): devtype = models.CharField(max_length=2, default=DEVICE_TYPES[0][0], choices=_DeviceChoicesAdapter()) man_passw = models.CharField(max_length=16, null=True, blank=True) map_dot = models.ForeignKey(Dot, on_delete=models.SET_NULL, null=True, blank=True) + user_group = models.ForeignKey('abonapp.AbonGroup', on_delete=models.SET_NULL, null=True, blank=True) class Meta: db_table = 'dev' diff --git a/devapp/templates/devapp/add_dev.html b/devapp/templates/devapp/add_dev.html new file mode 100644 index 0000000..ba3fc23 --- /dev/null +++ b/devapp/templates/devapp/add_dev.html @@ -0,0 +1,92 @@ +{% extends request.is_ajax|yesno:'bajax.html,base.html' %} +{% load i18n %} +{% block main %} + +
    +
    2. +
  2. {% trans 'Groups' %}
    3. +
  3. {% trans 'Add new device' %}
    4. +
+ + {% include 'message_block.html' %} + +
+

{{ dev.comment|default:_('Not assigned') }}

+
+ +
+
+

{% trans 'Device info' %}

+
+
+ + {% csrf_token %} + +
+ + +
+ + {{ form.ip_address }}{{ form.ip_address.errors }} +
+
+ +
+ + +
+ + {{ form.comment }}{{ form.comment.errors }} +
+
+ +
+ + +
+ + {{ form.devtype }}{{ form.devtype.errors }} +
+
+ +
+ + +
+ + {{ form.man_passw }}{{ form.man_passw.errors }} +
+
+ +
+ + +
+ + {{ form.map_dot }}{{ form.devtype.errors }} +
+
+ +
+ + +
+ + {{ form.user_group }}{{ form.user_group.errors }} +
+
+ +
+ + +
+ + +
+
+ +{% endblock %} \ No newline at end of file diff --git a/devapp/templates/devapp/dev.html b/devapp/templates/devapp/dev.html index 389098e..1e74645 100644 --- a/devapp/templates/devapp/dev.html +++ b/devapp/templates/devapp/dev.html @@ -8,12 +8,7 @@
-
{% csrf_token %} + {% csrf_token %}
@@ -60,6 +55,15 @@
+
+ + +
+ + {{ form.user_group }}{{ form.user_group.errors }} +
+
+