From 3a54cdb85027e4a59ca6d78f5b91dbf7be77afd0 Mon Sep 17 00:00:00 2001 From: luxagraf Date: Fri, 1 Feb 2019 09:27:21 -0600 Subject: redid jrnl to speed things up and use less memory --- design/templates/archives/homepage-light.html | 15 +++++---- design/templates/archives/jrnl.html | 46 --------------------------- design/templates/base.html | 2 +- design/templates/details/entry.html | 2 +- design/templates/jrnl/entry_list.html | 45 ++++++++++++++++++++++++++ design/templates/lib/img_archive.html | 6 +++- 6 files changed, 60 insertions(+), 56 deletions(-) delete mode 100644 design/templates/archives/jrnl.html create mode 100644 design/templates/jrnl/entry_list.html (limited to 'design') diff --git a/design/templates/archives/homepage-light.html b/design/templates/archives/homepage-light.html index e9bc241..7aaf1aa 100644 --- a/design/templates/archives/homepage-light.html +++ b/design/templates/archives/homepage-light.html @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load get_image_by_size %} {% load typogrify_tags %} {% block sitename %} @@ -22,15 +21,17 @@
{%with image=homepage.featured_image%} {{image.alt}} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%}{%endwith%} - + srcset="{{image.get_srcset}}" + src="{{image.get_src}}" + alt="{{image.alt}} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%}"> + {%endwith%}

{{object.title|safe|smartypants}}

- {% if object.country.name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.state.name}}, U.S.{%else%}{{object.location.name|smartypants|safe}}, {{object.country.name}}{%endif%} + {% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, {{object.state_name}}}, U.S.{%else%}{{object.location_name|smartypants|safe}}, {{object.country_name}}{%endif%} {{homepage.tag_line|safe|smartypants}} @@ -45,7 +46,7 @@ srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.name %}

About Luxagraf

map of travels

After nearly two years exploring the U.S. in our home, a 1969 Dodge Travco RV, we left the states to spend the winter in Mexico.

-

We left our former home in Athens, GA in the Spring of 2017. We were most recently in {% if location.location.state.country.name == "United States" %}{{location.location.name|smartypants|safe}}, {{location.location.state.code|safe}}{%else%}{{location.location.name|smartypants|safe}}, {{location.location.state.country.name|safe}}{%endif%}. The map above has a rough sketch of our route to date. You can read about our adventures in the journal section. There's more about us on the about page

+

We left our former home in Athens, GA in the Spring of 2017. We were most recently in {% if location.country_name == "United States" %}{{location.location_name|smartypants|safe}}, {{location.location.state.code|safe}}{%else%}{{location.location_name|smartypants|safe}}, {{location.country_name|safe}}{%endif%}. The map above has a rough sketch of our route to date. You can read about our adventures in the journal section. There's more about us on the about page

@@ -63,7 +64,7 @@ srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.name %}

- {% if object.country.name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.state.name}}, U.S.{%else%}{{object.location.name|smartypants|safe}}, {{object.country.name}}{%endif%} + {% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, {{object.state_name}}, U.S.{%else%}{{object.location_name|smartypants|safe}}, {{object.country_name}}{%endif%}

{% endfor %} @@ -84,7 +85,7 @@ srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.name %}

- {% if object.country.name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.state.name}}, U.S.{%else%}{{object.location.name|smartypants|safe}}, {{object.country.name}}{%endif%} + {% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, {{object.state_name}}, U.S.{%else%}{{object.location_name|smartypants|safe}}, {{object.country_name}}{%endif%}

{% endfor %} diff --git a/design/templates/archives/jrnl.html b/design/templates/archives/jrnl.html deleted file mode 100644 index c95215e..0000000 --- a/design/templates/archives/jrnl.html +++ /dev/null @@ -1,46 +0,0 @@ -{% extends 'base.html' %} -{% load typogrify_tags %} -{% load get_image_by_size %} -{% load pagination_tags %} - -{% block pagetitle %}Luxagraf | {% if region %}Travel Writing from {{region.name|title|smartypants|safe}}{%else%}Travel Writing from Around the World {%endif%}{% if page != "1" %} -- Page {{page}}{%endif%}{% endblock %} -{% block metadescription %}{% if region %}Travel writing, essays and dispatches from {{region.name|title|smartypants|safe}}{%else%}Travel writing, essays and dispatches from around the world{%endif%} Page {{page}}{% endblock %} -{%block bodyid%}id="writing" class="archive"{%endblock%} - - -{% block primary %} -
-

{% if region %}Journal entries from {%if region.name == 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endif%}{%else%}Journal {%endif%}

{% autopaginate object_list 24 %} {% for object in object_list %} -
-
- {% if object.featured_image %} - {% include "lib/img_archive.html" with image=object.featured_image %} - {%else%} - {{ object.title }}{%endif%} -
-

{{object.title|safe|smartypants|widont}}

- - -

- - {% if object.country.name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.state.name}}, U.S.{%else%}{{object.location.name|smartypants|safe}}, {{object.country.name}}{%endif%} - – - - {{object.dek|safe}} - -

-
{% endfor %} -
- -{% endblock %} - - - -{% block js %}{% endblock%} diff --git a/design/templates/base.html b/design/templates/base.html index a96d76e..d0d1618 100644 --- a/design/templates/base.html +++ b/design/templates/base.html @@ -40,7 +40,7 @@
  • Journal
    • -
  • Map
    • +
  • About
  • More
    • diff --git a/design/templates/details/entry.html b/design/templates/details/entry.html index ad98274..2804da3 100644 --- a/design/templates/details/entry.html +++ b/design/templates/details/entry.html @@ -9,7 +9,7 @@ - + diff --git a/design/templates/jrnl/entry_list.html b/design/templates/jrnl/entry_list.html new file mode 100644 index 0000000..d58bd05 --- /dev/null +++ b/design/templates/jrnl/entry_list.html @@ -0,0 +1,45 @@ +{% extends 'base.html' %} +{% load typogrify_tags %} +{% load pagination_tags %} + +{% block pagetitle %}Luxagraf | {% if region %}Travel Writing from {{region.name|title|smartypants|safe}}{%else%}Travel Writing from Around the World {%endif%}{% if page != "1" %} -- Page {{page}}{%endif%}{% endblock %} +{% block metadescription %}{% if region %}Travel writing, essays and dispatches from {{region.name|title|smartypants|safe}}{%else%}Travel writing, essays and dispatches from around the world{%endif%} Page {{page}}{% endblock %} +{%block bodyid%}id="writing" class="archive"{%endblock%} + + +{% block primary %} +
    +

    {% if region %}Journal entries from {%if region.name == 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endif%}{%else%}Journal {%endif%}

    {% autopaginate object_list 24 %} {% for object in object_list %} +
    +
    + {% if object.featured_image %} + {% include "lib/img_archive.html" with image=object.featured_image %} + {%else%} + {{ object.title }}{%endif%} +
    +

    {{object.title|safe|smartypants|widont}}

    + + +

    + + {% if object.country.name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.state.name}}, U.S.{%else%}{{object.location.name|smartypants|safe}}, {{object.country.name}}{%endif%} + – + + {{object.dek|safe}} + +

    +
    {% endfor %} +
    + +{% endblock %} + + + +{% block js %}{% endblock%} diff --git a/design/templates/lib/img_archive.html b/design/templates/lib/img_archive.html index 2d00e78..22b0cce 100644 --- a/design/templates/lib/img_archive.html +++ b/design/templates/lib/img_archive.html @@ -1,2 +1,6 @@ {% load get_image_by_size %} -{{image.alt}} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%} +{{image.alt}} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%} -- cgit v1.2.3