diff --git a/assets/css/main.css b/assets/css/main.css index d113549..9161b2a 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -35,9 +35,9 @@ body, html { position: relative; } -input[type=checkbox], input[type=radio] { - opacity: 0; -} +/*input[type=checkbox], input[type=radio] { + opacity: 0; / * Блядь, какого ХУЯ????? * / +}*/ a, a:hover, a:focus, a:active { text-decoration: none !important; @@ -1314,7 +1314,7 @@ footer:after { margin: 30px 0 23px 0; } -.titleResF1 { +.titleResF1, div p.titleResF1 { font-size: 15px; font-family: 'Arial-MT-Regular', sans-serif; font-weight: bold; @@ -5483,3 +5483,196 @@ input[type="radio"]:checked + span { } } +/*my_new_style*/ +.proj_answ_form .textAreaBlock2 p { + font-size: 15px; + font-weight: bold; + display: table; + width: auto; + margin-top: 13px; +} +.polsF1 .dropdown-menu.open a{ + border: none; + border-radius: 0; + margin-bottom: 0; +} +.proj_answ_form .bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn){ + width: 121px !important; + border: 1px solid #cdcdcd; +} +.proj_answ_form .bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn) .btn{ + padding: 14px 30px 14px 18px; +} +.proj_answ_form .textAreaBlock2 input{ + width: 90px; + height: 51px; + padding: 0 15px; + font-size: 15px; + background-color: white; + color: #9c9c9c; + float: left; + margin-right: 26px; + font-family: 'Arial-MT-Regular', sans-serif; +} +.proj_answ_form .textAreaBlock2 input[type="text"] { + margin-left: 10px; + width: 216px; +} +.proj_answ_form .textAreaBlock2 input[name="term"]{ + width: 262px; +} +.proj_answ_form .textAreaBlock2 p span{ + position: absolute; + bottom: 13px; + font-size: 12px; + font-weight: normal; +} +.port_add_bl ul li{ + width: 20%; + display: table; + float: left; + padding-right: 10px; +} +.port_add_bl ul { + margin-top: 15px; + padding: 0 15px; +} +.port_add_bl label{ + margin-right: 5px; +} +.port_add_bl > p:first-child{ + font-size: 15px; + font-weight: bold; + padding: 0 15px; +} +#fileUploadContainer div button, .proj_answ_form .send_req_block button{ + border-radius: 40px; + font-family: 'pfdintextcomppro-regular', sans-serif; + letter-spacing: 2px; + color: #373737; + font-size: 15px; + border: 1px solid #BEBEBE; + padding: 17px 46px; + text-transform: uppercase; + outline: none; +} +#fileUploadContainer, .proj_answ_form .check_bs, .proj_answ_form .send_req_block{ + padding: 0 15px; +} +.proj_answ_form .check_bs label{ + margin-right: 5px; +} +.dashedCol4 { + width: 254px; + height: 239px; + position: absolute; + overflow: hidden; + display: block; + background-color: #fff; +} +.dashedCol4:after { + content: ""; + position: absolute; + height: 50px; + width: 100%; + background: #fff; + bottom: 0; + right: 0; +} +.dashedCol4:hover{ + box-shadow: 0 0 10px rgba(0,0,0,0.8); + z-index: 999; + display: table; +} +.insetSpec span:first-child{ + width: 75%; +} +.select2-container .select2-choice { + border-radius: 0 !important; + border: 1px solid #ccc; + background: #fff !important; + height: 50px; + font-size: 15px; + color: #2c2c2c; + position: relative; + font-family: 'Arial-MT-Regular', sans-serif; + background-color: white; +} +.select2-container .select2-choice .select2-arrow{ + display: none; +} +.select2-container .select2-choice > .select2-chosen { + margin-right: 6px; + line-height: 47px; +} +.select2-results .select2-result-label{ + font-size: 15px; + font-family: 'Arial-MT-Regular', sans-serif; + padding-top: 10px; + padding-bottom: 10px; + display: block; + padding: 9px 8px; + clear: both; + background: #fff; + font-weight: normal; + line-height: 1.42857143; + color: #333333; + white-space: nowrap; +} +.select2-results .select2-result-label:hover{ + background-color: #f2f2f2; +} +.select2-display-none{ + border: 1px solid #aaa; +} +.select2-container .select2-choice abbr{ + right: 3px; + top: 16px; +} +#portfolio-add-form .textAreaBlock2 p{ + font-size: 15px; + font-family: 'Arial-MT-Regular', sans-serif; + font-weight: bold; + color: #2c2c2c; +} +#portfolio-add-form #text-new{ + margin-top: 0; +} +.textAreaBlock2 input{ + width: 100%; + height: 51px; + padding: 0 15px; + font-size: 15px; + background-color: white; + color: #9c9c9c; + font-family: 'Arial-MT-Regular', sans-serif; +} +#portfolio-add-form .polsF1 .btn{ + border:1px solid #c2c2c2; +} +#modal_type_build .btn-group{ + width: 100% !important; +} +.textAreaBlock2 .add_file_to_port{ + border-radius: 40px; + font-family: 'pfdintextcomppro-regular', sans-serif; + letter-spacing: 2px; + color: #373737; + background-color: #fff; + font-size: 15px; + border: 1px solid #BEBEBE; + padding: 17px 46px; + text-transform: uppercase; + outline: none; + display: table; + float: left; + width: auto; +} +.textAreaBlock2 .add_file_to_port:hover{ + color: #373737; + background-color: #f2f2f2 !important; +} +.progress-bar-success { + background-color: #c2c2c2; +} +/*end_new*/ \ No newline at end of file diff --git a/projects/templates/project_detail.html b/projects/templates/project_detail.html index 5808868..7b9ed78 100644 --- a/projects/templates/project_detail.html +++ b/projects/templates/project_detail.html @@ -1,251 +1,597 @@ {% extends 'partials/base.html' %} {% load humanize %} - +{% load thumbnail %} +{% load specializtions_tags %} {% block content %} {% include 'partials/header.html' %} -
-
-
-

{{ project }}

-
-
-
-
-

{{ project.budget|intcomma }}

-
-
- +
+
+
+

{{ project.name }}

+
+ +
+
+ + {% if request.user.is_contractor %} +
+

{{ project.budget|intcomma }}

+
+ {% endif %} + +
+
- execitor-image -
- -

- {{ project.customer.get_full_name }} [{{ project.customer }}] -

-

На сайте {{ project.created|naturaltime }}

-
-
- -
-
-
-

- Специализации: -

-
- Интерьеры -
-
- Визуализация/3D -
-
-
-
-
    -
  • - 13.0.2016 -
    • -
  • - Техническое сопровождение -
    • -
-
-
-

Есть допуск СРО

-
-
-
-
-
-
-
    -
  • - Местоположение: -
    • -
  • - Классификация здания: {{ project.realty.building_classification }} -
    • -
  • - Вид строительства: {{ project.realty.type_construction }} -
    • -
-
-
-

- {{ project.text }} + {% if project.customer.avatar %} + execitor-image + {% else %} + execitor-image + {% endif %} +

+ +

+ {{ project.customer.get_full_name }} [{{ project.customer.username }}]

-
-
- - Ответить на проект - -
-
- -
-
-
- - -
- {% csrf_token %} +

На сайте {{ project.created|naturaltime }}

- + {% if not request.user.is_contractor %} + + {% endif %} +
+ + {% if request.user.is_contractor %} +
+ +
+ {% endif %} + +
+
+

+ Специализации: +

+
+ Интерьеры +
+
+ Визуализация/3D +
+
+
+ +
+
    +
  • + {{ project.created }} +
    • +
  • + {{ project.get_work_type_display }} +
    • +
-
-
-
-

Стоимость

- + {% if project.cro %} +
+
+

Есть допуск СРО

+
+ {% endif %} +
+
+ +
+
+ + {% if project.realty %} +
+
    +
  • Местоположение: {{ project.realty.location.name }}
    • +
  • Классификация здания: {{ project.realty.building_classification.name }}
    • +
  • Вид строительства: {{ project.realty.type_construction.name }}
    • +
+
+ {% endif %} + +
+

+ {{ project.text }} +

+
+ +
+ {% if request.user.is_contractor %} + + Ответить на проект + +
+
+ + +
- -
-
-

Бюджет

- {{ form.currency }} + {% elif request.user.is_customer %} + + Редактировать + + +
+ {% csrf_token %} + + + + Снять с публикации + +
+ {% endif %} +
+
+ + + + + + + + + + + + {% if request.user.is_contractor %} + + + + + + + {% if answer %} +
+
+
+ +
+ {% if answer.author.avatar %} + execitor-image + {% else %} + execitor-image + {% endif %} +
+ + +

+ {% if answer.author|class_name == 'User' %} + {{ answer.author.get_full_name }} [{{ answer.author.username }}] + {% elif answer.author|class_name == 'Team' %} + {{ answer.author.name }} + {% endif %} +

+ +

На сайте {{ answer.author.created }}

+ + {% if answer.author|class_name == 'User' %} + {% if answer.author.contractor_status == 'free' %} +
Свободен
+ {% endif %} + {% endif %} +
+
+ + + {% if answer.author|class_name == 'User' %} + {% if answer.author.cro %} +
+
+

Есть допуск СРО

+
+ {% endif %} + {% elif answer.author|class_name == 'Team' %} +{# {% if any of these motherfuckers "answer.author.contractors.all" got a cro, then... %}#} +
+
+

Есть допуск СРО

+
+{# {% endif %}#} + {% endif %}
+
+

+ Цена: + {{ answer.budget|intcomma }} + +

+

+ Срок: {{ answer.term }} {{ answer.get_term_type_display|decap }} +

+

Опубликован: {{ answer.created }}

+
+
+ + отказ + +
+ + + + + +
+ {% for portf in answer.portfolios.all %} +
+
+
+
+
+
+
+ {% endfor %} +
+ + + + + +
+
+
+

+ Иванов Петр Иванович +

+ + 13.01.2016 / 21:05 + +
+ + + + + +
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio. +

+
+
+ + + + +
+
+

+ Иванов Петр Иванович +

+ + 13.01.2016 / 21:05 + +

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio. +

+ + Ответить + +
+
+
+ + +
- -
-
-
-
-

Срок

- - + {% else %} +
+ {% csrf_token %} + + +
+
+
+

Стоимость {{ form.budget.errors.as_text }}

+ +
+
+ +
+
+ {{ form.currency }} +
+
+ +
+
+

Срок {{ form.term.errors.as_text }}

+ +
+
+ +
+
+ {{ form.term_type }} +
+
+ +
+
+

Текст {{ form.text.errors.as_text }}

+ +
+
- -
-
-

Тип срока

- {{ form.term_type }} + +
+
+

Портфолио {{ form.portfolios.errors.as_text }}

+ +
    + {% for p in form.portfolios.field.queryset.all %} +
  • + +

    {{ p.name }}

    +
    • + {% endfor %} +
- -
-
-
-
-
-

Текст

- + +
+
+
+
+ Не более 10 файлов общим объемом до 500 Мб +
+ +
    + +
+
-
-
- -
-
-
- {% for p in user.portfolio.all %} -

{{ p }}

- {% endfor %} + +
+
+
+ +

{{ form.secure_deal_only.label }}

+
+
+
+ +
+
+
+ +
-
+ +
+ + {% endif %} + + + + + + {% elif request.user.is_customer %} + + + + + +
+
+

Исполнители

- -
-
+
+
+ + + +
- -
-
- {% for answer in project.answers.all %} -
+
+ +
+
+

Сравнить кандидатов

+
+
+ +
+

Новые исполнители

+
+ + + + + + + + + + + + {% for answer_p in project.answers.all %} +
+
-
- execitor-image -
+ +
+ {% thumbnail answer_p.author.avatar "126x125" crop="center" as im %} + execitor-image + {% endthumbnail %} +
+

- {{ answer.contractor.get_full_name }} [{{ answer.contractor }}] + {{ answer_p.author.get_full_name }} [{{ answer_p.author.username }}]

-

{{ answer.contractor.created }}

+

На сайте 8 лет и 3 месяца

+
Свободен
- - {% if answer.contractor.cro %} -
-
-

Есть допуск СРО

-
+ {% ratings_widget answer_p.author.pk 'restList2' %} + {% if answer_p.author.cro %} +
+
+

Есть допуск СРО

+
{% endif %}

Цена: - {{ answer.budget }} + {{ answer_p.budget }}

- Срок: {{ answer.term }} {{ answer.term_type }} + Срок: {{ answer_p.term }} of {{ answer_p.term_type }}

-

Опубликован: {{ answer.created }}

+

Опубликован: {{ answer_p.created | date:"M d, Y" }}

- + + Кандидат + + + предложить проект + + отказ
-
-{#
#} -{#
#} -{#

#} -{# Иванов Петр Иванович#} -{#

#} -{# #} -{# 13.0.2016 / 21:05#} -{# #} -{#
#} -{# #} -{# #} -{# #} -{# #} -{# #} -{#
#} -{#

#} -{# Text#} -{#

#} -{#
#} -{#
#} +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ Иванов Петр Иванович +

+ + 13.01.2016 / 21:05 + +
+ + + + + +
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio. +

+
+
+
+
+

+ Иванов Петр Иванович +

+ + 13.01.2016 / 21:05 + +

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio. +

+ + Ответить + +
+
+
{% endfor %} -
- -
- {% include 'partials/pagination.html' %} -
- - {% include 'partials/footer.html' %} -
-
+ {% endif %} + + + + {% include 'partials/footer.html' %} +
+
{% endblock %} diff --git a/specializations/templates/templatetags/specializations_widget.html b/specializations/templates/templatetags/specializations_widget.html index 97aa3e2..d2aaed3 100644 --- a/specializations/templates/templatetags/specializations_widget.html +++ b/specializations/templates/templatetags/specializations_widget.html @@ -1,11 +1,13 @@

Специализации:

- {% for spec in specializations %} -
- {{ spec }} - 2-й -
- {% endfor %} +
+ {% for spec in specializations %} +
+ {{ spec }} + 2-й +
+ {% endfor %} +
{#
#} {#

#} diff --git a/users/templates/portfolio_create_form.html b/users/templates/portfolio_create_form.html index ab0a03f..a7d316d 100644 --- a/users/templates/portfolio_create_form.html +++ b/users/templates/portfolio_create_form.html @@ -3,13 +3,13 @@

{% csrf_token %}
-

Название{{ portfolio_form.name.errors.as_text }}

+

Название{{ portfolio_form.name.errors.as_text }}

-

Описание{{ portfolio_form.description.errors.as_text }}

+

Описание{{ portfolio_form.description.errors.as_text }}

@@ -32,77 +32,81 @@
- - + +
-
+

Бюджет{{ portfolio_form.budget.errors.as_text }}

-
+
{{ portfolio_form.currency}}
-
+
-
+

Срок выполнения{{ portfolio_form.budget.errors.as_text }}

-
+
{{ portfolio_form.term_type }}
-
+
-
-

Вид строительства

- {{ portfolio_form.construction_type}} -
- -
-

Классификация здания

- {{ portfolio_form.building_classification}} -
+
+
+
+

Вид строительства

+ {{ portfolio_form.construction_type}} +
+
+

Классификация здания

+ {{ portfolio_form.building_classification}} +
+
+
-
+
-
- +
+
-{# #} -{# #} -{# Выберите файлы#} -{# #} -{# #} -{# #} - - - -
-
- -
-
-
- -
-
-
- +
+
+ + Выберите файлы + +
+ +
+
+
+
+
+ +
+
+
+
+ +
+