From 73450a17c1f81364f76af1fc6023844d23750806 Mon Sep 17 00:00:00 2001 From: Edwin Noorlander Date: Tue, 11 Aug 2026 17:22:41 +0200 Subject: [PATCH] Plugin system: content vs system types, sidebar-aware UI, arrow visibility - plugin.json type field: 'content' (sidebar) or 'system' (API only) - Content-edit: label 'Plugins', hide section if layout has no sidebar - Content-edit: disable checkboxes when no sidebar layout selected - Content-edit: hide up arrow on first item, down arrow on last item - PluginManager: isPluginViewable() checks type=system -> not viewable - Admin plugins page: show Content/Systeem type badge - HTMLBlock: add plugin.json with type=content - Navigation: add type=content to config --- .../default/views/pages/content-edit.twig | 55 +++++++++++++------ admin/theme/default/views/pages/plugins.twig | 9 ++- cms/core/plugin/PluginManager.php | 8 ++- plugins/HTMLBlock/plugin.json | 7 +++ plugins/Navigation/Navigation.php | 1 + plugins/Navigation/plugin.json | 3 +- public/admin.php | 21 ++++++- 7 files changed, 80 insertions(+), 24 deletions(-) create mode 100644 plugins/HTMLBlock/plugin.json diff --git a/admin/theme/default/views/pages/content-edit.twig b/admin/theme/default/views/pages/content-edit.twig index c379d89..0fe0726 100644 --- a/admin/theme/default/views/pages/content-edit.twig +++ b/admin/theme/default/views/pages/content-edit.twig @@ -28,16 +28,16 @@ {% if availablePlugins is not empty %} -
- +
+
    {% for plugin in selectedPlugins %}
  • - +
    -
    +
    @@ -47,10 +47,10 @@ {% if plugin not in selectedPlugins %}
  • - +
    -
    +
    @@ -88,8 +88,10 @@ document.addEventListener('DOMContentLoaded', function () { var backBtn = document.getElementById('back-btn'); var filenameInput = document.getElementById('filename'); var layoutSelect = document.getElementById('layout'); + var pluginSection = document.getElementById('plugin-section'); if (!backBtn) return; + var sidebarLayouts = {{ sidebarLayouts|json_encode|raw }}; var changed = false; function markChanged() { @@ -104,11 +106,36 @@ document.addEventListener('DOMContentLoaded', function () { filenameInput.addEventListener('input', markChanged); } + // Show/hide plugin section based on layout + function updatePluginVisibility() { + if (!layoutSelect || !pluginSection) return; + var hasSidebar = sidebarLayouts.indexOf(layoutSelect.value) !== -1; + pluginSection.style.display = hasSidebar ? '' : 'none'; + // Disable checkboxes if no sidebar + pluginSection.querySelectorAll('.plugin-checkbox').forEach(function(cb) { + cb.disabled = !hasSidebar; + }); + } + + // Update arrow visibility — hide up on first, down on last + function updateArrows() { + if (!pluginList) return; + var items = pluginList.querySelectorAll('li[data-plugin]'); + items.forEach(function(item, i) { + var upBtn = item.querySelector('.plugin-up'); + var downBtn = item.querySelector('.plugin-down'); + if (upBtn) upBtn.style.visibility = (i === 0) ? 'hidden' : ''; + if (downBtn) downBtn.style.visibility = (i === items.length - 1) ? 'hidden' : ''; + }); + } + // Update the layout value in the editor's frontmatter when the select changes if (layoutSelect) { layoutSelect.addEventListener('change', function () { var newLayout = this.value; var editor = document.getElementById('editor-textarea'); + updatePluginVisibility(); + if (!editor) return; var cm = window.codeMirrorEditor; @@ -117,7 +144,6 @@ document.addEventListener('DOMContentLoaded', function () { // Check if frontmatter exists var fmMatch = content.match(/^---\n([\s\S]*?)\n---/); if (fmMatch) { - // Update existing layout line in frontmatter var frontmatter = fmMatch[1]; if (/^layout:\s*.+$/m.test(frontmatter)) { frontmatter = frontmatter.replace(/^layout:\s*.+$/m, 'layout: ' + newLayout); @@ -126,7 +152,6 @@ document.addEventListener('DOMContentLoaded', function () { } content = content.replace(/^---\n([\s\S]*?)\n---/, '---\n' + frontmatter + '\n---'); } else { - // No frontmatter yet — add one content = '---\nlayout: ' + newLayout + '\n---\n\n' + content; } @@ -160,17 +185,13 @@ document.addEventListener('DOMContentLoaded', function () { pluginList.insertBefore(item, item.nextElementSibling.nextElementSibling); markChanged(); } + updateArrows(); }); - - // On form submit, reorder the checkboxes to match the visual order - var form = document.getElementById('editor-form'); - if (form) { - form.addEventListener('submit', function () { - // The DOM order of the
  • elements already determines the form submission order - // because the checkboxes are inside the
  • elements - }); - } } + + // Initialize + updatePluginVisibility(); + updateArrows(); }); {% endblock %} diff --git a/admin/theme/default/views/pages/plugins.twig b/admin/theme/default/views/pages/plugins.twig index 94b0204..83f5657 100644 --- a/admin/theme/default/views/pages/plugins.twig +++ b/admin/theme/default/views/pages/plugins.twig @@ -16,13 +16,16 @@
    {{ plugin.name|default(plugin.name) }} - {{ plugin.enabled ? 'Actief' : 'Inactief' }} + + {% if plugin.type == 'system' %}Systeem{% else %}Content{% endif %} + {{ plugin.enabled ? 'Actief' : 'Inactief' }} +

    {{ plugin.description|default('Geen beschrijving') }}

    - {% if plugin.version %}v{{ plugin.version }}{% endif %} - {% if plugin.author %}{{ plugin.author }}{% endif %} + {% if plugin.version %}v{{ plugin.version }}{% endif %} + {% if plugin.author %}{{ plugin.author }}{% endif %}

    diff --git a/cms/core/plugin/PluginManager.php b/cms/core/plugin/PluginManager.php index 94bdbd9..c334b75 100644 --- a/cms/core/plugin/PluginManager.php +++ b/cms/core/plugin/PluginManager.php @@ -132,7 +132,13 @@ class PluginManager { if (method_exists($plugin, 'getConfig')) { $config = $plugin->getConfig(); - return !isset($config['viewable']) || $config['viewable'] !== false; + if (isset($config['viewable']) && $config['viewable'] === false) { + return false; + } + // System plugins don't show in sidebar + if (isset($config['type']) && $config['type'] === 'system') { + return false; + } } return true; } diff --git a/plugins/HTMLBlock/plugin.json b/plugins/HTMLBlock/plugin.json new file mode 100644 index 0000000..20cc059 --- /dev/null +++ b/plugins/HTMLBlock/plugin.json @@ -0,0 +1,7 @@ +{ + "name": "HTMLBlock", + "version": "1.0.0", + "author": "CodePress", + "description": "Voorbeeld sidebar plugin met pagina info en quick navigation", + "type": "content" +} \ No newline at end of file diff --git a/plugins/Navigation/Navigation.php b/plugins/Navigation/Navigation.php index 84782a3..925e8cf 100644 --- a/plugins/Navigation/Navigation.php +++ b/plugins/Navigation/Navigation.php @@ -10,6 +10,7 @@ class Navigation $this->config = [ 'title' => 'Navigatie', 'viewable' => true, + 'type' => 'content', ]; } diff --git a/plugins/Navigation/plugin.json b/plugins/Navigation/plugin.json index f6d0dea..bf12caa 100644 --- a/plugins/Navigation/plugin.json +++ b/plugins/Navigation/plugin.json @@ -2,5 +2,6 @@ "name": "Navigation", "version": "1.0.0", "author": "CodePress", - "description": "Essentiële navigatie plugin voor handleidingen en content" + "description": "Essentiële navigatie plugin voor handleidingen en content", + "type": "content" } \ No newline at end of file diff --git a/public/admin.php b/public/admin.php index c2072de..c24b32c 100644 --- a/public/admin.php +++ b/public/admin.php @@ -508,9 +508,10 @@ function handleContentEdit($auth, $config, $twig, $user, $csrf, $siteConfig): vo } } - // Get available plugins (must have plugin.json or .php) + // Get available content plugins (type=content in plugin.json, or no type = content) $pluginsDir = $config['plugins_dir']; $availablePlugins = []; + $sidebarLayouts = []; if (is_dir($pluginsDir)) { foreach (glob($pluginsDir . '*', GLOB_ONLYDIR) as $pluginDir) { $pluginName = basename($pluginDir); @@ -518,12 +519,27 @@ function handleContentEdit($auth, $config, $twig, $user, $csrf, $siteConfig): vo $hasJson = file_exists($pluginDir . '/plugin.json'); $hasPhp = file_exists($pluginDir . '/' . $pluginName . '.php'); if ($hasJson || $hasPhp) { - $availablePlugins[] = $pluginName; + // Check plugin type — only content plugins show in sidebar + $pluginType = 'content'; + if ($hasJson) { + $pj = json_decode(file_get_contents($pluginDir . '/plugin.json'), true); + $pluginType = $pj['type'] ?? 'content'; + } + if ($pluginType === 'content') { + $availablePlugins[] = $pluginName; + } } } } } + // Determine which layouts have a sidebar (based on theme twig files) + foreach ($themeLayouts as $key => $twigFile) { + if (strpos($key, 'sidebar') !== false) { + $sidebarLayouts[] = $key; + } + } + $currentLang = extractLanguagePrefix($file); $route = 'content-edit'; $fileDir = trim(dirname($file), '.\\/'); @@ -541,6 +557,7 @@ function handleContentEdit($auth, $config, $twig, $user, $csrf, $siteConfig): vo 'currentLayout' => $currentLayout ?: $themeDefaultLayout, 'themeLayouts' => $themeLayouts, 'themeDefaultLayout' => $themeDefaultLayout, + 'sidebarLayouts' => $sidebarLayouts, 'activeThemeName' => $activeThemeName, 'availablePlugins' => $availablePlugins, 'selectedPlugins' => $selectedPlugins,