From cc7446fc4770652347ae1c18db8c3e2f4b582770 Mon Sep 17 00:00:00 2001 From: Mukhtar Date: Mon, 15 Aug 2016 23:14:58 +0300 Subject: [PATCH] #ARC-9 Fixes url links and template tags --- chat/templates/chat_customer.html | 2 +- users/templates/contractor_filter.html | 28 +++++++++++-------- users/templates/contractor_office.html | 2 +- users/templates/contractor_profile.html | 16 ++++++++++- .../partials/customer_profile_info_block.html | 9 ++++-- users/templates/user_financial_info_edit.html | 10 +++++-- users/templates/user_profile_edit.html | 5 +++- users/views.py | 10 ++++--- work_sell/templates/worksell_detail.html | 17 ++--------- 9 files changed, 59 insertions(+), 40 deletions(-) diff --git a/chat/templates/chat_customer.html b/chat/templates/chat_customer.html index 8faf966..c1869f9 100644 --- a/chat/templates/chat_customer.html +++ b/chat/templates/chat_customer.html @@ -41,7 +41,7 @@ {% endif %}

-

{{ contact.username }} {{ contact.username }}
+
{{ contact.username }}

Интерьеры 2-й -
- Визуализация/3D - 45-й -
-
- Экстерьеры - 10-й -
Архитектура @@ -313,11 +307,21 @@ {% with contractor=obj %}
-
- execitor-image -
+ +
+ + {% if contractor.avatar %} + {% thumbnail contractor.avatar "126x125" crop="center" as im %} + profile-image + {% endthumbnail %} + + {% else %} + profile-image + {% endif %} +
+

- {{ contractor.get_full_name }} [{{ contractor.username }}] + {{ contractor.get_full_name }} [{{ contractor.username }}]

Свободен
diff --git a/users/templates/contractor_office.html b/users/templates/contractor_office.html index 22a8955..f780884 100644 --- a/users/templates/contractor_office.html +++ b/users/templates/contractor_office.html @@ -16,7 +16,7 @@
{% specialization_widget contractor.pk %} @@ -89,6 +89,20 @@
+
diff --git a/users/templates/user_financial_info_edit.html b/users/templates/user_financial_info_edit.html index 640691f..77c4104 100644 --- a/users/templates/user_financial_info_edit.html +++ b/users/templates/user_financial_info_edit.html @@ -1,6 +1,6 @@ {% extends 'partials/base.html' %} - +{% load thumbnail %} {% block content %} {% include 'partials/header.html' %} @@ -20,7 +20,13 @@
- profile-image + {% if form.avatar.value %} + {% thumbnail form.avatar.value "235x224" crop="center" as im %} + profile-image + {% endthumbnail %} + + {% endif %} +
{% endif %}
- +