added sightings to entry template

author: luxagraf <sng@luxagraf.net> 2018-01-29 13:00:52 -0600
committer: luxagraf <sng@luxagraf.net> 2018-01-29 13:00:52 -0600
commit: 8d42093452652eeeb149f8b596b43c4317a8909e (patch)
tree: 80ee11a6e83e416d776ce7f5b78dcad62b94c65a /design
parent: f5e8556676cd9158fccc82934a7eb5037c52e957 (diff)
3 files changed, 24 insertions, 176 deletions
diff --git a/design/sass/_writing_details.scss b/design/sass/_writing_details.scss
index 348d617..c17f9ab 100644
--- a/design/sass/_writing_details.scss
+++ b/design/sass/_writing_details.scss
@@ -749,4 +749,19 @@ figure.picwide img.picwide {
 .wildlife {
     @include constrain_narrow;
     text-align: left;
+    li {
+        margin: .25em 0;
+    }
+    li ul li:before {
+      content: "\2022";
+      margin-right: .35rem;
+      color: $body_font_light;
+    }
+    .grouper {
+        margin-top: 1em;
+    }
+    a {
+        text-decoration: none;
+        color: lighten($body_font, 20);
+    }
 }
diff --git a/design/templates/details/entry.amp b/design/templates/details/entry.amp
deleted file mode 100644
index 4ce660d..0000000
--- a/design/templates/details/entry.amp
+++ /dev/null
@@ -1,172 +0,0 @@
-{% load typogrify_tags %}
-{% load amp %}
-<!doctype html>
-<html amp lang="en">
-<head>
-<meta charset="utf-8">
-<title>{%block pagetitle%}{{object.title}}{%endblock%}</title>
-<link rel="canonical" href="https://luxagraf.net{{object.get_absolute_url}}">
-    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1">
-    <meta name="twitter:card" content="summary_large_image"/>
-    <meta name="twitter:url" content="{{object.get_absolute_url}}">
-    <meta name="twitter:description" content="{{object.meta_description}}"/>
-    <meta name="twitter:title" content="{{object.title|safe}}"/>
-    <meta name="twitter:site" content="@luxagraf"/>
-    <meta name="twitter:domain" content="luxagraf"/>
-    <meta name="twitter:image:src" content="{{object.get_image_url}}"/>
-    <meta name="twitter:creator" content="@luxagraf"/>
-    <meta name="twitter:site:id" content="9469062">
-    <meta name="twitter:creator:id" content="9469062">
-    <meta name="twitter:description" content=""/>
-
-    <meta name="geo.placename" content="{% if object.country.name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.state.name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.country.name}}{%endif%}"> 
-    <meta name="geo.region" content="{{object.country.iso2}}{%if object.state.code != '' %}-{{object.state.code}}{%endif%}">
-    <meta property="og:type" content="article" />
-    <meta property="og:title" content="{{object.title|safe}}" />
-    <meta property="og:url" content="https://luxagraf.net{{object.get_absolute_url}}" />
-    <meta property="og:description" content="{{object.meta_description}}" />
-    <meta property="article:published_time" content="{{object.pub_date|date:'c'}}" />
-    <meta property="article:author" content="Luxagraf" />
-    <meta property="og:site_name" content="Luxagraf" />
-    <meta property="og:image" content="{{object.get_image_url}}" />{% for image in object.get_images %}
-    <meta property="og:image" content="{{image}}" />{% endfor %}
-    <meta property="og:locale" content="en_US" />
-
-
-<script type="application/ld+json">
-{
-    "@context": "http://schema.org",
-    "@type": "BlogPosting",
-    "headline": "{{object.title|safe}}",
-    "description": "{{object.meta_description}}",
-    "datePublished": "{{object.pub_date|date:"c"}}",
-    "author": {
-        "@type": "Person",
-        "name": "Scott Gilbertson"
-    },
-    "publisher": {
-        "@type": "Person",
-        "name": "Scott Gilbertson"
-        "logo": {
-            "@type": "ImageObject",
-            "url": "",
-            "width": 240,
-            "height": 53
-        }
-    }
-}
-</script>
-<style amp-custom>
-body {
-    font-size: 1rem;
-    line-height: 1.73;
-    font-family: Georgia, serif;
-    background-color: #fff;
-    color: #333;
-    padding: 1em;
-}
-nav {
-    font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
-    max-width: 60em;
-    margin: 0 auto;
-}
-main {
-    max-width: 60em;
-    margin: 0 auto;
-}
-main footer {
-    text-align: right;
-}
-a {
-    text-decoration: underline;
-    color: #c63;
-}
-nav a {
-    text-decoration: none;
-    text-transform: uppercase;
-    color: #222;
-}
-h1,h2,h3,h4,h5 {
-    line-height: 1;
-    font-weight: bold;
-}
-h1 {
-    font-size: 1.5rem;
-    color: #666;
-}
-h2 {
-    font-size: 1.125rem;
-    color: #555;
-}
-h3 {
-    font-size: 1rem;
-    color: #444;
-}
-h4 {
-    font-size: 0.875rem;
-}
-h5 {
-    font-size: 0.75rem;
-}
-h1 a, h1 a *,
-h2 a, h2 a *,
-h3 a, h3 a *,
-h4 a, h4 a * {
-    text-decoration: none;
-    font-weight: bold
-}
-code {
-    font-size: 0.875rem;
-    font-family: "Courier New",monospace;
-}
-pre {
-    white-space: pre-wrap;
-    word-wrap: break-word;
-}
-blockquote {
-    font-family: Georgia,"Times New Roman",serif;
-    font-size: 0.875rem;
-}
-blockquote * {
-    font-style: italic;
-}
-blockquote * em {
-    font-weight: bold;
-}
-blockquote * strong {
-    font-style: normal;
-}
-hr {
-    border: none;
-    border-bottom: 0.0625rem dotted #ccc;
-}
-.hide {display: none;}
-</style>
-<style>body {opacity: 0}</style><noscript><style>body {opacity: 1}</style></noscript>
-<script async src="https://cdn.ampproject.org/v0.js"></script>
-</head>
-<body>
-
-<nav>
-<a href="https://luxagraf.net/">
-luxagraf</a>
-</nav>
-
-<main class="h-entry">
-    <article class="h-entry hentry post--article{% 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">
-            <header id="header" class="post--header {% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %}post--header--double{%endif%}{%endwith%}">
-                <h1 class="p-name entry-title post--title" itemprop="headline">{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|widont|safe}}{%endif%}</h1>
-                <time class="dt-published published dt-updated post--date" datetime="{{object.pub_date|date:'c'}}" itemprop="datePublished">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
-            <p class="p-author author hide" itemprop="author"><span class="byline-author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Scott Gilbertson</span></span></p>
-                <aside class="p-location h-adr adr post--location" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
-                    {% if object.country.name == "United States" %}<span class="p-locality locality">{{object.location.name|smartypants|safe}}</span>, <a class="p-region region" href="/jrnl/united-states/" title="travel writing from the United States">{{object.state.name|safe}}</a>, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location.name|smartypants|safe}}</span>, <a class="p-country-name country-name" href="/jrnl/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name|safe}}</a>{%endif%}
-                </aside>
-            </header>
-        <div id="article" class="e-content entry-content post--body post--body--{% with object.template_name as t %}{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%endif%}{%endwith%}" itemprop="articleBody">
-            {{object.body_html|amp|safe}}
-        </div>
-        </article>
-</main>
-
-</body>
-</html>
diff --git a/design/templates/details/entry.html b/design/templates/details/entry.html
index df88bd4..b910338 100644
--- a/design/templates/details/entry.html
+++ b/design/templates/details/entry.html
@@ -53,12 +53,17 @@ class="{%if t == 1 or t == 3 or t == 5 %}double{%else%}single{%endif%}{%if t ==
         <div id="article" class="e-content entry-content post--body post--body--{% with object.template_name as t %}{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%endif%}{%endwith%}" itemprop="articleBody">
             {{object.body_html|safe|smartypants|widont}}
         </div>
-             <!--   <aside class="wildlife">
+                <aside class="wildlife">
                     <h3>Fauna and Flora</h3>
-                    <ul>{% for obj in wildlife %}
-                        <li>{{obj}} </li>
+                    {% regroup wildlife by ap.apclass.get_kind_display as wildlife_list %}
+                    <ul>
+                    {% for object_list in wildlife_list %}
+                    <li class="grouper">{{object_list.grouper}}<ul>
+                    {% for object in object_list.list %}
+                    <li><a href="{% url 'sightings:detail' object.ap.slug %}">{{object}}</a></li>
                     {% endfor %}</ul>
-             </aside>-->
+                        {% endfor %}</ul>
+                </aside>
         </article>
         {% with object.get_next_published as next %}
         {% with object.get_previous_published as prev %}
author	luxagraf <sng@luxagraf.net>	2018-01-29 13:00:52 -0600
committer	luxagraf <sng@luxagraf.net>	2018-01-29 13:00:52 -0600
commit	8d42093452652eeeb149f8b596b43c4317a8909e (patch)
tree	80ee11a6e83e416d776ce7f5b78dcad62b94c65a /design
parent	f5e8556676cd9158fccc82934a7eb5037c52e957 (diff)