remotes/origin/setup
ArturBaybulatov 10 years ago
parent 6cf1c1e50d
commit c892800736
  1. 33
      projects/templates/projects/project_detail.html
  2. 409
      projects/templates/projects/project_list.html
  3. 0
      reviews/__init__.py
  4. 0
      reviews/admin.py
  5. 0
      reviews/apps.py
  6. 0
      reviews/migrations/0001_initial.py
  7. 0
      reviews/migrations/0002_auto_20160531_0906.py
  8. 0
      reviews/migrations/__init__.py
  9. 0
      reviews/models.py
  10. 0
      reviews/tests.py
  11. 0
      reviews/views.py
  12. 1
      specializations/templates/specializations/specialization.html
  13. 1
      specializations/templates/specializations/specialization_detail.html
  14. 3
      specializations/templates/specializations/specialization_list.html
  15. 8
      templates/home.html
  16. 3
      templates/partials/base.html
  17. 2
      templates/partials/footer.html
  18. 76
      templates/partials/header.html
  19. 21
      templates/partials/pagination.html
  20. 0
      templates/trash/chat1.html
  21. 0
      templates/trash/comparison.html
  22. 0
      templates/trash/contractor-balance.html
  23. 0
      templates/trash/contractor-filter.html
  24. 0
      templates/trash/contractor_my-office.html
  25. 0
      templates/trash/contractor_my-office_deleted-projects.html
  26. 0
      templates/trash/contractor_my-office_open-projects.html
  27. 0
      templates/trash/contractor_portfolio-detail.html
  28. 0
      templates/trash/contractor_project-detail.html
  29. 0
      templates/trash/contractor_public-profile.html
  30. 0
      templates/trash/contractor_public-profile_edit.html
  31. 0
      templates/trash/contractor_work-for-sell-detail.html
  32. 0
      templates/trash/contractor_works-for-sell.html
  33. 0
      templates/trash/customer_balance.html
  34. 0
      templates/trash/customer_create-project.html
  35. 0
      templates/trash/customer_project-detail.html
  36. 0
      templates/trash/customer_public-profile_deleted-projects.html
  37. 0
      templates/trash/customer_public-profile_edit.html
  38. 0
      templates/trash/customer_public-profile_open-projects.html
  39. 0
      templates/trash/etc_raspechatka-dokumentov.html
  40. 0
      templates/trash/etc_text.html
  41. 2
      templates/trash/project-filter.html
  42. 0
      templates/trash/sign-up_universal.html
  43. 0
      work_sell/__init__.py
  44. 0
      work_sell/admin.py
  45. 0
      work_sell/apps.py
  46. 0
      work_sell/migrations/0001_initial.py
  47. 0
      work_sell/migrations/__init__.py
  48. 0
      work_sell/models.py
  49. 0
      work_sell/tests.py
  50. 0
      work_sell/views.py

@ -1,7 +1,11 @@
{% extends 'partials/base.html' %} {% extends 'partials/base.html' %}
{% load staticfiles %} {% load staticfiles %}
{% load humanize %}
{% block content %} {% block content %}
{% load humanize %} {% include 'partials/header.html' %}
<div class="col-lg-12"> <div class="col-lg-12">
<p class="titleScore">{{ object }}</p> <p class="titleScore">{{ object }}</p>
@ -193,7 +197,6 @@
<div class="candidateBlock disTab"> <div class="candidateBlock disTab">
{% for answer in object.answers.all %} {% for answer in object.answers.all %}
<div class="candidate can-new"> <div class="candidate can-new">
<div class="col-lg-4"> <div class="col-lg-4">
<a href="#" class="aLinkExe"> <a href="#" class="aLinkExe">
@ -262,29 +265,11 @@
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
<div class="col-lg-12 pagin"> <div class="col-lg-12 pagin">
<nav> {% include 'partials/pagination.html' %}
<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>
</div> </div>
{% include 'partials/footer.html' %}
{% endblock %} {% endblock %}

@ -1,207 +1,212 @@
{% extends 'partials/base.html' %} {% extends 'partials/base.html' %}
{% block content %} {% block content %}
<div class="col-lg-12"> {% include 'partials/header.html' %}
<p class="titleScore">Биржа проектов</p>
</div> <div class="container mainScore">
<div class="col-lg-12"> <div class="row">
<div class="filter clearfix"> <div class="col-lg-12">
<div class="triangle1"></div> <p class="titleScore">Биржа проектов</p>
<div class="titleF1 disTab"> </div>
<div class="col-lg-3">Тип работ:</div> <div class="col-lg-12">
<div class="col-lg-3">Специализации:</div> <div class="filter clearfix">
<div class="col-lg-3"></div> <div class="triangle1"></div>
<div class="col-lg-3"></div> <div class="titleF1 disTab">
</div> <div class="col-lg-3">Тип работ:</div>
<div class="polsF1 disTab"> <div class="col-lg-3">Специализации:</div>
<div class="col-lg-3"> <div class="col-lg-3"></div>
<select class="selectpicker"> <div class="col-lg-3"></div>
<option>Mustard</option> </div>
<option>Ketchup</option> <div class="polsF1 disTab">
<option>Relish</option> <div class="col-lg-3">
</select> <select class="selectpicker">
</div> <option>Mustard</option>
<div class="col-lg-3"> <option>Ketchup</option>
<select class="selectpicker"> <option>Relish</option>
<option>Mustard</option> </select>
<option>Ketchup</option> </div>
<option>Relish</option> <div class="col-lg-3">
</select> <select class="selectpicker">
</div> <option>Mustard</option>
<div class="col-lg-3"> <option>Ketchup</option>
<select class="selectpicker"> <option>Relish</option>
<option>Mustard</option> </select>
<option>Ketchup</option> </div>
<option>Relish</option> <div class="col-lg-3">
</select> <select class="selectpicker">
</div> <option>Mustard</option>
<div class="col-lg-3"> <option>Ketchup</option>
<select class="selectpicker"> <option>Relish</option>
<option>Mustard</option> </select>
<option>Ketchup</option> </div>
<option>Relish</option> <div class="col-lg-3">
</select> <select class="selectpicker">
</div> <option>Mustard</option>
</div> <option>Ketchup</option>
<div class="searchF1"> <option>Relish</option>
<div class="col-lg-6"> </select>
<input type="text" class="searchInp box-sizing" placeholder="Ключевые слова" name="search"> </div>
</div> </div>
<div class="col-lg-3"> <div class="searchF1">
<a href="javascript:void(0)" class="findReal"> <div class="col-lg-6">
найти исполнителя <input type="text" class="searchInp box-sizing" placeholder="Ключевые слова" name="search">
</a> </div>
</div> <div class="col-lg-3">
<div class="col-lg-3"> <a href="javascript:void(0)" class="findReal">
<a href="javascript:void(0)" class="clearSearch"> найти исполнителя
Очистить фильт </a>
</a> </div>
</div> <div class="col-lg-3">
</div> <a href="javascript:void(0)" class="clearSearch">
<div class="resSearchF1"> Очистить фильт
<div class="col-lg-3"> </a>
<p class="titleResF1">Расширенный поиск</p> </div>
<button class="resButtonF1"> </div>
<span class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span> <div class="resSearchF1">
</button> <div class="col-lg-3">
</div> <p class="titleResF1">Расширенный поиск</p>
<div class="col-lg-9"> <button class="resButtonF1">
<div class="borderS1"></div> <span class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span>
</div> </button>
</div> </div>
<div class="slideRes disTab activeSlide"> <div class="col-lg-9">
<div class="titleF1 disTab"> <div class="borderS1"></div>
<div class="col-lg-3">Тип работ:</div> </div>
<div class="col-lg-3">Специализации:</div> </div>
<div class="col-lg-3"></div> <div class="slideRes disTab activeSlide">
<div class="col-lg-3"></div> <div class="titleF1 disTab">
</div> <div class="col-lg-3">Тип работ:</div>
<div class="polsF1 disTab"> <div class="col-lg-3">Специализации:</div>
<div class="col-lg-3"> <div class="col-lg-3"></div>
<select class="selectpicker"> <div class="col-lg-3"></div>
<option>Mustard</option> </div>
<option>Ketchup</option> <div class="polsF1 disTab">
<option>Relish</option> <div class="col-lg-3">
</select> <select class="selectpicker">
<option>Mustard</option>
<option>Ketchup</option>
<option>Relish</option>
</select>
</div>
<div class="col-lg-3">
<select class="selectpicker">
<option>Mustard</option>
<option>Ketchup</option>
<option>Relish</option>
</select>
</div>
<div class="col-lg-3">
<select class="selectpicker">
<option>Mustard</option>
<option>Ketchup</option>
<option>Relish</option>
</select>
</div>
<div class="col-lg-3">
<select class="selectpicker">
<option>Mustard</option>
<option>Ketchup</option>
<option>Relish</option>
</select>
</div>
</div>
<div class="sro">
<div class="col-lg-12">
<label><input type="checkbox" value="1" name="k"><span></span></label>
<p>Требуется допуск (СРО)</p>
</div>
</div>
</div>
</div>
</div>
<div class="col-lg-12">
<p class="titleScore">Список проектов</p>
<div class="linkSort">
<p>Сортировать по:</p>
<a href="javascript:void(0)" class="activeSort">
цене
<span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
</a>
<a href="javascript:void(0)">
cорту
<span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
</a>
<a href="javascript:void(0)">
рейтенгу
<span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
</a>
<a href="javascript:void(0)">
дате размещения
<span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
</a>
<a href="javascript:void(0)">
ответам
<span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
</a>
<a href="javascript:void(0)">
просмотрам
<span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
</a>
</div>
</div>
<div class="projectsBlock disTab">
{% for proj in object_list %}
<div class="projectPro clearfix">
<div class="col-lg-9 leftPro">
<p class="titlePro">
<a href="{% url 'projects:detail' proj.id %}">{{ proj }}</a>
</p>
<ul class="desPro">
<li>
Объект "{{ proj.realty.name }}"
</li>
<li>
<span>2</span> ответ от имени группы
</li>
</ul>
<p class="textPro">
{{ proj.text }}
</p>
<ul class="listPro">
<li>
{{ proj.created }}
</li>
<li>
523
</li>
<li>
523
</li>
<li>
{{ proj.user }}
</li>
</ul>
</div>
<div class="col-lg-3 rightPro">
<p class="cenaPro">
{{ proj.price }} <i class="fa fa-rub"></i>
</p>
<ul>
<li>
Безопасная сделка
</li>
<li>
Стадия: "П"
</li>
<li>
Отказаться и перемстить
в корзину
</li>
</ul>
</div>
</div> </div>
<div class="col-lg-3"> {% endfor %}
<select class="selectpicker"> </div>
<option>Mustard</option> <div class="col-lg-12 pagin">
<option>Ketchup</option> {% include 'partials/pagination.html' %}
<option>Relish</option> </div>
</select>
</div> {% include 'partials/footer.html' %}
<div class="col-lg-3"> </div>
<select class="selectpicker"> </div>
<option>Mustard</option>
<option>Ketchup</option>
<option>Relish</option>
</select>
</div>
<div class="col-lg-3">
<select class="selectpicker">
<option>Mustard</option>
<option>Ketchup</option>
<option>Relish</option>
</select>
</div>
</div>
<div class="sro">
<div class="col-lg-12">
<label><input type="checkbox" value="1" name="k"><span></span></label>
<p>Требуется допуск (СРО)</p>
</div>
</div>
</div>
</div>
</div>
<div class="col-lg-12">
<p class="titleScore">Список проектов</p>
<div class="linkSort">
<p>Сортировать по:</p>
<a href="javascript:void(0)" class="activeSort">
цене
<span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
</a>
<a href="javascript:void(0)">
cорту
<span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
</a>
<a href="javascript:void(0)">
рейтенгу
<span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
</a>
<a href="javascript:void(0)">
дате размещения
<span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
</a>
<a href="javascript:void(0)">
ответам
<span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
</a>
<a href="javascript:void(0)">
просмотрам
<span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
</a>
</div>
</div>
<div class="projectsBlock disTab">
{% for proj in object_list %}
<div class="projectPro clearfix">
<div class="col-lg-9 leftPro">
<p class="titlePro">
<a href="{% url 'projects:detail' proj.id %}">{{ proj }}</a>
</p>
<ul class="desPro">
<li>
Объект "{{ proj.realty.name }}"
</li>
<li>
<span>2</span> ответ от имени группы
</li>
</ul>
<p class="textPro">
{{ proj.text }}
</p>
<ul class="listPro">
<li>
{{ proj.created }}
</li>
<li>
523
</li>
<li>
523
</li>
<li>
{{ proj.user }}
</li>
</ul>
</div>
<div class="col-lg-3 rightPro">
<p class="cenaPro">
{{ proj.price }} <i class="fa fa-rub"></i>
</p>
<ul>
<li>
Безопасная сделка
</li>
<li>
Стадия: "П"
</li>
<li>
Отказаться и переместить
в корзину
</li>
</ul>
</div>
</div>
{% endfor %}
</div>
<div class="col-lg-12 pagin">
<nav>
</nav>
</div>
{% endblock %} {% endblock %}

@ -1,4 +1,5 @@
{% extends '_layout.html' %} {% extends '_layout.html' %}
{% block content %} {% block content %}
<h1>Angular setup <h1>Angular setup

@ -1,4 +1,5 @@
{% extends 'partials/base.html' %} {% extends 'partials/base.html' %}
{% block content %} {% block content %}
{{ object }} {{ object }}
{% endblock %} {% endblock %}

@ -1,4 +1,5 @@
{% extends 'partials/base.html' %} {% extends 'partials/base.html' %}
{% block content %} {% block content %}
<h1>Специализации</h1> <h1>Специализации</h1>
{% load mptt_tags %} {% load mptt_tags %}
@ -29,7 +30,7 @@
<div id="children" style="border:2px solid #000;"> <div id="children" style="border:2px solid #000;">
</div> </div>
{% block js_block %} {% block js %}
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {

@ -1,17 +1,12 @@
{% extends 'partials/base.html' %} {% extends 'partials/base.html' %}
{% load staticfiles %}
{% block content %} {% block content %}
<section class="mainContainer"> <section class="mainContainer">
{% include 'partials/header.html' %} {% include 'partials/header.html' %}
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<p class="welcomeMain">Основная задача сайта</p> <p class="welcomeMain">Основная задача сайта</p>
<p>Authed? {{ user.is_authenticated }}</p>
{{ user }}
{{ user.groups.all }}
</div> </div>
</div> </div>
@ -38,7 +33,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="youtube"></div> <div class="youtube"></div>

@ -10,9 +10,6 @@
<title>Archilance</title> <title>Archilance</title>
<!-- Prevent Angular from displaying unrendered template expressions: -->
<style>[ng-cloak] {display: none !important}</style>
<link rel='stylesheet' href='{% static "css/bootstrap.css" %}'> <link rel='stylesheet' href='{% static "css/bootstrap.css" %}'>
<link rel='stylesheet' href='{% static "css/font-awesome.min.css" %}'> <link rel='stylesheet' href='{% static "css/font-awesome.min.css" %}'>
<link rel='stylesheet' href='{% static "css/reset.css" %}'> <link rel='stylesheet' href='{% static "css/reset.css" %}'>

@ -1,5 +1,3 @@
{% extends 'partials/base.html' %}
{% load staticfiles %} {% load staticfiles %}

@ -1,20 +1,21 @@
{% load staticfiles %} {% load staticfiles %}
<div class="wrTop">
<div class="wrTop disTab">
<div class="container-fluid topMain"> <div class="container-fluid topMain">
<div class="row"> <div class="row">
<div class="col-lg-3"> <div class="col-lg-3">
<div class="logo" onClick="window.location='/'"></div> <div class="logo" onClick="window.location='/'"></div>
</div> </div>
<div class="col-lg-7"> <div class="col-lg-7">
<ul class="mainMenu"> <ul class="mainMenu">
<li> <li class="icon_tm1">
<a href="{% url 'projects:list' %}">Биржа проектов</a> <a href="{% url 'projects:list' %}">Биржа проектов</a>
<span></span>
</li> </li>
<li class="icon_tm2">
<li>
<a href="{% url 'users:contractor-list' %}">Поиск исполнителей</a> <a href="{% url 'users:contractor-list' %}">Поиск исполнителей</a>
<span></span>
</li> </li>
<li> <li>
@ -24,16 +25,67 @@
<a href="{% url 'users:customer-view' user.id %}">Мой офис</a> <a href="{% url 'users:customer-view' user.id %}">Мой офис</a>
{% endif %} {% endif %}
</li> </li>
{#<li> {# <li class="icon_tm3">#}
<a href="javascript:void(0)">Работы на продажу</a> {# <a href="javascript:void(0)">Работы на продажу</a>#}
</li>#} {# <span></span>#}
{# </li> #}
</ul> </ul>
</div> </div>
<div class="col-lg-2"> <div class="col-lg-2">
<a href="javascript:void(0)" class="reg">регистрация</a> <div class="imgProfile">
<div class="lock"></div> <img src="img/profile.jpg" alt="profile-image">
</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="#">
Войти заказчиком
<span></span>
</a>
</li>
<li class="icon_mm2">
<a href="#">
Войти исполнителем
<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>
<div class="rating">
<div class="ratingInset"></div>
<div class="iconRating"></div>
</div>
<p class="ratingPer">45%</p>
</div> </div>
</div> </div>
</div> </div>

@ -0,0 +1,21 @@
<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>

@ -667,4 +667,4 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.10.0/js/i18n/defaults-*.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.10.0/js/i18n/defaults-*.min.js"></script>
<script src="js/main.js"></script> <script src="js/main.js"></script>
</body> </body>
</html> </html>
Loading…
Cancel
Save