diff options
| -rw-r--r-- | app/posts/templates/posts/essay_list.html | 8 | ||||
| -rw-r--r-- | app/posts/views/essay_views.py | 9 | ||||
| -rw-r--r-- | templates/base.html | 2 |
3 files changed, 14 insertions, 5 deletions
diff --git a/app/posts/templates/posts/essay_list.html b/app/posts/templates/posts/essay_list.html index 58163d0..361ba6f 100644 --- a/app/posts/templates/posts/essay_list.html +++ b/app/posts/templates/posts/essay_list.html @@ -13,6 +13,14 @@ {% if topic == 'tools'%} <h1>Tools</h1> <h3>I am fascinated by artifacts, stuff, the things we populate our lives with. I've chosen to call them tools, but they're more than that aren't they? Requires: <a href="/essays/spirit/">Spirit</a>, <a href="/essays/craft/">Craft</a>.</h3>{%endif%} + {% if not topic %} + <h1>Essays</h1> + <h3>Life and how to live it. At the intersection of <a href="/essays/spirit/">Spirit</a>, <a href="/essays/craft/">Craft</a>, and <a href="/essays/tools/">Tools</a>.</h3> + <h3><i>Être fort pour être utile</i></h3> + <hr /> + <h2>Join us. Subscribe to <em>Friends of a Long Year</em></h2> + <iframe target='_parent' style="border:none; background:white; width:100%;" title="embedded form for subscribing the the Friends of a Long Year newsletter" src="{% url 'lttr:subscribe' slug='friends' %}"></iframe> + {% endif %} </div> <ul class="archive-list">{% for object in object_list %} <li class="h-entry hentry archive-list-card archive-list-card-sm" itemscope itemType="http://schema.org/Article"> diff --git a/app/posts/views/essay_views.py b/app/posts/views/essay_views.py index 6437543..453f068 100644 --- a/app/posts/views/essay_views.py +++ b/app/posts/views/essay_views.py @@ -25,7 +25,7 @@ class EssayListView(PaginatedListView): ''' # Call the base implementation first to get a context context = super(EssayListView, self).get_context_data(**kwargs) - context['breadcrumbs'] = ('Essay',) + context['breadcrumbs'] = ('Essays',) return context @@ -48,7 +48,8 @@ class EssayCategoryList(PaginatedListView): # Call the base implementation first to get a context context = super(EssayCategoryList, self).get_context_data(**kwargs) print(self.topic) - context['breadcrumbs'] = ('Essay',) + context['breadcrumbs'] = ('Essays', self.topic) + context['crumb_url'] = '/essays/' context['topic'] = self.topic return context @@ -68,8 +69,8 @@ class EssayDetailView(LuxDetailView): model = apps.get_model(obj.model_name.app_label, obj.model_name.model) related.append(model.objects.get(slug=obj.slug, pub_date=obj.pub_date)) context['related'] = related - context['breadcrumbs'] = ('Range',) - context['crumb_url'] = reverse('range:list') + context['breadcrumbs'] = ('Essays',) + context['crumb_url'] = '/essays/' return context def get_template_names(self): diff --git a/templates/base.html b/templates/base.html index 03be0c3..0bce354 100644 --- a/templates/base.html +++ b/templates/base.html @@ -28,7 +28,7 @@ </div> <nav> <a class="nav-item smcaps" href="{% url "jrnl:list" %}" title="Stories of life on the road.">Jrnl</a> - <a class="nav-item smcaps" href="{% url "range:list" %}" title="Life and how to live it">Essays</a> + <a class="nav-item smcaps" href="/essays/" title="Life and how to live it">Essays</a> <!--<a class="nav-item smcaps" href="{% url "guides:guide-list" %}" title="Guides">Guides</a> --> <a class="nav-item smcaps" href="/about" title="About Scott">About</a> <!-- |