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

PR-45 Модификация редактирования профиля Заказчика

Browse Source 
Переделана на новый базовый шаблон
remotes/origin/PR-45
booblegum 9 years ago
parent 437cd902a0
commit f6ddee032c
3 changed files with 240 additions and 236 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. 1
      projects/static/css/project_filter.css
  2. 1
      users/static/css/user_profile_edit.css
  3. 474
      users/templates/user_profile_edit.html

1
projects/static/css/project_filter.css
Unescape View File

@ -24,6 +24,7 @@ body {
.header { .header {
display: block;
font-size: 12pt; font-size: 12pt;
color: black; color: black;
} }

1
users/static/css/user_profile_edit.css
Unescape View File

@ -9,6 +9,7 @@
} }
.avatar { .avatar {
background-color: #F1F1F1;
width: 228px; width: 228px;
height: 228px; height: 228px;
padding: 10px; padding: 10px;

474
users/templates/user_profile_edit.html
Unescape View File

@ -1,9 +1,11 @@
{% extends 'partials/base.html' %} {% extends 'partials/_base.html' %}
{% load staticfiles %} {% load staticfiles %}
{% load thumbnail %} {% load thumbnail %}
{% load sass_tags %} {% load sass_tags %}
{% block head_css %} {#{% block old_css %}{% endblock %}#}
{% block personal_css %}
<link rel='stylesheet' href='{% sass_src "lib/proekton-components/sass/components.sass" %}'> <link rel='stylesheet' href='{% sass_src "lib/proekton-components/sass/components.sass" %}'>
<link rel='stylesheet' href='{% sass_src "sass/old_main.sass" %}'>
<link rel='stylesheet' href='{% static "css/project_filter.css" %}'>{# other #} <link rel='stylesheet' href='{% static "css/project_filter.css" %}'>{# other #}
<link rel='stylesheet' href='{% static "css/font-awesome.min.css" %}'> <link rel='stylesheet' href='{% static "css/font-awesome.min.css" %}'>
<link rel='stylesheet' href='{% static "css/user_profile_edit.css" %}'> <link rel='stylesheet' href='{% static "css/user_profile_edit.css" %}'>
@ -11,308 +13,308 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{% include 'partials/header.html' %} <div class="container main-scope">
<div class="container mainScore"> <div class="row main-content">
<div class="row mainContent"> {# <div class="old-main">#}
<form method="POST" enctype="multipart/form-data" novalidate> <form method="POST" enctype="multipart/form-data" novalidate>
{% csrf_token %} {% csrf_token %}
{% if request.user.is_customer %} {% if request.user.is_customer %}
<input type="hidden" name="next" value="{% url 'users:customer-profile' pk=pk %}"> <input type="hidden" name="next" value="{% url 'users:customer-profile' pk=pk %}">
{% else %} {% else %}
<input type="hidden" name="next" value="{% url 'users:contractor-profile' pk=pk %}"> <input type="hidden" name="next" value="{% url 'users:contractor-profile' pk=pk %}">
{% endif %} {% endif %}
<div class="col-lg-12"> <div class="col-lg-12">
<div class="row row-eq-height"> <div class="row row-eq-height">
<div class="col-lg-3 -live-image-avatar-upload-container"> <div class="col-lg-3 -live-image-avatar-upload-container">
<div class="avatar" style="float: none"> <div class="avatar" style="float: none">
<div class="avatarInset -position-relative-parent"> <div class="avatarInset -position-relative-parent">
<a href="#" onclick="return false" class="btn close -live-image-delete" <a href="#" onclick="return false" class="btn close -live-image-delete"
style="display: none">&times;</a> style="display: none">&times;</a>
{% if request.user.avatar %} {% if request.user.avatar %}
{% thumbnail request.user.avatar "235x224" crop="center" as avatar %} {% thumbnail request.user.avatar "208x208" crop="center" as avatar %}
<img src="{{ avatar.url }}" alt="profile-image" class="-avatar-image"> <img src="{{ avatar.url }}" alt="profile-image" class="-avatar-image">
{% endthumbnail %} {% endthumbnail %}
{% else %} {% else %}
<img src="{% static 'img/profile.jpg' %}" alt="profile-image" <img src="{% static 'img/profile.jpg' %}" alt="profile-image"
class="-avatar-image"> class="-avatar-image">
{% endif %} {% endif %}
</div>
</div> </div>
</div> <div style="margin-top: 15px">
<div style="margin-top: 15px"> <div class="upload-new">
<div class="upload-new"> {# <div class="upload2 up-l1">#}
{# <div class="upload2 up-l1">#} <input type="file" name="image" class="-live-image-upload">
<input type="file" name="image" class="-live-image-upload">
<p>Загрузить фотографию</p> <p>Загрузить фотографию</p>
{# </div>#} {# </div>#}
</div>
</div>
<div {% if not TESTING %}style="display: none"{% endif %}>
<input type="text" name="live_image" class="-live-image-id">
</div> </div>
</div> </div>
<div {% if not TESTING %}style="display: none"{% endif %}> <div class="col-lg-9">
<input type="text" name="live_image" class="-live-image-id"> <div class="row">
</div> <div class="col-lg-12">
</div> <div class="bottom-line">
<div class="col-lg-9"> {% if request.user.is_customer %}
<div class="row"> <span class="header">
<div class="col-lg-12">
<div class="bottom-line">
{% if request.user.is_customer %}
<span class="header">
Полное заполнение профиля влияет на количество откликиков исполнителей и “безопасную сделку” Полное заполнение профиля влияет на количество откликиков исполнителей и “безопасную сделку”
<i class="fa fa-question-circle-o" aria-hidden="true" title=""></i> <i class="fa fa-question-circle-o" aria-hidden="true" title=""></i>
</span> </span>
{% else %} {% else %}
<span class="header"> <span class="header">
Параметры заполнения прифоля влияют на фильтр поиска специалистов, ранжирования в списке Параметры заполнения прифоля влияют на фильтр поиска специалистов, ранжирования в списке
<i class="fa fa-question-circle-o" aria-hidden="true" title=""></i> <i class="fa fa-question-circle-o" aria-hidden="true" title=""></i>
</span> </span>
{% endif %} {% endif %}
</div>
</div> </div>
</div> </div>
</div> <div class="row">
<div class="row"> <div class="col-lg-12" style="padding-bottom: 10px">
<div class="col-lg-12" style="padding-bottom: 10px">
<span class="header block-header"> <span class="header block-header">
Личная информация <i class="fa fa-question-circle-o" aria-hidden="true" Личная информация <i class="fa fa-question-circle-o" aria-hidden="true"
title=""></i> title=""></i>
</span> </span>
</div>
</div> </div>
</div>
<div class="row"> <div class="row">
<div class="col-lg-4"> <div class="col-lg-4">
<input value="{{ form.last_name.value }}" name="{{ form.last_name.html_name }}" <input value="{{ form.last_name.value }}" name="{{ form.last_name.html_name }}"
class="simple-input" placeholder="Фамилия"> class="simple-input" placeholder="Фамилия">
</div>
<div class="col-lg-4">
<input value="{{ form.first_name.value }}" name="{{ form.first_name.html_name }}"
class="simple-input" placeholder="Имя">
</div>
<div class="col-lg-4">
<input value="{{ form.patronym.value }}" name="{{ form.patronym.html_name }}"
class="simple-input" placeholder="Отчество">
</div>
<div class="col-lg-4">
<div class="vertical-child" id="sb-location-1">
</div> </div>
</div> <div class="col-lg-4">
<div class="col-lg-4"> <input value="{{ form.first_name.value }}"
<div class="vertical-child" id="sb-location-2"> name="{{ form.first_name.html_name }}"
class="simple-input" placeholder="Имя">
</div> </div>
</div> <div class="col-lg-4">
<div class="col-lg-4"> <input value="{{ form.patronym.value }}" name="{{ form.patronym.html_name }}"
<div class="vertical-child" id="sb-location-3"> class="simple-input" placeholder="Отчество">
</div> </div>
</div> <div class="col-lg-4">
<div class="col-lg-8"> <div class="vertical-child" id="sb-location-1">
<div class="selected-container horizontal vertical-child no-margin" </div>
id="selected-location"> </div>
<div class="header">&nbsp;</div> <div class="col-lg-4">
<input type="hidden" name="location" <div class="vertical-child" id="sb-location-2">
value="{{ form.location.value }}"> </div>
</div>
<div class="col-lg-4">
<div class="vertical-child" id="sb-location-3">
</div>
</div>
<div class="col-lg-8">
<div class="selected-container horizontal vertical-child no-margin"
id="selected-location">
<div class="header">&nbsp;</div>
<input type="hidden" name="location"
value="{{ form.location.value }}">
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div> <!-- top -->
</div> <!-- top --> {% if request.user.is_contractor %}
{% if request.user.is_contractor %} <div class="row">
<div class="row"> <div style="padding-bottom: 10px" class="col-lg-12">
<div style="padding-bottom: 10px" class="col-lg-12"> <div class="row">
<div class="row"> <div class="col-lg-offset-3 col-lg-9">
<div class="col-lg-offset-3 col-lg-9"> <div class="top-line">
<div class="top-line">
<span class="header block-header"> <span class="header block-header">
Мой опыт работы в проектировании / дизайне / сопровождении проектной документации Мой опыт работы в проектировании / дизайне / сопровождении проектной документации
<i class="fa fa-question-circle-o" aria-hidden="true" title=""></i> <i class="fa fa-question-circle-o" aria-hidden="true" title=""></i>
</span> </span>
</div>
</div> </div>
</div> </div>
</div> <div class="row">
<div class="row"> <div class="col-lg-12">
<div class="col-lg-12"> <div class="" id="select-box-1">
<div class="" id="select-box-1"> </div>
</div> </div>
</div> </div>
</div> <div class="row">
<div class="row"> <div class="col-lg-3">
<div class="col-lg-3"> <div class="vertical-child" id="select-box-2">
<div class="vertical-child" id="select-box-2"> </div>
</div> </div>
</div> <div class="col-lg-3">
<div class="col-lg-3"> <div class="vertical-child" id="select-box-3">
<div class="vertical-child" id="select-box-3"> </div>
</div>
<div class="col-lg-3">
<div class="vertical-child" id="select-box-4">
</div>
</div>
<div class="col-lg-3">
<div class="vertical-child" id="select-box-5">
</div>
</div> </div>
</div> </div>
<div class="col-lg-3"> <div class="row">
<div class="vertical-child" id="select-box-4"> <div class="col-lg-12">
<div class="selected-container horizontal" id="selected-spec">
<input type="hidden"
name="{{ form.contractor_specializations.html_name }}"
value="{{ form.contractor_specializations.value }}">
</div>
</div> </div>
</div> </div>
<div class="col-lg-3"> <div class="row">
<div class="vertical-child" id="select-box-5"> <div class="col-lg-3">
<div class="vertical-child" id="sb-building-classification">
</div>
<div class="vertical-child" id="sb-building-sub-classification">
</div>
<div class="selected-container" id="selected-building-classification">
<input type="hidden"
name="{{ form.contractor_building_classifications.html_name }}"
value="{{ form.contractor_building_classifications.value }}">
</div>
</div>
<div class="col-lg-3">
<div class="vertical-child" id="sb-construction-type">
</div>
<div class="selected-container" id="selected-construction-type">
<input type="hidden"
name="{{ form.contractor_construction_types.html_name }}"
value="{{ form.contractor_construction_types.value }}">
</div>
</div>
<div class="col-lg-3">
<div class="select-box-header vertical-child">
<span style="width: 180px" class="header">Требуется допуск (СРО)</span>
<i class="fa fa-question-circle-o" aria-hidden="true"
title="bla-bla-bla..."></i>
</div>
<div class="custom-check">
<div class="checked"></div>
<div style="display: none" class="not-checked"></div>
<input name="{{ form.cro.html_name }}" type="checkbox" hidden
{% if form.cro.value %} checked{% endif %}>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> <!-- center -->
{% endif %}
<div class="row">
<div class="col-lg-12">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="selected-container horizontal" id="selected-spec"> <div class="top-line" style="padding-top: 15px">
<input type="hidden" name="{{ form.contractor_specializations.html_name }}" <div class="btn-group toggle" role="group" aria-label="...">
value="{{ form.contractor_specializations.value }}"> <a style="z-index: 0" href="#"
{# <a style="z-index: 0" href="{% url 'users:user-profile-edit' pk=pk %}"#}
role="button"
class="btn btn-default active">Общая информация</a>
<a href="#"
class="btn btn-default" role="button">Финансовая информация</a>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row info">
<div class="col-lg-3"> <div class="col-lg-3">
<div class="vertical-child" id="sb-building-classification"> <div class="header"> Дата рождения</div>
</div> <div class="birth_edit_dat">
<div class="vertical-child" id="sb-building-sub-classification"> {{ form.date_of_birth }}
</div>
<div class="selected-container" id="selected-building-classification">
<input type="hidden"
name="{{ form.contractor_building_classifications.html_name }}"
value="{{ form.contractor_building_classifications.value }}">
</div> </div>
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<div class="vertical-child" id="sb-construction-type"> <div style="position: relative" class="select-box-container custom-select"
</div> id="gender">
<div class="selected-container" id="selected-construction-type"> <div class="select-box-header">
<input type="hidden" <div class="header">Пол</div>
name="{{ form.contractor_construction_types.html_name }}" </div>
value="{{ form.contractor_construction_types.value }}"> <input class="simple-select" placeholder="Выберите"
value="{{ form.get_gender_display }}" readonly>
<input type="hidden" name="{{ form.gender.html_name }}"
value="{{ form.gender.value }}">
<div class="select-box-options" style="width: 100%; display: none">
<div style="min-width: inherit" class="box-wrapper">
<ul>
{% for id, text in form.gender.field.choices %}
<li data-id="{{ id }}">{{ text }}</li>
{% endfor %}
</ul>
</div>
</div>
</div> </div>
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<div class="select-box-header vertical-child"> <div style="position: relative" class="select-box-container custom-select"
<span style="width: 180px" class="header">Требуется допуск (СРО)</span> id="gender">
<i class="fa fa-question-circle-o" aria-hidden="true" <div class="select-box-header">
title="bla-bla-bla..."></i> <div class="header">Статус</div>
</div> </div>
<input class="simple-select" placeholder="Выберите"
<div class="custom-check"> value="{{ form.get_status_display }}" readonly>
<div class="checked"></div> <input type="hidden" name="{{ form.contractor_status.html_name }}"
<div style="display: none" class="not-checked"></div> value="{{ form.contractor_status.value }}">
<input name="{{ form.cro.html_name }}" type="checkbox" hidden <div class="select-box-options" style="width: 100%; display: none">
{% if form.cro.value %} checked{% endif %}> <div style="min-width: inherit" class="box-wrapper">
<ul>
{% for id, text in form.contractor_status.field.choices %}
<li data-id="{{ id }}">{{ text }}</li>
{% endfor %}
</ul>
</div>
</div>
</div> </div>
</div> </div>
</div> <div class="col-lg-3">
</div> <div class="header">Skype</div>
</div> <!-- center --> <input name="{{ form.skype.html_name }}" class="simple-input"
{% endif %} placeholder="skype id"
<div class="row"> value="{{ form.skype.value }}">
<div class="col-lg-12">
<div class="row">
<div class="col-lg-12">
<div class="top-line" style="padding-top: 15px">
<div class="btn-group toggle" role="group" aria-label="...">
<a style="z-index: 0" href="#"
{# <a style="z-index: 0" href="{% url 'users:user-profile-edit' pk=pk %}"#}
role="button"
class="btn btn-default active">Общая информация</a>
<a href="#"
class="btn btn-default" role="button">Финансовая информация</a>
</div>
</div> </div>
</div> <div class="clearfix visible-lg"></div>
</div> <div class="col-lg-3 vertical-child">
<div class="row info"> <div class="header">Сайт</div>
<div class="col-lg-3"> <input name="{{ form.website.html_name }}" class="simple-input"
<div class="header"> Дата рождения</div> placeholder="example.com"
<div class="birth_edit_dat"> value="{{ form.website.value }}">
{{ form.date_of_birth }}
</div> </div>
</div> <div class="col-lg-3 vertical-child">
<div class="col-lg-3"> <div class="header">Телефон</div>
<div style="position: relative" class="select-box-container custom-select" <input name="{{ form.phone.html_name }}" class="simple-input phone"
id="gender"> placeholder="+7 909 999 00 00"
<div class="select-box-header"> value="{{ form.phone.value }}"
<div class="header">Пол</div> type="tel">
</div>
<input class="simple-select" placeholder="Выберите"
value="{{ form.get_gender_display }}" readonly>
<input type="hidden" name="{{ form.gender.html_name }}"
value="{{ form.gender.value }}">
<div class="select-box-options" style="width: 100%; display: none">
<div style="min-width: inherit" class="box-wrapper">
<ul>
{% for id, text in form.gender.field.choices %}
<li data-id="{{ id }}">{{ text }}</li>
{% endfor %}
</ul>
</div>
</div>
</div> </div>
<div class="col-lg-3 vertical-child">
</div> <div class="header">Второй телефон</div>
<div class="col-lg-3"> <input name="{{ form.phone2.html_name }}" class="simple-input phone"
<div style="position: relative" class="select-box-container custom-select" placeholder="+7 909 999 00 00"
id="gender"> value="{{ form.phone2.value }}"
<div class="select-box-header"> type="tel">
<div class="header">Статус</div> </div>
</div> <div class="col-lg-3 vertical-child" style="text-align: center">
<input class="simple-select" placeholder="Выберите" <div class="header">&nbsp;</div>
value="{{ form.get_status_display }}" readonly> <input type="submit" class="btn btn-simple" value="СОХРАНИТЬ">
<input type="hidden" name="{{ form.contractor_status.html_name }}"
value="{{ form.contractor_status.value }}">
<div class="select-box-options" style="width: 100%; display: none">
<div style="min-width: inherit" class="box-wrapper">
<ul>
{% for id, text in form.contractor_status.field.choices %}
<li data-id="{{ id }}">{{ text }}</li>
{% endfor %}
</ul>
</div>
</div>
</div> </div>
</div> </div>
<div class="col-lg-3">
<div class="header">Skype</div>
<input name="{{ form.skype.html_name }}" class="simple-input" placeholder="skype id"
value="{{ form.skype.value }}">
</div>
<div class="clearfix visible-lg"></div>
<div class="col-lg-3 vertical-child">
<div class="header">Сайт</div>
<input name="{{ form.website.html_name }}" class="simple-input"
placeholder="example.com"
value="{{ form.website.value }}">
</div>
<div class="col-lg-3 vertical-child">
<div class="header">Телефон</div>
<input name="{{ form.phone.html_name }}" class="simple-input phone"
placeholder="+7 909 999 00 00"
value="{{ form.phone.value }}"
type="tel">
</div>
<div class="col-lg-3 vertical-child">
<div class="header">Второй телефон</div>
<input name="{{ form.phone2.html_name }}" class="simple-input phone"
placeholder="+7 909 999 00 00"
value="{{ form.phone2.value }}"
type="tel">
</div>
<div class="col-lg-3 vertical-child" style="text-align: center">
<div class="header">&nbsp;</div>
<input type="submit" class="btn btn-simple" value="СОХРАНИТЬ">
</div>
</div>
</div> </div>
</div> <!-- bottom --> </div> <!-- bottom -->
</div> </div>
</form> </form>
</div> {# </div>#}
<div class="row">
{% include 'partials/footer.html' %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% block js_block %} {% block personal_js %}
{{ block.super }} {{ block.super }}
<script src='{% static "lib/proekton-components/js/build/init_user_profile.js" %}'></script> <script src='{% static "lib/proekton-components/js/build/init_user_profile.js" %}'></script>
<script src='{% static "projects-filter.js" %}'></script> <script src='{% static "projects-filter.js" %}'></script>

Write Preview
Loading…
Cancel
Save