From 8b31ee173ed8bc12dcf502a3fb147592b60d69e9 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Fri, 16 Aug 2019 15:49:58 +0300 Subject: [PATCH] Added configuration option for `Flex Page`, enabled experimental options in Admin Plugin --- CHANGELOG.md | 2 ++ system/blueprints/config/system.yaml | 37 ++++++++++++++++++++++++++++ system/config/system.yaml | 5 ++-- 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e5cd1b9f..8464e59ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # v1.7.0-beta.6 ## mm/dd/2019 +1. [](#new) + * Added configuration option for `Flex Page`, enabled experimental options in Admin Plugin 1. [](#bugfix) * Fixed `$page->summary()` always striping HTML tags if the summary was set by `$page->setSummary()` diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml index f42d37086..93b3b4f33 100644 --- a/system/blueprints/config/system.yaml +++ b/system/blueprints/config/system.yaml @@ -1461,3 +1461,40 @@ form: 0: PLUGIN_ADMIN.NO validate: type: bool + + experimental: + type: tab + title: PLUGIN_ADMIN.EXPERIMENTAL + + fields: + experimental_section: + type: section + title: PLUGIN_ADMIN.EXPERIMENTAL + underline: true + + pages.type: + type: select + label: PLUGIN_ADMIN.PAGES_TYPE + highlight: stable + help: PLUGIN_ADMIN.PAGES_TYPE_HELP + options: + page: PLUGIN_ADMIN.REGULAR + flex: PLUGIN_ADMIN.FLEX + + accounts.type: + type: select + label: PLUGIN_ADMIN.ACCOUNTS_TYPE + highlight: stable + help: PLUGIN_ADMIN.ACCOUNTS_TYPE_HELP + options: + data: PLUGIN_ADMIN.REGULAR + flex: PLUGIN_ADMIN.FLEX + + accounts.storage: + type: select + label: PLUGIN_ADMIN.ACCOUNTS_STORAGE + highlight: stable + help: PLUGIN_ADMIN.ACCOUNTS_STORAGE_HELP + options: + data: PLUGIN_ADMIN.FILE + flex: PLUGIN_ADMIN.FOLDER diff --git a/system/config/system.yaml b/system/config/system.yaml index a40d94d04..921f4eb30 100644 --- a/system/config/system.yaml +++ b/system/config/system.yaml @@ -27,6 +27,7 @@ home: hide_in_urls: false # Hide the home route in URLs pages: + type: page # EXPERIMENTAL: Page type: page or flex theme: quark # Default theme (defaults to "quark" theme) order: by: default # Order pages by "default", "alpha" or "date" @@ -163,8 +164,8 @@ gpm: official_gpm_only: true # By default GPM direct-install will only allow URLs via the official GPM proxy to ensure security accounts: - type: data # Account type: data or flex - storage: file # Flex storage type: file or folder + type: data # EXPERIMENTAL: Account type: data or flex + storage: file # EXPERIMENTAL: Flex storage type: file or folder strict_mode: yaml_compat: true # Grav 1.5+: Enables YAML backwards compatibility