Merge branch 'master' of http://code.brln.tv/diffusion/ARCH/archilance into mukhtar
Mukhtar
10 years ago
commit
b8b4cf4a3d
12 changed files with 392 additions and 447 deletions
@ -1,11 +1,37 @@ |
||||
{% extends 'partials/base.html' %} |
||||
|
||||
{% block head %} |
||||
<meta http-equiv="refresh" content="15;URL='{% url 'wallets:score-detail' pk=request.user.pk %}'"> |
||||
{% endblock %} |
||||
|
||||
{% block content %} |
||||
<div class='container-fluid'> |
||||
<div class='row'> |
||||
<div class='col-xs-12' style='margin-top: 15px'> |
||||
<h1 style="text-align: center">{{ message }}</h1> |
||||
{% include 'partials/header.html' %} |
||||
|
||||
<div class="container mainScore"> |
||||
<div class="row"> |
||||
<div class='col-xs-12' style='margin-top: 15px; text-align: center'> |
||||
<h1>{{ message }}</h1> |
||||
|
||||
{% if request.user.is_authenticated %} |
||||
<div> |
||||
<a href="{% url 'wallets:score-detail' pk=request.user.pk %}"> |
||||
Вернуться на страницу личного счёта |
||||
</a> |
||||
|
||||
(автоматически через 15 секунд) |
||||
</div> |
||||
{% endif %} |
||||
</div> |
||||
|
||||
{% include 'partials/footer.html' %} |
||||
</div> |
||||
</div> |
||||
{% endblock %} |
||||
|
||||
{% block js_block %} |
||||
<script> |
||||
setTimeout(function() { |
||||
window.location.href = '{% url 'wallets:score-detail' pk=request.user.pk %}' |
||||
}, 15000) |
||||
</script> |
||||
{% endblock %} |
||||
|
||||
@ -1,95 +0,0 @@ |
||||
{% extends 'partials/base.html' %} |
||||
|
||||
{% load staticfiles %} |
||||
{% load specializtions_tags %} |
||||
{% load thumbnail %} |
||||
|
||||
{% 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' with contractor_pk=request.user.pk active='open' all_project_count=projects_count %} |
||||
<div class="buttonGP disTab"> |
||||
<div class="btn-group valProject2" role="group" aria-label="..."> |
||||
<a href="{% url 'users:contractor-office-open-projects' pk=request.user.pk %}" class="btn btn-default">Все</a> |
||||
<a href="{% url 'users:contractor-office-open-projects' pk=request.user.pk %}?owner=private" class="btn btn-default">Личные</a> |
||||
<a href="{% url 'users:contractor-office-open-projects' pk=request.user.pk %}?owner=teams" class="btn btn-default">От именни группы</a> |
||||
</div> |
||||
<div class="btn-group valProject2" role="group" aria-label="..."> |
||||
<button type="button" class="btn btn-default"> |
||||
Открытые проекты |
||||
<span><mark>{{ current_projects_count }}</mark> / <span>{{ projects_count }}</span></span> |
||||
</button> |
||||
<button type="button" class="btn btn-default"> |
||||
Архив |
||||
<span><mark></mark><span>{{ archive_count }}</span></span> |
||||
</button> |
||||
</div> |
||||
</div> |
||||
<div class="projectsBlock disTab"> |
||||
{% for proj in open_projects %} |
||||
<div class="projectPro clearfix"> |
||||
<div class="col-lg-9 leftPro"> |
||||
<a href="{% url 'projects:detail' proj.pk %}"> |
||||
<p class="titlePro"> |
||||
{{ proj }} |
||||
</p> |
||||
</a> |
||||
<ul class="desPro"> |
||||
<li> |
||||
Объект "{{ proj.realty.name }}" |
||||
</li> |
||||
</ul> |
||||
<p class="textPro"> |
||||
</p> |
||||
<ul class="listPro"> |
||||
<li> |
||||
{{ proj.created }} |
||||
</li> |
||||
<li> |
||||
0 |
||||
</li> |
||||
<li> |
||||
0 |
||||
</li> |
||||
<li> |
||||
{{ proj.customer.username }} |
||||
</li> |
||||
</ul> |
||||
</div> |
||||
<div class="col-lg-3 rightPro"> |
||||
<p class="cenaPro"> |
||||
{{ proj.budget }} <i class="fa fa-rub"></i> |
||||
</p> |
||||
<ul> |
||||
{% if proj.cro %} |
||||
<li> |
||||
Безопасная сделка |
||||
</li> |
||||
{% endif %} |
||||
|
||||
<li> |
||||
<form action="{% url 'projects:contractor-answer-archive' %}" method="POST" novalidate> |
||||
{% csrf_token %} |
||||
<input type="hidden" name="next" value="{{ request.path }}"> |
||||
<input type="hidden" name="project_pk" value="{{ proj.pk }}"> |
||||
<input type="hidden" name="user_pk" value="{{ request.user.pk }}"> |
||||
<a href="#" onclick="$(this).closest('form').submit(); return false">Отказаться и переместить в архив</a> |
||||
</form> |
||||
|
||||
</li> |
||||
|
||||
</ul> |
||||
</div> |
||||
</div> |
||||
{% endfor %} |
||||
</div> |
||||
|
||||
{% include 'partials/footer.html' %} |
||||
</div> |
||||
</div> |
||||
{% endblock %} |
||||
@ -1,30 +1,33 @@ |
||||
{% url 'users:contractor-office' pk=contractor.pk as contractor_office_url %} |
||||
{% url 'users:contractor-office-open-projects' pk=contractor.pk as contractor_office_open_projects_url %} |
||||
|
||||
<div class="profileTabs"> |
||||
<ul class="nav nav-tabs nav-justified"> |
||||
<li role="presentation"> |
||||
<a href="{% url 'users:contractor-filter' %}">Поиск исполнителей </a> |
||||
</li> |
||||
<li role="presentation" {% if active == 'groups' %}class="active"{% endif %}> |
||||
<a href="{% url 'users:contractor-office' pk=contractor_pk %}" > |
||||
Мои группы |
||||
</a> |
||||
<div class="roundsCount"> |
||||
</div> |
||||
</li> |
||||
<li role="presentation" {% if active == 'open' %}class="active"{% endif %}> |
||||
<a href="{% url 'users:contractor-office-open-projects' pk=contractor_pk %}" >Открытые проекты</a> |
||||
<span class="desPresent"> |
||||
в процессе обсуждения |
||||
</span> |
||||
<div class="roundsCount"> |
||||
<div class="countR">0</div> |
||||
<div class="countG">{{ all_project_count}}</div> |
||||
</div> |
||||
</li> |
||||
<li role="presentation"> |
||||
<a href="{% url 'chat:chat-user' %}">Проекты в работе</a> |
||||
<div class="roundsCount"> |
||||
<div class="countG">0</div> |
||||
</div> |
||||
</li> |
||||
</ul> |
||||
</div> |
||||
<ul class="nav nav-tabs nav-justified"> |
||||
<li role="presentation"> |
||||
<a href="{% url 'users:contractor-filter' %}">Поиск исполнителей</a> |
||||
</li> |
||||
|
||||
<li role="presentation" {% if request.path == contractor_office_url %}class="active"{% endif %}> |
||||
<a href="{{ contractor_office_url }}">Мои группы</a> |
||||
<div class="roundsCount"></div> |
||||
</li> |
||||
|
||||
<li role="presentation" {% if request.path == contractor_office_open_projects_url %}class="active"{% endif %}> |
||||
<a href="{{ contractor_office_open_projects_url }}" >Открытые проекты</a> |
||||
<span class="desPresent">в процессе обсуждения</span> |
||||
|
||||
<div class="roundsCount"> |
||||
<div class="countR">0</div> |
||||
<div class="countG">{{ all_project_count }}</div> |
||||
</div> |
||||
</li> |
||||
|
||||
<li role="presentation"> |
||||
<a href="{% url 'chat:chat-user' %}">Проекты в работе</a> |
||||
|
||||
<div class="roundsCount"> |
||||
<div class="countG">0</div> |
||||
</div> |
||||
</li> |
||||
</ul> |
||||
</div> |
||||
|
||||
Loading…
Reference in new issue