Updated changelog

2026-07-20 05:21:56 +02:00 · 2017-04-10 15:18:10 -06:00
parent b85e595bbb
commit 840a349ace
8 changed files with 5 additions and 382 deletions
--- 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)
--- 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
--- a/system/blueprints/pages/modular_new.yaml
+++ b/system/blueprints/pages/modular_new.yaml
@@ -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
--- a/system/blueprints/pages/modular_raw.yaml
+++ b/system/blueprints/pages/modular_raw.yaml
@@ -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
--- a/system/blueprints/pages/move.yaml
+++ b/system/blueprints/pages/move.yaml
@@ -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
--- a/system/blueprints/pages/new.yaml
+++ b/system/blueprints/pages/new.yaml
@@ -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
--- a/system/blueprints/pages/new_folder.yaml
+++ b/system/blueprints/pages/new_folder.yaml
@@ -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
--- a/system/blueprints/pages/raw.yaml
+++ b/system/blueprints/pages/raw.yaml
@@ -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