diff options
| -rw-r--r-- | app/jrnl/views.py | 11 | ||||
| -rw-r--r-- | design/sass/_archives.scss | 5 | ||||
| -rw-r--r-- | design/sass/_details.scss | 7 | ||||
| -rw-r--r-- | design/templates/jrnl/entry_detail.html | 2 |
4 files changed, 21 insertions, 4 deletions
diff --git a/app/jrnl/views.py b/app/jrnl/views.py index 1d4a965..1a29898 100644 --- a/app/jrnl/views.py +++ b/app/jrnl/views.py @@ -1,5 +1,6 @@ from django.views.generic import ListView from django.views.generic.detail import DetailView +from django.views.generic.dates import DateDetailView from django.views.generic.dates import YearArchiveView, MonthArchiveView from django.contrib.syndication.views import Feed from django.shortcuts import get_object_or_404 @@ -71,8 +72,9 @@ class EntryMonthArchiveView(MonthArchiveView): template_name = "archives/writing_date.html" -class EntryDetailView(DetailView): +class EntryDetailView(DateDetailView): model = Entry + date_field = 'pub_date' slug_field = "slug" def get_queryset(self): @@ -80,7 +82,12 @@ class EntryDetailView(DetailView): return queryset.select_related('location').prefetch_related('field_notes').prefetch_related('books') def get_object(self, queryset=None): - obj = super(EntryDetailView, self).get_object(queryset=queryset) + obj = get_object_or_404( + self.model, + slug=self.kwargs['slug'], + pub_date__month=self.kwargs['month'], + pub_date__year=self.kwargs['year'] + ) self.location = obj.location return obj diff --git a/design/sass/_archives.scss b/design/sass/_archives.scss index 29f33df..c477467 100644 --- a/design/sass/_archives.scss +++ b/design/sass/_archives.scss @@ -292,7 +292,10 @@ } .post-location { color: lighten($body_font_light, 5); - + a { + color: lighten($body_font_light, 5); + text-decoration: none; + } } .btn { @include smcaps; diff --git a/design/sass/_details.scss b/design/sass/_details.scss index 8550695..7348916 100644 --- a/design/sass/_details.scss +++ b/design/sass/_details.scss @@ -139,6 +139,13 @@ h4.post-source { } } } + +.post-location { + a { + color: $secondary_link_color; + text-decoration: none; + } +} //### PAGE NAVIGATION ### .nav-wrapper { @include constrain_narrow(); diff --git a/design/templates/jrnl/entry_detail.html b/design/templates/jrnl/entry_detail.html index c7ad0a6..260096d 100644 --- a/design/templates/jrnl/entry_detail.html +++ b/design/templates/jrnl/entry_detail.html @@ -41,7 +41,7 @@ class="detail {%if t == 1 or t == 3 or t == 5 %}double{%else%}single{%endif%}{%i <h1 class="p-name entry-title post-title" itemprop="headline">{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|safe}}{%endif%}</h1> <time class="dt-published published dt-updated post-date" datetime="{{object.pub_date|date:'c'}}" itemprop="datePublished">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time> <aside class="p-location h-adr adr post-location" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place"> - {% if object.country.name == "United States" %}<span class="p-locality locality">{{object.location.name|smartypants|safe}}</span>, <a class="p-region region" href="/jrnl/united-states/" title="travel writing from the United States">{{object.state.name|safe}}</a>, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location.name|smartypants|safe}}</span>, <a class="p-country-name country-name" href="/jrnl/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name|safe}}</a>{%endif%} + {% if object.country_name == "United States" %}<span class="p-locality locality">{{object.location_name|smartypants|safe}}</span>, <a class="p-region region" href="/jrnl/united-states/" title="travel writing from the United States">{{object.state_name|safe}}</a>, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location_name|smartypants|safe}}</span>, <a class="p-country-name country-name" href="/jrnl/{{object.country.slug}}/" title="travel writing from {{object.country_name}}">{{object.country_name|safe}}</a>{%endif%} {% with object.get_template_name_display as t %}{%if t == "single" or t == "single-dark" %} – <a href="" onclick="showMap({{object.latitude}}, {{object.longitude}}, { type:'point', lat:'{{object.latitude}}', lon:'{{object.longitude}}'}); return false;" title="see a map">Map</a>{%endif%}{%endwith%} </aside> </header> |