Merge branch 'develop'

Author: mullema

README.md

@@ -12,6 +12,7 @@ Features with Blueprint options:
 
 This plugin is compatible with [rasteiner/k3-pagesdisplay-sections](https://github.com/rasteiner/k3-pagesdisplay-section)
 
+From Kirby 3.5 use v5.0\
 From Kirby 3.6 use v4.0\
 From Kirby 3.5 use v3.0\
 From Kirby 3.2.5 use v2.2.x\

composer.json

@@ -3,14 +3,17 @@
   "description": "Allow single language pages/site/users in a multi language setup, hide buttons in topbar and sections.",
   "type": "kirby-plugin",
   "license": "MIT",
-  "version": "4.1",
+  "version": "5.0",
   "authors": [
     {
       "name": "Matthias Müller",
       "email": "[email protected]"
     }
   ],
   "require": {
-    "getkirby/composer-installer": "^1.1"
+    "getkirby/composer-installer": "^1.2"
+  },
+  "conflict": {
+    "getkirby/cms": "<3.7"
   }
 }

index.js

@@ -48,13 +48,39 @@
     }
   }
 
+  function extendTableComponent (component) {
+    return {
+      extends: component,
+      watch: {
+        rows () {
+          for (const key in this.rows) {
+            const row = this.rows[key]
+
+            if (!row.blueprintOptions) continue
+
+            if (row.blueprintOptions.hideOptions === true || row.blueprintOptions.hideSettings === true) {
+              this.rows[key].options = {}
+            }
+
+            if (row.blueprintOptions.hideOptions === true || row.blueprintOptions.hideStatus === true) {
+              if ('flag' in this.rows[key]) delete this.rows[key].flag
+            }
+          }
+
+          this.values = this.rows
+        }
+      }
+    }
+  }
+
   /**
-   * Extend item to hide settings & status in sections
+   * Extend item / table to hide settings & status in sections
    * Extend site / page / user view to hide settings / status and language dropdown
    */
   panel.plugin('mullema/k3-panel-view-extended', {
     components: {
       'k-item': extendComponent('k-item'),
+      'k-table': extendTableComponent('k-table'),
       'k-site-view': extendView('k-site-view'),
       'k-page-view': extendView('k-page-view'),
       'k-user-view': extendView('k-user-view')

src/extension.php

@@ -6,41 +6,45 @@
   'computed' => [
       // https://github.com/getkirby/kirby/blob/master/config/sections/pages.php
       'data' => function () {
-
           $data = [];
 
-          foreach ($this->pages as $item) {
-              $blueprint   = $item->blueprint(); // panel-view-extended
-              $permissions = $item->permissions();
-              $image       = $item->panelImage($this->image);
-
-              // escape the default text
-              // TODO: no longer needed in 3.6
-              $text = $item->toString($this->text);
-              if ($this->text === '{{ page.title }}') {
-                  $text = Escape::html($text);
-              }
+          foreach ($this->pages as $page) {
+              $blueprint   = $page->blueprint(); // panel-view-extended
+              $panel       = $page->panel();
+              $permissions = $page->permissions();
 
-              $data[] = [
-                  'id'          => $item->id(),
-                  'dragText'    => $item->dragText(),
-                  'text'        => $text,
-                  'info'        => $item->toString($this->info ?? false),
-                  'parent'      => $item->parentId(),
-                  'icon'        => $item->panelIcon($image),
-                  'image'       => $image,
-                  'link'        => $item->panelUrl(true),
-                  'status'      => $item->status(),
+              $item = [
+                  'dragText'    => $panel->dragText(),
+                  'id'          => $page->id(),
+                  'image'       => $panel->image(
+                      $this->image,
+                      $this->layout === 'table' ? 'list' : $this->layout
+                  ),
+                  'info'        => $page->toSafeString($this->info ?? false),
+                  'link'        => $panel->url(true),
+                  'parent'      => $page->parentId(),
                   'permissions' => [
                       'sort'         => $permissions->can('sort'),
                       'changeSlug'   => $permissions->can('changeSlug'),
                       'changeStatus' => $permissions->can('changeStatus'),
-                      'changeTitle'  => $permissions->can('changeTitle')
+                      'changeTitle'  => $permissions->can('changeTitle'),
                   ],
+                  'status'      => $page->status(),
+                  'template'    => $page->intendedTemplate()->name(),
+                  'text'        => $page->toSafeString($this->text),
                   'blueprintOptions'   => $blueprint->options() // panel-view-extended
               ];
+
+              if ($this->layout === 'table') {
+                  $item = $this->columnsValues($item, $page);
+              }
+
+              $data[] = $item;
           }
+
           return $data;
+
+
       }
   ]
 ];