From 46d8c5cb73066723889a08342a42a471360e758b Mon Sep 17 00:00:00 2001 From: PekopT Date: Mon, 29 Aug 2016 22:31:46 +0300 Subject: [PATCH 1/5] various --- users/templates/contractor_office_open_projects.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/templates/contractor_office_open_projects.html b/users/templates/contractor_office_open_projects.html index 306191d..8b20fef 100644 --- a/users/templates/contractor_office_open_projects.html +++ b/users/templates/contractor_office_open_projects.html @@ -20,7 +20,7 @@
Все Личные - От именни группы + От имени группы
From f055e4c4ffd02a0f6ff598df1e2ea394ffd33211 Mon Sep 17 00:00:00 2001 From: PekopT Date: Mon, 29 Aug 2016 22:35:52 +0300 Subject: [PATCH 2/5] #ARC-8 11 --- projects/models.py | 2 +- projects/templates/portfolio_detail.html | 4 ++-- work_sell/templates/worksell_detail.html | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/models.py b/projects/models.py index 35ea510..e1de565 100644 --- a/projects/models.py +++ b/projects/models.py @@ -290,7 +290,7 @@ class Portfolio(models.Model): construction_type = models.ForeignKey(ConstructionType, related_name='portfolios', null=True, blank=True) created = models.DateTimeField(auto_now_add=True, auto_created=True) currency = models.CharField(max_length=20, default='rur', choices=CURRENCIES, null=True, blank=True) - description = models.TextField() + description = models.TextField(blank=True) location = TreeForeignKey('common.Location', related_name='portfolios', null=True, blank=True) name = models.CharField(max_length=255) specialization = TreeForeignKey(Specialization, related_name='portfolios', null=True, blank=True) diff --git a/projects/templates/portfolio_detail.html b/projects/templates/portfolio_detail.html index 8d4ae53..5c85ebf 100644 --- a/projects/templates/portfolio_detail.html +++ b/projects/templates/portfolio_detail.html @@ -47,13 +47,13 @@
- {% if object.text %} + {% if object.description %}

Описание:

- {{ object.text }} + {{ object.description }}

{% endif %} diff --git a/work_sell/templates/worksell_detail.html b/work_sell/templates/worksell_detail.html index e43e153..8111bd7 100644 --- a/work_sell/templates/worksell_detail.html +++ b/work_sell/templates/worksell_detail.html @@ -48,13 +48,13 @@
- {% if object.text %} + {% if object.description %}

Описание:

- {{ object.text }} + {{ object.description }}

{% endif %} From 32962d40d1665d757d2d88359196ce79619ec788 Mon Sep 17 00:00:00 2001 From: PekopT Date: Mon, 29 Aug 2016 22:46:10 +0300 Subject: [PATCH 3/5] #ARC-8 8-14 --- projects/templates/portfolio_detail.html | 67 ++---- work_sell/templates/worksell_detail.html | 266 +++++++++++------------ 2 files changed, 153 insertions(+), 180 deletions(-) diff --git a/projects/templates/portfolio_detail.html b/projects/templates/portfolio_detail.html index 5c85ebf..5721e31 100644 --- a/projects/templates/portfolio_detail.html +++ b/projects/templates/portfolio_detail.html @@ -47,63 +47,40 @@
- {% if object.description %} -
-

Описание:

-
-
-

- {{ object.description }} -

-
- {% endif %} + {% if object.description %} +
+

Описание:

+
+
+

+ {{ object.description }} +

+
+ {% endif %}
-
-
+ {% if object.photos.all|length > 1 %} +
+
+ {% endif %}
-
{% for photo in object.photos.all %}
{% endfor %}
-
-
-
- {% for photo in object.photos.all %} -
- {% endfor %} + {% if object.photos.all|length > 1 %} +
+
+ {% for photo in object.photos.all %} +
+ {% endfor %} +
-
+ {% endif %}
-{#
#} -{#
#} -{#
#} -{#
#} -{#
#}
-{#
#} -{#

Похожие работы

#} -{#
#} -{#
#} -{# {% for worksell in worksell_related %}#} -{#
#} -{##} -{#
#} -{# {% thumbnail worksell.get_cover "265x265" crop="center" as im %}#} -{#
#} -{#
#} -{#
#} -{# {% endthumbnail %}#} -{#
#} -{#
#} -{# {% endfor %}#} -{#
#} - {% include 'partials/footer.html' %} -
diff --git a/work_sell/templates/worksell_detail.html b/work_sell/templates/worksell_detail.html index 8111bd7..6fe56c4 100644 --- a/work_sell/templates/worksell_detail.html +++ b/work_sell/templates/worksell_detail.html @@ -2,152 +2,148 @@ {% load staticfiles %} {% load thumbnail %} {% block content %} - {% include 'partials/header.html' %} -
-
-
-

{{ object }}

+ {% include 'partials/header.html' %} +
+
+
+

{{ object }}

- {% if object.get_prev %} -
-

предыдущий

-
- {% endif %} + {% if object.get_prev %} +
+

предыдущий

+
+ {% endif %} - {% if object.get_next %} -
-

следующий

-
- {% endif %} -
-
-
-
-

{{ object.budget }}

-
- {% if request.user.is_authenticated %} -
- - купить - -
+ {% if object.get_next %} +
+

следующий

+
+ {% endif %} +
+
+
+
+

{{ object.budget }}

+
+ {% if request.user.is_authenticated %} +
+ + купить + +
-
- - Написать сообщение - -
- {% endif %} -
- - посмотреть контакты - -
-
+
+ + Написать сообщение + +
+ {% endif %} +
+ + посмотреть контакты + +
+
+
+ {% if object.description %} +
+

Описание:

+
+
+

+ {{ object.description }} +

+
+ {% endif %} +
+ {% if object.photos.all|length > 1 %} +
+
+ {% endif %} +
+
+ {% for photo in object.photos.all %} +
+ {% endfor %} +
+
+ {% if object.photos.all|length > 1 %} +
+
+ {% for photo in object.photos.all %} +
+ {% endfor %} +
+
+ {% endif %} +
+
+
+

Похожие работы

+
-
- {% if object.description %} -
-

Описание:

-
-
-

- {{ object.description }} -

-
- {% endif %} -
-
-
-
-
-
- {% for photo in object.photos.all %} -
- {% endfor %} -
-
-
-
-
- {% for photo in object.photos.all %} -
- {% endfor %} -
-
-
-{#
#} -{#
#} -{#
#} -{#
#} -{#
#} -
-
-

Похожие работы

-
+
+ {% for worksell in worksell_related %} +
+
+ {% thumbnail worksell.get_cover "265x265" crop="center" as im %} + +
+
+
+ + {% endthumbnail %} +
+
+ {% endfor %} +
+ {% include 'partials/footer.html' %} -
- {% for worksell in worksell_related %} -
- -
- {% thumbnail worksell.get_cover "265x265" crop="center" as im %} -
-
-
- {% endthumbnail %} -
-
- {% endfor %} -
- - {% include 'partials/footer.html' %} - -
-
+
+
{% endblock %} {% block js_block %} - - + - {% endblock %} + } + }); + +{% endblock %} From d5b4a5569347761479272a9d2908db6375151ee8 Mon Sep 17 00:00:00 2001 From: PekopT Date: Mon, 29 Aug 2016 22:48:01 +0300 Subject: [PATCH 4/5] #ARC-8 8-14 --- projects/templates/portfolio_detail.html | 25 ------------------------ 1 file changed, 25 deletions(-) diff --git a/projects/templates/portfolio_detail.html b/projects/templates/portfolio_detail.html index 5721e31..5013bfb 100644 --- a/projects/templates/portfolio_detail.html +++ b/projects/templates/portfolio_detail.html @@ -20,31 +20,6 @@
{% endif %}
- {#
#} - {#
#} - {#
#} - {#

{{ object.budget }}

#} - {#
#} - {# {% if request.user.is_authenticated %}#} - {#
#} - {# #} - {# купить#} - {# #} - {#
#} - {##} - {#
#} - {# #} - {# Написать сообщение#} - {# #} - {#
#} - {# {% endif %}#} - {#
#} - {# #} - {# посмотреть контакты#} - {# #} - {#
#} - {#
#} -
{% if object.description %} From c408bd7cc9d6dd97ee10b8e95f4af2d6e5ae76cd Mon Sep 17 00:00:00 2001 From: PekopT Date: Mon, 29 Aug 2016 23:17:09 +0300 Subject: [PATCH 5/5] various --- users/templates/contractor_office.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/templates/contractor_office.html b/users/templates/contractor_office.html index 50730f7..6e7b635 100644 --- a/users/templates/contractor_office.html +++ b/users/templates/contractor_office.html @@ -17,7 +17,7 @@
- {% if False and contractor.team %} + {% if contractor.team %}