From f547a33e18f3c3b6de199d72e2c6fcfbb94de11b Mon Sep 17 00:00:00 2001 From: luxagraf Date: Mon, 5 Sep 2022 10:44:43 -0500 Subject: essays: cleaned up templates, fixed some stray bugs --- .../django_comments/templates/comments/form.html | 1 + .../templates/locations/location_detail.html | 36 ++++++++------------- app/pages/templates/pages/luxagraf/homepage.html | 2 -- app/posts/templates/posts/essay_detail.html | 37 ++++++---------------- app/posts/templates/posts/essay_list.html | 37 ++++++---------------- app/posts/templates/posts/fieldnote_detail.html | 1 + app/posts/templates/posts/jrnl_detail.html | 1 + app/posts/templates/posts/post_detail.html | 1 + app/posts/templates/posts/range_detail.html | 4 --- app/posts/templates/posts/src_detail.html | 1 + app/posts/templates/posts/src_list.html | 4 +-- app/sightings/templates/sightings/ap_detail.html | 26 +++++++++++---- templates/base.html | 12 +++---- templates/comments/form.html | 2 +- 14 files changed, 63 insertions(+), 102 deletions(-) diff --git a/app/lib/django_comments/templates/comments/form.html b/app/lib/django_comments/templates/comments/form.html index 939f7e1..aac33bf 100644 --- a/app/lib/django_comments/templates/comments/form.html +++ b/app/lib/django_comments/templates/comments/form.html @@ -19,3 +19,4 @@

+{{form}} diff --git a/app/locations/templates/locations/location_detail.html b/app/locations/templates/locations/location_detail.html index 81aeb97..9622a14 100644 --- a/app/locations/templates/locations/location_detail.html +++ b/app/locations/templates/locations/location_detail.html @@ -64,29 +64,19 @@ {% endif %} {% if sighting_list %}
-

Birds and Mammals seen in {{object}}

{% for object in sighting_list %} - {% endfor %} +

Birds and Mammals seen in {{object}}

+
{% for object in sighting_list %} + {% endfor %} +
{%endif%} - - {% comment %} - {% for entry in book_list %}{% if forloop.first %} - {%endif%}{% endfor %} - {% endcomment %} {% endblock %} diff --git a/app/pages/templates/pages/luxagraf/homepage.html b/app/pages/templates/pages/luxagraf/homepage.html index b7fa7d4..2f2dc19 100644 --- a/app/pages/templates/pages/luxagraf/homepage.html +++ b/app/pages/templates/pages/luxagraf/homepage.html @@ -91,5 +91,3 @@
Browse the Archives
{% endblock %} - -{% block js %}{% comment %} {% endcomment%}{% endblock%} diff --git a/app/posts/templates/posts/essay_detail.html b/app/posts/templates/posts/essay_detail.html index 7eb90f5..961187d 100644 --- a/app/posts/templates/posts/essay_detail.html +++ b/app/posts/templates/posts/essay_detail.html @@ -4,33 +4,13 @@ {%block htmlclass%}class="detail single"{%endblock%} {% block pagetitle %}{{object.title|title|smartypants|safe}} - by Scott Gilbertson{% endblock %} -{% block metadescription %}{% autoescape on %}{{object.meta_description|striptags|safe}}{% endautoescape %}{% endblock %} -{%block extrahead%} -{% if object.has_code %} - -{%endif %} +{% block metadescription %}{% autoescape on %}{{object.meta_description|striptags|safe}}{% endautoescape %}{% endblock %}{%block extrahead%} - - - - - - - - - - - - - - {% if object.featured_image %} - {%endif%} - +{% if object.has_code %} {%endif %} {%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 %} +{% block primary %}

{{object.title|smartypants|safe}}

@@ -86,12 +66,12 @@ {% endif %} {%endif%}
- +
{% if object.related.all %}
You might also enjoy
{% for object in related %} -
+
{% if object.featured_image %} @@ -99,9 +79,9 @@ {%endif%}

{% if object.title %}{{object.title|safe|smartypants|widont}}{% else %}{{object.common_name}}{%endif%}

- + - {% if object.location %} + {% if object.location %} {% if object.location.country_name == "United States" %}{{object.location.state_name}}{%else%}{{object.location.country_name}}{%endif%} {%endif%} {% if object.location and object.model_name.model != 'page' %}–{%endif%} @@ -128,11 +108,12 @@
{% else %}

Sorry, comments have been disabled for this post.

+
{%endif%}
- {% endblock %} {% block js %} +{{ block.super }} {%endblock%} diff --git a/app/posts/templates/posts/essay_list.html b/app/posts/templates/posts/essay_list.html index cdd272f..e18919f 100644 --- a/app/posts/templates/posts/essay_list.html +++ b/app/posts/templates/posts/essay_list.html @@ -1,42 +1,23 @@ {% extends 'base.html' %} {% load typogrify_tags %} - {% 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 breadcrumbs %}{% if breadcrumbs %}{% include "lib/breadcrumbs.html" with breadcrumbs=breadcrumbs %}{%endif%}{% endblock %} -{% block primary %}
+{% block primary %}

Essays & Articles

Topics include travel, writing, photography, free software, culture, and once, Del Taco.

Some essays below were previously published in: WIRED, Budget Travel, Ars Technica, Epicurious, Longshot Magazine, The Cost of Paper and elsewhere.

Essays

-
-{%endblock%} - - - + {%endfor%} + +
+{%endblock%} diff --git a/app/posts/templates/posts/fieldnote_detail.html b/app/posts/templates/posts/fieldnote_detail.html index f678400..eba1f10 100644 --- a/app/posts/templates/posts/fieldnote_detail.html +++ b/app/posts/templates/posts/fieldnote_detail.html @@ -50,4 +50,5 @@ {% block js %} +{{ block.super }} {%endblock%} diff --git a/app/posts/templates/posts/jrnl_detail.html b/app/posts/templates/posts/jrnl_detail.html index d07719d..a0b9b11 100644 --- a/app/posts/templates/posts/jrnl_detail.html +++ b/app/posts/templates/posts/jrnl_detail.html @@ -164,4 +164,5 @@ {% block js %} +{{ block.super }} {%endblock%} diff --git a/app/posts/templates/posts/post_detail.html b/app/posts/templates/posts/post_detail.html index b7c31fa..e7492e2 100644 --- a/app/posts/templates/posts/post_detail.html +++ b/app/posts/templates/posts/post_detail.html @@ -111,4 +111,5 @@ {% block js %} +{{ block.super }} {%endblock%} diff --git a/app/posts/templates/posts/range_detail.html b/app/posts/templates/posts/range_detail.html index ac3af66..17c1486 100644 --- a/app/posts/templates/posts/range_detail.html +++ b/app/posts/templates/posts/range_detail.html @@ -159,7 +159,3 @@
{%endif%} {% endblock %} - -{% block js %}{% comment %} {% endcomment%}{% endblock%} - - diff --git a/app/posts/templates/posts/src_detail.html b/app/posts/templates/posts/src_detail.html index b372139..bef0057 100644 --- a/app/posts/templates/posts/src_detail.html +++ b/app/posts/templates/posts/src_detail.html @@ -119,4 +119,5 @@ {% block js %} +{{ block.super }} {%endblock%} diff --git a/app/posts/templates/posts/src_list.html b/app/posts/templates/posts/src_list.html index c673935..b015deb 100644 --- a/app/posts/templates/posts/src_list.html +++ b/app/posts/templates/posts/src_list.html @@ -7,7 +7,7 @@ {% block metadescription %}Tutorials and tools for building great things on the web - by Scott Gilbertson.{% endblock %} {%block sitesubtitle %}Code Slowly{% endblock%} {% block breadcrumbs %}{% include "lib/breadcrumbs.html" with breadcrumbs=breadcrumbs %}{% endblock %} -{% block primary %}
+{% block primary %}

/src/

Let's building things.

@@ -31,8 +31,6 @@ - -
{%endblock%} diff --git a/app/sightings/templates/sightings/ap_detail.html b/app/sightings/templates/sightings/ap_detail.html index 72c3666..c27b81e 100644 --- a/app/sightings/templates/sightings/ap_detail.html +++ b/app/sightings/templates/sightings/ap_detail.html @@ -2,7 +2,18 @@ {% load typogrify_tags %} {% block extrahead %} {% endblock %} {% block bodyid %}class="detail center"{%endblock%} @@ -10,7 +21,7 @@ {% block primary %}
-

{{object.common_name}}

+

{{object.common_name}}

{{object.scientific_name}}

Family {{object.apclass.scientific_name}} ({{object.apclass}})

@@ -38,6 +49,8 @@ {%endfor%}
+
+
{% endblock %} @@ -45,13 +58,14 @@ {% block js %} - +{{ block.super }} {% endblock %} diff --git a/templates/base.html b/templates/base.html index a5a9af4..5b4c22d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -14,7 +14,7 @@ title="Luxagraf RSS feed" href="https://luxagraf.net/rss/"> {%block stylesheet%}{%endblock%} @@ -29,9 +29,9 @@ @@ -50,8 +50,7 @@ Scott Gilbertson.

- {% block js %}{% endblock%} - - +{% endblock%} diff --git a/templates/comments/form.html b/templates/comments/form.html index 129de90..fba222b 100644 --- a/templates/comments/form.html +++ b/templates/comments/form.html @@ -10,7 +10,7 @@ {% if field.is_hidden %} {{ field }} {% else %} -
+
{{ field.label_tag }} {%if field.name == "comment"%}
{{ field }}
{%else%}{{field}}{%endif%}
-- cgit v1.2.3