From 7dcaa703e0a346120a7c4f9e11bf77dc276ac78c Mon Sep 17 00:00:00 2001
From: Mischa <mischa@gorinskat.nl>
Date: Sat, 20 Jun 2026 10:15:02 +0200
Subject: [PATCH] ux: merge journey fields into entry/location tabs; unstack
 lat/lng and weather fields

---
 themes/intotheeast/blueprints/entry.yaml | 81 +++++++++---------------
 themes/intotheeast/blueprints/story.yaml | 34 +++++-----
 2 files changed, 45 insertions(+), 70 deletions(-)

diff --git a/themes/intotheeast/blueprints/entry.yaml b/themes/intotheeast/blueprints/entry.yaml
index 927ea8a..fb6c3dc 100644
--- a/themes/intotheeast/blueprints/entry.yaml
+++ b/themes/intotheeast/blueprints/entry.yaml
@@ -24,55 +24,38 @@ form:
               label: Country
               placeholder: 'e.g. Japan'
 
-            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'
+            header.lat:
+              type: text
+              label: Latitude
+              placeholder: '35.0116'
 
-            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'
+            header.lng:
+              type: text
+              label: Longitude
+              placeholder: '135.7681'
 
-                col2_temp:
-                  type: column
-                  fields:
-                    header.weather_temp_c:
-                      type: number
-                      label: 'Temperature (°C)'
-                      placeholder: '19'
-                      validate:
-                        min: -60
-                        max: 60
+            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'
+              validate:
+                min: -60
+                max: 60
 
             header.hero_image:
               type: text
@@ -80,10 +63,6 @@ form:
               placeholder: 'photo.jpg'
               help: 'Filename of the hero/header image. Leave blank to use the first uploaded image.'
 
-        journey:
-          type: tab
-          title: Journey
-          fields:
             header.transport_mode:
               type: select
               label: How I arrived here
diff --git a/themes/intotheeast/blueprints/story.yaml b/themes/intotheeast/blueprints/story.yaml
index 9534f19..c690001 100644
--- a/themes/intotheeast/blueprints/story.yaml
+++ b/themes/intotheeast/blueprints/story.yaml
@@ -67,25 +67,6 @@ form:
               placeholder: '11.6760'
               help: 'GPS longitude (decimal degrees)'
 
-        publishing:
-          type: tab
-          title: Publishing
-          fields:
-            header.published:
-              type: toggle
-              label: Published
-              highlight: 1
-              default: 1
-              options:
-                1: 'Yes'
-                0: 'No'
-              validate:
-                type: bool
-
-        journey:
-          type: tab
-          title: Journey
-          fields:
             header.transport_mode:
               type: select
               label: How I arrived here
@@ -109,3 +90,18 @@ form:
                 0: 'No'
               validate:
                 type: bool
+
+        publishing:
+          type: tab
+          title: Publishing
+          fields:
+            header.published:
+              type: toggle
+              label: Published
+              highlight: 1
+              default: 1
+              options:
+                1: 'Yes'
+                0: 'No'
+              validate:
+                type: bool