From 9bfeb0ce6e14bc3670d4439399dbf3926530496c Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Thu, 21 Apr 2016 13:42:05 -0600 Subject: [PATCH] Changed to new form `data-*@` format in blueprints --- system/blueprints/config/system.yaml | 4 ++-- system/blueprints/media/move.yaml | 2 +- system/blueprints/pages/default.yaml | 12 ++++++------ system/blueprints/pages/modular_new.yaml | 6 +++--- system/blueprints/pages/modular_raw.yaml | 6 +++--- system/blueprints/pages/move.yaml | 4 ++-- system/blueprints/pages/new.yaml | 8 ++++---- system/blueprints/pages/new_folder.yaml | 4 ++-- system/blueprints/pages/raw.yaml | 6 +++--- system/blueprints/user/account.yaml | 4 ++-- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml index b1293404a..4aa356eb5 100644 --- a/system/blueprints/config/system.yaml +++ b/system/blueprints/config/system.yaml @@ -56,7 +56,7 @@ form: size: medium classes: fancy help: PLUGIN_ADMIN.TIMEZONE_HELP - '@data-options': '\Grav\Common\Utils::timezones' + data-options@: '\Grav\Common\Utils::timezones' default: '' options: '': 'Default (Server Timezone)' @@ -69,7 +69,7 @@ form: label: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT help: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_HELP placeholder: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_PLACEHOLDER - '@data-options': '\Grav\Common\Utils::dateFormats' + data-options@: '\Grav\Common\Utils::dateFormats' validate: type: string diff --git a/system/blueprints/media/move.yaml b/system/blueprints/media/move.yaml index 6287e0595..06fc5bac8 100644 --- a/system/blueprints/media/move.yaml +++ b/system/blueprints/media/move.yaml @@ -5,4 +5,4 @@ form: type: select label: PLUGIN_ADMIN.PAGE classes: fancy - '@data-options': '\Grav\Common\Page\Pages::parents' + data-options@: '\Grav\Common\Page\Pages::parents' diff --git a/system/blueprints/pages/default.yaml b/system/blueprints/pages/default.yaml index 68dbb7325..c5f79c9ed 100644 --- a/system/blueprints/pages/default.yaml +++ b/system/blueprints/pages/default.yaml @@ -138,8 +138,8 @@ form: type: select label: PLUGIN_ADMIN.PARENT classes: fancy - '@data-options': '\Grav\Common\Page\Pages::parentsRawRoutes' - '@data-default': '\Grav\Plugin\admin::route' + data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes' + data-default@: '\Grav\Plugin\admin::route' options: '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT @@ -149,7 +149,7 @@ form: label: PLUGIN_ADMIN.PAGE_FILE help: PLUGIN_ADMIN.PAGE_FILE_HELP default: default - '@data-options': '\Grav\Common\Page\Pages::pageTypes' + data-options@: '\Grav\Common\Page\Pages::pageTypes' header.body_classes: type: text @@ -186,7 +186,7 @@ form: label: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT help: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_HELP placeholder: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_PLACEHOLDER - '@data-options': '\Grav\Common\Utils::dateFormats' + data-options@: '\Grav\Common\Utils::dateFormats' validate: type: string @@ -215,7 +215,7 @@ form: type: checkboxes label: PLUGIN_ADMIN.PROCESS toggleable: true - '@config-default': system.pages.process + config-default@: system.pages.process default: markdown: true twig: false @@ -230,7 +230,7 @@ form: label: PLUGIN_ADMIN.DEFAULT_CHILD_TYPE default: default placeholder: PLUGIN_ADMIN.USE_GLOBAL - '@data-options': '\Grav\Common\Page\Pages::types' + data-options@: '\Grav\Common\Page\Pages::types' header.routable: type: toggle diff --git a/system/blueprints/pages/modular_new.yaml b/system/blueprints/pages/modular_new.yaml index 45ef1667d..1e9e46fc1 100644 --- a/system/blueprints/pages/modular_new.yaml +++ b/system/blueprints/pages/modular_new.yaml @@ -29,8 +29,8 @@ form: type: select label: PLUGIN_ADMIN.PAGE classes: fancy - '@data-options': '\Grav\Common\Page\Pages::parents' - '@data-default': '\Grav\Plugin\admin::route' + data-options@: '\Grav\Common\Page\Pages::parents' + data-default@: '\Grav\Plugin\admin::route' options: '': PLUGIN_ADMIN.DEFAULT_OPTION_SELECT validate: @@ -42,7 +42,7 @@ form: label: PLUGIN_ADMIN.MODULAR_TEMPLATE help: PLUGIN_ADMIN.PAGE_FILE_HELP default: default - '@data-options': '\Grav\Common\Page\Pages::modularTypes' + data-options@: '\Grav\Common\Page\Pages::modularTypes' validate: required: true diff --git a/system/blueprints/pages/modular_raw.yaml b/system/blueprints/pages/modular_raw.yaml index 020ab4a1d..0dffdf7fe 100644 --- a/system/blueprints/pages/modular_raw.yaml +++ b/system/blueprints/pages/modular_raw.yaml @@ -78,8 +78,8 @@ form: type: select label: PLUGIN_ADMIN.PARENT classes: fancy - '@data-options': '\Grav\Common\Page\Pages::parents' - '@data-default': '\Grav\Plugin\admin::route' + data-options@: '\Grav\Common\Page\Pages::parents' + data-default@: '\Grav\Plugin\admin::route' options: '': PLUGIN_ADMIN.DEFAULT_OPTION_SELECT validate: @@ -90,7 +90,7 @@ form: classes: fancy label: PLUGIN_ADMIN.MODULAR_TEMPLATE default: default - '@data-options': '\Grav\Common\Page\Pages::modularTypes' + data-options@: '\Grav\Common\Page\Pages::modularTypes' validate: required: true diff --git a/system/blueprints/pages/move.yaml b/system/blueprints/pages/move.yaml index 4e7bf23e5..68a1d7469 100644 --- a/system/blueprints/pages/move.yaml +++ b/system/blueprints/pages/move.yaml @@ -11,7 +11,7 @@ form: type: select label: PLUGIN_ADMIN.PARENT classes: fancy - '@data-options': '\Grav\Common\Page\Pages::parents' - '@data-default': '\Grav\Plugin\admin::route' + data-options@: '\Grav\Common\Page\Pages::parents' + data-default@: '\Grav\Plugin\admin::route' options: '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT diff --git a/system/blueprints/pages/new.yaml b/system/blueprints/pages/new.yaml index 80c05f375..62a3addec 100644 --- a/system/blueprints/pages/new.yaml +++ b/system/blueprints/pages/new.yaml @@ -31,8 +31,8 @@ form: type: select label: PLUGIN_ADMIN.PARENT_PAGE classes: fancy - '@data-options': '\Grav\Common\Page\Pages::parents' - '@data-default': '\Grav\Plugin\admin::getLastPageRoute' + data-options@: '\Grav\Common\Page\Pages::parents' + data-default@: '\Grav\Plugin\admin::getLastPageRoute' options: '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT validate: @@ -43,8 +43,8 @@ form: 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::getLastPageName' + data-options@: '\Grav\Common\Page\Pages::types' + data-default@: '\Grav\Plugin\admin::getLastPageName' validate: required: true diff --git a/system/blueprints/pages/new_folder.yaml b/system/blueprints/pages/new_folder.yaml index 700f3798b..38b319b3c 100644 --- a/system/blueprints/pages/new_folder.yaml +++ b/system/blueprints/pages/new_folder.yaml @@ -24,8 +24,8 @@ form: type: select label: PLUGIN_ADMIN.PARENT_PAGE classes: fancy - '@data-options': '\Grav\Common\Page\Pages::parents' - '@data-default': '\Grav\Plugin\admin::getLastPageRoute' + data-options@: '\Grav\Common\Page\Pages::parents' + data-default@: '\Grav\Plugin\admin::getLastPageRoute' options: '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT validate: diff --git a/system/blueprints/pages/raw.yaml b/system/blueprints/pages/raw.yaml index a195ab7ed..97d7c8ac3 100644 --- a/system/blueprints/pages/raw.yaml +++ b/system/blueprints/pages/raw.yaml @@ -78,8 +78,8 @@ form: type: select label: PLUGIN_ADMIN.PARENT classes: fancy - '@data-options': '\Grav\Common\Page\Pages::parents' - '@data-default': '\Grav\Plugin\admin::route' + data-options@: '\Grav\Common\Page\Pages::parents' + data-default@: '\Grav\Plugin\admin::route' options: '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT @@ -89,7 +89,7 @@ form: label: PLUGIN_ADMIN.DISPLAY_TEMPLATE help: PLUGIN_ADMIN.DISPLAY_TEMPLATE_HELP default: default - '@data-options': '\Grav\Common\Page\Pages::types' + data-options@: '\Grav\Common\Page\Pages::types' validate: required: true diff --git a/system/blueprints/user/account.yaml b/system/blueprints/user/account.yaml index 33c032607..bd1caa85f 100644 --- a/system/blueprints/user/account.yaml +++ b/system/blueprints/user/account.yaml @@ -56,7 +56,7 @@ form: label: PLUGIN_ADMIN.LANGUAGE size: medium classes: fancy - '@data-options': '\Grav\Plugin\admin::adminLanguages' + data-options@: '\Grav\Plugin\admin::adminLanguages' default: 'en' help: PLUGIN_ADMIN.LANGUAGE_HELP @@ -71,7 +71,7 @@ form: type: selectize size: large label: PLUGIN_ADMIN.GROUPS - '@data-options': '\Grav\User\Groups::groups' + data-options@: '\Grav\User\Groups::groups' classes: fancy help: PLUGIN_ADMIN.GROUPS_HELP validate: