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

Fixes

Browse Source
remotes/origin/PR-39
ArturBaybulatov 10 years ago
parent ca8ccecbd4
commit d2ef084ed8
4 changed files with 61 additions and 54 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. 2
      templates/partials/base.html
  2. 12
      users/templates/customer_profile_open_projects.html
  3. 7
      users/templates/customer_profile_trashed_projects.html
  4. 18
      users/templates/partials/customer_profile_info_block.html

2
templates/partials/base.html
Unescape View File

@ -37,7 +37,7 @@
{% endfor %} {% endfor %}
{% endif %} {% endif %}
<div style="position: absolute; left: 0; top: 0; padding: 6px; color: black; background-color: {% if request.user.is_contractor %}#BADA55{% else %}#C0FFEE{% endif %}; z-index: 50"> <div ondblclick="$(this).css('display', 'none')" style="position: absolute; left: 0; bottom: 0; padding: 6px; color: black; background-color: {% if request.user.is_contractor %}#BADA55{% else %}#C0FFEE{% endif %}; z-index: 50">
{{ request.user }}<br> {{ request.user }}<br>
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}

12
users/templates/customer_profile_open_projects.html
Unescape View File

@ -29,11 +29,13 @@
</div> </div>
</div> </div>
{% if request.user.is_customer %}
<div class="col-lg-3 col-lg-offset-1"> <div class="col-lg-3 col-lg-offset-1">
<p class="addWork add-work-new"> <p class="addWork add-work-new">
<a href="{% url 'projects:customer-project-create' %}">Разместить заказ</a> <a href="{% url 'projects:customer-project-create' %}">Разместить заказ</a>
</p> </p>
</div> </div>
{% endif %}
</div> </div>
<div class="projectsBlock new-pro-block disTab"> <div class="projectsBlock new-pro-block disTab">
@ -50,9 +52,9 @@
</ul> </ul>
<ul class="color-menu"> <ul class="color-menu">
<li><a href="#">Новые: 0</a></li> <li><a href="#">Новые: {{ proj.answers.count|sub:proj.candidates.count }}</a></li>
<li><a href="#">Кандидаты: 0</a></li> <li><a href="#">Кандидаты: {{ proj.candidates.count }}</a></li>
<li><a href="#">Отказал: 0</a></li> <li><a href="#">Отказал: {{ proj.rejected_answers_count }}</a></li>
</ul> </ul>
<p class="textPro"> <p class="textPro">
@ -62,7 +64,7 @@
<ul class="listPro"> <ul class="listPro">
<li>{{ proj.created}}</li> <li>{{ proj.created}}</li>
<li>0</li> <li>0</li>
<li>0</li> <li>{{ proj.answers.count }}</li>
<li>{{ customer.get_full_name }}</li> <li>{{ customer.get_full_name }}</li>
</ul> </ul>
</div> </div>
@ -72,6 +74,7 @@
{{ proj.budget }} <i class="fa fa-rub"></i> {{ proj.budget }} <i class="fa fa-rub"></i>
</p> </p>
{% if request.user == proj.customer %}
<ul> <ul>
<li> <li>
<a href='{% url 'projects:customer-project-edit' pk=proj.pk %}?back={{ request.path }}'>Редактировать</a> <a href='{% url 'projects:customer-project-edit' pk=proj.pk %}?back={{ request.path }}'>Редактировать</a>
@ -85,6 +88,7 @@
</form> </form>
</li> </li>
</ul> </ul>
{% endif %}
</div> </div>
</div> </div>
{% endfor %} {% endfor %}

7
users/templates/customer_profile_trashed_projects.html
Unescape View File

@ -56,10 +56,10 @@
{{ proj.created}} {{ proj.created}}
</li> </li>
<li> <li>
523 0
</li> </li>
<li> <li>
523 {{ proj.answers.count }}
</li> </li>
<li> <li>
{{ customer.get_full_name }} {{ customer.get_full_name }}
@ -70,6 +70,8 @@
<p class="cenaPro"> <p class="cenaPro">
{{ proj.budget }} <i class="fa fa-rub"></i> {{ proj.budget }} <i class="fa fa-rub"></i>
</p> </p>
{% if request.user == proj.customer %}
<ul> <ul>
<li> <li>
<form action="{% url 'projects:customer-project-restore' pk=proj.pk %}" method="POST"> <form action="{% url 'projects:customer-project-restore' pk=proj.pk %}" method="POST">
@ -89,6 +91,7 @@
</form> </form>
</li> </li>
</ul> </ul>
{% endif %}
</div> </div>
</div> </div>
{% endfor %} {% endfor %}

18
users/templates/partials/customer_profile_info_block.html
Unescape View File

@ -41,21 +41,21 @@
<ul class="nav nav-tabs nav-justified"> <ul class="nav nav-tabs nav-justified">
{% url 'users:customer-profile-open-projects' pk=pk as a %} {% url 'users:customer-profile-open-projects' pk=pk as a %}
{% url 'users:customer-profile-trashed-projects' pk=pk as a2 %} {% url 'users:customer-profile-trashed-projects' pk=pk as a2 %}
{% url 'users:customer-profile-current-projects' pk=pk as b %} {# {% url 'users:customer-profile-current-projects' pk=pk as b %}#}
{% url 'users:customer-profile-reviews' pk=pk as c %} {% url 'users:customer-profile-reviews' pk=pk as c %}
<li role="presentation" {% if request.path == a or request.path == a2 %}class="active"{% endif %}> <li role="presentation" {% if request.path == a or request.path == a2 %}class="active"{% endif %}>
<a href="{{ a }}">Открытые проекты</a> <a href="{{ a }}">Открытые проекты</a>
</li> </li>
<li role="presentation" {% if request.path == b %}class="active"{% endif %}> {# <li role="presentation" {% if request.path == b %}class="active"{% endif %}>#}
<a href="{{ b }}">Текущие проекты</a> {# <a href="{{ b }}">Текущие проекты</a>#}
{# #}
<div class="roundsCount"> {# <div class="roundsCount">#}
<div class="countR">0</div> {# <div class="countR">0</div>#}
<div class="countG">0</div> {# <div class="countG">0</div>#}
</div> {# </div>#}
</li> {# </li>#}
<li role="presentation" {% if request.path == c %}class="active"{% endif %}> <li role="presentation" {% if request.path == c %}class="active"{% endif %}>
<a href="{{ c }}">Отзывы</a> <a href="{{ c }}">Отзывы</a>

Write Preview
Loading…
Cancel
Save