From dc9d0910c93f91c16481b9540f16fb06a419fb21 Mon Sep 17 00:00:00 2001 From: luxagraf Date: Sat, 5 Mar 2016 17:19:08 -0500 Subject: Added map to bird detail page --- app/birds/views.py | 8 +++++++- design/sass/_birds.scss | 14 ++++++++++++++ design/templates/details/bird.html | 20 ++++++++++++++++++-- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/app/birds/views.py b/app/birds/views.py index ea789fc..4d7f59e 100644 --- a/app/birds/views.py +++ b/app/birds/views.py @@ -39,5 +39,11 @@ class BirdDetailView(DetailView): bird__slug=self.kwargs['slug'] ) except BirdAudio.DoesNotExist: - return context + pass + try: + context['sighting'] = BirdSighting.objects.get( + bird__slug=self.kwargs['slug'] + ) + except BirdSighting.DoesNotExist: + pass return context diff --git a/design/sass/_birds.scss b/design/sass/_birds.scss index 8e82411..9662f7c 100644 --- a/design/sass/_birds.scss +++ b/design/sass/_birds.scss @@ -19,3 +19,17 @@ } .audio small { display: block;} } + +.birds { + .map { + margin: 0 auto; + width: 99%; + height: 200px; + @include constrain_wide; + @include breakpoint(beta) { + @include constrain_narrow; + } + } +} + + diff --git a/design/templates/details/bird.html b/design/templates/details/bird.html index 0a91317..9676683 100644 --- a/design/templates/details/bird.html +++ b/design/templates/details/bird.html @@ -1,13 +1,29 @@ {% extends 'base.html' %} {% block extrahead %} + {% endblock %} +{% block bodyid %}class="birds"{%endblock%} {% block primary %}
-{{object.common_name}} +
+

{{object.common_name}}

+

Seen by {% for person in sighting.seen_by.all %}{{person}}{%if forloop.last %}{%else%}{% if forloop.revcounter == 2 %}, and {%else%}, {%endif%}{%endif%}{%endfor%}

+ - +
{% endblock %} +{% block js %} + + + +{% endblock %} -- cgit v1.2.3