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

edited modal form(add portfolio), application form, specialization widget

Browse Source
remotes/origin/PR-39
shishman 10 years ago
parent 6c5a2779e6
commit 58dd3fcc94
4 changed files with 800 additions and 255 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. 201
      assets/css/main.css
  2. 540
      projects/templates/project_detail.html
  3. 2
      specializations/templates/templatetags/specializations_widget.html
  4. 60
      users/templates/portfolio_create_form.html

201
assets/css/main.css
Unescape View File

@ -35,9 +35,9 @@ body, html {
position: relative; position: relative;
} }
input[type=checkbox], input[type=radio] { /*input[type=checkbox], input[type=radio] {
opacity: 0; opacity: 0; / * Блядь, какого ХУЯ????? * /
} }*/
a, a:hover, a:focus, a:active { a, a:hover, a:focus, a:active {
text-decoration: none !important; text-decoration: none !important;
@ -1314,7 +1314,7 @@ footer:after {
margin: 30px 0 23px 0; margin: 30px 0 23px 0;
} }
.titleResF1 { .titleResF1, div p.titleResF1 {
font-size: 15px; font-size: 15px;
font-family: 'Arial-MT-Regular', sans-serif; font-family: 'Arial-MT-Regular', sans-serif;
font-weight: bold; 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*/

540
projects/templates/project_detail.html
Unescape View File

@ -1,7 +1,8 @@
{% extends 'partials/base.html' %} {% extends 'partials/base.html' %}
{% load humanize %} {% load humanize %}
{% load thumbnail %}
{% load specializtions_tags %}
{% block content %} {% block content %}
{% include 'partials/header.html' %} {% include 'partials/header.html' %}
@ -9,24 +10,47 @@
<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">{{ project }}</p> <p class="titleScore">{{ project.name }}</p>
</div> </div>
<div class="doneBlock new-done disTab"> <div class="doneBlock new-done disTab">
<div class="triangle1"></div> <div class="triangle1"></div>
{% if request.user.is_contractor %}
<div class="col-lg-12 new-p"> <div class="col-lg-12 new-p">
<p>{{ project.budget|intcomma }} <i class="fa fa-rub"></i></p> <p>{{ project.budget|intcomma }} <i class="fa fa-rub"></i></p>
</div> </div>
{% endif %}
<div class="col-lg-4"> <div class="col-lg-4">
<a href="#" class="aLinkExe"> <a href="#" class="aLinkExe">
<div class="imgExecutor"> <div class="imgExecutor">
{% if project.customer.avatar %}
<img src="{{ project.customer.avatar.url }}" alt="execitor-image">
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="execitor-image"> <img src="{% static 'img/profile.jpg' %}" alt="execitor-image">
{% endif %}
</div> </div>
</a> </a>
<p class="nameExecutor"> <p class="nameExecutor">
<a href="#">{{ project.customer.get_full_name }} [{{ project.customer }}]</a> <a href="#">{{ project.customer.get_full_name }} [{{ project.customer.username }}]</a>
</p> </p>
<p class="navv2">На сайте {{ project.created|naturaltime }}</p> <p class="navv2">На сайте {{ project.created|naturaltime }}</p>
{% if not request.user.is_contractor %}
<ul class="rettList restList3">
<li>
<a href="javascript:void(0)">Отзывы:
<span> + 0</span>
<small> 0</small>
<mark> - 0</mark>
</a>
</li>
</ul>
{% endif %}
</div> </div>
{% if request.user.is_contractor %}
<div class="col-lg-3 retts"> <div class="col-lg-3 retts">
<ul class="rettList restList2"> <ul class="rettList restList2">
<li>Рейтинг: <span> 0</span></li> <li>Рейтинг: <span> 0</span></li>
@ -40,6 +64,8 @@
</li> </li>
</ul> </ul>
</div> </div>
{% endif %}
<div class="col-lg-2 new-dashed"> <div class="col-lg-2 new-dashed">
<div class="dashedCol4 dashedCol44 dashedColColor"> <div class="dashedCol4 dashedCol44 dashedColColor">
<p class="specUser"> <p class="specUser">
@ -53,147 +79,416 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-3 retts new-list"> <div class="col-lg-3 retts new-list">
<ul class="desListPro"> <ul class="desListPro">
<li> <li>
13.0.2016 {{ project.created }}
</li> </li>
<li> <li>
Техническое сопровождение {{ project.get_work_type_display }}
</li> </li>
</ul> </ul>
{% if project.cro %}
<div class="sroUser sroExecutor sroPro"> <div class="sroUser sroExecutor sroPro">
<div class="iconSRO"></div> <div class="iconSRO"></div>
<p>Есть допуск СРО</p> <p>Есть допуск СРО</p>
</div> </div>
{% endif %}
</div> </div>
</div> </div>
<div class="infoProjectBlock info-new disTab"> <div class="infoProjectBlock info-new disTab">
<div class="triangle2"></div> <div class="triangle2"></div>
{% if project.realty %}
<div class="col-lg-10 col-lg-offset-1"> <div class="col-lg-10 col-lg-offset-1">
<ul class="listProjectIn"> <ul class="listProjectIn">
<li> <li><span>Местоположение:</span> {{ project.realty.location.name }}</li>
<span>Местоположение:</span> <li><span>Классификация здания:</span> {{ project.realty.building_classification.name }}</li>
</li> <li><span>Вид строительства:</span> {{ project.realty.type_construction.name }}</li>
<li>
<span>Классификация здания:</span> {{ project.realty.building_classification }}
</li>
<li>
<span>Вид строительства:</span> {{ project.realty.type_construction }}
</li>
</ul> </ul>
</div> </div>
{% endif %}
<div class="col-lg-10 col-lg-offset-1"> <div class="col-lg-10 col-lg-offset-1">
<p class="textProIn"> <p class="textProIn">
{{ project.text }} {{ project.text }}
</p> </p>
</div> </div>
<div class="col-lg-10 col-lg-offset-1"> <div class="col-lg-10 col-lg-offset-1">
<a href="javascript:void(0)" class="new-answer"> {% if request.user.is_contractor %}
<a href="#" class="new-answer">
Ответить на проект Ответить на проект
</a> </a>
<div class="polsF1 pols-new disTab"> <div class="polsF1 pols-new disTab">
<div class="col-lg-3"> <div class="col-lg-3">
<select class="selectpicker"> <form action="{% url 'projects:detail' pk=project.pk %}" method="GET" novalidate>
<option value="{{ user.id }}">Ответ от своего имени</option> <select name="answer_as_team" class="selectpicker" onchange="$(this).closest('form').submit()">
<option value="{{ user.team.id }}">{{ user.team.name }}</option> {% if answer_as_team %}
<option value="">От своего имени</option>
<option value="on" selected>От имени группы</option>
{% else %}
<option value="" selected>От своего имени</option>
<option value="on">От имени группы</option>
{% endif %}
</select> </select>
</form>
</div>
</div> </div>
{% elif request.user.is_customer %}
<a href="{% url 'projects:customer-project-edit' pk=project.pk %}?back={{ request.path }}" class="linkProIn linkProIn1">
Редактировать
</a>
<form action="{% url 'projects:customer-project-trash' pk=project.pk %}" method="POST">
{% csrf_token %}
<input type="hidden" name="next" value="{{ request.path }}">
<a href="#" onclick="$(this).closest('form').submit(); return false" class="linkProIn linkProIn2">
Снять с публикации
</a>
</form>
{% endif %}
</div> </div>
</div> </div>
<form action="{% url 'projects:contractor-project-answer' pk=pk %}" method="POST">
{% csrf_token %}
<input type="hidden" name="next" value="{% url 'projects:detail' pk=pk %}">
<div class="polsF1 disTab">
<div class="col-lg-3">
<div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Стоимость</p>
<input type="text" class="box-sizing" name="{{ form.budget.name }}"/>
{% if request.user.is_contractor %}
{% if answer %}
<div class="candidateBlock disTab">
<div class="candidate can-new">
<div class="col-lg-4">
<a href="#" class="aLinkExe">
<div class="imgExecutor">
{% if answer.author.avatar %}
<img src="{{ answer.author.avatar.url }}" alt="execitor-image">
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="execitor-image">
{% endif %}
</div> </div>
</a>
<p class="nameExecutor">
{% if answer.author|class_name == 'User' %}
<a href="#">{{ answer.author.get_full_name }} [{{ answer.author.username }}]</a>
{% elif answer.author|class_name == 'Team' %}
<a href="#">{{ answer.author.name }}</a>
{% endif %}
</p>
<p class="navv2">На сайте {{ answer.author.created }}</p>
{% if answer.author|class_name == 'User' %}
{% if answer.author.contractor_status == 'free' %}
<div class="statusUser">Свободен</div><!-- ............. -->
{% endif %}
{% endif %}
</div> </div>
<div class="col-lg-3 retts">
<ul class="rettList restList2">
<li>Рейтинг: <span> 0</span></li>
<li>Безопасные сделки: <span> 0</span></li>
<li>
<a href="javascript:void(0)">Отзывы:
<span> + 0</span>
<small> 0</small>
<mark> - 0</mark>
</a>
</li>
</ul>
{% if answer.author|class_name == 'User' %}
{% if answer.author.cro %}
<div class="sroUser sroExecutor">
<div class="iconSRO"></div>
<p>Есть допуск СРО</p>
</div>
{% endif %}
{% elif answer.author|class_name == 'Team' %}
{# {% if any of these motherfuckers "answer.author.contractors.all" got a cro, then... %}#}
<div class="sroUser sroExecutor">
<div class="iconSRO"></div>
<p>Есть допуск СРО</p>
</div>
{# {% endif %}#}
{% endif %}
</div>
<div class="col-lg-2 listCens">
<p>
Цена:
<span>{{ answer.budget|intcomma }}</span>
<i class="fa fa-rub"></i>
</p>
<p>
Срок: <span>{{ answer.term }} {{ answer.get_term_type_display|decap }}</span>
</p>
<p>Опубликован: {{ answer.created }}</p>
</div>
<div class="col-lg-3 retts">
<a href="#" onclick="return false" class="candLink candLink3">
отказ
</a>
</div>
<div class="gallMini disTab">
{% for portf in answer.portfolios.all %}
<div class="col-lg-3"> <div class="col-lg-3">
<div class="textAreaBlock2 text-nn box-sizing disTab"> <div class="insetCol box-sizing disTab">
<p>Бюджет</p> <div class="imgGal" style="background: url('{{ portf.photos.first.img.url }}') no-repeat center">
{{ form.currency }} <div class="imgFigure"></div>
</div>
</div>
</div>
{% endfor %}
</div>
<div class="commBlock44 disTab">
<div class="comm44 disTab">
<div class="col-lg-10 col-lg-offset-1">
<p class="nameComm">
Иванов Петр Иванович
</p>
<span class="dateComm44">
13.01.2016 / 21:05
</span>
<div class="stars box-sizing">
<span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>
<span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>
<span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>
<span class="glyphicon glyphicon-star" aria-hidden="true"></span>
<span class="glyphicon glyphicon-star" aria-hidden="true"></span>
</div>
<p class="textComm44">
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.
</p>
</div>
</div>
<div class="comm44 disTab">
<div class="col-lg-10 col-lg-offset-1">
<p class="nameComm nameCommAct">
Иванов Петр Иванович
</p>
<span class="dateComm44">
13.01.2016 / 21:05
</span>
<p class="textComm44">
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.
</p>
<a href="javascript:void(0)" class="answerComm">
Ответить
</a>
</div>
</div> </div>
</div> </div>
<div class="col-lg-6"></div>
</div> </div>
</div>
{% else %}
<form action="{% url 'projects:detail' pk=project.pk %}" method="POST" enctype="multipart/form-data" novalidate class="proj_answ_form">
{% csrf_token %}
<input type="hidden" name="next" value="{% url 'projects:detail' pk=project.pk %}">
<input type="hidden" name="answer_as_team" value="{% if answer_as_team %}on{% endif %}">
<div class="polsF1 disTab"> <div class="polsF1 disTab">
<div class="col-lg-3"> <div class="col-lg-4">
<div class="textAreaBlock2 text-nn box-sizing disTab">
<p class="titleResF1">Стоимость <span style="color: red">{{ form.budget.errors.as_text }}</span></p>
<input type="text" class="box-sizing" name="{{ form.budget.html_name }}" value="{{ form.budget.value }}">
</div>
</div>
<div class="col-lg-2">
<div class="textAreaBlock2 text-nn box-sizing disTab"> <div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Срок</p> {{ form.currency }}
<input type="text" class="box-sizing" name="{{ form.term.name }}"/> </div>
</div>
<div class="col-lg-4">
<div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Срок <span style="color: red">{{ form.term.errors.as_text }}</span></p>
<input type="text" class="box-sizing" name="{{ form.term.html_name }}" value="{{ form.term.value }}">
</div> </div>
</div> </div>
<div class="col-lg-3"> <div class="col-lg-2">
<div class="textAreaBlock2 text-nn box-sizing disTab"> <div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Тип срока</p>
{{ form.term_type }} {{ form.term_type }}
</div> </div>
</div> </div>
<div class="col-lg-6"></div> <div class="col-lg-12">
</div>
<div class="polsF1 disTab">
<div class="col-lg-9">
<div class="textAreaBlock2 text-nn box-sizing disTab"> <div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Текст</p> <p>Текст <span style="color: red">{{ form.text.errors.as_text }}</span></p>
<textarea name="{{ form.text.name }}" id="text-new"></textarea> <textarea name="{{ form.text.html_name }}" id="text-new">{{ form.text.value }}</textarea>
</div> </div>
</div> </div>
<div class="col-lg-3"></div> <div class="col-lg-3"></div>
</div> </div>
<div class="polsF1 disTab"> <div class="polsF1 disTab searchF1">
<div class="col-lg-9"> <div class="col-lg-12 port_add_bl">
<div class="textAreaBlock2 text-nn box-sizing disTab"> <p>Портфолио <span style="color: red">{{ form.portfolios.errors.as_text }}</span></p>
{% for p in user.portfolio.all %}
<h3>{{ p }}</h3> <ul>
{% for p in form.portfolios.field.queryset.all %}
<li>
<label>
<input
type="checkbox"
name="{{ form.portfolios.html_name }}"
value="{{ p.pk }}"
{% if p.pk|str in form.portfolios.value %}checked{% endif %}>
<span></span>
</label>
<p>{{ p.name }}</p>
</li>
{% endfor %} {% endfor %}
</ul>
</div> </div>
</div> </div>
<div class="col-lg-3"></div>
<div class="polsF1 disTab searchF1">
<div class="col-lg-12">
<div id="fileUploadContainer">
<div>
<button type="button" id="fileUploadAddBtn">Добавить файл</button> Не более 10 файлов общим объемом до 500 Мб
</div> </div>
<div class="polsF1 disTab"> <ul class="list-new-new">
<div class="col-lg-3"><input type="submit" value="Создать"/></div> <li class="file-upload-widget" style="display: none">
<input type="file" name="new_files" class="file-upload-input" style="position: absolute; top: -1000px; left: -1000px">
<span class="file-upload-label"></span>
<a href="#" onclick="return false" class="file-upload-remove-btn">&times;</a>
</li>
</ul>
</div>
</div>
</div>
<div class="polsF1 disTab searchF1">
<div class="col-lg-12">
<div class="check_bs">
<label>
{{ form.secure_deal_only }}
<span></span>
</label>
<p>{{ form.secure_deal_only.label }}</p>
</div> </div>
</div>
</div>
<div class="polsF1 disTab searchF1">
<div class="col-lg-12">
<div class="send_req_block">
<button type="submit">Опубликовать ответ</button>
</div>
</div>
</div>
<div class="polsF1 disTab searchF1"></div>
</form> </form>
{% endif %}
{% elif request.user.is_customer %}
<div class="exBigBlock disTab">
<div class="col-lg-12">
<p class="titleEx">Исполнители</p>
</div>
<div class="col-lg-12 exButton">
<div class="btn-group" role="group" aria-label="...">
<button type="button" class="btn btn-default">
Новые <span>+7</span>
</button>
<button type="button" class="btn btn-default">
Кандидаты <span>7</span>
</button>
<button type="button" class="btn btn-default">
Отказал <span>7</span>
</button>
</div>
</div>
</div>
<div class="col-lg-12 compareBlock">
<div class="col-lg-2 col-lg-offset-5">
<p>Сравнить кандидатов</p>
</div> </div>
</div>
<div class="col-lg-12 exNew">
<p>Новые исполнители</p>
</div>
{% for answer_p in project.answers.all %}
<div class="candidateBlock disTab"> <div class="candidateBlock disTab">
{% for answer in project.answers.all %} <div class="candidate">
<div class="candidate can-new">
<div class="col-lg-4"> <div class="col-lg-4">
<a href="#" class="aLinkExe"><div class="imgExecutor"> <a href="#" class="aLinkExe">
<img src="{% static 'img/profile.jpg' %}" alt="execitor-image"> <div class="imgExecutor">
</div></a> {% thumbnail answer_p.author.avatar "126x125" crop="center" as im %}
<img src="{{ im.url }}" alt="execitor-image">
{% endthumbnail %}
</div>
</a>
<p class="nameExecutor"> <p class="nameExecutor">
<a href="#">{{ answer.contractor.get_full_name }} [{{ answer.contractor }}]</a> <a href="#">{{ answer_p.author.get_full_name }} [{{ answer_p.author.username }}]</a>
</p> </p>
<p class="navv2">{{ answer.contractor.created }}</p> <p class="navv2">На сайте 8 лет и 3 месяца</p>
<div class="statusUser">Свободен</div>
</div> </div>
<div class="col-lg-3 retts"> <div class="col-lg-3 retts">
<ul class="rettList restList2"> {% ratings_widget answer_p.author.pk 'restList2' %}
<li>Рейтинг: <span> 0</span></li> {% if answer_p.author.cro %}
<li>Безопасные сделки: <span> 0</span></li>
<li>
<a href="javascript:void(0)">Отзывы:
<span> + 0</span>
<small> 0</small>
<mark> - 0</mark>
</a>
</li>
</ul>
{% if answer.contractor.cro %}
<div class="sroUser sroExecutor"> <div class="sroUser sroExecutor">
<div class="iconSRO"></div> <div class="iconSRO"></div>
<p>Есть допуск СРО</p> <p>Есть допуск СРО</p>
@ -202,48 +497,99 @@
</div> </div>
<div class="col-lg-2 listCens"> <div class="col-lg-2 listCens">
<p>Цена: <p>Цена:
<span> {{ answer.budget }}</span> <span> {{ answer_p.budget }}</span>
<i class="fa fa-rub"></i> <i class="fa fa-rub"></i>
</p> </p>
<p> <p>
Срок: <span>{{ answer.term }} {{ answer.term_type }}</span> Срок: <span>{{ answer_p.term }} of {{ answer_p.term_type }}</span>
</p> </p>
<p>Опубликован: {{ answer.created }}</p> <p>Опубликован: {{ answer_p.created | date:"M d, Y" }}</p>
</div> </div>
<div class="col-lg-3 retts"> <div class="col-lg-3 retts">
<a href="" class="candLink candLink3"> <a href="javascript:void(0)" class="candLink candLink1">
Кандидат
</a>
<a href="{% url 'chat:chat-user' %}" class="candLink candLink2">
предложить проект
</a>
<a href="javascript:void(0)" class="candLink candLink3">
отказ отказ
</a> </a>
</div> </div>
<div class="commBlock44 comm-new disTab"> <div class="gallMini disTab">
{# <div class="comm44 disTab">#} <div class="col-lg-3">
{# <div class="col-lg-10 col-lg-offset-1">#} <div class="insetCol box-sizing disTab">
{# <p class="nameComm">#} <div class="imgGal">
{# Иванов Петр Иванович#} <div class="imgFigure"></div>
{# </p>#}
{# <span class="dateComm44">#}
{# 13.0.2016 / 21:05#}
{# </span>#}
{# <div class="stars box-sizing">#}
{# <span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>#}
{# <span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>#}
{# <span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>#}
{# <span class="glyphicon glyphicon-star" aria-hidden="true"></span>#}
{# <span class="glyphicon glyphicon-star" aria-hidden="true"></span>#}
{# </div>#}
{# <p class="textComm44">#}
{# Text#}
{# </p>#}
{# </div>#}
{# </div>#}
</div> </div>
</div> </div>
{% endfor %}
</div> </div>
<div class="col-lg-3">
<div class="col-lg-12 pagin"> <div class="insetCol box-sizing disTab">
{% include 'partials/pagination.html' %} <div class="imgGal">
<div class="imgFigure"></div>
</div>
</div>
</div>
<div class="col-lg-3">
<div class="insetCol box-sizing disTab">
<div class="imgGal">
<div class="imgFigure"></div>
</div>
</div> </div>
</div>
<div class="col-lg-3">
<div class="insetCol box-sizing disTab">
<div class="imgGal">
<div class="imgFigure"></div>
</div>
</div>
</div>
</div>
<div class="commBlock44 disTab">
<div class="comm44 disTab">
<div class="col-lg-10 col-lg-offset-1">
<p class="nameComm">
Иванов Петр Иванович
</p>
<span class="dateComm44">
13.01.2016 / 21:05
</span>
<div class="stars box-sizing">
<span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>
<span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>
<span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>
<span class="glyphicon glyphicon-star" aria-hidden="true"></span>
<span class="glyphicon glyphicon-star" aria-hidden="true"></span>
</div>
<p class="textComm44">
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.
</p>
</div>
</div>
<div class="comm44 disTab">
<div class="col-lg-10 col-lg-offset-1">
<p class="nameComm nameCommAct">
Иванов Петр Иванович
</p>
<span class="dateComm44">
13.01.2016 / 21:05
</span>
<p class="textComm44">
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.
</p>
<a href="javascript:void(0)" class="answerComm">
Ответить
</a>
</div>
</div>
</div>
</div>
</div>
{% endfor %}
{% endif %}
{% include 'partials/footer.html' %} {% include 'partials/footer.html' %}
</div> </div>

2
specializations/templates/templatetags/specializations_widget.html
Unescape View File

@ -1,5 +1,6 @@
<div class="dashedCol4"> <div class="dashedCol4">
<p class="specUser">Специализации:</p> <p class="specUser">Специализации:</p>
<div class="special_inner">
{% for spec in specializations %} {% for spec in specializations %}
<div class="insetSpec"> <div class="insetSpec">
<span>{{ spec }}</span> <span>{{ spec }}</span>
@ -7,6 +8,7 @@
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
</div>
{# <div class="dashedCol4 dashedCol44 dashedColColor">#} {# <div class="dashedCol4 dashedCol44 dashedColColor">#}
{# <p class="specUser">#} {# <p class="specUser">#}
{# Специализации:#} {# Специализации:#}

60
users/templates/portfolio_create_form.html
Unescape View File

@ -3,13 +3,13 @@
<form method="post" id="portfolio-add-form">{% csrf_token %} <form method="post" id="portfolio-add-form">{% csrf_token %}
<div class="textAreaBlock2 text-nn box-sizing disTab"> <div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Название<span style="color: red">{{ portfolio_form.name.errors.as_text }}</span></p> <p>Название<span style="color: red; margin-left:8px; font-size: 12px;" class="error-{{ portfolio_form.name.html_name }}">{{ portfolio_form.name.errors.as_text }}</span></p>
<input type="text" class="box-sizing" name="{{ portfolio_form.name.html_name }}" <input type="text" class="box-sizing" name="{{ portfolio_form.name.html_name }}"
value="{{ portfolio_form.name.value }}"> value="{{ portfolio_form.name.value }}">
</div> </div>
<div class="textAreaBlock2 text-nn box-sizing disTab"> <div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Описание<span style="color: red">{{ portfolio_form.description.errors.as_text }}</span></p> <p>Описание<span style="color: red; margin-left:8px; font-size: 12px;" class="error-{{ portfolio_form.description.html_name }}">{{ portfolio_form.description.errors.as_text }}</span></p>
<textarea name="{{ portfolio_form.description.html_name }}" id="text-new">{{ portfolio_form.description.value }}</textarea> <textarea name="{{ portfolio_form.description.html_name }}" id="text-new">{{ portfolio_form.description.value }}</textarea>
</div> </div>
@ -32,76 +32,80 @@
<div class="col-lg-3"> <div class="col-lg-3">
<input type='hidden' class="-spec-select -spec-select-level-4" style="width: 100%"> <input type='hidden' class="-spec-select -spec-select-level-4" style="width: 100%">
</div> </div>
<div class="textAreaBlock2 text-nn box-sizing disTab">
<input type="hidden" id="chosenSpecId" name="{{ portfolio_form.specialization.html_name }}" <input type="hidden" id="chosenSpecId" name="{{ portfolio_form.specialization.html_name }}"
value="{{ portfolio_form.specialization.value }}"> value="{{ portfolio_form.specialization.value }}">
</div>
<div class="textAreaBlock2 text-nn box-sizing disTab"> <div class="textAreaBlock2 polsF1 text-nn box-sizing disTab">
<p>Бюджет{{ portfolio_form.budget.errors.as_text }}</p> <p>Бюджет{{ portfolio_form.budget.errors.as_text }}</p>
<div class="row"> <div class="row">
<div class="col-lg-6"> <div class="col-lg-6">
<input type="text" class="box-sizing" name="{{ form.budget.html_name }}" value="{{ form.budget.value }}"> <input type="text" class="box-sizing" name="{{ form.budget.html_name }}" value="{{ form.budget.value }}">
</div> </div>
<div class="col-lg-6"> <div class="col-lg-3">
{{ portfolio_form.currency}} {{ portfolio_form.currency}}
</div> </div>
</div> </div>
</div> </div>
<div class="textAreaBlock2 text-nn box-sizing disTab"> <div class="textAreaBlock2 polsF1 text-nn box-sizing disTab">
<p>Срок выполнения{{ portfolio_form.budget.errors.as_text }}</p> <p>Срок выполнения{{ portfolio_form.budget.errors.as_text }}</p>
<div class="row"> <div class="row">
<div class="col-lg-6"> <div class="col-lg-6">
<input type="text" class="box-sizing" name="{{ form.budget.html_name }}" value="{{ form.budget.value }}"> <input type="text" class="box-sizing" name="{{ form.budget.html_name }}" value="{{ form.budget.value }}">
</div> </div>
<div class="col-lg-6"> <div class="col-lg-3">
{{ portfolio_form.term_type }} {{ portfolio_form.term_type }}
</div> </div>
</div> </div>
</div> </div>
<div class="textAreaBlock2 text-nn box-sizing disTab"></div> <div class="textAreaBlock2 text-nn box-sizing disTab"></div>
<div class="polsF1 polsF2 disTab"> <div class="textAreaBlock2 polsF1 text-nn box-sizing disTab" id="modal_type_build">
<div class="row">
<div class="col-lg-3">
<p>Вид строительства</p> <p>Вид строительства</p>
{{ portfolio_form.construction_type}} {{ portfolio_form.construction_type}}
</div> </div>
<div class="col-lg-3">
<div class="polsF1 polsF2 disTab">
<p>Классификация здания</p> <p>Классификация здания</p>
{{ portfolio_form.building_classification}} {{ portfolio_form.building_classification}}
</div> </div>
</div>
</div>
<div class="polsF1 polsF2 disTab"> <div class="textAreaBlock2 polsF1 text-nn box-sizing disTab">
<input type="hidden" name="{{ portfolio_form.user.html_name }}" value="{{ request.user.pk }}" /> <input type="hidden" name="{{ portfolio_form.user.html_name }}" value="{{ request.user.pk }}" />
</div> </div>
<div class="polsF1 polsF2 disTab"> <div class="textAreaBlock2 polsF1 text-nn box-sizing disTab">
<input type="hidden" name="" id="upload-files-pk" value="" /> <input type="hidden" name="images-ids" id="upload-files-pk" />
</div> </div>
<!-- The fileinput-button span is used to style the file input field as button --> <!-- The fileinput-button span is used to style the file input field as button -->
{# <span class="btn btn-success fileinput-button">#} <div class="textAreaBlock2 polsF1 text-nn box-sizing disTab">
{# <i class="glyphicon glyphicon-plus"></i>#} <div class="col-lg-12" style="margin-bottom: 12px;">
{# <span>Выберите файлы</span>#} <span class="btn btn-success fileinput-button add_file_to_port">
{# <!-- The file input field used as target for the file upload widget -->#} <span>Выберите файлы</span>
{# <input id="fileupload" type="file" name="file" multiple>#} <input id="fileupload" type="file" name="file" multiple value="">
{# </span>#} </span>
<input id="fileupload" type="file" name="file" multiple> </div>
<br>
<br>
<!-- The global progress bar --> <!-- The global progress bar -->
<div id="progress" class="progress"> <div class="col-lg-12">
<div id="progress-portfolio" class="progress">
<div class="progress-bar progress-bar-success"></div> <div class="progress-bar progress-bar-success"></div>
</div> </div>
</div>
<!-- The container for the uploaded files --> <!-- The container for the uploaded files -->
<div class="col-lg-12">
<div id="files" class="files"></div> <div id="files" class="files"></div>
<br> </div>
<div class="searchF1 polsF1 polsFF links-filter"> <div class="col-lg-12">
<input class="btn-submit-link" type="submit" value="Разместить портфолио"> <input class="btn-submit-link add_file_to_port" type="submit" value="Разместить портфолио">
</div>
</div> </div>
</form> </form>
</div> </div>

Write Preview
Loading…
Cancel
Save