From 6a5430c582ba82631a79ced6b32c3a432a6a90ed Mon Sep 17 00:00:00 2001 From: booblegum Date: Wed, 4 Jan 2017 16:42:08 +0300 Subject: [PATCH] =?UTF-8?q?PR-68=20=D0=9A=D0=BE=D1=80=D1=80=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=B2=20=D0=BD?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B0=D1=85=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D1=8F=20=D0=97=D0=B0=D0=BA=D0=B0?= =?UTF-8?q?=D0=B7=D1=87=D0=B8=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit У Заказчика поле "статус" --> "Место работы" --- users/forms.py | 1 + .../migrations/0022_user_organization_name.py | 20 +++++++++ users/models.py | 1 + users/static/css/user_profile_edit.css | 4 ++ users/templates/user_profile_edit.html | 43 +++++++++++-------- 5 files changed, 52 insertions(+), 17 deletions(-) create mode 100644 users/migrations/0022_user_organization_name.py diff --git a/users/forms.py b/users/forms.py index c7f8c3d..399e851 100644 --- a/users/forms.py +++ b/users/forms.py @@ -70,6 +70,7 @@ class UserProfileEditFullForm(forms.ModelForm): 'last_name', 'patronym', 'location', + 'organization_name', 'contractor_specializations', # Специализации 'contractor_building_classifications', # Классификация зданий 'contractor_construction_types', # Вид строительства diff --git a/users/migrations/0022_user_organization_name.py b/users/migrations/0022_user_organization_name.py new file mode 100644 index 0000000..88a7cd4 --- /dev/null +++ b/users/migrations/0022_user_organization_name.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2017-01-04 12:54 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0021_user_raw_password'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='organization_name', + field=models.CharField(blank=True, max_length=64, verbose_name='Место работы'), + ), + ] diff --git a/users/models.py b/users/models.py index 6c78666..d0d1123 100644 --- a/users/models.py +++ b/users/models.py @@ -150,6 +150,7 @@ class User(AbstractBaseUser, PermissionsMixin): last_name = models.CharField(max_length=255, blank=True) last_time_visit = models.DateTimeField(default=timezone.now) location = TreeForeignKey('common.Location', related_name='users', null=True, blank=True) + organization_name = models.CharField(max_length=64, blank=True, verbose_name="Место работы") patronym = models.CharField(max_length=255, blank=True) phone = models.CharField(max_length=30, blank=True, null=True) phone2 = models.CharField(max_length=30, blank=True, null=True) diff --git a/users/static/css/user_profile_edit.css b/users/static/css/user_profile_edit.css index 28295e8..76008f0 100644 --- a/users/static/css/user_profile_edit.css +++ b/users/static/css/user_profile_edit.css @@ -26,6 +26,10 @@ margin-bottom: -1px; } +.simple-input:-webkit-autofill, .simple-select:-webkit-autofill{ + transition: background-color 5000s ease-in-out 0s +} + .simple-select select { background-color: darkgray; } diff --git a/users/templates/user_profile_edit.html b/users/templates/user_profile_edit.html index 3aee387..3e3309c 100644 --- a/users/templates/user_profile_edit.html +++ b/users/templates/user_profile_edit.html @@ -255,25 +255,34 @@
-
-
-
Статус
-
- - -
Skype