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

#PR-48

Browse Source
remotes/origin/PR-39
PekopT 9 years ago
parent c39dfbd729
commit 8f6fd85044
10 changed files with 74 additions and 110 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      assets/css/main.css
  2. BIN
      assets/img/social/fb.png
  3. BIN
      assets/img/social/gplus.png
  4. BIN
      assets/img/social/ok.gif
  5. BIN
      assets/img/social/tw.png
  6. BIN
      assets/img/social/vk.png
  7. BIN
      assets/img/social/yt.png
  8. 95
      templates/registration/login.html
  9. 49
      templates/registration/registration_form.html
  10. 38
      templates/registration/social.html

2
assets/css/main.css
Unescape View File

@ -6050,7 +6050,7 @@ a.linkS2[data-target="#withdraw-money"]{
.addWork { .addWork {
font-style: italic; font-style: italic;
padding: 17px 23px 17px 48px; padding: 17px 23px 17px 48px;
margin-top: 20px; /*margin-top: 20px;*/
margin-left: 0; margin-left: 0;
border-radius: 50px; border-radius: 50px;
border: 1px solid #42B476; border: 1px solid #42B476;

BIN
assets/img/social/fb.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 449 B

BIN
assets/img/social/gplus.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 974 B

BIN
assets/img/social/ok.gif
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
assets/img/social/tw.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 742 B

BIN
assets/img/social/vk.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 621 B

BIN
assets/img/social/yt.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 841 B

95
templates/registration/login.html
Unescape View File

@ -1,81 +1,48 @@
{% extends 'partials/base.html' %} {% extends 'partials/base.html' %}
{% block content %} {% block content %}
{% include 'partials/header.html' %} {% include 'partials/header.html' %}
<div class="container mainScore"> <div class="container mainScore">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<p class="titleScore">Вход на сайт</p> <p class="titleScore">Вход на сайт</p>
</div> </div>
<div class="form-regestration"> <div class="form-regestration">
<form method="post">{% csrf_token %} <form method="post">{% csrf_token %}
{{ form.non_field_errors }} {{ form.non_field_errors }}
<div class="col-lg-12 select-reg"> <div class="col-lg-12 select-reg">
<input type="text" name="{{ form.username.name }}" value="{{ form.username.value }}" class="box-sizing email-reg" <input type="text" name="{{ form.username.name }}" value="{{ form.username.value }}"
placeholder="Электронная почта"> class="box-sizing email-reg"
{{ form.username.errors }} placeholder="Электронная почта">
</div> {{ form.username.errors }}
<div class="col-lg-12 select-reg"> </div>
<input type="password" name="{{ form.password.name }}" value="{{ form.password.value }}"class="box-sizing pass-reg" placeholder="Пароль"> <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 }} {{ 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 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 class="col-lg-12 select-reg"> </div>
<div class="check-reg">
<label><input type="checkbox" name="check-reg"><span></span></label>
<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 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"> {% include 'registration/social.html' %}
<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"> <div class="col-lg-12 select-reg">
<a href="{% url 'social:begin' 'vk-oauth2' %}"> <button class="reg-sub">Вход</button>
<img src="http://nepesh.com/static/img/social/vk.png" alt="vk"> </div>
</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>
</div>
</form> </form>
</div>
{% include 'partials/footer.html' %}
</div> </div>
{% include 'partials/footer.html' %} </div>
</div>
</div>
{% endblock %} {% endblock %}

49
templates/registration/registration_form.html
Unescape View File

@ -9,7 +9,7 @@
<div class="form-regestration"> <div class="form-regestration">
<form method="post">{% csrf_token %} <form method="post">{% csrf_token %}
{{ form.non_field_errors }} {{ form.non_field_errors }}
{% if not hide_user_type %} {% if not hide_user_type %}
<div class="col-lg-12 select-reg polsF1"> <div class="col-lg-12 select-reg polsF1">
{# {% if request.GET.type == 'customer' %}#} {# {% if request.GET.type == 'customer' %}#}
@ -23,12 +23,12 @@
{# {% endfor %}#} {# {% endfor %}#}
{# </select>#} {# </select>#}
{# {% endif %}#} {# {% endif %}#}
{{ form.user_type }} {{ form.user_type }}
{{ form.user_type.errors }} {{ form.user_type.errors }}
</div> </div>
{% endif %} {% endif %}
<div class="col-lg-12 select-reg"> <div class="col-lg-12 select-reg">
<input type="text" name="{{ form.username.name }}" value="{{ form.username.value }}" class="box-sizing email-reg" <input type="text" name="{{ form.username.name }}" value="{{ form.username.value }}" class="box-sizing email-reg"
placeholder="Nickname"> placeholder="Nickname">
@ -60,49 +60,8 @@
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="col-lg-12" style="margin-top: 25px;"> {% include 'registration/social.html' %}
<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 -vk">#}
{# <a href="{% url 'social:begin' 'mailru-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"> <div class="col-lg-12 select-reg">
<div class="check-reg"> <div class="check-reg">
<label><input type="checkbox" name="{{ form.tos.name }}" {{ form.tos.value }} /><span></span></label> <label><input type="checkbox" name="{{ form.tos.name }}" {{ form.tos.value }} /><span></span></label>

38
templates/registration/social.html
Unescape View File

@ -0,0 +1,38 @@
{% load static %}
<div class="col-lg-12" style="margin-top: 25px;">
<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="{% 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="{% static 'img/social/tw.png' %}" alt="tw">
</a>
</div>
<div class="pull-left -social -gplus">
<a href="{% url 'social:begin' 'google-oauth2' %}">
<img src="{% static 'img/social/gplus.png' %}" alt="gplus">
</a>
</div>
<div class="pull-left -social -vk">
<a href="{% url 'social:begin' 'vk-oauth2' %}">
<img src="{% static 'img/social/vk.png' %}" alt="vk">
</a>
</div>
<div class="pull-left -social -ok">
<a href="{% url 'social:begin' 'odnoklassniki-oauth2' %}">
<img src="{% static 'img/social/ok.gif' %}" alt="yt">
</a>
</div>
</div>
</div>
</div>
Write Preview
Loading…
Cancel
Save