From ceea3dbf99fdd0b64142275fb8efb582b464647c Mon Sep 17 00:00:00 2001 From: Sergey Leschina Date: Wed, 21 Mar 2012 00:42:57 +0400 Subject: [PATCH] Add photos to house page (#1) --- house/models.py | 1 + house/views.py | 4 +++- static_base/css/content.css | 5 +++++ templates/house/house.html | 11 +++++++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/house/models.py b/house/models.py index d9b15c9..ee6752c 100644 --- a/house/models.py +++ b/house/models.py @@ -133,6 +133,7 @@ def make_upload_folder(instance, filename): house = models.ForeignKey('House', verbose_name=_("House")) file = YFField(upload_to=make_upload_folder) title = models.CharField(max_length=250, blank=True, verbose_name=_("Title")) + author = models.CharField(max_length=250, blank=True, verbose_name=_("Author")) def __unicode__(self): return self.title diff --git a/house/views.py b/house/views.py index 5727122..7eba20d 100644 --- a/house/views.py +++ b/house/views.py @@ -3,7 +3,7 @@ from django.template import RequestContext from django.conf import settings from django.db.models import Count, Max, Min -from house.models import Street, House +from house.models import * def index_page(request): @@ -36,9 +36,11 @@ def street(request, id): def house(request, id): h = House.objects.get(pk=id) + photo = HousePhoto.objects.filter(house=h) return render_to_response('house/house.html', { 'house': h, + 'photo': photo, 'is_admin': True, 'CMADE_KEY': settings.CMADE_KEY, }, context_instance=RequestContext(request)) diff --git a/static_base/css/content.css b/static_base/css/content.css index 35a185c..6db367b 100644 --- a/static_base/css/content.css +++ b/static_base/css/content.css @@ -28,6 +28,11 @@ table.info { width: 100%; } +table.info.photo { + text-align: center; + margin-top: -1px; +} + .info th { text-align: right; } diff --git a/templates/house/house.html b/templates/house/house.html index 3f407e2..1b55a41 100644 --- a/templates/house/house.html +++ b/templates/house/house.html @@ -122,4 +122,15 @@

{{ house.street }}, {{ house.num {% endif %} + +{% if house.kult_id %} + +{% for p in photo %} + +{% endfor %} +
+ Автор: {{ p.author }} +
+{% endif %} + {% endblock %}