mitri4
/
proekton.com
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#ARC-2 Fixes bugs

Browse Source
remotes/origin/PR-39
Mukhtar 10 years ago
parent cc7446fc47
commit 9d46df1386
5 changed files with 65 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      assets/css/extra.css
  2. 2
      assets/css/main.css
  3. 2
      ratings/templatetags/specializtions_tags.py
  4. 49
      templates/registration/login.html
  5. 10
      templates/registration/registration_form.html

11
assets/css/extra.css
Unescape View File

@ -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;
}

2
assets/css/main.css
Unescape View File

@ -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;
}

2
ratings/templatetags/specializtions_tags.py
Unescape View File

@ -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 {

49
templates/registration/login.html
Unescape View File

@ -8,22 +8,63 @@
<p class="titleScore">Вход на сайт</p>
</div>
<div class="form-regestration">
{{ form.errors }}
<form method="post">{% csrf_token %}
{{ form.non_field_errors }}
<div class="col-lg-12 select-reg">
<input type="text" name="{{ form.username.name }}" value="{{ form.username.value }}" class="box-sizing email-reg"
placeholder="Электронная почта">
{{ form.username.errors }}
</div>
<div class="col-lg-12 select-reg">
<input type="password" name="{{ form.password.name }}" value="{{ form.password.value }}"class="box-sizing pass-reg" placeholder="Пароль">
{{ form.password.errors }}
</div>
<div class="col-lg-12 select-reg">
<div class="check-reg">
<label><input type="checkbox" name="check-reg"><span></span></label>
<p>Запомнить</p>
<p><a href="{% url 'password_reset_recover' %}">Забыли пароль ?</a></p>
<p style="width: 35%;margin-top: 2px;">Запомнить</p>
<p style="width: 50%;float: right;text-align: right;margin-top: 2px;"><a href="{% url 'password_reset_recover' %}">Забыли пароль ?</a></p>
</div>
</div>
</div>
<div class="col-lg-12" style="margin-top: 10px;">
<div class="col-xs-12 text-center">
<div class="btn-group" role="group">
<div class="pull-left -social -fb">
<a href="{% url 'social:begin' 'facebook' %}?user_type={% if request.GET.type == 'customer' %}Заказчики{% else %}Исполнители{% endif %}">
<img src="http://nepesh.com/static/img/social/fb.png" alt="fb">
</a>
</div>
<div class="pull-left -social -tw">
<a href="{% url 'social:begin' 'twitter' %}?user_type={% if request.GET.type == 'customer' %}Заказчики{% else %}Исполнители{% endif %}">
<img src="http://nepesh.com/static/img/social/tw.png" alt="tw">
</a>
</div>
<div class="pull-left -social -gplus">
<a href="{% url 'social:begin' 'google-oauth2' %}">
<img src="http://nepesh.com/static/img/social/gplus.png" alt="gplus">
</a>
</div>
<div class="pull-left -social -vk">
<a href="{% url 'social:begin' 'vk-oauth2' %}">
<img src="http://nepesh.com/static/img/social/vk.png" alt="vk">
</a>
</div>
<div class="pull-left -social -ok">
<a href="{% url 'social:begin' 'odnoklassniki-oauth2' %}">
<img src="http://nepesh.com/static/img/social/ok.gif" alt="yt">
</a>
</div>
</div>
</div>
</div>
<div class="col-lg-12 select-reg">
<button class="reg-sub">Вход</button>

10
templates/registration/registration_form.html
Unescape View File

@ -8,7 +8,7 @@
</div>
<div class="form-regestration">
<form method="post">{% csrf_token %}
{{ form.errors }}
{{ form.non_field_errors }}
<div class="col-lg-12 select-reg polsF1">
{% if request.GET.type == 'customer' %}
<input type="hidden" name="group_id" value="Заказчики"/>
@ -27,19 +27,23 @@
<div class="col-lg-12 select-reg">
<input type="text" name="{{ form.username.name }}" value="{{ form.username.value }}" class="box-sizing email-reg"
placeholder="Nickname">
{{ form.username.errors }}
</div>
<div class="col-lg-12 select-reg">
<div class="col-lg-12 select-reg ">
<input type="text" name="{{ form.email.name }}" class="box-sizing email-reg"
value="{{ form.email.value }}" placeholder="Электронная почта">
{{ form.email.errors }}
</div>
<div class="col-lg-12 select-reg">
<input type="password" name="{{ form.password1.name }}" class="box-sizing pass-reg"
placeholder="Пароль">
{{ form.password1.errors }}
</div>
<div class="col-lg-12 select-reg">
<input type="password" name="{{ form.password2.name }}" class="box-sizing pass-reg"
placeholder="Пароль">
{{ form.password2.errors }}
</div>
<div class="col-lg-12 select-reg">
<button class="reg-sub">Зарегистрироваться</button>
@ -92,7 +96,7 @@
</div>
</form>
<div class="col-lg-12 select-reg">
<a href="" class="have-ac">Я уже зарегистрирован на ресурсе</a>
<a href="{% url 'auth_login' %}" class="have-ac">Я уже зарегистрирован на ресурсе</a>
</div>
</div>

Write Preview
Loading…
Cancel
Save