diff options
Diffstat (limited to 'app/posts')
| -rw-r--r-- | app/posts/templates/posts/essay_detail.html | 2 | ||||
| -rw-r--r-- | app/posts/templates/posts/essay_list.html | 12 | ||||
| -rw-r--r-- | app/posts/views.py | 14 |
3 files changed, 17 insertions, 11 deletions
diff --git a/app/posts/templates/posts/essay_detail.html b/app/posts/templates/posts/essay_detail.html index 8ffcfe5..23619d0 100644 --- a/app/posts/templates/posts/essay_detail.html +++ b/app/posts/templates/posts/essay_detail.html @@ -29,7 +29,7 @@ {%endblock%} {%block bodyid %}{% if object.get_post_type_display == 'tools' %}class="src"{% endif %}{%endblock%} - +{% block breadcrumbs %}{% include "lib/breadcrumbs.html" with breadcrumbs=breadcrumbs %}{% endblock %} {% block primary %} <main> <article class="h-entry hentry {% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %} post--article--double{%endif%}{%endwith%}" itemscope itemType="http://schema.org/Article"> diff --git a/app/posts/templates/posts/essay_list.html b/app/posts/templates/posts/essay_list.html index 271f83f..8a35225 100644 --- a/app/posts/templates/posts/essay_list.html +++ b/app/posts/templates/posts/essay_list.html @@ -3,16 +3,12 @@ {% block pagetitle %}Collected Essays of Scott Gilbertson {% endblock %} {% block metadescription %}Collected writing: essays, articles and stories on travel, photography, tools, walking, the natural world and other ephemera.{% endblock %} - -{% block primary %}<ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb"> - <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> → </li> - <li>Essays</li> - </ul> - <main role="main" id="essay-archive" class="essay-archive archive-list"> +{% block breadcrumbs %}{% if breadcrumbs %}{% include "lib/breadcrumbs.html" with breadcrumbs=breadcrumbs %}{%endif%}{% endblock %} +{% block primary %}<main role="main" id="essay-archive" class="essay-archive archive-list"> <div class="essay-intro"> - <h2>My various articles and essays collected in one spot.</h2> + <h2>Essays & Articles</h2> <p>Topics include travel, writing, photography, free software, culture, and once, Del Taco.</p> - <p>Many essays below were previously published in: <em><a href="https://www.wired.com/author/scott-gilbertson/">WIRED</a></em>, <em><a href="https://www.budgettravel.com/article/0902_HTTN_SocialNetwork_5488">Budget Travel</a></em>, <em><a href="https://arstechnica.com/">Ars Technica</a></em>, <em><a href="https://web.archive.org/web/20100904114555/http://one.longshotmag.com/article/going-for-seconds">Longshot Magazine</a>,</em> <em><a href="https://web.archive.org/web/20150506051746/http://1888.center/scott-gilbertson/">The Cost of Paper</a></em> and elsewhere.</a></p> + <p>Some essays below were previously published in: <em><a href="https://www.wired.com/author/scott-gilbertson/" rel="me">WIRED</a></em>, <em><a href="https://www.budgettravel.com/article/0902_HTTN_SocialNetwork_5488">Budget Travel</a></em>, <em><a href="https://arstechnica.com/">Ars Technica</a></em>, <em><a href="https://www.epicurious.com/contributors/scott-gilbertson" rel="me">Epicurious</a></em>, <em><a href="https://web.archive.org/web/20100904114555/http://one.longshotmag.com/article/going-for-seconds">Longshot Magazine</a>,</em> <em><a href="https://web.archive.org/web/20150506051746/http://1888.center/scott-gilbertson/" rel="me">The Cost of Paper</a></em> and elsewhere.</a></p> </div> <h1 class="topic-hed">Essays</h1> <ul>{% for object in object_list %} diff --git a/app/posts/views.py b/app/posts/views.py index fc85fa7..47c8c86 100644 --- a/app/posts/views.py +++ b/app/posts/views.py @@ -4,7 +4,7 @@ from django.contrib.syndication.views import Feed from django.apps import apps from django.conf import settings -from utils.views import PaginatedListView +from utils.views import PaginatedListView, LuxDetailView from .models import Post from taxonomy.models import Category @@ -40,8 +40,17 @@ class EssayListView(PostList): queryset = super(EssayListView, self).get_queryset() return queryset.filter(post_type__in=[2,]).filter(status__exact=1).order_by('-pub_date').prefetch_related('location').prefetch_related('featured_image') + def get_context_data(self, **kwargs): + ''' + override for custom breadcrumb path + ''' + # Call the base implementation first to get a context + context = super(EssayListView, self).get_context_data(**kwargs) + context['breadcrumbs'] = ('Essays',) + return context -class PostDetailView(DetailView): + +class PostDetailView(LuxDetailView): model = Post slug_field = "slug" @@ -62,6 +71,7 @@ class PostDetailView(DetailView): obj = self.get_object() return ["posts/%s_detail.html" % obj.get_post_type_display(), 'posts/post_detail.html'] + class PostDetailViewTXT(PostDetailView): template_name = "posts/entry_detail.txt" |