Revert "PR-55 Подвал, форма нового заказа и кнопки на главной"

This reverts commit 37cdbe19e0.
remotes/origin/HEAD
booblegum 9 years ago
parent 37cdbe19e0
commit 2395f6dce2
  1. 1
      assets/sass/components/custom-components.sass
  2. 1
      assets/sass/old_main.sass
  3. 38
      projects/templates/project_filter.html
  4. 12
      templates/home.html
  5. 5
      templates/partials/sass/home.sass
  6. 2
      users/templates/contractor_filter.html
  7. 478
      users/templates/contractor_office.html
  8. 17
      users/templates/contractor_office_chat_projects.html
  9. 212
      users/templates/contractor_office_open_projects.html
  10. 122
      work_sell/templates/worksells_list.html

@ -194,7 +194,6 @@ textarea.description
font-size: 16px font-size: 16px
border-radius: 50% border-radius: 50%
margin-left: 25px margin-left: 25px
margin-right: 25px
-webkit-transition: all 0.3s ease-out -webkit-transition: all 0.3s ease-out
-moz-transition: all 0.3s ease-out -moz-transition: all 0.3s ease-out
transition: all 0.3s ease-out transition: all 0.3s ease-out

@ -320,7 +320,6 @@
.mainScore .mainScore
position: relative position: relative
> .row > .row
padding: 0 15px
border-right: 1px solid #CFCFCF border-right: 1px solid #CFCFCF
border-left: 1px solid #CFCFCF border-left: 1px solid #CFCFCF

@ -1,32 +1,38 @@
{% extends 'partials/_base.html' %} {% extends 'partials/base.html' %}
{% load staticfiles %} {% load staticfiles %}
{% load sass_tags %} {% load sass_tags %}
{% block personal_css %} {% block head_css %}
<link rel='stylesheet' href='{% sass_src "sass/old_main.sass" %}'> {# <link rel='stylesheet' href='{% static "lib/proekton-components/css/fonts.css" %}'>#}
{# <link rel='stylesheet' href='{% static "lib/proekton-components/css/selected-container.css" %}'>#}
{# <link rel='stylesheet' href='{% static "lib/proekton-components/css/editable-container.css" %}'>#}
{# <link rel='stylesheet' href='{% static "lib/proekton-components/css/select-box.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='{% 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" %}'>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="old-main"> {% include 'partials/header.html' %}
<div class="container mainScore ">
<div class="row"> <div class="container mainScore ">
<div class="col-lg-12 "> <div class=" ">
<p class="titleScore">Поиск заказов</p> <div class="col-lg-12 ">
</div> <p class="titleScore">Поиск заказов</p>
{# FILTER#} </div>
{% include 'partials/inc-projects-filter.html' %} {# FILTER#}
{% include 'partials/inc-projects-filter.html' %}
<div class="col-lg-12 "> <div class="col-lg-12 ">
<div id="projectsBlock"> <div id="projectsBlock">
{% include 'partials/inc-projects-results.html' %} {% include 'partials/inc-projects-results.html' %}
</div>
</div> </div>
{% include 'partials/footer.html' %}
</div> </div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% block personal_js %} {% block js_block %}
{{ block.super }}
<script src='{% static "lib/proekton-components/js/build/init.js" %}'></script> <script src='{% static "lib/proekton-components/js/build/init.js" %}'></script>
<script src='{% static "js/build/project_filter.js" %}'></script> <script src='{% static "js/build/project_filter.js" %}'></script>

@ -28,6 +28,7 @@
{% else %} {% else %}
<a class="to-profile" href="{% url 'registration_register' %}?type=customer">Я заказчик</a> <a class="to-profile" href="{% url 'registration_register' %}?type=customer">Я заказчик</a>
{% endif %} {% endif %}
<p>
<ul class="customer-list"> <ul class="customer-list">
<li> <li>
<div class="icon-1"></div> <div class="icon-1"></div>
@ -67,18 +68,20 @@
</div> </div>
</li> </li>
</ul> </ul>
</p>
<a class="create" href="{% url 'projects:customer-project-create' %}">Разместить заказ</a> <a class="create" href="{% url 'projects:customer-project-create' %}">Разместить заказ</a>
</div> </div>
</div> </div>
<div class="col-lg-5 mod-no-padding"> <div class="col-lg-5 mod-no-padding">
<div class="infoBlock contractor"> <div class="infoBlock contractor">
{% if request.user.is_authenticated and request.user.is_contractor %} {% if request.user.is_authenticated and request.user.is_contractor %}
<a class="to-profile" href="{% url 'users:contractor-profile' pk=request.user.pk %}"> <a class="to-profile" href="{% url 'users:contractor-profile' pk=request.user.pk %}">Я
Я исполнитель</a> исполнитель</a>
{% else %} {% else %}
<a class="to-profile" href="{% url 'registration_register' %}?type=contractor"> <a class="to-profile" href="{% url 'registration_register' %}?type=contractor">Я
Я исполнитель</a> исполнитель</a>
{% endif %} {% endif %}
<p>
<ul class="contractor-list"> <ul class="contractor-list">
<li> <li>
<div class="icon-7"></div> <div class="icon-7"></div>
@ -117,6 +120,7 @@
</div> </div>
</li> </li>
</ul> </ul>
</p>
<a class="create" href="{% url 'work_sell:create' %}">Разместить проект</a> <a class="create" href="{% url 'work_sell:create' %}">Разместить проект</a>
</div> </div>
</div> </div>

@ -38,9 +38,8 @@
&.customer-list, &.customer-list,
&.contractor-list &.contractor-list
text-align: left text-align: left
//padding-left: 60px padding-left: 60px
//padding-right: 20px padding-right: 20px
padding: 20px 20px 0 60px
li li
display: flex display: flex
align-items: center align-items: center

@ -11,7 +11,7 @@
{% block content %} {% block content %}
<div class="old-main"> <div class="old-main">
<div class="container mainScore "> <div class="container mainScore ">
<div class="row"> <div class="row" style="padding: 0 15px">
<div class="col-lg-12 "> <div class="col-lg-12 ">
<p class="titleScore">Поиск Исполнителей</p> <p class="titleScore">Поиск Исполнителей</p>
</div> </div>

@ -1,315 +1,303 @@
{% extends 'partials/_base.html' %} {% extends 'partials/base.html' %}
{% load specializtions_tags %} {% load specializtions_tags %}
{% load thumbnail %} {% load thumbnail %}
{% load user_tags %} {% load user_tags %}
{% load sass_tags %}
{% block personal_css %}
<link rel='stylesheet' href='{% sass_src "sass/old_main.sass" %}'>
{% endblock %}
{% block content %} {% block content %}
{% include 'partials/modals/add_team_member.html' %} {% include 'partials/modals/add_team_member.html' %}
{% include 'partials/header.html' %}
<div class="old-main"> <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>
{% include 'partials/contractor_profile_tabs.html' %} {% include 'partials/contractor_profile_tabs.html' %}
<div class="buttonGP disTab"> <div class="buttonGP disTab">
<div class="btn-group valProject2 val-pro3" role="group"> <div class="btn-group valProject2 val-pro3" role="group">
{% if contractor.team %} {% if contractor.team %}
<a href="{% url 'users:team-profile' pk=contractor.team.pk %}" class="btn btn-default"> <a href="{% url 'users:team-profile' pk=contractor.team.pk %}" class="btn btn-default">
{{ contractor.team.name }} {{ contractor.team.name }}
<span><mark>{% get_new_count_message contractor.team request.user %}</mark></span> <span><mark>{% get_new_count_message contractor.team request.user %}</mark></span>
</a> </a>
{% else %} {% else %}
<button type="button" class="btn btn-default add-group" data-toggle="modal" <button type="button" class="btn btn-default add-group" data-toggle="modal"
data-target="#myModal"> data-target="#myModal">
+ Добавить группу + Добавить группу
</button> </button>
{% endif %} {% endif %}
</div> </div>
<div class="btn-group valProject2 val-pro3" role="group"> <div class="btn-group valProject2 val-pro3" role="group">
{% for team in contractor.teams.all %} {% for team in contractor.teams.all %}
<a href="{% url 'users:team-profile' pk=team.pk %}" class="btn btn-default"> <a href="{% url 'users:team-profile' pk=team.pk %}" class="btn btn-default">
{{ team.name }} {{ team.name }}
<span><mark>{% get_new_count_message team request.user %}</mark></span> <span><mark>{% get_new_count_message team request.user %}</mark></span>
</a> </a>
{% endfor %} {% endfor %}
</div> </div>
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
<h4 class="modal-title" id="myModalLabel">Добавление новой группы</h4> <h4 class="modal-title" id="myModalLabel">Добавление новой группы</h4>
</div> </div>
<form method="post" action="{% url 'users:team-create' %}">{% csrf_token %} <form method="post" action="{% url 'users:team-create' %}">{% csrf_token %}
<div class="modal-body"> <div class="modal-body">
<div class="textAreaBlock2 text-nn box-sizing disTab"> <div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Название <span <p>Название <span style="color: red">{{ form_team.name.errors.as_text }}</span>
style="color: red">{{ form_team.name.errors.as_text }}</span> </p>
</p> <input type="text" class="box-sizing" name="{{ form_team.name.html_name }}">
<input type="text" class="box-sizing" name="{{ form_team.name.html_name }}">
</div>
</div> </div>
</div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Закрыть <button type="button" class="btn btn-default" data-dismiss="modal">Закрыть</button>
</button> <button type="submit" class="btn btn-primary">Сохранить</button>
<button type="submit" class="btn btn-primary">Сохранить</button> </div>
</div> </form>
</form>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
{% if contractor.team %} {% if contractor.team %}
<div class="projectsBlock disTab"> <div class="projectsBlock disTab">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="col-lg-3 divCol3"> <div class="col-lg-3 divCol3">
<div class="avatar"> <div class="avatar">
<div class="avatarInset"> <div class="avatarInset">
{% if contractor.avatar %} {% if contractor.avatar %}
{% thumbnail contractor.avatar "265x264" crop="center" as im %} {% thumbnail contractor.avatar "265x264" crop="center" as im %}
<a href="{% url 'users:team-profile' pk=contractor.team.pk %}"><img <a href="{% url 'users:team-profile' pk=contractor.team.pk %}"><img
src="{{ im.url }}" alt="profile-image"></a> src="{{ im.url }}" alt="profile-image"></a>
{% endthumbnail %} {% endthumbnail %}
{% else %} {% else %}
<a href="{% url 'users:team-profile' pk=contractor.team.pk %}"> <a href="{% url 'users:team-profile' pk=contractor.team.pk %}">
{% if contractor.gender == "female" %} {% if contractor.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" <img src="{% static 'img/avatars/avatar-female.jpg' %}"
alt="profile-image"> alt="profile-image">
{% else %} {% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" <img src="{% static 'img/avatars/avatar-male.jpg' %}"
alt="profile-image"> alt="profile-image">
{% endif %} {% endif %}
</a> </a>
{% endif %} {% endif %}
</div>
</div> </div>
</div>
<div class="menuUser disTab"> <div class="menuUser disTab">
<a href="#" onclick="return false" data-toggle="modal" <a href="#" onclick="return false" data-toggle="modal" data-target="#addTeamMemberModal"
data-target="#addTeamMemberModal" class="add-man -add-team-member">
class="add-man -add-team-member"> добавить участника
добавить участника </a>
</a>
<div class="block-users">
<div class="block-users"> <p>Состав группы</p>
<p>Состав группы</p>
{% for c in contractor.team.contractors.all %}
{% for c in contractor.team.contractors.all %} <div class="message-new">
<div class="message-new"> <div class="imgMess">
<div class="imgMess"> {% if c.avatar %}
{% if c.avatar %} {% thumbnail c.avatar "60x60" crop="center" as im %}
{% thumbnail c.avatar "60x60" crop="center" as im %} <img src="{{ im.url }}" alt="mess-image">
<img src="{{ im.url }}" alt="mess-image"> {% endthumbnail %}
{% endthumbnail %} {% else %}
{% if c.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}"
alt="profile-image">
{% else %} {% else %}
{% if c.gender == "female" %} <img src="{% static 'img/avatars/avatar-male.jpg' %}"
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="profile-image">
alt="profile-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}"
alt="profile-image">
{% endif %}
{% endif %} {% endif %}
</div> {% endif %}
</div>
<p class="nameMess" style="float: none"> <p class="nameMess" style="float: none">
<a href="{% url 'users:contractor-profile' c.pk %}">{{ c.get_full_name }}</a> <a href="{% url 'users:contractor-profile' c.pk %}">{{ c.get_full_name }}</a>
</p> </p>
<p><span>{{ c.get_popular_specialization }}</span></p> <p><span>{{ c.get_popular_specialization }}</span></p>
</div> </div>
{% empty %} {% empty %}
В группе пока нет участников В группе пока нет участников
{% endfor %} {% endfor %}
</div>
</div> </div>
</div> </div>
</div>
<div class="col-lg-9 divCol9"> <div class="col-lg-9 divCol9">
<div class="col-lg-4"> <div class="col-lg-4">
<p class="nameUser"><a <p class="nameUser"><a
href="{% url 'users:team-profile' pk=contractor.team.pk %}">{{ contractor.team.name }}</a> href="{% url 'users:team-profile' pk=contractor.team.pk %}">{{ contractor.team.name }}</a>
</p> </p>
<p class="cityUser">{{ contractor.get_location }}</p> <p class="cityUser">{{ contractor.get_location }}</p>
<p class="navv">На сайте {{ contractor.team.created }}</p> <p class="navv">На сайте {{ contractor.team.created }}</p>
<p class="navv"> <p class="navv">
Кол-во человек: <span>{{ contractor.team.contractors.count }}</span> Кол-во человек: <span>{{ contractor.team.contractors.count }}</span>
</p> </p>
<p class="navv"> <p class="navv">
Выполненных проектов: <span>{{ completed_project_count }}</span> Выполненных проектов: <span>{{ completed_project_count }}</span>
</p> </p>
<div class="statusUser st-new">Свободен</div> <div class="statusUser st-new">Свободен</div>
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
{% specialization_team_widget contractor.team.pk %} {% specialization_team_widget contractor.team.pk %}
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
{% ratings_team_widget contractor.team.pk %} {% ratings_team_widget contractor.team.pk %}
{% if contractor.cro %} {% if contractor.cro %}
<div class="sroUser"> <div class="sroUser">
<div class="iconSRO"></div> <div class="iconSRO"></div>
<p>Есть допуск СРО</p> <p>Есть допуск СРО</p>
</div> </div>
{% endif %} {% endif %}
</div>
</div> </div>
</div>
<div class="col-lg-9"> <div class="col-lg-9">
<div class="profileTabs2"> <div class="profileTabs2">
<ul class="nav nav-tabs nav-justified"> <ul class="nav nav-tabs nav-justified">
<li role="presentation" class="active"> <li role="presentation" class="active">
<a href="#tab11" data-toggle="tab">Портфолио</a> <a href="#tab11" data-toggle="tab">Портфолио</a>
</li> </li>
<li role="presentation"> <li role="presentation">
<a href="#tab12" data-toggle="tab">Готовые проекты</a> <a href="#tab12" data-toggle="tab">Готовые проекты</a>
</li> </li>
<li role="presentation"> <li role="presentation">
<a href="#tab13" data-toggle="tab">Отзывы</a> <a href="#tab13" data-toggle="tab">Отзывы</a>
</li> </li>
</ul> </ul>
</div>
</div> </div>
</div>
<div class="tab-content"> <div class="tab-content">
<div id="tab11" class="tab-pane fade in active"> <div id="tab11" class="tab-pane fade in active">
<div class="galleryWork2 disTab col-lg-9 -portfolios-container"> <div class="galleryWork2 disTab col-lg-9 -portfolios-container">
<script type="text/x-template" class="-portfolio-item-templ"> <script type="text/x-template" class="-portfolio-item-templ">
<div class="col-lg-4"> <div class="col-lg-4">
<div class="insetCol box-sizing disTab"> <div class="insetCol box-sizing disTab">
<div class="imgGal" <div class="imgGal"
style="background:rgba(0, 0, 0, 0) url('<%- portfolio.photos[0].img %>') no-repeat scroll center center / cover"> style="background:rgba(0, 0, 0, 0) url('<%- portfolio.photos[0].img %>') no-repeat scroll center center / cover">
<a class="open-modal-image" <a class="open-modal-image" href="<%- portfolio.photos[0].img %>">
href="<%- portfolio.photos[0].img %>"> <div class="imgFigure"></div>
<div class="imgFigure"></div> </a>
</a>
</div>
</div>
<div class="insetCol2 box-sizing disTab text-center">
<a href="<%- portfAbsUrl %>"><%- trunc({length: 50}, portfolio.name)
%></a>
</div> </div>
</div> </div>
</script>
</div>
<div class="col-lg-9 col-lg-offset-3 -more-portfolios-btn"> <div class="insetCol2 box-sizing disTab text-center">
<div class="linkElse"> <a href="<%- portfAbsUrl %>"><%- trunc({length: 50}, portfolio.name)
<a href="#" onclick="loadMorePortfolios(); return false" class="showElse">показать %></a>
еще</a> </div>
</div> </div>
</script>
</div>
<div class="col-lg-9 col-lg-offset-3 -more-portfolios-btn">
<div class="linkElse">
<a href="#" onclick="loadMorePortfolios(); return false" class="showElse">показать
еще</a>
</div> </div>
</div> </div>
</div>
<div id="tab12" class="tab-pane fade"> <div id="tab12" class="tab-pane fade">
<div class="galleryWork2 disTab -work-sells-container"> <div class="galleryWork2 disTab -work-sells-container">
<script type="text/x-template" class="-work-sell-item-templ"> <script type="text/x-template" class="-work-sell-item-templ">
<div class="col-lg-4"> <div class="col-lg-4">
<div class="insetCol box-sizing disTab"> <div class="insetCol box-sizing disTab">
<div class="imgGal" <div class="imgGal"
style="background:rgba(0, 0, 0, 0) url('<%- workSell.photos[0].img %>') no-repeat scroll center center / cover ;"> style="background:rgba(0, 0, 0, 0) url('<%- workSell.photos[0].img %>') no-repeat scroll center center / cover ;">
<a class="open-modal-image" <a class="open-modal-image" href="<%- workSell.photos[0].img %>">
href="<%- workSell.photos[0].img %>"> <div class="imgFigure"></div>
<div class="imgFigure"></div> </a>
</a> </div>
</div>
<div class="cenaImg box-sizing"> <div class="cenaImg box-sizing">
<div class="cenaImgInset"> <div class="cenaImgInset">
<%- workSell.budget %> <i class="fa fa-rub"></i> <%- workSell.budget %> <i class="fa fa-rub"></i>
</div>
</div> </div>
</div> </div>
<div class="insetCol2 box-sizing disTab">
<a href="<%- workSellAbsUrl %>"><%- trunc({length: 50},
workSell.name)
%></a>
</div>
</div> </div>
</script> <div class="insetCol2 box-sizing disTab">
</div> <a href="<%- workSellAbsUrl %>"><%- trunc({length: 50}, workSell.name)
%></a>
<div class="col-lg-9 col-lg-offset-3 -more-work-sells-btn"> </div>
<div class="linkElse">
<a href="#" onclick="loadMoreWorkSells(); return false" class="showElse">показать
еще</a>
</div> </div>
</div> </script>
</div> </div>
<div id="tab13" class="tab-pane fade"> <div class="col-lg-9 col-lg-offset-3 -more-work-sells-btn">
{% for review in reviews %} <div class="linkElse">
<div class="new-comm-44"> <a href="#" onclick="loadMoreWorkSells(); return false" class="showElse">показать
<div class="col-lg-12"> еще</a>
<p class="nameComm"> </div>
<a href="#">{{ review.get_sender }}</a> </div>
</p> </div>
{% if review.project.deal_type == 'secure_deal' %} <div id="tab13" class="tab-pane fade">
<span class="dateComm44">Безопасная сделка</span> {% for review in reviews %}
{% endif %} <div class="new-comm-44">
<div class="col-lg-12">
<p class="nameComm">
<a href="#">{{ review.get_sender }}</a>
</p>
<div class="stars box-sizing"> {% if review.project.deal_type == 'secure_deal' %}
<a href="#"> <span class="dateComm44">Безопасная сделка</span>
{% if review.type == 'positive' %} {% endif %}
Положительный отзыв
{% elif review.type == 'negative' %}
Отрицательный отзыв
{% else %}
Нейтральный отзыв
{% endif %}
</a>
</div>
<p class="textComm44"> <div class="stars box-sizing">
{{ review.text|safe }} <a href="#">
</p> {% if review.type == 'positive' %}
Положительный отзыв
{% elif review.type == 'negative' %}
Отрицательный отзыв
{% else %}
Нейтральный отзыв
{% endif %}
</a>
</div> </div>
<p class="textComm44">
{{ review.text|safe }}
</p>
</div> </div>
{% empty %} </div>
<div class="new-comm-44"> {% empty %}
<p style="text-align: center;">Отзывов пока нет</p> <div class="new-comm-44">
</div> <p style="text-align: center;">Отзывов пока нет</p>
{% endfor %} </div>
</div> {% endfor %}
</div> </div>
</div> </div>
</div> </div>
{% endif %} </div>
{% endif %}
</div> {% include 'partials/footer.html' %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% block personal_js %} {% block js_block %}
<script> <script>
(function () { (function () {
// Pagination --------------------------------------------------- // Pagination ---------------------------------------------------

@ -1,18 +1,15 @@
{% extends 'partials/_base.html' %} {% extends 'partials/base.html' %}
{% load staticfiles %} {% load staticfiles %}
{% load project_tags %} {% load project_tags %}
{% load specializtions_tags %} {% load specializtions_tags %}
{% load thumbnail %} {% load thumbnail %}
{% load sass_tags %}
{% block personal_css %}
<link rel='stylesheet' href='{% sass_src "sass/old_main.sass" %}'>
{% endblock %}
{% block content %} {% block content %}
<div class="old-main"> {% 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>
@ -130,14 +127,16 @@
</div> </div>
<!-- End block Tab2--> <!-- End block Tab2-->
{% include 'order_info.html' %} {% include 'order_info.html' %}
</div> </div>
{% include 'partials/footer.html' %}
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}
{% block personal_js %} {% block js_block %}
<script type="text/javascript"> <script type="text/javascript">
var userId = {{ request.user.pk }}; var userId = {{ request.user.pk }};
var domain = '{{ request.META.HTTP_HOST }}'; var domain = '{{ request.META.HTTP_HOST }}';

@ -1,68 +1,59 @@
{% extends 'partials/_base.html' %} {% extends 'partials/base.html' %}
{% load project_tags %} {% load project_tags %}
{% load specializtions_tags %} {% load specializtions_tags %}
{% load thumbnail %} {% load thumbnail %}
{% load sass_tags %}
{% block personal_css %}
<link rel='stylesheet' href='{% sass_src "sass/old_main.sass" %}'>
{% endblock %}
{% block content %} {% block content %}
<div class="old-main"> {% include 'partials/header.html' %}
<div class="container mainScore">
<div class="row"> <div class="container mainScore" >
<div class="col-lg-12"> <div class="row">
<p class="titleScore">Личный кабинет</p> <div class="col-lg-12">
</div> <p class="titleScore">Личный кабинет</p>
</div>
{% include 'partials/contractor_profile_tabs.html' %}
{% include 'partials/contractor_profile_tabs.html' %}
<div class="buttonGP disTab">
<div class="btn-group valProject2" role="group"> <div class="buttonGP disTab">
<a href="#" data-param-name="owner" data-default onclick="return false" <div class="btn-group valProject2" role="group">
class="btn btn-default -nav">Все</a> <a href="#" data-param-name="owner" data-default onclick="return false" class="btn btn-default -nav">Все</a>
<a href="#" data-param-name="owner" data-param-val="private" onclick="return false" <a href="#" data-param-name="owner" data-param-val="private" onclick="return false" class="btn btn-default -nav">Личные</a>
class="btn btn-default -nav">Личные</a> <a href="#" data-param-name="owner" data-param-val="teams" onclick="return false" class="btn btn-default -nav">От имени группы</a>
<a href="#" data-param-name="owner" data-param-val="teams" onclick="return false" </div>
class="btn btn-default -nav">От имени группы</a>
</div> <div class="btn-group valProject2" role="group">
<a href="#" data-param-name="archived" data-default onclick="return false" class="btn btn-default -nav">
<div class="btn-group valProject2" role="group"> Открытые проекты
<a href="#" data-param-name="archived" data-default onclick="return false" <span><mark>{{ open_project_count }}</mark><!-- / <span>0</span>--></span>
class="btn btn-default -nav"> </a>
Открытые проекты
<span><mark>{{ open_project_count }}</mark><!-- / <span>0</span>--></span> <a href="#" data-param-name="archived" data-param-val="on" onclick="return false" class="btn btn-default -nav">
</a> Архив
<span><mark></mark><span>{{ archived_project_count }}</span></span>
<a href="#" data-param-name="archived" data-param-val="on" onclick="return false" </a>
class="btn btn-default -nav"> </div>
Архив </div>
<span><mark></mark><span>{{ archived_project_count }}</span></span>
</a> <div class="projectsBlock disTab">
</div> {% for project in projects %}
</div> <div class="projectPro clearfix">
<div class="col-lg-9 leftPro">
<div class="projectsBlock disTab"> <a href="{% url 'projects:detail' project.pk %}">
{% for project in projects %} <p class="titlePro">{{ project.name }}</p>
<div class="projectPro clearfix"> </a>
<div class="col-lg-9 leftPro">
<a href="{% url 'projects:detail' project.pk %}"> {% if project.realty and project.realty.name %}
<p class="titlePro">{{ project.name }}</p> <ul class="desPro">
</a> <li>Объект "{{ project.realty.name }}"</li>
</ul>
{% if project.realty and project.realty.name %} {% endif %}
<ul class="desPro">
<li>Объект "{{ project.realty.name }}"</li> <p class="textPro">{{ project.text|linebreaksbr|truncatechars:300 }}</p>
</ul>
{% endif %} {% if TEMPLATE_DEBUG %}
<pre><!--
<p class="textPro">{{ project.text|linebreaksbr|truncatechars:300 }}</p>
{% if TEMPLATE_DEBUG %}
<pre><!--
--><b>State:</b> {{ project.state }}<br><!-- --><b>State:</b> {{ project.state }}<br><!--
--><br><!-- --><br><!--
--><b>Specialization:</b> {{ project.specialization }}<br><!-- --><b>Specialization:</b> {{ project.specialization }}<br><!--
@ -75,87 +66,86 @@
--><br><!-- --><br><!--
--><b>Build. classif.:</b> {{ project.realty.building_classification }}<br><!-- --><b>Build. classif.:</b> {{ project.realty.building_classification }}<br><!--
--></pre> --></pre>
{% endif %}
<ul class="listPro">
<li>{{ project.created }}</li>
<li>{{ project.hit_count.hits }}</li>
<li>{{ project.answers.count }}</li>
<li>{{ project.customer.username }}</li>
</ul>
</div>
<div class="col-lg-3 rightPro">
<p class="cenaPro">
{{ project.budget }} <i class="{% fa_currency_classes project.currency %}"></i>
</p>
<ul>
{% if proj.secure_deal %}
<li>Безопасная сделка</li>
{% endif %} {% endif %}
<ul class="listPro"> <li>
<li>{{ project.created }}</li> {{ project.specialization.name }}
<li>{{ project.hit_count.hits }}</li> </li>
<li>{{ project.answers.count }}</li>
<li>{{ project.customer.username }}</li> <li class="-hide-if-archived" style="display: none">
</ul> <form action="{% url 'projects:reject-project-answer' pk=project|get_answer:contractor|pk %}" method="POST" novalidate>
</div> {% csrf_token %}
<input type="hidden" name="next" value="{{ request.path }}">
<div class="col-lg-3 rightPro">
<p class="cenaPro"> <a href="#" onclick="$(this).closest('form').submit(); return false" title="{{ project|get_answer:contractor|pk }}">
{{ project.budget }} <i class="{% fa_currency_classes project.currency %}"></i> Отказаться и переместить в архив
</p> </a>
</form>
<ul> </li>
{% if proj.secure_deal %} </ul>
<li>Безопасная сделка</li>
{% endif %}
<li>
{{ project.specialization.name }}
</li>
<li class="-hide-if-archived" style="display: none">
<form action="{% url 'projects:reject-project-answer' pk=project|get_answer:contractor|pk %}"
method="POST" novalidate>
{% csrf_token %}
<input type="hidden" name="next" value="{{ request.path }}">
<a href="#" onclick="$(this).closest('form').submit(); return false"
title="{{ project|get_answer:contractor|pk }}">
Отказаться и переместить в архив
</a>
</form>
</li>
</ul>
</div>
</div> </div>
{% endfor %} </div>
</div> {% endfor %}
</div> </div>
{% include 'partials/footer.html' %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% block personal_js %} {% block js_block %}
<script> <script>
(function () { (function() {
var $navLinks = $('a.-nav') var $navLinks = $('a.-nav')
var urlObj = new URI(window.location.href) var urlObj = new URI(window.location.href)
var query = urlObj.query(true) var query = urlObj.query(true)
$('[data-default]').addClass('_defaultActive') $('[data-default]').addClass('_defaultActive')
$navLinks.each(function (i, link) { $navLinks.each(function(i, link) {
var $link = $(link) var $link = $(link)
var paramName = $link.data('paramName') var paramName = $link.data('paramName')
var paramVal = $link.data('paramVal') var paramVal = $link.data('paramVal')
if (query[paramName] === paramVal) { if (query[paramName] === paramVal) {
$link.addClass('active') $link.addClass('active')
$('[data-param-name="' + paramName + '"][data-default]').removeClass('_defaultActive') $('[data-param-name="' + paramName + '"][data-default]').removeClass('_defaultActive')
} }
}) })
$navLinks.filter('._defaultActive').addClass('active') $navLinks.filter('._defaultActive').addClass('active')
$navLinks.on('click', function ($evt) { $navLinks.on('click', function($evt) {
var $link = $(this) var $link = $(this)
var paramName = $link.data('paramName') var paramName = $link.data('paramName')
var paramVal = $link.data('paramVal') var paramVal = $link.data('paramVal')
paramVal ? urlObj.setQuery(paramName, paramVal) : urlObj.removeQuery(paramName) paramVal ? urlObj.setQuery(paramName, paramVal) : urlObj.removeQuery(paramName)
window.location.href = urlObj.href() window.location.href = urlObj.href()
}) })
//--------------------------------------------------- //---------------------------------------------------
if (query.archived !== 'on') if (query.archived !== 'on')
$('.-hide-if-archived').css('display', 'block') $('.-hide-if-archived').css('display', 'block')
}()) }())

@ -1,38 +1,19 @@
{#{% extends 'partials/base.html' %}#} {% extends 'partials/base.html' %}
{#{% load staticfiles %}#}
{#{% load thumbnail %}#}
{#{% block content %}#}
{##}
{##}
{# {% include 'partials/header.html' %}#}
{# #}
{# <div class="container footer-border">#}
{# {% include 'partials/footer.html' %}#}
{# </div>#}
{#{% endblock %}#}
{% extends 'partials/_base.html' %}
{% load sass_tags %}
{% load static %}
{% load thumbnail %}
{% load staticfiles %} {% load staticfiles %}
{% load thumbnail %}
{% block content %}
{% block personal_css %}
<link rel='stylesheet' href='{% sass_src "sass/old_main.sass" %}'>
{% endblock %}
{% block content %} {% include 'partials/header.html' %}
<div class="old-main"> <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>
<form action="{% url 'work_sell:list' %}" method="GET" novalidate> <form action="{% url 'work_sell:list' %}" method="GET" novalidate>
<div class="col-lg-12"> <div class="col-lg-12">
<div class="filter clearfix"> <div class="filter clearfix">
<div class="triangle1"></div> <div class="triangle1"></div>
@ -52,23 +33,22 @@
<input type="hidden" class="-spec-select -spec-select-level-3" style="width: 100%"> <input type="hidden" class="-spec-select -spec-select-level-3" style="width: 100%">
</div> </div>
<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>
<input type="hidden" name="{{ form.specialization.html_name }}" <input type="hidden" name="{{ form.specialization.html_name }}" value="{{ form.specialization.value }}" class="-chosen-spec-id">
value="{{ form.specialization.value }}" class="-chosen-spec-id">
</div> </div>
<div class="searchF1"> <div class="searchF1">
<div class="col-lg-6"> <div class="col-lg-6">
<input <input
type="text" type="text"
name="keywords" name="keywords"
onkeydown="event.keyCode === 13 && $(this).closest('form').submit()" onkeydown="event.keyCode === 13 && $(this).closest('form').submit()"
value="{{ form.keywords.value }}" value="{{ form.keywords.value }}"
class="searchInp box-sizing" class="searchInp box-sizing"
placeholder="Ключевые слова"> placeholder="Ключевые слова">
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<a href="#" class="findReal" onclick="$(this).closest('form').submit(); return false"> <a href="#" class="findReal" onclick="$(this).closest('form').submit(); return false">
@ -83,6 +63,7 @@
</div> </div>
<div class="resSearchF1"> <div class="resSearchF1">
<div class="col-lg-3"> <div class="col-lg-3">
<p class="titleResF1">Расширенный поиск</p> <p class="titleResF1">Расширенный поиск</p>
@ -96,6 +77,13 @@
</div> </div>
<div class="slideRes disTab activeSlide"> <div class="slideRes disTab activeSlide">
<div class="titleF1 disTab"> <div class="titleF1 disTab">
<div class="col-lg-3">Классификация здания</div> <div class="col-lg-3">Классификация здания</div>
@ -115,6 +103,9 @@
</div> </div>
<div class="slideRes disTab activeSlide"> <div class="slideRes disTab activeSlide">
<div class="titleF1 disTab"> <div class="titleF1 disTab">
<div class="col-lg-3">Местоположение</div> <div class="col-lg-3">Местоположение</div>
@ -122,22 +113,18 @@
<div class="polsF1 disTab"> <div class="polsF1 disTab">
<div class="col-lg-3"> <div class="col-lg-3">
<input type="hidden" class="-location-select -location-select-country" <input type="hidden" class="-location-select -location-select-country" style="width: 100%">
style="width: 100%">
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<input type="hidden" class="-location-select -location-select-region" <input type="hidden" class="-location-select -location-select-region" style="width: 100%">
style="width: 100%">
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<input type="hidden" class="-location-select -location-select-city" <input type="hidden" class="-location-select -location-select-city" style="width: 100%">
style="width: 100%">
</div> </div>
<input type="hidden" id="chosenLocationId" name="{{ realty_form.location.html_name }}" <input type="hidden" id="chosenLocationId" name="{{ realty_form.location.html_name }}" value="{{ realty_form.location.value }}">
value="{{ realty_form.location.value }}">
</div> </div>
@ -146,14 +133,14 @@
</div> </div>
</form> </form>
<div class="galleryWork disTab"> <div class="galleryWork disTab">
{% for work in work_sells %} {% for work in work_sells %}
<div class="col-lg-3"> <div class="col-lg-3">
<div class="insetCol box-sizing disTab"> <div class="insetCol box-sizing disTab">
<a href="{% url 'work_sell:detail' work.pk %}"> <a href="{% url 'work_sell:detail' work.pk %}">
{% thumbnail work.get_cover "265x265" crop="center" as im %} {% thumbnail work.get_cover "265x265" crop="center" as im %}
<div class="imgGal" style="background: url('{{ im.url }}') no-repeat center;"> <div class="imgGal" style="background: url('{{ im.url }}') no-repeat center;">
<div class="imgFigure"></div> <div class="imgFigure"></div>
@ -169,32 +156,31 @@
<div class="insetCol2 box-sizing disTab"> <div class="insetCol2 box-sizing disTab">
<a href="{% url 'work_sell:detail' work.pk %}">{{ work }}</a> <a href="{% url 'work_sell:detail' work.pk %}">{{ work }}</a>
{% if request.user.pk == work.contractor.pk %} {% if request.user.pk == work.contractor.pk %}
<div class="buttonsImg" disTab> <div class="buttonsImg" disTab>
<a href="{% url 'work_sell:edit' work.pk %}"> <a href="{% url 'work_sell:edit' work.pk %}">
<div class="insetBI insetBI1"> <div class="insetBI insetBI1">
<i class="fa fa-pencil"></i> <i class="fa fa-pencil"></i>
</div> </div>
</a> </a>
<a href="{% url 'work_sell:delete' work.pk %}"> <a href="{% url 'work_sell:delete' work.pk %}">
<div class="insetBI insetBI2"> <div class="insetBI insetBI2">
<i class="fa fa-times"></i> <i class="fa fa-times"></i>
</div>
</a>
</div> </div>
</a>
</div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
<div class="col-lg-12 pagin"> <div class="col-lg-12 pagin">
{% include 'partials/pagination.html' %} {% include 'partials/pagination.html' %}
</div> </div>
{# {% include 'partials/footer.html' %}#} {% include 'partials/footer.html' %}
</div> </div>
</div> </div>
</div> {% endblock %}
{% endblock %}

Loading…
Cancel
Save