parent
d369019f30
commit
6909abe875
14 changed files with 782 additions and 362 deletions
@ -1,131 +1,137 @@ |
||||
{% load staticfiles %} |
||||
{% load thumbnail %} |
||||
<div class="wrTop {% if request.user.is_authenticated %} disTab {% endif %}"> |
||||
<div class="container-fluid topMain"> |
||||
<div class="row"> |
||||
<div class="col-lg-3"> |
||||
<div class="logo" onClick="window.location='/'"></div> |
||||
</div> |
||||
{% if request.user.is_authenticated %} |
||||
<div class="col-lg-7"> |
||||
<ul class="mainMenu"> |
||||
<li class="icon_tm1"> |
||||
<a href="{% url 'projects:project-filter' %}">Биржа проектов</a> |
||||
<span></span> |
||||
</li> |
||||
{% load staticfiles %} |
||||
{% load thumbnail %} |
||||
|
||||
<div class="wrTop {% if request.user.is_authenticated %} disTab {% endif %}"> |
||||
<div class="container-fluid topMain"> |
||||
<div class="row"> |
||||
<div class="col-lg-3"> |
||||
<div class="logo" onClick="window.location='/'"></div> |
||||
</div> |
||||
|
||||
{% if request.user.is_authenticated %} |
||||
<div class="col-lg-7"> |
||||
<ul class="mainMenu"> |
||||
<li class="icon_tm1"> |
||||
<a href="{% url 'projects:project-filter' %}">Биржа проектов</a> |
||||
<span></span> |
||||
</li> |
||||
|
||||
{% if request.user.is_contractor %} |
||||
<li class="officeList icon_tml"> |
||||
<a href="{% url 'users:contractor-office' pk=request.user.pk %}">Мой офис</a> |
||||
<span></span> |
||||
</li> |
||||
<li class="officeList icon_tml"> |
||||
<a href="{% url 'users:contractor-office' pk=request.user.pk %}">Мой офис</a> |
||||
<span></span> |
||||
</li> |
||||
{% endif%} |
||||
|
||||
{% if request.user.is_customer %} |
||||
<li class="icon_tm2"> |
||||
<a href="{% url 'users:contractor-list' %}">Поиск исполнителей</a> |
||||
<span></span> |
||||
</li> |
||||
<li class="icon_tm3"> |
||||
<a href="{% url 'users:contractor-list' %}">Работы на продажу</a> |
||||
<span></span> |
||||
</li> |
||||
<a href="{% url 'users:contractor-filter' %}">Поиск исполнителей</a> |
||||
<span></span> |
||||
</li> |
||||
<li class="icon_tm3"> |
||||
<a href="#">Работы на продажу</a> |
||||
<span></span> |
||||
</li> |
||||
{% endif %} |
||||
</ul> |
||||
</div> |
||||
{% else %} |
||||
</ul> |
||||
</div> |
||||
{% else %} |
||||
<div class="col-lg-7"> |
||||
<ul class="mainMenu"> |
||||
<li class="icon_tm1"> |
||||
<a href="{% url 'projects:project-filter' %}">Биржа проектов</a> |
||||
<span></span> |
||||
</li> |
||||
<li class="icon_tm2"> |
||||
<a href="{% url 'users:contractor-list' %}">Поиск исполнителей</a> |
||||
<span></span> |
||||
</li> |
||||
<li class="icon_tm3"> |
||||
<a href="{% url 'users:contractor-list' %}">Работы на продажу</a> |
||||
<span></span> |
||||
</li> |
||||
</ul> |
||||
</div> |
||||
{% endif %} |
||||
{% if request.user.is_authenticated %} |
||||
<div class="col-lg-2"> |
||||
<div class="imgProfile"> |
||||
{% if request.user.is_contractor %} |
||||
<a href="{% url 'users:contractor-profile' pk=request.user.pk %}"> |
||||
{% thumbnail request.user.avatar "75x75" crop="center" as im %} |
||||
<img src="{{ im.url }}" alt="profile-image"> |
||||
{% endthumbnail %} |
||||
</a> |
||||
{% elif request.user.is_customer %} |
||||
<a href="{% url 'users:customer-profile-open-projects' pk=request.user.pk %}"> |
||||
{% thumbnail request.user.avatar "75x75" crop="center" as im %} |
||||
<img src="{{ im.url }}" alt="profile-image"> |
||||
{% endthumbnail %} |
||||
</a> |
||||
{% endif %} |
||||
</div> |
||||
<div class="infoProfile disTab"> |
||||
<div class="btn-group" role="group"> |
||||
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> |
||||
<span class="glyphicon glyphicon-menu-hamburger" aria-hidden="true"></span> |
||||
</button> |
||||
<ul class="dropdown-menu menu-drop-new"> |
||||
<li class="icon_mm1"> |
||||
<a href="{% url 'auth_login' %}"> |
||||
Войти заказчиком |
||||
<span></span> |
||||
</a> |
||||
</li> |
||||
<li class="icon_mm2"> |
||||
<a href="{% url 'auth_login' %}"> |
||||
Войти исполнителем |
||||
<span></span> |
||||
</a> |
||||
</li> |
||||
<li class="icon_mm3"> |
||||
<a href="#"> |
||||
Сообщения |
||||
<span></span> |
||||
</a> |
||||
</li> |
||||
<li class="icon_mm4"> |
||||
<a href="#"> |
||||
Счет |
||||
<span></span> |
||||
</a> |
||||
</li> |
||||
<li class="icon_mm5"> |
||||
<a href="#"> |
||||
Настройки |
||||
<span></span> |
||||
</a> |
||||
</li> |
||||
<li class="icon_mm6"> |
||||
<a href="#"> |
||||
FAQ |
||||
<span></span> |
||||
</a> |
||||
</li> |
||||
</ul> |
||||
</div> |
||||
</div> |
||||
<ul class="mainMenu"> |
||||
<li class="icon_tm1"> |
||||
<a href="{% url 'projects:project-filter' %}">Биржа проектов</a> |
||||
<span></span> |
||||
</li> |
||||
<li class="icon_tm2"> |
||||
<a href="{% url 'users:contractor-filter' %}">Поиск исполнителей</a> |
||||
<span></span> |
||||
</li> |
||||
<li class="icon_tm3"> |
||||
<a href="#">Работы на продажу</a> |
||||
<span></span> |
||||
</li> |
||||
</ul> |
||||
</div> |
||||
{% endif %} |
||||
|
||||
{% if request.user.is_authenticated %} |
||||
<div class="col-lg-2"> |
||||
<div class="imgProfile"> |
||||
{% if request.user.is_contractor %} |
||||
<a href="{% url 'users:contractor-profile' pk=request.user.pk %}"> |
||||
{% thumbnail request.user.avatar "75x75" crop="center" as im %} |
||||
<img src="{{ im.url }}" alt="profile-image"> |
||||
{% endthumbnail %} |
||||
</a> |
||||
{% elif request.user.is_customer %} |
||||
<a href="{% url 'users:customer-profile-open-projects' pk=request.user.pk %}"> |
||||
{% thumbnail request.user.avatar "75x75" crop="center" as im %} |
||||
<img src="{{ im.url }}" alt="profile-image"> |
||||
{% endthumbnail %} |
||||
</a> |
||||
{% endif %} |
||||
</div> |
||||
|
||||
<div class="infoProfile disTab"> |
||||
<div class="btn-group" role="group"> |
||||
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> |
||||
<span class="glyphicon glyphicon-menu-hamburger" aria-hidden="true"></span> |
||||
</button> |
||||
<ul class="dropdown-menu menu-drop-new"> |
||||
<li class="icon_mm1"> |
||||
<a href="{% url 'auth_login' %}"> |
||||
Войти заказчиком |
||||
<span></span> |
||||
</a> |
||||
</li> |
||||
<li class="icon_mm2"> |
||||
<a href="{% url 'auth_login' %}"> |
||||
Войти исполнителем |
||||
<span></span> |
||||
</a> |
||||
</li> |
||||
<li class="icon_mm3"> |
||||
<a href="#"> |
||||
Сообщения |
||||
<span></span> |
||||
</a> |
||||
</li> |
||||
<li class="icon_mm4"> |
||||
<a href="#"> |
||||
Счет |
||||
<span></span> |
||||
</a> |
||||
</li> |
||||
<li class="icon_mm5"> |
||||
<a href="#"> |
||||
Настройки |
||||
<span></span> |
||||
</a> |
||||
</li> |
||||
<li class="icon_mm6"> |
||||
<a href="#"> |
||||
FAQ |
||||
<span></span> |
||||
</a> |
||||
</li> |
||||
</ul> |
||||
</div> |
||||
</div> |
||||
|
||||
{% if request.user.is_contractor %} |
||||
<div class="rating"> |
||||
<div class="ratingInset"></div> |
||||
<div class="iconRating"></div> |
||||
</div> |
||||
<p class="ratingPer">45%</p> |
||||
<div class="rating"> |
||||
<div class="ratingInset"></div> |
||||
<div class="iconRating"></div> |
||||
</div> |
||||
<p class="ratingPer">45%</p> |
||||
{% endif %} |
||||
</div> |
||||
{% else %} |
||||
<div class="col-lg-2"> |
||||
<a href="{% url 'registration_register' %}" class="reg">Регистрация</a> |
||||
<div class="lock"></div> |
||||
</div> |
||||
{% endif %} |
||||
</div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
{% else %} |
||||
<div class="col-lg-2"> |
||||
<a href="{% url 'registration_register' %}" class="reg">Регистрация</a> |
||||
<div class="lock"></div> |
||||
</div> |
||||
{% endif %} |
||||
</div> |
||||
</div> |
||||
</div> |
||||
|
||||
@ -1,21 +1,29 @@ |
||||
<nav> |
||||
<ul class="pagination"> |
||||
<li> |
||||
<a href="#" aria-label="Previous"> |
||||
<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span> |
||||
</a> |
||||
</li> |
||||
<li class="active"><a href="#">1</a></li> |
||||
<li><a href="#">2</a></li> |
||||
<li><a href="#">3</a></li> |
||||
<li><a href="#">4</a></li> |
||||
<li><a href="#">5</a></li> |
||||
<li>...</li> |
||||
<li><a href="#">17</a></li> |
||||
<li> |
||||
<a href="#" aria-label="Next"> |
||||
<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span> |
||||
</a> |
||||
</li> |
||||
</ul> |
||||
</nav> |
||||
{% if is_paginated %} |
||||
<nav> |
||||
<ul class="pagination"> |
||||
{% if page_obj.has_previous %} |
||||
<li> |
||||
<button type="submit" name="page" value="{{ page_obj.previous_page_number }}">Previous</button> |
||||
</li> |
||||
{% endif %} |
||||
|
||||
{% for n in page_obj.paginator.page_range %} |
||||
{% if n == page_obj.number %} |
||||
<li class="i active"> |
||||
<button type="submit" name="page" value="{{ n }}" class="i" disabled>{{ n }}</button> |
||||
</li> |
||||
{% else %} |
||||
<li> |
||||
<button type="submit" name="page" value="{{ n }}">{{ n }}</button> |
||||
</li> |
||||
{% endif %} |
||||
{% endfor %} |
||||
|
||||
{% if page_obj.has_next %} |
||||
<li> |
||||
<button type="submit" name="page" value="{{ page_obj.next_page_number }}">Next</button> |
||||
</li> |
||||
{% endif %} |
||||
</ul> |
||||
</nav> |
||||
{% endif %} |
||||
|
||||
@ -0,0 +1,261 @@ |
||||
{% extends 'partials/base.html' %} |
||||
|
||||
{% load common_tags %} |
||||
|
||||
{% block content %} |
||||
{% include 'partials/header.html' %} |
||||
|
||||
|
||||
<div class="container mainScore"> |
||||
<div class="row"> |
||||
<div class="col-lg-12"> |
||||
<p class="titleScore">Поиск исполнителей</p> |
||||
</div> |
||||
|
||||
|
||||
<form action="{% url 'users:contractor-filter' %}" method="GET" novalidate> |
||||
<div class="col-lg-12"> |
||||
<div class="filter clearfix"> |
||||
<div class="triangle1"></div> |
||||
|
||||
|
||||
<div class="titleF1 disTab"> |
||||
<div class="col-lg-3">Специализации</div> |
||||
</div> |
||||
<div class="polsF1 disTab"> |
||||
<div class="col-lg-3"> |
||||
<input type="hidden" class="-spec-select -spec-select-level-1" style="width: 100%"> |
||||
</div> |
||||
<div class="col-lg-3"> |
||||
<input type="hidden" class="-spec-select -spec-select-level-2" style="width: 100%"> |
||||
</div> |
||||
<div class="col-lg-3"> |
||||
<input type="hidden" class="-spec-select -spec-select-level-3" style="width: 100%"> |
||||
</div> |
||||
<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="{{ form.specialization.html_name }}" value="{{ form.specialization.value }}"> |
||||
</div> |
||||
|
||||
|
||||
|
||||
|
||||
<div class="titleF1 titleF2 disTab"> |
||||
<div class="col-lg-3">Местоположение</div> |
||||
</div> |
||||
|
||||
|
||||
<div class="searchF1 polsF1 polsFF polsF3"> |
||||
<div class="col-lg-3"> |
||||
<input type="hidden" class="-location-select -location-select-country" style="width: 100%"> |
||||
</div> |
||||
|
||||
<div class="col-lg-3"> |
||||
<input type="hidden" class="-location-select -location-select-region" style="width: 100%"> |
||||
</div> |
||||
|
||||
<div class="col-lg-3"> |
||||
<input type="hidden" class="-location-select -location-select-city" style="width: 100%"> |
||||
</div> |
||||
|
||||
<input type="hidden" id="chosenLocationId" name="{{ form.location.html_name }}" value="{{ form.location.value }}"> |
||||
|
||||
|
||||
|
||||
<div class="col-lg-3"> |
||||
<a href="#" class="findReal" onclick="$(this).closest('form').submit(); return false"> |
||||
найти исполнителя |
||||
</a> |
||||
</div> |
||||
<div class="col-lg-3"> |
||||
<a href="{% url 'users:contractor-filter' %}" class="clearSearch"> |
||||
Очистить фильтр |
||||
</a> |
||||
</div> |
||||
</div> |
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="resSearchF1"> |
||||
<div class="col-lg-3"> |
||||
<p class="titleResF1">Расширенный поиск</p> |
||||
<button class="resButtonF1"> |
||||
<span class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span> |
||||
</button> |
||||
</div> |
||||
<div class="col-lg-9"> |
||||
<div class="borderS1"></div> |
||||
</div> |
||||
</div> |
||||
|
||||
</div> |
||||
</div> |
||||
|
||||
|
||||
|
||||
<div class="buttonGP disTab"> |
||||
<div class="btn-group valProject valProject2" role="group" aria-label="..."> |
||||
<button type="button" class="btn btn-default">Все</button> |
||||
<button type="button" class="btn btn-default">Группы</button> |
||||
<button type="button" class="btn btn-default">Исполнители</button> |
||||
</div> |
||||
<div class="polsF1 disTab polsSearch"> |
||||
<div class="col-lg-3"> |
||||
<select class="selectpicker"> |
||||
<option>Mustard</option> |
||||
<option>Ketchup</option> |
||||
<option>Relish</option> |
||||
</select> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
|
||||
|
||||
|
||||
|
||||
{% for contractor in contractors %} |
||||
<div class="executorBlock clearfix"> |
||||
<div class="col-lg-4"> |
||||
<a href="#" class="aLinkExe"><div class="imgExecutor"> |
||||
<img src="img/profile.jpg" alt="execitor-image"> |
||||
</div></a> |
||||
<p class="nameExecutor"> |
||||
<a href="#">{{ contractor.get_full_name }} [{{ contractor.username }}]</a> |
||||
</p> |
||||
<p class="navv2">На сайте 8 лет и 3 месяца</p> |
||||
<div class="statusUser">Свободен</div> |
||||
</div> |
||||
|
||||
|
||||
<div class="col-lg-2"> |
||||
<ul class="listExecutor"> |
||||
<li> |
||||
<a href="javascript:void(0)"> |
||||
смотреть профиль |
||||
</a> |
||||
</li> |
||||
<li> |
||||
<a href="javascript:void(0)"> |
||||
предложить проект |
||||
</a> |
||||
</li> |
||||
<li> |
||||
<a href="javascript:void(0)"> |
||||
написать сообщение |
||||
</a> |
||||
</li> |
||||
</ul> |
||||
</div> |
||||
|
||||
|
||||
<div class="col-lg-3"> |
||||
<div class="dashedCol4 dashedCol44"> |
||||
<p class="specUser"> |
||||
Специализации: |
||||
</p> |
||||
<div class="insetSpec"> |
||||
<span>Интерьеры</span> |
||||
<span>2-й</span> |
||||
</div> |
||||
<div class="insetSpec"> |
||||
<span>Визуализация/3D</span> |
||||
<span>45-й</span> |
||||
</div> |
||||
<div class="insetSpec"> |
||||
<span>Экстерьеры</span> |
||||
<span>10-й</span> |
||||
</div> |
||||
<div class="showSpec"> |
||||
<div class="insetSpec"> |
||||
<span>Архитектура</span> |
||||
<span>3-й</span> |
||||
</div> |
||||
<div class="insetSpec"> |
||||
<span>3D Моделирование</span> |
||||
<span>100-й</span> |
||||
</div> |
||||
</div> |
||||
<button class="showPress"> |
||||
|
||||
</button> |
||||
</div> |
||||
</div> |
||||
|
||||
|
||||
<div class="col-lg-3 retts"> |
||||
<ul class="rettList restList2"> |
||||
<li>Рейтинг: <span> 1245</span></li> |
||||
<li>Безопасные сделки: <span> 5</span></li> |
||||
<li> |
||||
<a href="javascript:void(0)">Отзывы: |
||||
<span> + 385</span> |
||||
<small> 0</small> |
||||
<mark> - 0</mark> |
||||
</a> |
||||
</li> |
||||
</ul> |
||||
<div class="sroUser sroExecutor"> |
||||
<div class="iconSRO"></div> |
||||
<p>Есть допуск СРО</p> |
||||
</div> |
||||
</div> |
||||
|
||||
|
||||
<div class="gallMini disTab"> |
||||
<div class="col-lg-3"> |
||||
<a href="#" class="linkInsetCol"> |
||||
<div class="insetCol box-sizing disTab"> |
||||
<div class="imgGal"> |
||||
<div class="imgFigure"></div> |
||||
</div> |
||||
</div> |
||||
</a> |
||||
</div> |
||||
<div class="col-lg-3"> |
||||
<a href="#" class="linkInsetCol"> |
||||
<div class="insetCol box-sizing disTab"> |
||||
<div class="imgGal"> |
||||
<div class="imgFigure"></div> |
||||
</div> |
||||
</div> |
||||
</a> |
||||
</div> |
||||
<div class="col-lg-3"> |
||||
<a href="#" class="linkInsetCol"> |
||||
<div class="insetCol box-sizing disTab"> |
||||
<div class="imgGal"> |
||||
<div class="imgFigure"></div> |
||||
</div> |
||||
</div> |
||||
</a> |
||||
</div> |
||||
<div class="col-lg-3"> |
||||
<a href="#" class="linkInsetCol"> |
||||
<div class="insetCol box-sizing disTab"> |
||||
<div class="imgGal"> |
||||
<div class="imgFigure"></div> |
||||
</div> |
||||
</div> |
||||
</a> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
{% endfor %} |
||||
|
||||
|
||||
|
||||
<div class="col-lg-12 pagin"> |
||||
{% include 'partials/pagination.html' %} |
||||
</div> |
||||
</form> |
||||
|
||||
|
||||
{% include 'partials/footer.html' %} |
||||
</div> |
||||
</div> |
||||
{% endblock %} |
||||
@ -1,7 +0,0 @@ |
||||
{% extends 'partials/base.html' %} |
||||
|
||||
|
||||
{% block content %} |
||||
<h1>Исполнители</h1> |
||||
|
||||
{% endblock %} |
||||
Loading…
Reference in new issue