ux: merge journey fields into entry/location tabs; unstack lat/lng and weather fields

themes/intotheeast/blueprints/entry.yaml

@@ -24,30 +24,16 @@ 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'
 
-            col2:
-              type: columns
-              fields:
-                col2_weather:
-                  type: column
-                  fields:
             header.weather_desc:
               type: select
               label: Weather Condition
@@ -63,9 +49,6 @@ form:
                 'Snow': '❄️ Snow'
                 'Thunderstorm': '⛈️ Thunderstorm'
 
-                col2_temp:
-                  type: column
-                  fields:
             header.weather_temp_c:
               type: number
               label: 'Temperature (°C)'
@@ -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

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