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

Resolve conflicts

Browse Source
remotes/origin/PR-39
ArturBaybulatov 10 years ago
parent f0369e0353 ec96fb1894
commit b28524cef4
5 changed files with 332 additions and 66 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. 4
      assets/css/bootstrap.css
  2. 239
      assets/css/main.css
  3. 69
      chat/templates/chat_customer.html
  4. 23
      specializations/templates/templatetags/specializations_widget.html
  5. 63
      users/templates/portfolio_create_form.html

4
assets/css/bootstrap.css vendored
Unescape View File

@ -3610,13 +3610,13 @@ tbody.collapse.in {
right: 0;
left: auto;
}
.dropup .caret,
/*.dropup .caret,
.navbar-fixed-bottom .dropdown .caret {
border-top: 0;
border-bottom: 4px dashed;
border-bottom: 4px solid \9;
content: "";
}
}*/
.dropup .dropdown-menu,
.navbar-fixed-bottom .dropdown .dropdown-menu {
top: auto;

239
assets/css/main.css
Unescape View File

@ -1115,7 +1115,7 @@ footer:after {
}
.titleF1 {
margin: 0 0 23px 0;
margin: 23px 0 0 0;
}
.titleF1, .polsF1, .searchF1, .resSearchF1, .sro {
@ -1133,7 +1133,7 @@ footer:after {
.polsF1 .btn-group .btn {
width: 100% !important;
padding: 15px 105px 15px 18px;
padding: 15px 30px 15px 18px;
border-radius: 0 !important;
border: none;
font-size: 15px;
@ -1204,11 +1204,12 @@ footer:after {
color: #FF0029;
}
.polsF1 .dropdown-menu {
.polsF1 .dropdown-menu.open {
width: 100%;
margin-top: 2px;
margin:0 !important;
padding: 0 !important;
border-radius: 0 !important;
outline: 1px solid #FF0029;
outline: 2px solid #FF0029;
}
.bootstrap-select.btn-group .dropdown-menu {
@ -1219,9 +1220,9 @@ footer:after {
margin-bottom: 0;
}
.polsF1 .dropdown-menu li:first-child {
/*.polsF1 .dropdown-menu li:first-child {
margin-top: -6px;
}
}*/
.polsF1 .dropdown-menu li:last-child {
margin-bottom: 2px;
@ -1314,7 +1315,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;
@ -5440,7 +5441,7 @@ input[type="radio"]:checked + span {
position: absolute;
font-family: 'Glyphicons Halflings';
right: -6.5px;
top: -21px;
top: -19px;
font-size: 12px;
}
@ -5483,3 +5484,223 @@ 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{
background: #fff;
border: none;
}
.select2-container .select2-choice .select2-arrow b{
position: relative;
top: 9px;
}
.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;
}
#portfolio-add-form .bootstrap-select{
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;
}
.bootstrap-select.btn-group .dropdown-menu li {
position: relative;
float: left;
width: 100%;
}
#order-stages label{
margin-bottom: 0;
margin-top: 8px;
}
#order-stages .checkbox label{
margin-top: 0;
}
#order-stages > div {
display: table;
width: 100%;
padding-bottom: 14px;
border-bottom: 1px solid #2c2c2c;
margin-bottom: 14px;
}
#order-stages > div:nth-last-child(2), #order-stages > div:last-child{
border: none;
}
/*end_new*/

69
chat/templates/chat_customer.html
Unescape View File

@ -24,7 +24,7 @@
</div>
</div>
<div class="tab-content">
<!-- Tab1 (contacts block)-->
<!-- Tab1 (contacts block)-->
<div class="chatBlock disTab tab-pane fade in active" id="tab1">
<div class="col-lg-3 wrMessages">
<div class="messageBlock box-sizing disTab">
@ -86,9 +86,9 @@
</div>
</div>
</div>
<!-- End block Tab1(contacts block)-->
<!-- End block Tab1(contacts block)-->
<!-- Tab2 (chat order block)-->
<!-- Tab2 (chat order block)-->
<div class="chatBlock disTab tab-pane fade" id="tab2">
<div class="col-lg-3 wrMessages">
<div class="messageBlock box-sizing disTab">
@ -142,8 +142,8 @@
Обсуджение задания и условий выполнения работы. Подтверждение заказа исполнителем.
</p>
</div>
<div id="order-stages"></div>
<div id="order-stages" class="stepssBlock"></div>
<div class="stepssBlock box-sizing disTab">
<p class="titleStepss">2 / Резервирование</p>
@ -153,41 +153,40 @@
</p>
<div class="textAreaBlock2 FFD box-sizing disTab">
<a href="#" data-toggle="modal" data-target="#reserve-stage-modal">Зарезирвировать</a>
</div>
<a href="#" data-toggle="modal" data-target="#reserve-stage-modal">Зарезирвировать</a>
</div>
</div>
</div>
<!-- Зарезервировать средства (модальное окно)-->
<div id="reserve-stage-modal" class="modal fade">
<div class="modal-dialog" style="width:900px;">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×
</button>
<h4 class="modal-title">Зарезервировать средства</h4>
</div>
<div id="reserve-stage-modal" class="modal fade">
<div class="modal-dialog" style="width:900px;">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h4 class="modal-title">Зарезервировать средства</h4>
</div>
<div class="modal-body">
<div class="textAreaBlock2 text-nn box-sizing disTab">
</div>
<div class="modal-body">
<div class="textAreaBlock2 text-nn box-sizing disTab">
</div>
<div class="searchF1 polsF1 polsFF links-filter">
<input class="btn-submit-link" type="submit" value="Сохранить">
<div class="searchF1 polsF1 polsFF links-filter">
<input class="btn-submit-link" type="submit" value="Сохранить">
</div>
</div>
<div class="modal-footer"></div>
</div>
</div>
<div class="modal-footer"></div>
</div>
</div>
</div>
<!-- Конец блока -->
<!-- Конец блока -->
<div class="stepssBlock box-sizing disTab">
<p class="titleStepss">3 / Выполнение работы</p>
<p class="textStepss">
Процесс выполнения задания в заказе до получения заказчиком итогового результата работы.
</p>
</div>
<div class="stepssBlock box-sizing disTab">
<p class="titleStepss">3 / Выполнение работы</p>
<p class="textStepss">
Процесс выполнения задания в заказе до получения заказчиком итогового результата работы.
</p>
</div>
<div class="textAreaBlock2 box-sizing disTab">
@ -258,12 +257,8 @@
</div>
</div>
<!-- End block (chat order block) -->
<!-- End block (chat order block) -->
</div>
{% include 'partials/footer.html' %}
</div>
</div>
@ -455,6 +450,7 @@
getStages(orderId);
});
// Вытащить сообщения для конактов
$('.user-block').on('click', function () {
var userId = $(this).attr('data-id');
@ -537,7 +533,6 @@
});
var userId = '{{ request.user.pk }}';
var SocketHandler = function () {
var domain = '{{ request.META.HTTP_HOST }}';

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

@ -0,0 +1,23 @@
<div class="dashedCol4">
<p class="specUser">Специализации:</p>
<div class="special_inner">
{% for spec in specializations %}
<div class="insetSpec">
<span>{{ spec }}</span>
<span>2-й</span>
</div>
{% endfor %}
</div>
</div>
{# <div class="dashedCol4 dashedCol44 dashedColColor">#}
{# <p class="specUser">#}
{# Специализации:#}
{# </p>#}
{# <div class="insetSpec">#}
{# <span>Интерьеры</span>#}
{# </div>#}
{# #}
{# <div class="insetSpec">#}
{# <span>Визуализация/3D</span>#}
{# </div>#}
{# </div>#}

63
users/templates/portfolio_create_form.html
Unescape View File

@ -3,13 +3,13 @@
<form method="post" id="portfolio-add-form">{% csrf_token %}
<div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Название<span style="color: red" class="error-{{ portfolio_form.name.html_name }}">{{ 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 }}"
value="{{ portfolio_form.name.value }}">
</div>
<div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Описание<span style="color: red" class="error-{{ portfolio_form.description.html_name }}">{{ 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>
</div>
@ -32,40 +32,49 @@
<div class="col-lg-3">
<input type='hidden' class="-spec-select -spec-select-level-4" style="width: 100%">
</div>
<input type="hidden" id="chosenSpecId" name="{{ portfolio_form.specialization.html_name }}"
<div class="textAreaBlock2 text-nn box-sizing disTab">
<input type="hidden" id="chosenSpecId" name="{{ portfolio_form.specialization.html_name }}"
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>
<div class="row">
<div class="col-lg-6">
<input type="text" class="box-sizing" name="{{ portfolio_form.budget.html_name }}" value="{{ portfolio_form.budget.value }}">
</div>
<div class="col-lg-6">
<div class="col-lg-3">
{{ portfolio_form.currency}}
</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>
<div class="row">
<div class="col-lg-6">
<input type="text" class="box-sizing" name="{{ portfolio_form.budget.html_name }}" value="{{ portfolio_form.budget.value }}">
</div>
<div class="col-lg-6">
<div class="col-lg-3">
{{ portfolio_form.term_type }}
</div>
</div>
</div>
</div>
<div class="textAreaBlock2 text-nn box-sizing disTab"></div>
<div class="polsF1 polsF2 disTab">
<p>Вид строительства</p>
{{ portfolio_form.construction_type}}
</div>
<div class="textAreaBlock2 polsF1 text-nn box-sizing disTab" id="modal_type_build">
<div class="row">
<div class="col-lg-3">
<p>Вид строительства</p>
{{ portfolio_form.construction_type}}
</div>
<div class="col-lg-3">
<p>Классификация здания</p>
{{ portfolio_form.building_classification}}
</div>
</div>
</div>
<div class="polsF1 polsF2 disTab">
<p>Классификация здания</p>
@ -78,14 +87,18 @@
{{ portfolio_form.duplicate }} Дублировать проект в готовые работы
</div>
<div class="polsF1 polsF2 disTab">
<input type="hidden" name="" id="upload-files-pk" value="" />
</div>
<!-- The fileinput-button span is used to style the file input field as button -->
<span class="btn btn-success fileinput-button">
<i class="glyphicon glyphicon-plus"></i>
<span>Выберите файлы</span>
<input id="fileupload" type="file" name="file" multiple>
</span>
<div class="textAreaBlock2 polsF1 text-nn box-sizing disTab" style="margin-bottom: 12px;">
<span class="btn btn-success fileinput-button add_file_to_port">
<span>Выберите файлы</span>
<input id="fileupload" type="file" name="file" multiple value="">
</span>
</div>
<br>
<br>
@ -99,6 +112,20 @@
<div class="searchF1 polsF1 polsFF links-filter">
<input class="btn-submit-link" type="submit" value="Разместить портфолио">
</div>
<!-- The global progress bar -->
<div class="textAreaBlock2 polsF1 text-nn box-sizing disTab">
<div id="progress-portfolio" class="progress">
<div class="progress-bar progress-bar-success"></div>
</div>
</div>
<!-- The container for the uploaded files -->
<div class="textAreaBlock2 polsF1 text-nn box-sizing disTab">
<div id="files" class="files"></div>
</div>
<div class="textAreaBlock2 polsF1 text-nn box-sizing disTab">
<input class="btn-submit-link add_file_to_port" type="submit" value="Разместить портфолио">
</div>
<!-- </div> -->
</form>
</div>

Write Preview
Loading…
Cancel
Save