Merge commit 'b3b4f77'

# Conflicts:
#	themes/intotheeast/templates/partials/trip-feed-col.html.twig
#	themes/intotheeast/templates/trip.html.twig

themes/intotheeast/templates/partials/base.html.twig

@@ -10,6 +10,7 @@
     {% do assets.addJs('theme://js/main.js', {group: 'bottom'}) %}
     {% do assets.addJs('theme://js/nav.js', {group: 'bottom'}) %}
     {% block map_assets %}{% endblock %}
+    {% block head_assets %}{% endblock %}
     {{ assets.css()|raw }}
     {{ assets.js()|raw }}
 </head>
@@ -26,6 +27,10 @@
         <nav class="site-nav" id="site-nav" aria-label="Main navigation">
             <a href="{{ base_url_absolute }}"{% if page.template == 'home' %} aria-current="page"{% endif %}>Home</a>
             <a href="{{ base_url_absolute }}/trips"{% if page.template == 'trips' %} aria-current="page"{% endif %}>Past Trips</a>
+            {% if grav.user.authenticated %}
+            <a href="{{ base_url_absolute }}/post"{% if page.template == 'post-form' %} aria-current="page"{% endif %}>New Post</a>
+            <a href="{{ base_url_absolute }}/gpx-manager"{% if page.template == 'gpx-manager' %} aria-current="page"{% endif %}>GPX Manager</a>
+            {% endif %}
         </nav>
         {% endblock %}
     </header>

themes/intotheeast/templates/partials/entry-journal.html.twig

@@ -1,7 +1,22 @@
 {% include 'partials/weather-icons.html.twig' %}
-<article class="journal-post" id="entry-{{ entry.slug }}" data-type="journal" data-lat="{{ entry.header.lat }}" data-lng="{{ entry.header.lng }}">
+{% set owner_can_edit = owner_can_edit ?? false %}
+{% set feed_return_url = feed_return_url ?? trip_page.url ?? '/' %}
+<article class="journal-post{% if not entry.published %} is-draft{% endif %}" id="entry-{{ entry.slug }}" data-type="journal" data-lat="{{ entry.header.lat }}" data-lng="{{ entry.header.lng }}"{% if owner_can_edit %} data-entry-route="{{ entry.route }}"{% endif %}>
     <header class="journal-post-header">
-        <h2 class="journal-post-title">{{ entry.title }}</h2>
+        <div class="journal-post-titlerow">
+            <h2 class="journal-post-title">{{ entry.title }}{% if not entry.published %} <span class="journal-draft-badge">Draft</span>{% endif %}</h2>
+            {% if owner_can_edit %}
+            <div class="journal-post-actions" data-entry-route="{{ entry.route }}">
+                <a class="entry-action entry-action--edit" href="/post?edit={{ entry.route|url_encode }}&return={{ feed_return_url|url_encode }}">Edit</a>
+                <button class="entry-action entry-action--delete" type="button" data-delete-start>Delete</button>
+                <span class="entry-delete-confirm" hidden>
+                    <button class="entry-action entry-action--cancel" type="button" data-delete-cancel>Cancel</button>
+                    <button class="entry-action entry-action--confirm" type="button" data-delete-confirm>Confirm delete</button>
+                </span>
+                <span class="entry-delete-msg" role="status" aria-live="polite"></span>
+            </div>
+            {% endif %}
+        </div>
         <p class="journal-post-meta">
             <a class="journal-post-permalink" href="{{ entry.url }}">
                 <time datetime="{{ entry.date|date('Y-m-d') }}">{{ entry.date|date('d M Y')|upper }}</time>

themes/intotheeast/templates/partials/trip-feed-col.html.twig

@@ -5,6 +5,10 @@
    caller only. Home's active-trip include omits it (`only`), so it defaults off
    and that header renders exactly as before (KTD4 / R12). #}
 {% set trip_header_extras = trip_header_extras|default(false) %}
+{# owner_can_edit gates the Draft badge + Edit/Delete controls on each card
+   (threaded into entry-journal below). Default false so any caller that doesn't
+   pass it renders a read-only feed. #}
+{% set owner_can_edit = owner_can_edit ?? false %}
 <div class="home-feed-col">
     <div class="home-trip-header">
         <h1 class="home-trip-name">{{ trip_page.title }}</h1>