From 6ce77d7be760fc484a2c790475f8bd102d091ae8 Mon Sep 17 00:00:00 2001
From: Mischa <mischa@gorinskat.nl>
Date: Sat, 20 Jun 2026 00:36:48 +0200
Subject: [PATCH] fix: restore entry.yaml original structure, keep only Journey
 tab addition

---
 themes/intotheeast/blueprints/entry.yaml | 156 +++++++++--------------
 1 file changed, 59 insertions(+), 97 deletions(-)

diff --git a/themes/intotheeast/blueprints/entry.yaml b/themes/intotheeast/blueprints/entry.yaml
index 65b1947..927ea8a 100644
--- a/themes/intotheeast/blueprints/entry.yaml
+++ b/themes/intotheeast/blueprints/entry.yaml
@@ -1,4 +1,7 @@
 title: 'Daily Entry'
+'@extends':
+    type: default
+    context: blueprints://pages
 
 form:
   fields:
@@ -6,39 +9,9 @@ form:
       type: tabs
       active: 1
       fields:
-
-        content:
+        entry:
           type: tab
-          title: Content
-          fields:
-            header.title:
-              type: text
-              label: Title
-              validate:
-                required: true
-
-            header.date:
-              type: datetime
-              label: Date
-              format: 'Y-m-d H:i'
-              validate:
-                required: true
-
-            header.hero_image:
-              type: text
-              label: Hero Image
-              placeholder: 'photo.jpg'
-              help: 'Filename of the hero image (upload via Media tab). Leave blank to use the first image.'
-
-            content:
-              type: markdown
-              label: Content
-              validate:
-                required: true
-
-        location:
-          type: tab
-          title: Location
+          title: Entry
           fields:
             header.location_city:
               type: text
@@ -51,72 +24,61 @@ form:
               label: Country
               placeholder: 'e.g. Japan'
 
-            header.lat:
+            col1:
+              type: columns
+              fields:
+                col1_lat:
+                  type: column
+                  fields:
+                    header.lat:
+                      type: text
+                      label: Latitude
+                      placeholder: '35.0116'
+                col1_lng:
+                  type: column
+                  fields:
+                    header.lng:
+                      type: text
+                      label: Longitude
+                      placeholder: '135.7681'
+
+            col2:
+              type: columns
+              fields:
+                col2_weather:
+                  type: column
+                  fields:
+                    header.weather_desc:
+                      type: select
+                      label: Weather Condition
+                      default: ''
+                      options:
+                        '': '— none —'
+                        'Sunny': '☀️ Sunny'
+                        'Partly cloudy': '⛅ Partly cloudy'
+                        'Cloudy': '☁️ Cloudy'
+                        'Foggy': '🌫️ Foggy'
+                        'Drizzle': '🌦️ Drizzle'
+                        'Rain': '🌧️ Rain'
+                        'Snow': '❄️ Snow'
+                        'Thunderstorm': '⛈️ Thunderstorm'
+
+                col2_temp:
+                  type: column
+                  fields:
+                    header.weather_temp_c:
+                      type: number
+                      label: 'Temperature (°C)'
+                      placeholder: '19'
+                      validate:
+                        min: -60
+                        max: 60
+
+            header.hero_image:
               type: text
-              label: Latitude
-              placeholder: '35.0116'
-              help: 'GPS latitude (decimal degrees)'
-
-            header.lng:
-              type: text
-              label: Longitude
-              placeholder: '135.7681'
-              help: 'GPS longitude (decimal degrees)'
-
-        weather:
-          type: tab
-          title: Weather
-          fields:
-            header.weather_desc:
-              type: select
-              label: Weather Condition
-              default: ''
-              options:
-                '': '— none —'
-                'Sunny': '☀️ Sunny'
-                'Partly cloudy': '⛅ Partly cloudy'
-                'Cloudy': '☁️ Cloudy'
-                'Foggy': '🌫️ Foggy'
-                'Drizzle': '🌦️ Drizzle'
-                'Rain': '🌧️ Rain'
-                'Snow': '❄️ Snow'
-                'Thunderstorm': '⛈️ Thunderstorm'
-
-            header.weather_temp_c:
-              type: number
-              label: 'Temperature (°C)'
-              placeholder: '19'
-              step: 1
-              validate:
-                min: -60
-                max: 60
-
-        publishing:
-          type: tab
-          title: Publishing
-          fields:
-            header.published:
-              type: toggle
-              label: Published
-              highlight: 1
-              default: 1
-              options:
-                1: 'Yes'
-                0: 'No'
-              validate:
-                type: bool
-
-            header.publish_date:
-              type: datetime
-              label: 'Publish Date'
-              help: 'Schedule future publication (leave blank to publish immediately)'
-              format: 'Y-m-d H:i'
-
-            header.unpublish_date:
-              type: datetime
-              label: 'Unpublish Date'
-              help: 'Automatically unpublish at this date/time'
-              format: 'Y-m-d H:i'
+              label: Hero Image Filename
+              placeholder: 'photo.jpg'
+              help: 'Filename of the hero/header image. Leave blank to use the first uploaded image.'
 
         journey:
           type: tab