Merge branch 'develop' of github.com:getgrav/grav-plugin-admin into d…

…evelop
getgrav · Aug 20, 2021 · e5135ec · e5135ec
2 parents c397f18 + e6e7a5d
commit e5135ec
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
     * Updated SCSS compiler to v1.6
 2. [](#improved)
     * Updated forms and nested fields to use new form logic
+    * Admin form now use layout `admin`, meaning you can create admin specific field templates by `forms/fields/myfield/admin-field.html.twig`
     * Stop using `|tu` filter, Grav already has the same logic in `|t` for admin
     * Remove unneeded escapes
     * Allow removal of plugin when disabled [#2167](https://github.com/getgrav/grav-plugin-admin/issues/2167)

diff --git a/themes/grav/templates/partials/blueprints-copy.html.twig b/themes/grav/templates/partials/blueprints-copy.html.twig
@@ -1,5 +1,6 @@
 {% set form_id = form_id ? form_id : 'blueprints' %}
 {% set scope = scope ?: 'data.' %}
+{% set field_layout = 'admin' %}
 
 <form {% if form_action %}action="{{ form_action }}"{% endif %} id="{{ form_id }}" method="post" data-grav-form="{{ form_id }}" {% if form.novalidate %}novalidate{% endif %} data-grav-keepalive="true">
     {% embed 'forms/default/fields.html.twig' with {name: null, fields: blueprints.fields} %}

diff --git a/themes/grav/templates/partials/blueprints-new-folder.html.twig b/themes/grav/templates/partials/blueprints-new-folder.html.twig
@@ -1,5 +1,6 @@
 {% set form_id = form_id ? form_id : 'blueprints' %}
 {% set scope = scope ?: 'data.' %}
+{% set field_layout = 'admin' %}
 
 <form {% if form_action %}action="{{ form_action }}"{% endif %} id="{{ form_id }}" method="post" data-grav-form="{{ form_id }}" data-grav-keepalive="true">
     {% embed 'forms/default/fields.html.twig' with {name: null, fields: blueprints.fields} %}

diff --git a/themes/grav/templates/partials/blueprints-new.html.twig b/themes/grav/templates/partials/blueprints-new.html.twig
@@ -1,5 +1,6 @@
 {% set form_id = form_id ? form_id : 'blueprints' %}
 {% set scope = scope ?: 'data.' %}
+{% set field_layout = 'admin' %}
 
 <form {% if form_action %}action="{{ form_action }}"{% endif %} id="{{ form_id }}" method="post" data-grav-form="{{ form_id }}" {% if form.novalidate %}novalidate{% endif %} data-grav-keepalive="true">
     {% embed 'forms/default/fields.html.twig' with {name: null, fields: blueprints.fields} %}

diff --git a/themes/grav/templates/partials/blueprints-raw.html.twig b/themes/grav/templates/partials/blueprints-raw.html.twig
@@ -1,5 +1,6 @@
 {% set form_id = form_id ? form_id : 'blueprints' %}
 {% set scope = scope ?: 'data.' %}
+{% set field_layout = 'admin' %}
 
 {% if admin.findFormFields('file', blueprints.fields) %}
     {% set multipart = ' enctype="multipart/form-data"' %}

diff --git a/themes/grav/templates/partials/blueprints.html.twig b/themes/grav/templates/partials/blueprints.html.twig
@@ -2,6 +2,7 @@
 {% set data = data ?? form.data %}
 {% set form_id = form_id ?? 'blueprints' %}
 {% set scope = scope ?: 'data.' %}
+{% set field_layout = 'admin' %}
 
 {% if admin.findFormFields('file', blueprints.fields) %}
     {% set multipart = ' enctype="multipart/form-data"' %}

diff --git a/themes/grav/templates/partials/login.html.twig b/themes/grav/templates/partials/login.html.twig
@@ -1,5 +1,6 @@
 {% extends 'partials/base.html.twig' %}
 {% set scope = form.scope %}
+{% set field_layout = 'admin' %}
 
 {% block messages %}{% endblock %}
 

diff --git a/themes/grav/templates/partials/page-move.html.twig b/themes/grav/templates/partials/page-move.html.twig
@@ -1,5 +1,6 @@
 {% set form_id = form_id ? form_id : 'page-move' %}
 {% set scope = scope ?: 'data.' %}
+{% set field_layout = 'admin' %}
 
 <form id="{{ form_id }}" method="post" data-grav-form="{{ form_id }}" data-page-move>
     <h1>Move</h1>

diff --git a/themes/grav/templates/partials/register.html.twig b/themes/grav/templates/partials/register.html.twig
@@ -1,5 +1,6 @@
 {% extends 'partials/base.html.twig' %}
 {% set scope = form.scope %}
+{% set field_layout = 'admin' %}
 
 {% block body %}
 <body id="admin-login-wrapper">