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

#ARC-9 Fixes url links and template tags

Browse Source
remotes/origin/PR-39
Mukhtar 10 years ago
parent 99d88a87f4
commit cc7446fc47
9 changed files with 59 additions and 40 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. 2
      chat/templates/chat_customer.html
  2. 28
      users/templates/contractor_filter.html
  3. 2
      users/templates/contractor_office.html
  4. 16
      users/templates/contractor_profile.html
  5. 9
      users/templates/partials/customer_profile_info_block.html
  6. 10
      users/templates/user_financial_info_edit.html
  7. 5
      users/templates/user_profile_edit.html
  8. 10
      users/views.py
  9. 17
      work_sell/templates/worksell_detail.html

2
chat/templates/chat_customer.html
Unescape View File

@ -41,7 +41,7 @@
{% endif %}
</div>
<p class="nameMess">
<div><a href="#">{{ contact.username }} {{ contact.username }}</a></div>
<div><a href="#">{{ contact.username }}</a></div>
</p>
<a href="#" data-target="#userModal" data-toggle="modal"

28
users/templates/contractor_filter.html
Unescape View File

@ -1,6 +1,8 @@
{% extends 'partials/base.html' %}
{% load common_tags %}
{% load specializtions_tags %}
{% load thumbnail %}
{% block content %}
{% include 'partials/header.html' %}
@ -213,14 +215,6 @@
<span>Интерьеры</span>
<span>2-й</span>
</div>
<div class="insetSpec">
<span>Визуализация/3D</span>
<span>45-й</span>
</div>
<div class="insetSpec">
<span>Экстерьеры</span>
<span>10-й</span>
</div>
<div class="showSpec">
<div class="insetSpec">
<span>Архитектура</span>
@ -313,11 +307,21 @@
{% with contractor=obj %}
<div class="executorBlock clearfix">
<div class="col-lg-4">
<a href="#" class="aLinkExe"><div class="imgExecutor">
<img src="img/profile.jpg" alt="execitor-image">
</div></a>
<a href="{% url 'users:contractor-profile' pk=obj.pk %}" class="aLinkExe">
<div class="imgExecutor">
{% if contractor.avatar %}
{% thumbnail contractor.avatar "126x125" crop="center" as im %}
<img src="{{ im.url }}" alt="profile-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="profile-image">
{% endif %}
</div>
</a>
<p class="nameExecutor">
<a href="#">{{ contractor.get_full_name }} [{{ contractor.username }}]</a>
<a href="{% url 'users:contractor-profile' pk=obj.pk %}">{{ contractor.get_full_name }} [{{ contractor.username }}]</a>
</p>
<p class="navv2">На сайте 8 лет и 3 месяца</p>
<div class="statusUser">Свободен</div>

2
users/templates/contractor_office.html
Unescape View File

@ -16,7 +16,7 @@
<div class="profileTabs">
<ul class="nav nav-tabs nav-justified">
<li role="presentation">
<a href="#">Поиск исполнителей</a>
<a href="{% url 'users:contractor-filter' %}">Поиск исполнителей</a>
</li>
<li role="presentation" class="active">

16
users/templates/contractor_profile.html
Unescape View File

@ -71,7 +71,7 @@
<div class="statusUser">Свободен</div>
{% endif %}
<a href="javascript:void(0)" class="showCon">показать контакты</a>
<a href="#" data-toggle="modal" data-target="#contact-contactor-modal" class="showCon">показать контакты</a>
</div>
<div class="col-lg-4">
{% specialization_widget contractor.pk %}
@ -89,6 +89,20 @@
</div>
</div>
<div id="contact-contactor-modal" class="modal fade">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×
</button>
<h4 class="modal-title">Контакты владельца </h4>
</div>
<div class="modal-body">
<h2>Здесь находятся контакты владельца</h2>
</div>
</div>
</div>
</div>
<div class="col-lg-9">
<div class="profileTabs2">
<ul class="nav nav-tabs nav-justified">

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

@ -27,9 +27,12 @@
</div>
<div class="col-lg-4">
<a href="javascript:void(0)" class="new-prop new-prop1">показать контакты</a>
<a href="javascript:void(0)" class="new-prop new-prop2">написать сообщение</a>
<a href="{% url 'users:user-profile-edit' pk=pk %}" class="new-red">редактировать профиль</a>
{% if request.user.pk != customer.pk %}
<a href="javascript:void(0)" class="new-prop new-prop1">показать контакты</a>
<a href="{% url 'chat:chat-user' %}?user_id={{ pk }}" class="new-prop new-prop2">написать сообщение</a>
{% else %}
<a href="{% url 'users:user-profile-edit' pk=pk %}" class="new-red">редактировать профиль</a>
{% endif %}
</div>
</div>

10
users/templates/user_financial_info_edit.html
Unescape View File

@ -1,6 +1,6 @@
{% extends 'partials/base.html' %}
{% load thumbnail %}
{% block content %}
{% include 'partials/header.html' %}
@ -20,7 +20,13 @@
<div class="col-lg-3 divCol3">
<div class="avatar">
<div class="avatarInset">
<img src="{{ form.avatar.value.url }}" alt="profile-image">
{% if form.avatar.value %}
{% thumbnail form.avatar.value "235x224" crop="center" as im %}
<img src="{{ im.url }}" alt="profile-image">
{% endthumbnail %}
{% endif %}
</div>
</div>
<div class="menuUser upload-img disTab">

5
users/templates/user_profile_edit.html
Unescape View File

@ -23,7 +23,10 @@
<div class="avatar">
<div class="avatarInset">
{% if form.avatar.value %}
<img src="{{ form.avatar.value.url }}" alt="profile-image">
{% thumbnail form.avatar.value "235x224" crop="center" as im %}
<img src="{{ im.url }}" alt="profile-image">
{% endthumbnail %}
{% endif %}
</div>
</div>

10
users/views.py
Unescape View File

@ -204,8 +204,9 @@ class ContractorFilterView(BaseMixin, View):
if get_contractors:
contractors = User.contractor_objects.filter(cro=cro)
# contractors = User.contractor_objects.filter(cro=cro)
contractors = User.contractor_objects
if specialization:
contractors = contractors.filter(
contractor_specializations__lft__gte=specialization.lft,
@ -230,8 +231,9 @@ class ContractorFilterView(BaseMixin, View):
if get_teams:
teams = Team.objects.filter(Q(contractors__cro=cro) | Q(owner__cro=cro))
# teams = Team.objects.filter(Q(contractors__cro=cro) | Q(owner__cro=cro))
teams = Team.objects
if specialization:
teams = teams.filter(
(

17
work_sell/templates/worksell_detail.html
Unescape View File

@ -39,26 +39,13 @@
</div>
{% endif %}
<div class="col-lg-3">
<a href="#" data-toggle="modal" data-target="#contact-contactor-modal" class="linkReady LR3">
<a href="{% url 'users:contractor-profile' object.contractor.pk %}" class="linkReady LR3">
посмотреть контакты
</a>
</div>
</div>
<div id="contact-contactor-modal" class="modal fade">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×
</button>
<h4 class="modal-title">Контакты владельца </h4>
</div>
<div class="modal-body">
<h2>Здесь находятся контакты владельца</h2>
</div>
</div>
</div>
</div>
<div class="desReadyBlock">
<div class="col-lg-10 col-lg-offset-1">

Write Preview
Loading…
Cancel
Save