downgrade to kirby v3

kirby/config/blocks/gallery/gallery.php

@@ -1,10 +1,5 @@
-<?php
-/** @var \Kirby\Cms\Block $block */
-$caption = $block->caption();
-$crop    = $block->crop()->isTrue();
-$ratio   = $block->ratio()->or('auto');
-?>
-<figure<?= Html::attr(['data-ratio' => $ratio, 'data-crop' => $crop], null, ' ') ?>>
+<?php /** @var \Kirby\Cms\Block $block */ ?>
+<figure>
   <ul>
     <?php foreach ($block->images()->toFiles() as $image): ?>
     <li>
@@ -12,9 +7,4 @@ $ratio   = $block->ratio()->or('auto');
     </li>
     <?php endforeach ?>
   </ul>
-  <?php if ($caption->isNotEmpty()): ?>
-  <figcaption>
-    <?= $caption ?>
-  </figcaption>
-  <?php endif ?>
 </figure>

kirby/config/blocks/gallery/gallery.yml

@@ -8,33 +8,9 @@ fields:
     query: model.images
     multiple: true
     layout: cards
-    size: small
+    size: tiny
     empty: field.blocks.gallery.images.empty
     uploads:
       template: blocks/image
     image:
       ratio: 1/1
-  caption:
-    label: field.blocks.image.caption
-    type: writer
-    icon: text
-    inline: true
-  ratio:
-    label: field.blocks.image.ratio
-    type: select
-    placeholder: Auto
-    width: 1/2
-    options:
-      1/1: "1:1"
-      16/9: "16:9"
-      10/8: "10:8"
-      21/9: "21:9"
-      7/5: "7:5"
-      4/3: "4:3"
-      5/3: "5:3"
-      3/2: "3:2"
-      3/1: "3:1"
-  crop:
-    label: field.blocks.image.crop
-    type: toggle
-    width: 1/2

kirby/config/blocks/heading/heading.yml

@@ -5,31 +5,20 @@ preview: heading
 fields:
   level:
     label: field.blocks.heading.level
-    type: toggles
+    type: select
     empty: false
     default: "h2"
-    labels: false
+    width: 1/6
     options:
-      - value: h1
-        icon: h1
-        text: H1
-      - value: h2
-        icon: h2
-        text: H2
-      - value: h3
-        icon: h3
-        text: H3
-      - value: h4
-        icon: h4
-        text: H4
-      - value: h5
-        icon: h5
-        text: H5
-      - value: h6
-        icon: h6
-        text: H6
+      - h1
+      - h2
+      - h3
+      - h4
+      - h5
+      - h6
   text:
     label: field.blocks.heading.text
     type: writer
     inline: true
+    width: 5/6
     placeholder: field.blocks.heading.placeholder

kirby/config/blocks/image/image.php

@@ -11,7 +11,7 @@ $src     = null;
 if ($block->location() == 'web') {
 	$src = $block->src()->esc();
 } elseif ($image = $block->image()->toFile()) {
-	$alt = $alt->or($image->alt());
+	$alt = $alt ?? $image->alt();
 	$src = $image->url();
 }
 

kirby/config/blocks/image/image.yml

@@ -8,8 +8,8 @@ fields:
     columns: 2
     default: "kirby"
     options:
-      kirby: "{{ t('field.blocks.image.location.internal') }}"
-      web: "{{ t('field.blocks.image.location.external') }}"
+      kirby: Kirby
+      web: Web
   image:
     label: field.blocks.image.name
     type: files

kirby/config/blocks/video/video.php

@@ -2,30 +2,12 @@
 use Kirby\Cms\Html;
 
 /** @var \Kirby\Cms\Block $block */
-$caption = $block->caption();
-
-if (
-	$block->location() == 'kirby' &&
-	$video = $block->video()->toFile()
-) {
-	$url   = $video->url();
-	$attrs = array_filter([
-		'autoplay' => $block->autoplay()->toBool(),
-		'controls' => $block->controls()->toBool(),
-		'loop'     => $block->loop()->toBool(),
-		'muted'    => $block->muted()->toBool(),
-		'poster'   => $block->poster()->toFile()?->url(),
-		'preload'  => $block->preload()->value(),
-	]);
-} else {
-	$url = $block->url();
-}
 ?>
-<?php if ($video = Html::video($url, [], $attrs ?? [])): ?>
+<?php if ($video = Html::video($block->url())): ?>
 <figure>
   <?= $video ?>
-  <?php if ($caption->isNotEmpty()): ?>
-  <figcaption><?= $caption ?></figcaption>
+  <?php if ($block->caption()->isNotEmpty()): ?>
+  <figcaption><?= $block->caption() ?></figcaption>
   <?php endif ?>
 </figure>
 <?php endif ?>

kirby/config/blocks/video/video.yml

@@ -2,77 +2,11 @@ name: field.blocks.video.name
 icon: video
 preview: video
 fields:
-  location:
-    label: field.blocks.video.location
-    type: radio
-    columns: 2
-    default: "web"
-    options:
-      kirby: "{{ t('field.blocks.image.location.internal') }}"
-      web: "{{ t('field.blocks.image.location.external') }}"
   url:
     label: field.blocks.video.url.label
     type: url
     placeholder: field.blocks.video.url.placeholder
-    when:
-      location: web
-  video:
-    label: field.blocks.video.name
-    type: files
-    query: model.videos
-    multiple: false
-    # you might want to add a template for videos here
-    when:
-      location: kirby
-  poster:
-    label: field.blocks.video.poster
-    type: files
-    query: model.images
-    multiple: false
-    image:
-      back: black
-    uploads:
-      template: blocks/image
-    when:
-      location: kirby
   caption:
     label: field.blocks.video.caption
     type: writer
     inline: true
-  autoplay:
-    label: field.blocks.video.autoplay
-    type: toggle
-    width: 1/3
-    when:
-      location: kirby
-  muted:
-    label: field.blocks.video.muted
-    type: toggle
-    width: 1/3
-    default: true
-    when:
-      location: kirby
-  loop:
-    label: field.blocks.video.loop
-    type: toggle
-    width: 1/3
-    when:
-      location: kirby
-  controls:
-    label: field.blocks.video.controls
-    type: toggle
-    width: 1/3
-    default: true
-    when:
-      location: kirby
-  preload:
-    label: field.blocks.video.preload
-    type: select
-    width: 2/3
-    default: auto
-    options:
-      - auto
-      - metadata
-      - none
-    when:
-      location: kirby