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

Merge branch 'PR-55'

Browse Source
remotes/origin/HEAD
booblegum 9 years ago
parent 63f7140a60 37cdbe19e0
commit 7c1d49c21b
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
Unified 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. 20
      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. 32
      users/templates/contractor_office.html
  8. 15
      users/templates/contractor_office_chat_projects.html
  9. 36
      users/templates/contractor_office_open_projects.html
  10. 58
      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 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

1
assets/sass/old_main.sass
Unescape View File

@ -320,6 +320,7 @@
.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

20
projects/templates/project_filter.html
Unescape View File

@ -1,20 +1,16 @@
{% extends 'partials/base.html' %} {% extends 'partials/_base.html' %}
{% load staticfiles %} {% load staticfiles %}
{% load sass_tags %} {% load sass_tags %}
{% block head_css %} {% block personal_css %}
{# <link rel='stylesheet' href='{% static "lib/proekton-components/css/fonts.css" %}'>#} <link rel='stylesheet' href='{% sass_src "sass/old_main.sass" %}'>
{# <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 %}
{% include 'partials/header.html' %} <div class="old-main">
<div class="container mainScore "> <div class="container mainScore ">
<div class=" "> <div class="row">
<div class="col-lg-12 "> <div class="col-lg-12 ">
<p class="titleScore">Поиск заказов</p> <p class="titleScore">Поиск заказов</p>
</div> </div>
@ -25,14 +21,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 js_block %} {% block personal_js %}
{{ 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>

12
templates/home.html
Unescape View File

@ -28,7 +28,6 @@
{% 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>
@ -68,20 +67,18 @@
</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>
@ -120,7 +117,6 @@
</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>

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

@ -38,8 +38,9 @@
&.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

2
users/templates/contractor_filter.html
Unescape View File

@ -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" style="padding: 0 15px"> <div class="row">
<div class="col-lg-12 "> <div class="col-lg-12 ">
<p class="titleScore">Поиск Исполнителей</p> <p class="titleScore">Поиск Исполнителей</p>
</div> </div>

32
users/templates/contractor_office.html
Unescape View File

@ -1,13 +1,19 @@
{% 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">
@ -54,14 +60,16 @@
<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 style="color: red">{{ form_team.name.errors.as_text }}</span> <p>Название <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> <button type="button" class="btn btn-default" data-dismiss="modal">Закрыть
</button>
<button type="submit" class="btn btn-primary">Сохранить</button> <button type="submit" class="btn btn-primary">Сохранить</button>
</div> </div>
</form> </form>
@ -96,7 +104,8 @@
</div> </div>
<div class="menuUser disTab"> <div class="menuUser disTab">
<a href="#" onclick="return false" data-toggle="modal" data-target="#addTeamMemberModal" <a href="#" onclick="return false" data-toggle="modal"
data-target="#addTeamMemberModal"
class="add-man -add-team-member"> class="add-man -add-team-member">
добавить участника добавить участника
</a> </a>
@ -196,7 +205,8 @@
<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" href="<%- portfolio.photos[0].img %>"> <a class="open-modal-image"
href="<%- portfolio.photos[0].img %>">
<div class="imgFigure"></div> <div class="imgFigure"></div>
</a> </a>
</div> </div>
@ -225,7 +235,8 @@
<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" href="<%- workSell.photos[0].img %>"> <a class="open-modal-image"
href="<%- workSell.photos[0].img %>">
<div class="imgFigure"></div> <div class="imgFigure"></div>
</a> </a>
</div> </div>
@ -237,7 +248,8 @@
</div> </div>
</div> </div>
<div class="insetCol2 box-sizing disTab"> <div class="insetCol2 box-sizing disTab">
<a href="<%- workSellAbsUrl %>"><%- trunc({length: 50}, workSell.name) <a href="<%- workSellAbsUrl %>"><%- trunc({length: 50},
workSell.name)
%></a> %></a>
</div> </div>
</div> </div>
@ -292,12 +304,12 @@
</div> </div>
{% endif %} {% endif %}
{% include 'partials/footer.html' %} </div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% block js_block %} {% block personal_js %}
<script> <script>
(function () { (function () {
// Pagination --------------------------------------------------- // Pagination ---------------------------------------------------

15
users/templates/contractor_office_chat_projects.html
Unescape View File

@ -1,14 +1,17 @@
{% 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 %}
{% 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">
@ -127,16 +130,14 @@
</div> </div>
<!-- End block Tab2--> <!-- End block Tab2-->
{% include 'order_info.html' %} {% include 'order_info.html' %}
</div> </div>
</div>
{% include 'partials/footer.html' %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% block js_block %} {% block personal_js %}
<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 }}';

36
users/templates/contractor_office_open_projects.html
Unescape View File

@ -1,13 +1,17 @@
{% 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 %}
{% include 'partials/header.html' %}
{% block content %}
<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">
@ -18,18 +22,23 @@
<div class="buttonGP disTab"> <div class="buttonGP disTab">
<div class="btn-group valProject2" role="group"> <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-default 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="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>
<div class="btn-group valProject2" role="group"> <div class="btn-group valProject2" role="group">
<a href="#" data-param-name="archived" data-default onclick="return false" class="btn btn-default -nav"> <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> <span><mark>{{ open_project_count }}</mark><!-- / <span>0</span>--></span>
</a> </a>
<a href="#" data-param-name="archived" data-param-val="on" onclick="return false" class="btn btn-default -nav"> <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> <span><mark></mark><span>{{ archived_project_count }}</span></span>
</a> </a>
@ -91,11 +100,13 @@
</li> </li>
<li class="-hide-if-archived" style="display: none"> <li class="-hide-if-archived" style="display: none">
<form action="{% url 'projects:reject-project-answer' pk=project|get_answer:contractor|pk %}" method="POST" novalidate> <form action="{% url 'projects:reject-project-answer' pk=project|get_answer:contractor|pk %}"
method="POST" novalidate>
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="next" value="{{ request.path }}"> <input type="hidden" name="next" value="{{ request.path }}">
<a href="#" onclick="$(this).closest('form').submit(); return false" title="{{ project|get_answer:contractor|pk }}"> <a href="#" onclick="$(this).closest('form').submit(); return false"
title="{{ project|get_answer:contractor|pk }}">
Отказаться и переместить в архив Отказаться и переместить в архив
</a> </a>
</form> </form>
@ -105,13 +116,12 @@
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
</div>
{% include 'partials/footer.html' %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% block js_block %} {% block personal_js %}
<script> <script>
(function () { (function () {
var $navLinks = $('a.-nav') var $navLinks = $('a.-nav')

58
work_sell/templates/worksells_list.html
Unescape View File

@ -1,11 +1,30 @@
{% extends 'partials/base.html' %} {#{% extends 'partials/base.html' %}#}
{% load staticfiles %} {#{% 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 thumbnail %}
{% block content %} {% load staticfiles %}
{% block personal_css %}
<link rel='stylesheet' href='{% sass_src "sass/old_main.sass" %}'>
{% endblock %}
{% include 'partials/header.html' %} {% block content %}
<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">
@ -36,7 +55,8 @@
<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 }}" 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>
@ -63,7 +83,6 @@
</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>
@ -77,13 +96,6 @@
</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>
@ -103,9 +115,6 @@
</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>
@ -113,18 +122,22 @@
<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" style="width: 100%"> <input type="hidden" class="-location-select -location-select-country"
style="width: 100%">
</div> </div>
<div class="col-lg-3"> <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>
<div class="col-lg-3"> <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> </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> </div>
@ -180,7 +193,8 @@
</div> </div>
{% include 'partials/footer.html' %} {# {% include 'partials/footer.html' %}#}
</div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
Write Preview
Loading…
Cancel
Save