added field_notes to footer of entry templates

3 files changed, 36 insertions, 14 deletions

diff --git a/app/jrnl/urls.py b/app/jrnl/urls.py
index a7bcc0e..82a4b22 100644
--- a/app/jrnl/urls.py
+++ b/app/jrnl/urls.py
@@ -7,7 +7,7 @@ app_name = "jrnl"
 
 urlpatterns = [
     path(
-        r'^feed.xml',
+        r'feed.xml',
         views.JrnlRSSFeedView(),
         name="feed"
     ),
diff --git a/design/sass/_writing_details.scss b/design/sass/_writing_details.scss
index c17f9ab..490b6cc 100644
--- a/design/sass/_writing_details.scss
+++ b/design/sass/_writing_details.scss
@@ -746,8 +746,9 @@ figure.picwide img.picwide {
         float: none;
     }
 }
-.wildlife {
+.entry-footer {
     @include constrain_narrow;
+    margin-top: 2em;
     text-align: left;
     li {
         margin: .25em 0;
@@ -764,4 +765,17 @@ figure.picwide img.picwide {
         text-decoration: none;
         color: lighten($body_font, 20);
     }
+    &:after {
+        @include faded_line_after;
+        @include breakpoint(beta) {
+            margin-bottom: 2em;
+        }
+    }
+}
+#field_notes {
+    li:before {
+      content: "\2022";
+      margin-right: .35rem;
+      color: $body_font_light;
+    }
 }
diff --git a/design/templates/details/entry.html b/design/templates/details/entry.html
index 902d8d2..e002531 100644
--- a/design/templates/details/entry.html
+++ b/design/templates/details/entry.html
@@ -52,19 +52,27 @@ class="{%if t == 1 or t == 3 or t == 5 %}double{%else%}single{%endif%}{%if t ==
             </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|safe|smartypants|widont}}
-        </div>{%if wildlife %}
-                <aside class="wildlife">
-                    <h3>Fauna and Flora</h3>
-                    {% 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>
+        </div>
+        <div class="entry-footer">{%if wildlife %}
+            <aside id="wildlife">
+                <h3>Fauna and Flora</h3>
+                {% 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>
                     {% endfor %}</ul>
-                        {% endfor %}</ul>
-                </aside>
-                {% endif %}
+            </aside>
+            {% endif %}{%if object.field_notes.all %}
+            <aside id="field_notes">
+                <h3>Field Notes</h3>
+                <ul>{% for obj in object.field_notes.all %}
+                <li><a href="{% url 'sketches:detail' year=obj.pub_date.year month=obj.pub_date|date:"m"  slug=obj.slug %}">{{obj}}</a></li>
+                {% endfor %}</ul>
+            </aside>{% endif %}
+        </div>
         </article>
         {% with object.get_next_published as next %}
         {% with object.get_previous_published as prev %}