From ee623596a8d63c40df727785569cf1c51e2b9d07 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Wed, 10 Sep 2014 10:05:36 -0600 Subject: [PATCH] system.yaml updates and synchronization --- system/blueprints/site.yaml | 6 +- system/blueprints/system.yaml | 537 +++++++++++++++++++--------------- system/config/system.yaml | 1 - 3 files changed, 298 insertions(+), 246 deletions(-) diff --git a/system/blueprints/site.yaml b/system/blueprints/site.yaml index 851030504..614137f6f 100644 --- a/system/blueprints/site.yaml +++ b/system/blueprints/site.yaml @@ -1,11 +1,13 @@ -title: Site settings +title: Site validation: strict form: fields: title: type: text - label: Site title + label: Site Title + placeholder: "Site wide title" + help: Default title for your site description: type: textarea diff --git a/system/blueprints/system.yaml b/system/blueprints/system.yaml index 097d67663..e4fd63c16 100644 --- a/system/blueprints/system.yaml +++ b/system/blueprints/system.yaml @@ -1,275 +1,326 @@ -title: Configuration -validation: strict +title: System form: - fields: - basics: - type: section - title: Basics - underline: true + fields: - fields: - title: - type: text - label: Site Title - placeholder: "Site wide title" - help: Default title for your site + content: + type: section + title: Content + underline: true - base_url_absolute: - type: text - label: Absolute Base URL - placeholder: "Override Absolute base URL (e.g. http://example.com)" - help: You can provide a base URL to use rather than letting Grav guess what it is + fields: + home.alias: + type: pages + size: medium + label: Home Page + show_all: false + show_modular: false + show_root: false + help: "The page that Grav will use as the default landing page" - base_url_relative: - type: text - label: Relative Base URL - placeholder: "Override Relative base URL (e.g. /subdirectory/site)" - help: You can provide a base URL to use rather than letting Grav guess what it is + pages.theme: + type: themeselect + size: medium + label: Default Theme + help: "Set the theme (defaults to 'default')" - pages.dateformat.short: - type: select - label: PHP date format - help: "Set the PHP date format" - default: 'jS M Y' - options: - 'F jS \\a\\t g:ia': "January 1st at 11:59pm" - 'l jS of F g:i A': "Monday 1st of January at 11:59 PM" - 'D, m M Y G:i:s': "Mon, 01 Jan 2014 23:59:00" - 'd-m-y G:i': "01-01-14 23:59" - 'jS M Y': "10th Feb 2014" + pages.markdown_extra: + type: toggle + label: Markdown Extra + highlight: 1 + options: + 1: Enabled + 0: Disabled + validate: + type: bool - pages.dateformat.long: - type: select - label: Default date format - help: "Set default date format rather than default for |date() filter" - options: - 'F jS \a\t g:ia': "January 1st at 11:59pm" - 'l jS of F g:i A': "Monday 1st of January at 11:59 PM" - 'D, m M Y G:i:s': "Mon, 01 Jan 2014 23:59:00" - 'd-m-y G:i': "01-01-14 23:59" - 'jS M Y': "10th Feb 2014" + pages.process: + type: checkboxes + label: Process + default: [markdown: true, twig: true] + options: + markdown: Markdown + twig: Twig + use: keys - pages.theme: - type: themeselect - label: Default Theme - help: "Set the theme (defaults to 'default')" + pages.dateformat.short: + type: select + label: Short Date Format + help: "Set the short date format" + default: 'jS M Y' + options: + 'F jS \\a\\t g:ia': "January 1st at 11:59pm" + 'l jS of F g:i A': "Monday 1st of January at 11:59 PM" + 'D, m M Y G:i:s': "Mon, 01 Jan 2014 23:59:00" + 'd-m-y G:i': "01-01-14 23:59" + 'jS M Y': "10th Feb 2014" - content: - type: section - title: Content - underline: true + pages.dateformat.long: + type: select + label: Long Date Format + help: "Set the long date format" + options: + 'F jS \a\t g:ia': "January 1st at 11:59pm" + 'l jS of F g:i A': "Monday 1st of January at 11:59 PM" + 'D, m M Y G:i:s': "Mon, 01 Jan 2014 23:59:00" + 'd-m-y G:i': "01-01-14 23:59" + 'jS M Y': "10th Feb 2014" - fields: - home.alias: - type: pages - label: Home page - show_all: false - show_modular: false - show_root: false - help: "The page that Grav will use as the default landing page" + pages.order.by: + type: select + label: Default Ordering + options: + default: Default - based on folder name + folder: Folder - based on prefix-less folder name + title: Title - based on title field in header + date: Date - based on date field in header - pages.order.by: - type: select - label: Default ordering - options: - default: Default - based on folder name - folder: Folder - based on prefix-less folder name - title: Title - based on title field in header - date: Date - based on date field in header + pages.order.dir: + type: toggle + label: Default Order Direction + default: asc + options: + asc: Ascending + desc: Descending - pages.order.dir: - type: toggle - label: Ordering direction - default: asc - options: - asc: Ascending - desc: Descending + pages.list.count: + type: text + label: Default Item Count + help: "Default max pages count" + validate: + type: number + min: 1 - pages.list.count: - type: text - label: Item count - help: "Default max pages count" - validate: - type: number - min: 1 - pages.process: - type: checkboxes - label: Process - default: [markdown: true, twig: true] - options: - markdown: Markdown - twig: Twig - use: keys - events: - type: section - title: Events - underline: true + events: + type: section + title: Events + underline: true - fields: - pages.events.page: - type: toggle - label: Page events - highlight: 1 - options: - 1: Enabled - 0: Disabled - validate: - type: bool + fields: + pages.events.page: + type: toggle + label: Page events + highlight: 1 + options: + 1: Enabled + 0: Disabled + validate: + type: bool - pages.events.twig: - type: toggle - label: Twig events - highlight: 1 - options: - 1: Enabled - 0: Disabled - validate: - type: bool + pages.events.twig: + type: toggle + label: Twig events + highlight: 1 + options: + 1: Enabled + 0: Disabled + validate: + type: bool - caching: - type: section - title: Caching - underline: true + caching: + type: section + title: Caching + underline: true - fields: - cache.enabled: - type: toggle - label: Caching - highlight: 1 - options: - 1: Enabled - 0: Disabled - validate: - type: bool + fields: + cache.enabled: + type: toggle + label: Caching + highlight: 1 + options: + 1: Enabled + 0: Disabled + validate: + type: bool - cache.check.pages: - type: toggle - label: Detect changes in pages - help: Be careful changing this setting. If you disable this setting, Grav no longer automatically updates the pages when the underlaying files are changed. - highlight: 1 - default: 1 - options: - 1: Enabled - 0: Disabled - validate: - type: bool + cache.check.method: + type: select + label: Cache Check Method + options: + file: File + folder: Folder + none: None - cache.prefix: - type: text - label: Cache prefix - placeholder: "Derived from base URL (override by entering random string)" + cache.driver: + type: select + label: Cache driver + options: + auto: Auto detect + file: File + apc: APC + xcache: XCache + memcache: MemCache + wincache: WinCache - cache.driver: - type: select - label: Cache driver - options: - auto: Auto detect - file: File - apc: APC - xcache: XCache - memcache: MemCache - memcached: MemCached - wincache: WinCache + cache.prefix: + type: text + label: Cache Prefix + placeholder: "Derived from base URL (override by entering random string)" - twig: - type: section - title: Twig Templating - underline: true + twig: + type: section + title: Twig Templating + underline: true - fields: - twig.cache: - type: toggle - label: Twig caching - highlight: 1 - options: - 1: Enabled - 0: Disabled - validate: - type: bool + fields: + twig.cache: + type: toggle + label: Twig caching + highlight: 1 + options: + 1: Enabled + 0: Disabled + validate: + type: bool - twig.debug: - type: toggle - label: Twig debug - highlight: 1 - options: - 1: Enabled - 0: Disabled - validate: - type: bool + twig.debug: + type: toggle + label: Twig debug + highlight: 1 + options: + 1: Enabled + 0: Disabled + validate: + type: bool - twig.auto_reload: - type: toggle - label: Detect changes - highlight: 1 - options: - 1: Enabled - 0: Disabled - validate: - type: bool + twig.auto_reload: + type: toggle + label: Detect changes + highlight: 1 + options: + 1: Enabled + 0: Disabled + validate: + type: bool - twig.autoescape: - type: toggle - label: Autoescape variables - highlight: 1 - options: - 1: Enabled - 0: Disabled - validate: - type: bool + twig.autoescape: + type: toggle + label: Autoescape variables + highlight: 1 + options: + 1: Enabled + 0: Disabled + validate: + type: bool - debugger: - type: section - title: Debugger - underline: true + assets: + type: section + title: Assets + underline: true - fields: - debugger.enabled: - type: toggle - label: Debugger - highlight: 1 - options: - 1: Enabled - 0: Disabled - validate: - type: bool + fields: + assets.css_pipeline: + type: toggle + label: CSS Pipeline + highlight: 0 + options: + 1: Enabled + 0: Disabled - debugger.max_depth: - type: select - label: Detail levels - placeholder: "How many nested levels to display for objects or arrays" - options: - 1: 1 level - 2: 2 levels - 3: 3 levels - 4: 4 levels - 5: 5 levels - 6: 6 levels - 7: 7 levels - 8: 8 levels - 9: 9 levels - 10: 10 levels - validate: - type: number + assets.css_minify: + type: toggle + label: CSS Minify + highlight: 1 + options: + 1: Enabled + 0: Disabled + + assets.css_rewrite: + type: toggle + label: CSS Rewrite + highlight: 1 + options: + 1: Enabled + 0: Disabled + + assets.js_pipeline: + type: toggle + label: JavaScript Pipeline + highlight: 0 + options: + 1: Enabled + 0: Disabled + + assets.js_minify: + type: toggle + label: JavaScript Minify + highlight: 1 + options: + 1: Enabled + 0: Disabled + + debugger: + type: section + title: Debugger + underline: true + + fields: + debugger.enabled: + type: toggle + label: Debugger + highlight: 1 + options: + 1: Enabled + 0: Disabled + validate: + type: bool + + debugger.mode: + type: select + label: Mode + options: + detect: Auto-Detect + development: Development + production: Production + + debugger.strict: + type: toggle + label: Strict + highlight: 0 + options: + 1: Enabled + 0: Disabled + validate: + type: bool + + debugger.max_depth: + type: select + label: Detail Level + placeholder: "How many nested levels to display for objects or arrays" + options: + 1: 1 level + 2: 2 levels + 3: 3 levels + 4: 4 levels + 5: 5 levels + 6: 6 levels + 7: 7 levels + 8: 8 levels + 9: 9 levels + 10: 10 levels + validate: + type: number + + debugger.log.enabled: + type: toggle + label: Logging + highlight: 1 + options: + 1: Enabled + 0: Disabled + validate: + type: bool + + debugger.shutdown.close_conection: + type: toggle + label: Shutdown Close Connection + highlight: 1 + options: + 1: Enabled + 0: Disabled + validate: + type: bool - debugger.log.enabled: - type: toggle - label: Logging - highlight: 1 - options: - 1: Enabled - 0: Disabled - validate: - type: bool - debugger.log.timing: - type: toggle - label: Log timings - highlight: 1 - options: - 1: Enabled - 0: Disabled - validate: - type: bool diff --git a/system/config/system.yaml b/system/config/system.yaml index bd18a408c..d4ab1eba5 100644 --- a/system/config/system.yaml +++ b/system/config/system.yaml @@ -46,6 +46,5 @@ debugger: max_depth: 10 # How many nested levels to display for objects or arrays log: enabled: true # Enable logging - timing: false # Enable timing logging shutdown: close_connection: true # Close the connection before calling onShutdown(). disable for debugging