From e7af8a1e0f71d38b7e83a22a822fb9d971a41ec2 Mon Sep 17 00:00:00 2001 From: luxagraf Date: Mon, 18 Feb 2019 15:21:42 -0600 Subject: redid sightings design and moved all location defered things to location objects --- design/sass/_details.scss | 25 ++++++++++++ design/templates/archives/homepage-light.html | 8 ++-- design/templates/archives/sightings.html | 40 ------------------ design/templates/details/sighting.html | 53 ------------------------ design/templates/essays/essay_detail.html | 2 +- design/templates/jrnl/entry_detail.html | 6 +-- design/templates/jrnl/entry_list.html | 2 +- design/templates/sightings/ap_detail.html | 59 +++++++++++++++++++++++++++ design/templates/sightings/sighting_list.html | 40 ++++++++++++++++++ 9 files changed, 133 insertions(+), 102 deletions(-) delete mode 100644 design/templates/archives/sightings.html delete mode 100644 design/templates/details/sighting.html create mode 100644 design/templates/sightings/ap_detail.html create mode 100644 design/templates/sightings/sighting_list.html (limited to 'design') diff --git a/design/sass/_details.scss b/design/sass/_details.scss index 6c86a86..cf453ea 100644 --- a/design/sass/_details.scss +++ b/design/sass/_details.scss @@ -26,7 +26,14 @@ line-height: 1; margin-top: .5rem; } + .post-subtitle-segundo { + @include fancy_sans; + @include smcaps; + @include fontsize(13); + font-weight: bold; + color: #999; + } .post-location { margin-top: 1rem; padding-top: 1rem; @@ -141,6 +148,24 @@ padding-bottom: 2.6rem; border-top: 1px solid #efefef; } +header.tight { + margin-bottom: 3rem; + * { + margin: 0; + text-align: center; + } + h1 { + margin-bottom: 1rem; + } + h2 { + display: inline-block; + border-top: 1px solid darken(#efefef, 10); + padding-top: 1rem; + } + h3 { + margin-top: .35rem; + } +} h4.post-source { @include fontsize(14); @include smcaps; diff --git a/design/templates/archives/homepage-light.html b/design/templates/archives/homepage-light.html index 26ff437..00243aa 100644 --- a/design/templates/archives/homepage-light.html +++ b/design/templates/archives/homepage-light.html @@ -31,7 +31,7 @@

- {% 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.location.country_name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.location.state_name}}}, U.S.{%else%}{{object.location.name|smartypants|safe}}, {{object.location.country_name}}{%endif%} {{homepage.tag_line|safe|smartypants}} @@ -46,7 +46,7 @@

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.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

+

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.comma_name|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

@@ -64,7 +64,7 @@

- {% 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.location.country_name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.location.state_name}}, U.S.{%else%}{{object.location_name|smartypants|safe}}, {{object.location.country_name}}{%endif%}

{% endfor %} @@ -85,7 +85,7 @@

- {% 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.location.country_name == "United States" %}{{object.location_name|smartypants|safe}}, {{object.state_name}}, U.S.{%else%}{{object.location_name|smartypants|safe}}, {{object.location.country_name}}{%endif%}

{% endfor %} diff --git a/design/templates/archives/sightings.html b/design/templates/archives/sightings.html deleted file mode 100644 index 3eb8ef6..0000000 --- a/design/templates/archives/sightings.html +++ /dev/null @@ -1,40 +0,0 @@ -{% extends 'base.html' %} -{% load typogrify_tags %} -{% load pagination_tags %} - -{% block pagetitle %}Luxagraf | Plants and Animals seen {% if region %}in {{region.name|title|smartypants|safe}}{%else%}by {{user}}{%endif%}{% if page != "1" %} -- Page {{page}}{%endif%}{% endblock %} -{% block metadescription %}Plants and Animals seen {% if region %} in {{region.name|title|smartypants|safe}}{%else%}by {{user}}{%endif%} Page {{page}}{% endblock %} -{%block bodyid%}id="birds" class="archive"{%endblock%} - - -{% block primary %} -
{% autopaginate object_list 24%} -

Plants and Animals seen {% if region %}in {%if region.name == 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endif%}{%else%} by {{user}}{%endif%}

{% for object in object_list %} - {% endfor %} -
- -{% endblock %} - - - -{% block js %}{% endblock%} diff --git a/design/templates/details/sighting.html b/design/templates/details/sighting.html deleted file mode 100644 index 1af2433..0000000 --- a/design/templates/details/sighting.html +++ /dev/null @@ -1,53 +0,0 @@ -{% extends 'base.html' %} -{% load typogrify_tags %} -{% block extrahead %} - -{% endblock %} -{% block bodyid %}class="detail"{%endblock%} -{% block primary %} - - -
-
-

{{object.common_name}}

-

{{object.scientific_name}}

-

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

- {{object.body_html|safe|smartypants|widont}} -{%if recording %} -
- -Audio recorded by {{recording.recorder}} on {{recording.pub_date|date:"F j, Y"}} in {{recording.location}}. © {{recording.copyright}} -
-{%endif%} -
- -
-
-
-{% endblock %} - -{% block js %} - - - -{% endblock %} diff --git a/design/templates/essays/essay_detail.html b/design/templates/essays/essay_detail.html index 780c80c..34f5d78 100644 --- a/design/templates/essays/essay_detail.html +++ b/design/templates/essays/essay_detail.html @@ -2,7 +2,7 @@ {% load typogrify_tags %} {% load comments %} -{% block pagetitle %}{{object.title|title|smartypants|safe}} - Luxagraf, Writing{%comment%}{% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, {{object.state_name}}{%else%}{{object.location_name|smartypants|safe}}, {{object.country_name}}{%endif%}{%endcomment%}{% endblock %} +{% block pagetitle %}{{object.title|title|smartypants|safe}} - Luxagraf, Essays{% endblock %} {% block metadescription %}{% autoescape on %}{{object.meta_description|striptags|safe}}{% endautoescape %}{% endblock %} {%block extrahead%} diff --git a/design/templates/jrnl/entry_detail.html b/design/templates/jrnl/entry_detail.html index 3e75017..4e84103 100644 --- a/design/templates/jrnl/entry_detail.html +++ b/design/templates/jrnl/entry_detail.html @@ -2,14 +2,14 @@ {% load typogrify_tags %} {% load comments %} -{% block pagetitle %}{{object.title|title|smartypants|safe}} - Luxagraf, Writing{%comment%}{% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, {{object.state_name}}{%else%}{{object.location_name|smartypants|safe}}, {{object.country_name}}{%endif%}{%endcomment%}{% endblock %} +{% block pagetitle %}{{object.title|title|smartypants|safe}} - Luxagraf, Writing{%comment%}{% if object.location.country_name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.location.state_name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.location.country_name}}{%endif%}{%endcomment%}{% endblock %} {% block metadescription %}{% autoescape on %}{{object.meta_description|striptags|safe}}{% endautoescape %}{% endblock %} {%block extrahead%} - + @@ -40,7 +40,7 @@ class="detail {%if t == 1 or t == 3 or t == 5 %}double{%else%}single{%endif%}{%i

{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|safe}}{%endif%}

diff --git a/design/templates/jrnl/entry_list.html b/design/templates/jrnl/entry_list.html index 0295f8f..2201e34 100644 --- a/design/templates/jrnl/entry_list.html +++ b/design/templates/jrnl/entry_list.html @@ -26,7 +26,7 @@

- {% 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.location.country_name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.location.state_name}}, U.S.{%else%}{{object.location.name|smartypants|safe}}, {{object.location.country_name}}{%endif%} – {{object.dek|safe}} diff --git a/design/templates/sightings/ap_detail.html b/design/templates/sightings/ap_detail.html new file mode 100644 index 0000000..154d7ac --- /dev/null +++ b/design/templates/sightings/ap_detail.html @@ -0,0 +1,59 @@ +{% extends 'base.html' %} +{% load typogrify_tags %} +{% block extrahead %} + +{% endblock %} +{% block bodyid %}class="detail"{%endblock%} +{% block primary %} +

+ +
+
+
+

{{object.common_name}}

+

{{object.scientific_name}}

+

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

+
+ {% if object.body_html %}{{object.body_html|safe|smartypants|widont}}{%endif%} +{%if recording %} +
+ +Audio recorded by {{recording.recorder}} on {{recording.pub_date|date:"F j, Y"}} in {{recording.location}}. © {{recording.copyright}} +
+{%endif%} + {% if field_notes %} +

Field Notes

{% for note in field_notes %} + {{note.body_html|safe|smartypants}} +

– {{note.sighting.location}}, {{note.sighting.location.comma_name}}, {{note.sighting.pub_date|date:"M Y"}}

+
+ {%endfor%} +{%endif%} +
Seen at
+
    {%for sight in sighting %} +
  • {{sight.location}}, {{sight.location.comma_name}}, {{sight.pub_date|date:"M Y"}}
    • + {%endfor%} +
+
+{% endblock %} + +{% block js %} + + + +{% endblock %} diff --git a/design/templates/sightings/sighting_list.html b/design/templates/sightings/sighting_list.html new file mode 100644 index 0000000..3ae33e5 --- /dev/null +++ b/design/templates/sightings/sighting_list.html @@ -0,0 +1,40 @@ +{% extends 'base.html' %} +{% load typogrify_tags %} +{% load pagination_tags %} + +{% block pagetitle %}Luxagraf | Plants and Animals seen {% if region %}in {{region.name|title|smartypants|safe}}{%else%}by {{user}}{%endif%}{% if page != "1" %} -- Page {{page}}{%endif%}{% endblock %} +{% block metadescription %}Plants and Animals seen {% if region %} in {{region.name|title|smartypants|safe}}{%else%}by {{user}}{%endif%} Page {{page}}{% endblock %} +{%block bodyid%}id="birds" class="archive"{%endblock%} + + +{% block primary %} +
{% autopaginate object_list 24%} +

Plants and Animals seen {% if region %}in {%if region.name == 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endif%}{%else%} by {{user}}{%endif%}

{% for object in object_list %} + {% endfor %} +
+ +{% endblock %} + + + +{% block js %}{% endblock%} -- cgit v1.2.3