From 840a349ace29c49bd1de3de1f26dc27abd1bc9a4 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 10 Apr 2017 15:18:10 -0600 Subject: [PATCH] Updated changelog --- CHANGELOG.md | 4 + system/blueprints/pages/default.yaml | 6 +- system/blueprints/pages/modular_new.yaml | 54 ------------ system/blueprints/pages/modular_raw.yaml | 106 ----------------------- system/blueprints/pages/move.yaml | 11 --- system/blueprints/pages/new.yaml | 66 -------------- system/blueprints/pages/new_folder.yaml | 35 -------- system/blueprints/pages/raw.yaml | 105 ---------------------- 8 files changed, 5 insertions(+), 382 deletions(-) delete mode 100644 system/blueprints/pages/modular_new.yaml delete mode 100644 system/blueprints/pages/modular_raw.yaml delete mode 100644 system/blueprints/pages/move.yaml delete mode 100644 system/blueprints/pages/new.yaml delete mode 100644 system/blueprints/pages/new_folder.yaml delete mode 100644 system/blueprints/pages/raw.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 82cde6e37..3b8c04de9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,11 @@ ## xx/xx/2017 1. [](#improved) +<<<<<<< Updated upstream * Added various `ancestor` helper methods in Page and Pages classes [#1362](https://github.com/getgrav/grav/pull/1362) +======= + * Added new 'parents' field and switched Page blueprints to use this +>>>>>>> Stashed changes * Added `isajaxrequest()` Twig function [#1400](https://github.com/getgrav/grav/issues/1400) * Added ability to inline CSS and JS code via Asset manager [#1377](https://github.com/getgrav/grav/pull/1377) * Add query string in lighttpd default config [#1393](https://github.com/getgrav/grav/issues/1393) diff --git a/system/blueprints/pages/default.yaml b/system/blueprints/pages/default.yaml index 0806ba24f..929a067c3 100644 --- a/system/blueprints/pages/default.yaml +++ b/system/blueprints/pages/default.yaml @@ -124,13 +124,9 @@ form: rule: slug route: - type: select + type: parents label: PLUGIN_ADMIN.PARENT classes: fancy - data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes' - data-default@: '\Grav\Plugin\Admin\Admin::rawRoute' - options: - '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT name: type: select diff --git a/system/blueprints/pages/modular_new.yaml b/system/blueprints/pages/modular_new.yaml deleted file mode 100644 index 966b5cbd4..000000000 --- a/system/blueprints/pages/modular_new.yaml +++ /dev/null @@ -1,54 +0,0 @@ -rules: - slug: - pattern: '[a-zA-Zа-яA-Я0-9_\-]+' - min: 1 - max: 200 - -form: - validation: loose - fields: - - section: - type: section - title: PLUGIN_ADMIN.ADD_MODULAR_CONTENT - - title: - type: text - label: PLUGIN_ADMIN.PAGE_TITLE - validate: - required: true - - folder: - type: text - label: PLUGIN_ADMIN.FOLDER_NAME - validate: - rule: slug - required: true - - route: - type: select - label: PLUGIN_ADMIN.PAGE - classes: fancy - data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes' - data-default@: '\Grav\Plugin\Admin\Admin::rawRoute' - validate: - required: true - - name: - type: select - classes: fancy - label: PLUGIN_ADMIN.MODULAR_TEMPLATE - help: PLUGIN_ADMIN.PAGE_FILE_HELP - default: default - data-options@: '\Grav\Common\Page\Pages::modularTypes' - validate: - required: true - - modular: - type: hidden - default: 1 - validate: - type: bool - - blueprint: - type: blueprint diff --git a/system/blueprints/pages/modular_raw.yaml b/system/blueprints/pages/modular_raw.yaml deleted file mode 100644 index 110866677..000000000 --- a/system/blueprints/pages/modular_raw.yaml +++ /dev/null @@ -1,106 +0,0 @@ -rules: - slug: - pattern: '[a-zA-Zа-яA-Я0-9_\-]+' - min: 1 - max: 200 - -form: - validation: loose - fields: - - tabs: - type: tabs - active: 1 - - fields: - content: - type: tab - title: PLUGIN_ADMIN.CONTENT - - fields: - frontmatter: - classes: frontmatter - type: editor - label: PLUGIN_ADMIN.FRONTMATTER - autofocus: true - codemirror: - mode: 'yaml' - indentUnit: 4 - autofocus: true - indentWithTabs: false - lineNumbers: true - styleActiveLine: true - gutters: ['CodeMirror-lint-markers'] - lint: true - - content: - type: markdown - - uploads: - type: pagemedia - label: PLUGIN_ADMIN.PAGE_MEDIA - - - options: - type: tab - title: PLUGIN_ADMIN.OPTIONS - - fields: - - columns: - type: columns - - fields: - column1: - type: column - - fields: - - ordering: - type: toggle - label: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX - help: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX_HELP - highlight: 1 - options: - 1: PLUGIN_ADMIN.ENABLED - 0: PLUGIN_ADMIN.DISABLED - validate: - type: bool - - folder: - type: text - label: PLUGIN_ADMIN.FILENAME - validate: - rule: slug - required: true - - route: - type: select - label: PLUGIN_ADMIN.PARENT - classes: fancy - data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes' - data-default@: '\Grav\Plugin\Admin\Admin::rawRoute' - options: - '': PLUGIN_ADMIN.DEFAULT_OPTION_SELECT - validate: - required: true - - name: - type: select - classes: fancy - label: PLUGIN_ADMIN.MODULAR_TEMPLATE - default: default - data-options@: '\Grav\Common\Page\Pages::modularTypes' - validate: - required: true - - column2: - type: column - - fields: - order: - type: order - label: PLUGIN_ADMIN.ORDERING - - blueprint: - type: blueprint diff --git a/system/blueprints/pages/move.yaml b/system/blueprints/pages/move.yaml deleted file mode 100644 index 3f9eda1f7..000000000 --- a/system/blueprints/pages/move.yaml +++ /dev/null @@ -1,11 +0,0 @@ -form: - validation: loose - fields: - route: - type: select - label: PLUGIN_ADMIN.PARENT - classes: fancy - data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes' - data-default@: '\Grav\Plugin\Admin\Admin::rawRoute' - options: - '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT diff --git a/system/blueprints/pages/new.yaml b/system/blueprints/pages/new.yaml deleted file mode 100644 index 78c7cecb6..000000000 --- a/system/blueprints/pages/new.yaml +++ /dev/null @@ -1,66 +0,0 @@ -rules: - slug: - pattern: '[a-zA-Zа-яA-Я0-9_\-]+' - min: 1 - max: 200 - -form: - validation: loose - fields: - - section: - type: section - title: PLUGIN_ADMIN.ADD_PAGE - - title: - type: text - label: PLUGIN_ADMIN.PAGE_TITLE - help: PLUGIN_ADMIN.PAGE_TITLE_HELP - validate: - required: true - - folder: - type: text - label: PLUGIN_ADMIN.FOLDER_NAME - help: PLUGIN_ADMIN.FOLDER_NAME_HELP - validate: - rule: slug - required: true - - route: - type: select - label: PLUGIN_ADMIN.PARENT_PAGE - classes: fancy - data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes' - data-default@: '\Grav\Plugin\Admin\Admin::getLastPageRoute' - options: - '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT - validate: - required: true - - name: - type: select - classes: fancy - label: PLUGIN_ADMIN.PAGE_FILE - help: PLUGIN_ADMIN.PAGE_FILE_HELP - data-options@: '\Grav\Common\Page\Pages::types' - data-default@: '\Grav\Plugin\Admin\Admin::getLastPageName' - validate: - required: true - - visible: - type: toggle - label: PLUGIN_ADMIN.VISIBLE - help: PLUGIN_ADMIN.VISIBLE_HELP - highlight: '' - default: '' - options: - '': Auto - 1: PLUGIN_ADMIN.YES - 0: PLUGIN_ADMIN.NO - validate: - type: bool - required: true - - blueprint: - type: blueprint diff --git a/system/blueprints/pages/new_folder.yaml b/system/blueprints/pages/new_folder.yaml deleted file mode 100644 index 44d53fc8c..000000000 --- a/system/blueprints/pages/new_folder.yaml +++ /dev/null @@ -1,35 +0,0 @@ -rules: - slug: - pattern: '[a-zA-Zа-яA-Я0-9_\-]+' - min: 1 - max: 200 - -form: - validation: loose - fields: - - section: - type: section - title: PLUGIN_ADMIN.ADD_FOLDER - - folder: - type: text - label: PLUGIN_ADMIN.FOLDER_NAME - help: PLUGIN_ADMIN.FOLDER_NAME_HELP - validate: - rule: slug - required: true - - route: - type: select - label: PLUGIN_ADMIN.PARENT_PAGE - classes: fancy - data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes' - data-default@: '\Grav\Plugin\Admin\Admin::getLastPageRoute' - options: - '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT - validate: - required: true - - blueprint: - type: blueprint diff --git a/system/blueprints/pages/raw.yaml b/system/blueprints/pages/raw.yaml deleted file mode 100644 index f61cf95f6..000000000 --- a/system/blueprints/pages/raw.yaml +++ /dev/null @@ -1,105 +0,0 @@ -rules: - slug: - pattern: '[a-zA-Zа-яA-Я0-9_\-]+' - min: 1 - max: 200 - -form: - validation: loose - fields: - - tabs: - type: tabs - active: 1 - - fields: - content: - type: tab - title: PLUGIN_ADMIN.CONTENT - - fields: - frontmatter: - classes: frontmatter - type: editor - label: PLUGIN_ADMIN.FRONTMATTER - autofocus: true - codemirror: - mode: 'yaml' - indentUnit: 4 - autofocus: true - indentWithTabs: false - lineNumbers: true - styleActiveLine: true - gutters: ['CodeMirror-lint-markers'] - lint: true - - content: - type: markdown - - uploads: - type: pagemedia - label: PLUGIN_ADMIN.PAGE_MEDIA - - options: - type: tab - title: PLUGIN_ADMIN.OPTIONS - - fields: - - columns: - type: columns - - fields: - column1: - type: column - - fields: - - ordering: - type: toggle - label: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX - help: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX_HELP - highlight: 1 - options: - 1: PLUGIN_ADMIN.ENABLED - 0: PLUGIN_ADMIN.DISABLED - validate: - type: bool - - folder: - type: text - label: PLUGIN_ADMIN.FOLDER_NAME - help: PLUGIN_ADMIN.FOLDER_NAME_HELP - validate: - rule: slug - required: true - - route: - type: select - label: PLUGIN_ADMIN.PARENT - classes: fancy - data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes' - data-default@: '\Grav\Plugin\Admin\Admin::rawRoute' - options: - '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT - - name: - type: select - classes: fancy - label: PLUGIN_ADMIN.DISPLAY_TEMPLATE - help: PLUGIN_ADMIN.DISPLAY_TEMPLATE_HELP - default: default - data-options@: '\Grav\Common\Page\Pages::types' - validate: - required: true - - column2: - type: column - - fields: - order: - type: order - label: PLUGIN_ADMIN.ORDERING - - blueprint: - type: blueprint