From 2d48cac99e216ebed795c775677f9e6b517e50df Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 27 Feb 2017 00:42:47 +0300 Subject: [PATCH] continue develop --- abonapp/locale/ru/LC_MESSAGES/django.mo | Bin 11362 -> 0 bytes abonapp/templates/abonapp/editAbon.html | 38 ++++---- abonapp/views.py | 2 +- accounts_app/locale/ru/LC_MESSAGES/django.mo | Bin 1550 -> 0 bytes accounts_app/templates/accounts/login.html | 7 +- devapp/dev_types.py | 3 +- devapp/models.py | 1 + devapp/templates/devapp/add_dev.html | 92 ++++++++++++++++++ devapp/templates/devapp/dev.html | 16 +-- devapp/templates/devapp/devices.html | 20 ++-- .../templates/devapp/devices_null_group.html | 81 +++++++++++++++ devapp/templates/devapp/ext.htm | 21 ++-- devapp/templates/devapp/group_list.html | 51 ++++++++++ devapp/templates/devapp/ports.html | 4 +- devapp/urls.py | 12 ++- devapp/views.py | 61 +++++++++--- .../locale/ar/LC_MESSAGES/django.mo | Bin 5751 -> 0 bytes .../locale/cs/LC_MESSAGES/django.mo | Bin 6309 -> 0 bytes .../locale/da/LC_MESSAGES/django.mo | Bin 4826 -> 0 bytes .../locale/de/LC_MESSAGES/django.mo | Bin 5250 -> 0 bytes .../locale/el/LC_MESSAGES/django.mo | Bin 6195 -> 0 bytes .../locale/es/LC_MESSAGES/django.mo | Bin 4610 -> 0 bytes .../locale/es_AR/LC_MESSAGES/django.mo | Bin 3099 -> 0 bytes .../locale/fa/LC_MESSAGES/django.mo | Bin 5926 -> 0 bytes .../locale/fr/LC_MESSAGES/django.mo | Bin 5739 -> 0 bytes .../locale/it/LC_MESSAGES/django.mo | Bin 5138 -> 0 bytes .../locale/ko/LC_MESSAGES/django.mo | Bin 5024 -> 0 bytes .../locale/lt/LC_MESSAGES/django.mo | Bin 4970 -> 0 bytes .../locale/nl/LC_MESSAGES/django.mo | Bin 5071 -> 0 bytes .../locale/pl/LC_MESSAGES/django.mo | Bin 3522 -> 0 bytes .../locale/pt_BR/LC_MESSAGES/django.mo | Bin 4996 -> 0 bytes .../locale/ro/LC_MESSAGES/django.mo | Bin 4885 -> 0 bytes .../locale/ru/LC_MESSAGES/django.mo | Bin 5733 -> 0 bytes .../locale/zh_CN/LC_MESSAGES/django.mo | Bin 4469 -> 0 bytes taskapp/models.py | 4 + taskapp/templates/taskapp/tasklist.html | 2 +- .../templates/taskapp/tasklist_active.html | 2 +- taskapp/templates/taskapp/tasklist_all.html | 2 +- .../templates/taskapp/tasklist_finish.html | 2 +- taskapp/templates/taskapp/tasklist_own.html | 2 +- templates/base.html | 6 +- 41 files changed, 356 insertions(+), 73 deletions(-) delete mode 100644 abonapp/locale/ru/LC_MESSAGES/django.mo delete mode 100644 accounts_app/locale/ru/LC_MESSAGES/django.mo create mode 100644 devapp/templates/devapp/add_dev.html create mode 100644 devapp/templates/devapp/devices_null_group.html create mode 100644 devapp/templates/devapp/group_list.html delete mode 100644 django_messages/locale/ar/LC_MESSAGES/django.mo delete mode 100644 django_messages/locale/cs/LC_MESSAGES/django.mo delete mode 100644 django_messages/locale/da/LC_MESSAGES/django.mo delete mode 100644 django_messages/locale/de/LC_MESSAGES/django.mo delete mode 100644 django_messages/locale/el/LC_MESSAGES/django.mo delete mode 100644 django_messages/locale/es/LC_MESSAGES/django.mo delete mode 100644 django_messages/locale/es_AR/LC_MESSAGES/django.mo delete mode 100644 django_messages/locale/fa/LC_MESSAGES/django.mo delete mode 100644 django_messages/locale/fr/LC_MESSAGES/django.mo delete mode 100644 django_messages/locale/it/LC_MESSAGES/django.mo delete mode 100644 django_messages/locale/ko/LC_MESSAGES/django.mo delete mode 100644 django_messages/locale/lt/LC_MESSAGES/django.mo delete mode 100755 django_messages/locale/nl/LC_MESSAGES/django.mo delete mode 100644 django_messages/locale/pl/LC_MESSAGES/django.mo delete mode 100644 django_messages/locale/pt_BR/LC_MESSAGES/django.mo delete mode 100644 django_messages/locale/ro/LC_MESSAGES/django.mo delete mode 100644 django_messages/locale/ru/LC_MESSAGES/django.mo delete mode 100644 django_messages/locale/zh_CN/LC_MESSAGES/django.mo diff --git a/abonapp/locale/ru/LC_MESSAGES/django.mo b/abonapp/locale/ru/LC_MESSAGES/django.mo deleted file mode 100644 index c7f75f5c35a952cccd225901f512d4bed458fcc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11362 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 Ww5N0FQr~P&d@WEYAMLbx-uqt$0*zz< 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 a305f5281b59220c75e16cda302d13ef08486155..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1550 zcmZXSU1%It6vwZ&eytzX3VvYK>qCPfJ9TCgO}e|Y?V3#D;(oE&6s!o2*_+A8?94JV z+gj*D601cTQ3OFy5y6*&51ZJfYm=_N_$b_Y@ks<<1YZTgC-Hw~CvKq^?)>gOAOCaC zWqvz)_)~^;6#E$Vx7bf(=kLG=s|P*>?tl-0KZA$CU%`jL-@&`UzY_kF*#89|fc?mw zBOXgQ3El(yOW?g=0i@bXAnBY1N&ijoK2Rj|z`vn+0i-@X1QEBv$H1%Laqvel4gLY9 zz(*na1o#a2I5-PF3)a9VK@X(*AAr>F7a+}h6{PuoO8mco6#pkkx`*y&4DGP{v1y@P z+%KK!oep8soR46WK55^&Xm(nVV@KlC=mXh!J%}$xjTiMni|Vqe*Jsmn>67W{H@NAx zxTdBxjkj#e4g*$fwQbi9Lf;HMAJ=ZU&gR!m*AhGs&KmdJHIEr>({@V+I<+j2#V)tuJYQ|pAb=LW2P5Ly?0+eWD8axd{UL?A-8 zY@QRWDIC#R_gukN0^#$xQr-977OSCBYAI)gPnlU>FV4SOTr&6>qp@77RZ|Vo@%&J! z1eV=WUhZ0f()6-CRj)Obd0&{+gR)?TBFi(XHmj%^C8Kg}Hane}Qm0iFfl5Q1vq?OO zd(9{|luAumDDqco*-B~ZY^`df%4QHMP2Y3_hh8qr7gx$iBaEH4+UODoiJzFa=-*e5*S8poj3N~vOu=hIH8sd>*0g^O|*I_NtT z?}RUO9Mg7le0AOQ@nrf+b5WTa$5C5r!dDD;)oaA%)L7SOG zik774x=OA%uAsj-PCq&Mza6?Lb5Jv{L*W$9Kwx?@m%8=um4oExjoz1o=u))7_%5cnLTI^Lo*?y1YTvzoO7Y z`8IzKJ;U3RyHJ%o6o`2T7-5?X!|1)(OK%yQsN?-;gQI~yJwbE{2K2||=Qw;v@5cTE D5wQBO 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 }} +
+
+