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

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

Browse Source 
Поправлены съехавшие Подвалы
В форме нового заказа поправлен отступ линии от кнопки дополнительных параметров
На главной поднять кнопки на 15 пикселей
remotes/origin/HEAD
booblegum 9 years ago
parent 63f7140a60
commit 37cdbe19e0
10 changed files with 459 additions and 429 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. 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

1
assets/sass/components/custom-components.sass
Unescape View File

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

1
assets/sass/old_main.sass
Unescape View File

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

38
projects/templates/project_filter.html
Unescape View File

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

12
templates/home.html
Unescape View File

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

5
templates/partials/sass/home.sass
Unescape View File

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

2
users/templates/contractor_filter.html
Unescape View File

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

478
users/templates/contractor_office.html
Unescape View File

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

17
users/templates/contractor_office_chat_projects.html
Unescape View File

@ -1,15 +1,18 @@
{% extends 'partials/base.html' %}
{% extends 'partials/_base.html' %}
{% load staticfiles %}
{% load project_tags %}
{% load specializtions_tags %}
{% load thumbnail %}
{% load sass_tags %}
{% block personal_css %}
<link rel='stylesheet' href='{% sass_src "sass/old_main.sass" %}'>
{% endblock %}
{% block content %}
{% include 'partials/header.html' %}
<div class="container mainScore">
<div class="old-main">
<div class="container mainScore">
<div class="row">
<div class="col-lg-12">
<p class="titleScore">Личный кабинет</p>
@ -127,16 +130,14 @@
</div>
<!-- End block Tab2-->
{% include 'order_info.html' %}
</div>
{% include 'partials/footer.html' %}
</div>
</div>
</div>
{% endblock %}
{% block js_block %}
{% block personal_js %}
<script type="text/javascript">
var userId = {{ request.user.pk }};
var domain = '{{ request.META.HTTP_HOST }}';

212
users/templates/contractor_office_open_projects.html
Unescape View File

@ -1,59 +1,68 @@
{% extends 'partials/base.html' %}
{% extends 'partials/_base.html' %}
{% load project_tags %}
{% load specializtions_tags %}
{% load thumbnail %}
{% load sass_tags %}
{% block personal_css %}
<link rel='stylesheet' href='{% sass_src "sass/old_main.sass" %}'>
{% endblock %}
{% block content %}
{% include 'partials/header.html' %}
<div class="container mainScore" >
<div class="row">
<div class="col-lg-12">
<p class="titleScore">Личный кабинет</p>
</div>
{% include 'partials/contractor_profile_tabs.html' %}
<div class="buttonGP disTab">
<div class="btn-group valProject2" role="group">
<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" 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>
</div>
<div class="btn-group valProject2" role="group">
<a href="#" data-param-name="archived" data-default onclick="return false" class="btn btn-default -nav">
Открытые проекты
<span><mark>{{ open_project_count }}</mark><!-- / <span>0</span>--></span>
</a>
<a href="#" data-param-name="archived" data-param-val="on" onclick="return false" class="btn btn-default -nav">
Архив
<span><mark></mark><span>{{ archived_project_count }}</span></span>
</a>
</div>
</div>
<div class="projectsBlock disTab">
{% for project in projects %}
<div class="projectPro clearfix">
<div class="col-lg-9 leftPro">
<a href="{% url 'projects:detail' project.pk %}">
<p class="titlePro">{{ project.name }}</p>
</a>
{% if project.realty and project.realty.name %}
<ul class="desPro">
<li>Объект "{{ project.realty.name }}"</li>
</ul>
{% endif %}
<p class="textPro">{{ project.text|linebreaksbr|truncatechars:300 }}</p>
{% if TEMPLATE_DEBUG %}
<pre><!--
<div class="old-main">
<div class="container mainScore">
<div class="row">
<div class="col-lg-12">
<p class="titleScore">Личный кабинет</p>
</div>
{% include 'partials/contractor_profile_tabs.html' %}
<div class="buttonGP disTab">
<div class="btn-group valProject2" role="group">
<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"
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>
</div>
<div class="btn-group valProject2" role="group">
<a href="#" data-param-name="archived" data-default onclick="return false"
class="btn btn-default -nav">
Открытые проекты
<span><mark>{{ open_project_count }}</mark><!-- / <span>0</span>--></span>
</a>
<a href="#" data-param-name="archived" data-param-val="on" onclick="return false"
class="btn btn-default -nav">
Архив
<span><mark></mark><span>{{ archived_project_count }}</span></span>
</a>
</div>
</div>
<div class="projectsBlock disTab">
{% for project in projects %}
<div class="projectPro clearfix">
<div class="col-lg-9 leftPro">
<a href="{% url 'projects:detail' project.pk %}">
<p class="titlePro">{{ project.name }}</p>
</a>
{% if project.realty and project.realty.name %}
<ul class="desPro">
<li>Объект "{{ project.realty.name }}"</li>
</ul>
{% endif %}
<p class="textPro">{{ project.text|linebreaksbr|truncatechars:300 }}</p>
{% if TEMPLATE_DEBUG %}
<pre><!--
--><b>State:</b> {{ project.state }}<br><!--
--><br><!--
--><b>Specialization:</b> {{ project.specialization }}<br><!--
@ -66,86 +75,87 @@
--><br><!--
--><b>Build. classif.:</b> {{ project.realty.building_classification }}<br><!--
--></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 %}
<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>
<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 %}
<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>
{% include 'partials/footer.html' %}
{% endfor %}
</div>
</div>
</div>
</div>
{% endblock %}
{% block js_block %}
{% block personal_js %}
<script>
(function() {
(function () {
var $navLinks = $('a.-nav')
var urlObj = new URI(window.location.href)
var query = urlObj.query(true)
$('[data-default]').addClass('_defaultActive')
$navLinks.each(function(i, link) {
$navLinks.each(function (i, link) {
var $link = $(link)
var paramName = $link.data('paramName')
var paramVal = $link.data('paramVal')
if (query[paramName] === paramVal) {
$link.addClass('active')
$('[data-param-name="' + paramName + '"][data-default]').removeClass('_defaultActive')
}
})
$navLinks.filter('._defaultActive').addClass('active')
$navLinks.on('click', function($evt) {
$navLinks.on('click', function ($evt) {
var $link = $(this)
var paramName = $link.data('paramName')
var paramVal = $link.data('paramVal')
paramVal ? urlObj.setQuery(paramName, paramVal) : urlObj.removeQuery(paramName)
window.location.href = urlObj.href()
})
//---------------------------------------------------
if (query.archived !== 'on')
$('.-hide-if-archived').css('display', 'block')
}())

122
work_sell/templates/worksells_list.html
Unescape View File

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