diff --git a/assets/css/extra.css b/assets/css/extra.css index c1aa855..3b50ed2 100644 --- a/assets/css/extra.css +++ b/assets/css/extra.css @@ -96,3 +96,14 @@ float: left; margin: 33px 0 0 0; } + + +.form-regestration .errorlist { + color: red; + width: 360px; + margin: 0 auto; + text-align: left; + font-family: 'Arial-MT-Regular', sans-serif; + font-size: 15px; + +} diff --git a/assets/css/main.css b/assets/css/main.css index 8f7b0c7..c27aa5a 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -4345,7 +4345,7 @@ input[type="checkbox"]:checked + span { width: 100%; float: left; margin: 0 0 80px 0; - padding: 67px 0 0 0; + padding: 67px 0 15px 0; background-color: #ddd; text-align: center; } diff --git a/ratings/templatetags/specializtions_tags.py b/ratings/templatetags/specializtions_tags.py index ba41ca1..564e8d5 100644 --- a/ratings/templatetags/specializtions_tags.py +++ b/ratings/templatetags/specializtions_tags.py @@ -7,7 +7,7 @@ from ratings.models import SpecializationRating register = template.Library() @register.inclusion_tag('templatetags/specializations_widget.html', takes_context=True) -def specialization_widget(context, user_id): +def specialization_widget(context, user_id, class_name=None): user_id = int(user_id) specializations = SpecializationRating.objects.select_related('specialization').filter(user_id=user_id) return { diff --git a/templates/registration/login.html b/templates/registration/login.html index 1147c9f..78a046a 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -8,22 +8,63 @@

Вход на сайт

- {{ form.errors }} +
{% csrf_token %} + {{ form.non_field_errors }}
+ {{ form.username.errors }}
+ {{ form.password.errors }}
-

Запомнить

-

Забыли пароль ?

+

Запомнить

+

Забыли пароль ?

-
+
+ +
+
+
+ +
+ + fb + +
+ +
+ + tw + +
+ +
+ + gplus + +
+ +
+ + vk + +
+ +
+ + yt + +
+ +
+
+
diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html index 373df04..e6845e6 100644 --- a/templates/registration/registration_form.html +++ b/templates/registration/registration_form.html @@ -8,7 +8,7 @@
{% csrf_token %} - {{ form.errors }} + {{ form.non_field_errors }}
{% if request.GET.type == 'customer' %} @@ -27,19 +27,23 @@
+ {{ form.username.errors }}
-
+
+ {{ form.email.errors }}
+ {{ form.password1.errors }}
+ {{ form.password2.errors }}
@@ -92,7 +96,7 @@