modif comtabilite

user/plugins/admin/themes/grav/templates/forms/fields/array/array.html.twig

@@ -1,46 +1,56 @@
 {% extends "forms/field.html.twig" %}
 
+{% macro renderer(key, text, field, scope) %}
+
+    {% if text is not iterable %}
+        <div class="form-row{% if field.value_only %} array-field-value_only{% endif %}"
+             data-grav-array-type="row">
+            <span data-grav-array-action="sort" class="fa fa-bars"></span>
+            {% if field.value_only != true %}
+                {% if key == '0' and text == '' %}
+                    {% set key = '' %}
+                {% endif %}
+
+                <input
+                        data-grav-array-type="key"
+                        type="text" value="{{ key }}"
+                        {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
+                        placeholder="{{ field.placeholder_key|e|tu }}" />
+            {% endif %}
+
+            {% if field.value_type == 'textarea' %}
+                <textarea
+                        data-grav-array-type="value"
+                        name="{{ ((scope ~ field.name)|fieldName) ~ '[' ~ key ~ ']' }}"
+                        placeholder="{{ field.placeholder_value|e|tu }}"
+                        {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}>{{ text }}</textarea>
+            {% else %}
+                <input
+                        data-grav-array-type="value"
+                        type="text"
+                        name="{{ ((scope ~ field.name)|fieldName) ~ '[' ~ key ~ ']' }}"
+                        placeholder="{{ field.placeholder_value|e|tu }}"
+                        {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
+                        value={% if text == 'true' %}true{% elseif text == 'false' %}false{% else %}"{{ text|join(', ')|e }}"{% endif %} />
+            {% endif %}
+
+            <span data-grav-array-action="rem" class="fa fa-minus"></span>
+            <span data-grav-array-action="add" class="fa fa-plus"></span>
+        </div>
+    {% endif %}
+{% endmacro %}
+
+{% import _self as array_field %}
+
 {% block global_attributes %}
     data-grav-array-name="{{ (scope ~ field.name)|fieldName }}"
     data-grav-array-keyname="{{ field.placeholder_key|e|tu }}"
     data-grav-array-valuename="{{ field.placeholder_value|e|tu }}"
+    data-grav-array-textarea="{{ field.value_type == 'textarea' }}"
     {{ parent() }}
 {% endblock %}
 
-{% macro renderer(key, text, field, scope) %}
-
-    {% if text is not iterable %}
-    <div class="form-row{% if field.value_only %} array-field-value_only{% endif %}"
-         data-grav-array-type="row">
-        <span data-grav-array-action="sort" class="fa fa-bars"></span>
-        {% if field.value_only != true %}
-            {% if key == '0' and text == '' %}
-                {% set key = '' %}
-            {% endif %}
-
-            <input
-                data-grav-array-type="key"
-                type="text" value="{{ key }}"
-                {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
-                placeholder="{{ field.placeholder_key|e|tu }}" />
-        {% endif %}
-
-        <input
-            data-grav-array-type="value"
-            type="text"
-            name="{{ ((scope ~ field.name)|fieldName) ~ '[' ~ key ~ ']' }}"
-            placeholder="{{ field.placeholder_value|e|tu }}"
-            {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
-            value={% if text == 'true' %}true{% elseif text == 'false' %}false{% else %}"{{ text|join(', ')|e }}"{% endif %} />
-
-        <span data-grav-array-action="rem" class="fa fa-minus"></span>
-        <span data-grav-array-action="add" class="fa fa-plus"></span>
-    </div>
-    {% endif %}
-{% endmacro %}
-
 {% block input %}
-    {% import _self as array_field %}
     <div class="{{ field.size }}" data-grav-array-type="container"{% if field.value_only %} data-grav-array-mode="value_only"{% endif %}{{ value|length <= 1 ? ' class="one-child"' : '' }}>
         {% if value|length %}
             {% for key, text in value -%}
@@ -58,18 +68,26 @@
             <div class="form-row" data-grav-array-type="row">
                 <span data-grav-array-action="sort" class="fa fa-bars"></span>
                 {% if field.value_only != true %}
-                <input
-                    data-grav-array-type="key"
-                    type="text"
-                    {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
-                    placeholder="{{ field.placeholder_key|e|tu }}" />
+                    <input
+                        data-grav-array-type="key"
+                        type="text"
+                        {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
+                        placeholder="{{ field.placeholder_key|e|tu }}" />
+                {% endif %}
+                {% if field.value_type == 'textarea' %}
+                    <textarea
+                        data-grav-array-type="value"
+                        name="{{ (scope ~ field.name)|fieldName }}"
+                        {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
+                        placeholder="{{ field.placeholder_value|e|tu }}"></textarea>
+                {% else %}
+                    <input
+                        data-grav-array-type="value"
+                        type="text"
+                        name="{{ (scope ~ field.name)|fieldName }}"
+                        {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
+                        placeholder="{{ field.placeholder_value|e|tu }}" />
                 {% endif %}
-                <input
-                    data-grav-array-type="value"
-                    type="text"
-                    name="{{ (scope ~ field.name)|fieldName }}"
-                    {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
-                    placeholder="{{ field.placeholder_value|e|tu }}" />
                 <span data-grav-array-action="rem" class="fa fa-minus"></span>
                 <span data-grav-array-action="add" class="fa fa-plus"></span>
             </div>

user/plugins/admin/themes/grav/templates/forms/fields/editor/editor.html.twig

@@ -32,13 +32,13 @@
             {% if field.resizer is not defined or field.resizer not in ['off', 'false', 0] %}<div class="grav-editor-resizer"></div>{% endif %}
             {% if field.description %}
                 <div class="form-extra-wrapper {{ field.size }} {{ field.wrapper_classes }}">
-                        <span class="form-description">
-                            {% if field.markdown %}
-                                {{ field.description|tu|markdown(false)|raw }}
-                            {% else %}
-                                {{ field.description|tu|raw }}
-                            {% endif %}
-                        </span>
+                    <span class="form-description">
+                        {% if field.markdown %}
+                            {{ field.description|tu|markdown(false)|raw }}
+                        {% else %}
+                            {{ field.description|tu|raw }}
+                        {% endif %}
+                    </span>
                 </div>
             {% endif %}
         </div>

user/plugins/admin/themes/grav/templates/forms/fields/file/file.html.twig

@@ -1,9 +1,4 @@
 {% extends "forms/field.html.twig" %}
-{% set defaults = config.plugins.form %}
-{% set files = defaults.files|merge(field|default([])) %}
-{% set limit = not field.multiple ? 1 : files.limit %}
-
-
 
 {% macro bytesToSize(bytes) -%}
     {% spaceless %}
@@ -43,20 +38,26 @@
         {% set real_path = global.admin.getPagePathFromToken(path) %}
         {% set remove = global.file_url_remove ? global.file_url_remove : (global.base_url_relative ~ '/media.json') %}
         {% set remove = uri.addNonce(
-        remove ~
-        '/route' ~ config.system.param_sep ~ base64_encode(global.base_path ~ '/' ~ real_path) ~
-        '/task' ~ config.system.param_sep ~ 'removeFileFromBlueprint' ~
-        '/proute' ~ config.system.param_sep ~ base64_encode(route) ~
-        '/blueprint' ~ config.system.param_sep ~ blueprint ~
-        '/type' ~ config.system.param_sep ~ type ~
-        '/field' ~ config.system.param_sep ~ files.name ~
-        '/path' ~ config.system.param_sep ~ base64_encode(value.path), 'admin-form', 'admin-nonce') %}
+            remove ~
+            '/route' ~ config.system.param_sep ~ base64_encode(global.base_path ~ '/' ~ real_path) ~
+            '/task' ~ config.system.param_sep ~ 'removeFileFromBlueprint' ~
+            '/proute' ~ config.system.param_sep ~ base64_encode(route) ~
+            '/blueprint' ~ config.system.param_sep ~ blueprint ~
+            '/type' ~ config.system.param_sep ~ type ~
+            '/field' ~ config.system.param_sep ~ files.name ~
+            '/path' ~ config.system.param_sep ~ base64_encode(value.path), 'admin-form', 'admin-nonce') %}
 
         {% set file = value|merge({remove: remove, path: (uri.rootUrl == '/' ? '/' : uri.rootUrl ~ '/' ~ real_path) }) %}
         <div class="hidden" data-file="{{ file|json_encode|e('html_attr') }}"></div>
     {% endif %}
 {% endmacro %}
 
+{% import _self as macro %}
+
+{% set defaults = config.plugins.form %}
+{% set files = defaults.files|merge(field|default([])) %}
+{% set limit = not field.multiple ? 1 : files.limit %}
+
 {% block input %}
     {% set upload_limit = config.system.media.upload_limit  / 1024 / 1024 %}
     {% set page_can_upload = exists or (type == 'page' and not exists and not (field.destination starts with '@self' or field.destination starts with 'self@')) %}
@@ -78,7 +79,7 @@
         />
 
         {% for path, file in value %}
-            {{ _self.preview(path, file, _context) }}
+            {{ macro.preview(path, file, _context) }}
         {% endfor %}
         {% include 'forms/fields/hidden/hidden.html.twig' with {field: {name: '_json.' ~ field.name}, value:value|raw|json_encode} %}
     </div>

user/plugins/admin/themes/grav/templates/forms/fields/list/list.html.twig

@@ -45,16 +45,18 @@
             {% if field.max is defined and not field.selectunique %}data-max="{{ field.max }}"{% endif %}
         >
             {% if fieldControls in ['top', 'both'] %}
-                <div class="collection-actions{{ not value|length ? ' hidden' : '' }}">
-                    <button class="button" type="button" data-action="expand_all"
-                            {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}><i class="fa fa-chevron-circle-down"></i> {{ "PLUGIN_ADMIN.EXPAND_ALL"|e|tu }}</button>
-                    <button class="button" type="button" data-action="collapse_all"
-                            {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}><i class="fa fa-chevron-circle-right"></i> {{ "PLUGIN_ADMIN.COLLAPSE_ALL"|e|tu }}</button>
+                <div class="collection-actions">
+                    {% if collapsible %}
+                        <button class="button" type="button" data-action="expand_all"
+                                {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}><i class="fa fa-chevron-circle-down"></i> {{ "PLUGIN_ADMIN.EXPAND_ALL"|e|tu }}</button>
+                        <button class="button" type="button" data-action="collapse_all"
+                                {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}><i class="fa fa-chevron-circle-right"></i> {{ "PLUGIN_ADMIN.COLLAPSE_ALL"|e|tu }}</button>
+                    {% endif %}
                     {% if field.sortby %}
                         <button class="button{{ not value|length ? ' hidden' : '' }}" type="button" data-action="sort" data-action-sort="{{ field.sortby }}" data-action-sort-dir="{{ field.sortby_dir|default('asc') }}"
                                 {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}><i class="fa fa-sort-amount-{{ field.sortby_dir|default('asc') }}"></i> {{ btnSortLabel|e|tu }} '{{ field.sortby }}'</button>
                     {% endif %}
-                    <button class="button" type="button" data-action="add" data-action-add="top"
+                    <button class="button" type="button" data-action="add" data-action-add="bottom"
                             {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}><i class="fa fa-plus"></i> {{ btnLabel|e|tu }}</button>
                 </div>
             {% endif %}
@@ -75,7 +77,7 @@
                                 {% set childName = itemName -%}
                             {%- elseif childName starts with '.' -%}
                                 {% set childKey = childName|trim('.') %}
-                                {% set childValue = val[childName[1:]] %}
+                                {% set childValue = val|nested(childName) %}
                                 {% set childName = itemName ~ childName %}
                             {% else %}
                                 {% set childKey = childName %}

user/plugins/admin/themes/grav/templates/forms/fields/multilevel/multilevel.html.twig

@@ -1,13 +1,8 @@
 {% extends "forms/field.html.twig" %}
 
-{% block global_attributes %}
-    data-grav-array-name="{{ (scope ~ field.name)|fieldName }}"
-    data-grav-array-keyname="{{ field.placeholder_key|e|tu }}"
-    data-grav-array-valuename="{{ field.placeholder_value|e|tu }}"
-    {{ parent() }}
-{% endblock %}
-
 {% macro renderer(key, content, field, scope, level, parent_key, up_level) %}
+    {% import _self as self %}
+
     {% macro field(value, key, level, globalvars, disable_name, hidden) %}
         {% set name = 'data[' ~ globalvars.field.name|replace({'.': ']['}) ~ ']' ~ key %}
         <div class="form-row array-field-value_only js__multilevel-field {{ level == 0 ? 'top' : '' }}"
@@ -28,14 +23,14 @@
 
     {% if level == 0 %}
 
-        {{ _self.field(key, '', level, _context, true, (is_numeric(key) ? true : false)) }}
+        {{ self.field(key, '', level, _context, true, (is_numeric(key) ? true : false)) }}
 
         {% if content is not iterable %}
             {% set level2 = level + 1 %}
 
             <div class="children-wrapper">
                 <div class="element-wrapper">
-                    {{ _self.field(content, '[' ~ key ~ ']', level2, _context) }}
+                    {{ self.field(content, '[' ~ key ~ ']', level2, _context) }}
                 </div>
             </div>
         {% endif %}
@@ -51,9 +46,9 @@
             <div class="element-wrapper">
                 {% if not is_numeric(inner_key) %}
                     {% if (content|length > 1) %}
-                        {{ _self.field(inner_key, parent_key, level, _context, true) }}
+                        {{ self.field(inner_key, parent_key, level, _context, true) }}
                     {% else %}
-                        {{ _self.field(inner_key, parent_key, level, _context) }}
+                        {{ self.field(inner_key, parent_key, level, _context) }}
                     {% endif %}
                     {% set level2 = level + 1 %}
                     {% set up_level = true %}
@@ -70,7 +65,7 @@
                     {% endif %}
 
                     {% set last_key = (is_numeric(inner_key)) ? '' : inner_key %}
-                    {{ _self.field(inner_content, parent_key ~ '[' ~ inner_key ~ ']', level2, _context) }}
+                    {{ self.field(inner_content, parent_key ~ '[' ~ inner_key ~ ']', level2, _context) }}
 
                     {% if not is_numeric(inner_key) %}
                             </div>
@@ -79,19 +74,28 @@
                 {% else %}
 
                     {% set inner_parent_key = parent_key ~ '[' ~ inner_key ~ ']' %}
-                    {{ _self.renderer(inner_key, inner_content, field, scope, level, inner_parent_key, up_level) }}
+                    {{ self.renderer(inner_key, inner_content, field, scope, level, inner_parent_key, up_level) }}
                 {% endif %}
             </div>
         {% endfor %}
     </div>
 {% endmacro %}
 
+{% import _self as macro %}
+
+{% block global_attributes %}
+    data-grav-array-name="{{ (scope ~ field.name)|fieldName }}"
+    data-grav-array-keyname="{{ field.placeholder_key|e|tu }}"
+    data-grav-array-valuename="{{ field.placeholder_value|e|tu }}"
+    {{ parent() }}
+{% endblock %}
+
 {% block input %}
     <div data-id="{{random_string()}}" data-grav-multilevel-field data-grav-array-type="container" data-grav-array-mode="value_only"{{ value|length <= 1 ? ' class="one-child"' : '' }}>
         {% if value|length %}
             {% for key, content in value -%}
                 <div class="element-wrapper">
-                    {{ _self.renderer(key, content, field, scope, 0, '[' ~ key ~ ']', true) }}
+                    {{ macro.renderer(key, content, field, scope, 0, '[' ~ key ~ ']', true) }}
                 </div>
             {% endfor %}
         {%- else -%}

user/plugins/admin/themes/grav/templates/forms/fields/order/order.html.twig

@@ -1,6 +1,6 @@
 {% set value = (value is null ? field.default : value) %}
-{% set siblings = data.parent.children %}
-{% set canOrder = data.order %}
+{% set siblings = context.parent.children %}
+{% set canOrder = context.order %}
 {% set vertical = field.style == 'vertical' %}
 
 <div class="form-field grid pure-g{% if vertical %} vertical{% endif %}">

user/plugins/admin/themes/grav/templates/forms/fields/pages/pages.html.twig

@@ -14,6 +14,8 @@
     {% endfor %}
 {% endmacro %}
 
+{% import _self as macro %}
+
 {% block global_attributes %}
     data-grav-selectize="{{ (field.selectize is defined ? field.selectize : {})|json_encode|e('html_attr') }}"
     data-grav-field="select"
@@ -43,7 +45,7 @@
         {% if field.show_root %}
             <option value="/">/ (root)</option>
         {% endif %}
-        {{ _self.page_options(_context, page_list) }}
+        {{ macro.page_options(_context, page_list) }}
         </select>
     </div>
 {% endblock %}

user/plugins/admin/themes/grav/templates/forms/fields/permissions/permissions.html.twig

@@ -1,5 +1,12 @@
 {% extends "forms/field.html.twig" %}
 
+{% macro spanToggle(input, length) %}
+    {% set space = repeat('  ', (length - input|length) / 2) %}
+    {{ (space ~ input ~ space)|raw }}
+{% endmacro %}
+
+{% import _self as macro %}
+
 {% set value = (value is null ? field.default : value) %}
 {% set value = (value is same as(false) ? 0 : value) %}
 
@@ -8,11 +15,6 @@
     data-grav-default="{{ field.default|json_encode()|e('html_attr') }}"
 {% endblock %}
 
-{% macro spanToggle(input, length) %}
-    {% set space = repeat('  ', (length - input|length) / 2) %}
-    {{ (space ~ input ~ space)|raw }}
-{% endmacro %}
-
 {% block input %}
     <div class="permissions-container">
         {% set permissions = admin.getPermissions %}
@@ -56,7 +58,7 @@
                             {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
                         />
 
-                        <label for="{{ id }}">{{ (_self.spanToggle(translation, maxLen)|trim)|raw }}</label>
+                        <label for="{{ id }}">{{ (macro.spanToggle(translation, maxLen)|trim)|raw }}</label>
                     {% endfor %}
                     <a></a>
                 </div>

user/plugins/admin/themes/grav/templates/forms/fields/range/range.html.twig

@@ -7,11 +7,11 @@
     {% if field.validate.max %}max="{{ field.validate.max }}"{% endif %}
     {% if field.validate.step %}step="{{ field.validate.step }}"{% endif %}
     {% if field.id is defined %}
-        id="range_{{ field.id|e|replace('.', '_') }}"
-        oninput="number_{{ field.id|e|replace('.', '_') }}_output.value = this.value"
+        id="range_{{ field.id|e|replace({'.': '_'}) }}"
+        oninput="number_{{ field.id|e|replace({'.': '_'}) }}_output.value = this.value"
     {% else %}
-        id="range_{{ field.name|e|replace('.', '_') }}"
-        oninput="number_{{ field.name|e|replace('.', '_') }}_output.value = this.value"
+        id="range_{{ field.name|e|replace({'.': '_'}) }}"
+        oninput="number_{{ field.name|e|replace({'.': '_'}) }}_output.value = this.value"
     {% endif %}
     {{ parent() }}
 {% endblock %}
@@ -30,11 +30,11 @@
             value="0"
         {% endif %}
         {% if field.id is defined %}
-            id="number_{{ field.id|e|replace('.', '_') }}_output"
-            oninput="range_{{ field.id|e|replace('.', '_') }}.value = this.value"
+            id="number_{{ field.id|e|replace({'.': '_'}) }}_output"
+            oninput="range_{{ field.id|e|replace({'.': '_'}) }}.value = this.value"
         {% else %}
-            id="number_{{ field.name|e|replace('.', '_') }}_output"
-            oninput="range_{{ field.name|e|replace('.', '_') }}.value = this.value"
+            id="number_{{ field.name|e|replace({'.': '_'}) }}_output"
+            oninput="range_{{ field.name|e|replace({'.': '_'}) }}.value = this.value"
         {% endif %}
     />
     <span class="range-append">{{ field.append }}</span>

user/plugins/admin/themes/grav/templates/forms/fields/selectize/selectize.html.twig

@@ -1,7 +1,7 @@
 {% extends "forms/field.html.twig" %}
 
 {% block global_attributes %}
-    data-grav-selectize="{{ (field.selectize is defined ? field.selectize|merge({'create': true})|merge({'items':value}) : {'create': true})|json_encode()|e('html_attr') }}"
+    data-grav-selectize="{{ (field.selectize is defined ? field.selectize|merge({'create': true}) : {'create': true})|json_encode()|e('html_attr') }}"
     {{ parent() }}
 {% endblock %}
 

user/plugins/admin/themes/grav/templates/forms/fields/tab/tab.html.twig

@@ -1,9 +1,13 @@
 {% if field.fields %}
     <div class="form-tab">
-    {% for field in field.fields %}
+    {% for childName, child in field.fields %}
         {% if field.type %}
-            {% set value = field.name ? data.value(field.name) : data.toArray %}
-            {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %}
+            {%- if childName starts with '.' -%}
+                {% set child = child|merge({ name: field.name ~ childName }) %}
+            {% endif %}
+
+            {% set value = child.name ? data.value(child.name) : data.toArray %}
+            {% include ["forms/fields/#{child.type}/#{child.type}.html.twig", 'forms/fields/text/text.html.twig'] with { field: child, value: data.value(child.name) } %}
         {% endif %}
     {% endfor %}
     </div>

user/plugins/admin/themes/grav/templates/forms/fields/toggle/toggle.html.twig

@@ -1,5 +1,12 @@
 {% extends "forms/field.html.twig" %}
 
+{% macro spanToggle(input, length) %}
+    {% set space = repeat('  ', (length - input|length) / 2) %}
+    {{ (space ~ input ~ space)|raw }}
+{% endmacro %}
+
+{% import _self as macro %}
+
 {% set value = (value is null ? field.default : value) %}
 {% set value = (value is same as(false) ? 0 : value) %}
 
@@ -15,11 +22,6 @@
     data-grav-field-name="{{ (scope ~ field.name)|fieldName }}"
 {% endblock %}
 
-{% macro spanToggle(input, length) %}
-    {% set space = repeat('  ', (length - input|length) / 2) %}
-    {{ (space ~ input ~ space)|raw }}
-{% endmacro %}
-
 {% block input %}
 
     <div class="switch-toggle switch-grav {{ field.size }} switch-{{ field.options|length }} {{ field.classes }}">
@@ -54,7 +56,7 @@
                 {% endif %}
                 {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
             />
-            <label for="{{ id }}">{{ (_self.spanToggle(translation, maxLen)|trim)|raw }}</label>
+            <label for="{{ id }}">{{ (macro.spanToggle(translation, maxLen)|trim)|raw }}</label>
         {% endfor %}
     </div>
 {% endblock %}

user/plugins/admin/themes/grav/templates/forms/fields/xss/xss.html.twig

@@ -0,0 +1,6 @@
+{% set xss_header = data.value('header')|array %}
+{% set xss_content = data.value('content') %}
+{% set xss_status = xss({header: xss_header, content: xss_content}) %}
+{% if xss_status is not empty %}
+    <div class="notice alert">{{ "PLUGIN_ADMIN.XSS_ISSUE"|tu([xss_status])|raw }}</div>
+{% endif %}

user/plugins/admin/themes/grav/templates/pages.html.twig

@@ -4,6 +4,87 @@
     {{ (repeat('  ', (length - input|length) / 2) ~ input ~ repeat('  ', (length - input|length) / 2))|raw }}
 {% endmacro %}
 
+{% macro loop(page, depth, twig_vars) %}
+    {% import _self as self %}
+
+    {% set config = twig_vars['config'] %}
+    {% set separator = config.system.param_sep %}
+    {% set display_field = config.plugins.admin.pages_list_display_field %}
+    {% set base_url = twig_vars['base_url_relative'] %}
+    {% set base_url_relative_frontend = twig_vars['base_url_relative_frontend'] %}
+    {% set base_url_simple = twig_vars['base_url_simple'] %}
+    {% set admin_route = twig_vars['admin_route'] %}
+    {% set admin_lang = twig_vars['admin_lang'] %}
+    {% set warn = twig_vars['warn'] %}
+    {% set uri = twig_vars['uri'] %}
+
+    {% if page.header.admin.children_display_order == 'collection' and page.header.content.order.by %}
+        {% if page.header.content.order.custom %}
+            {% set pcol = page.children().order(page.header.content.order.by, page.header.content.order.dir|default('asc'), page.header.content.order.custom) %}
+        {% else %}
+            {% set pcol = page.children().order(page.header.content.order.by, page.header.content.order.dir|default('asc')) %}
+        {% endif %}
+    {% else %}
+        {% set pcol = page.children() %}
+    {% endif %}
+
+    {% for p in pcol %}
+        {% set description = (not p.page ? "PLUGIN_ADMIN.FOLDER"|tu ~ ' • ' : "PLUGIN_ADMIN.PAGE"|tu ~ ' • ') ~
+            (p.modular ? "PLUGIN_ADMIN.MODULAR"|tu ~ ' • ' : '') ~
+            (p.routable ? "PLUGIN_ADMIN.ROUTABLE"|tu ~ ' • ' : "PLUGIN_ADMIN.NON_ROUTABLE"|tu ~ ' • ') ~
+            (p.visible ? "PLUGIN_ADMIN.VISIBLE"|tu ~ ' • ' : "PLUGIN_ADMIN.NON_VISIBLE"|tu ~ ' • ') ~
+            (p.published ? "PLUGIN_ADMIN.PUBLISHED"|tu ~ ' • ' : "PLUGIN_ADMIN.NON_PUBLISHED"|tu ~ ' • ') %}
+
+        {% set page_url = getPageUrl(p) %}
+
+        <li class="page-item" data-nav-id="{{ p.route }}">
+            <div class="row page-item__row">
+                <span class="page-item__toggle" {{ p.children(0).count > 0 ? 'data-toggle="children"' : ''}}>
+                    <i class="page-icon fa fa-fw fa-circle-o {{ p.children(0).count > 0 ? 'children-closed' : ''}} {{ p.modular ? 'modular' : (not p.routable ? 'not-routable' : (not p.visible ? 'not-visible' : (not p.page ? 'folder' :  ''))) }}"></i>
+                </span>
+                <div class="page-item__content">
+                    <div class="page-item__content-name">
+                        <span data-hint="{{ description|trim(' &bull; ')|raw }}" class="hint--top page-item__content-hint">
+                            {% set page_label = attribute(p.header, display_field)|defined(attribute(p, display_field))|defined(p.title) %}
+                            <a href="{{ page_url }}" class="page-edit">{{ page_label|e }}</a>
+                        </span>
+                        {% if p.language %}
+                            <span class="badge lang {% if p.language == admin_lang %}info{% endif %}">{{p.language}}</span>
+                        {% endif %}
+                        {% if p.home %}
+                            <span class="page-home"><i class="fa fa-home"></i></span>
+                        {% endif %}
+                    </div>
+                    <p class="page-route">{{ p.header.routes.default ?: p.route }} <span class="spacer"><i class="fa fa-long-arrow-right"></i></span> {{ p.template() }}</p>
+                </div>
+                <span class="page-item__tools">
+                    {% if config.plugins.admin.frontend_preview_target != 'inline' %}
+                        {% set preview_target = config.plugins.admin.frontend_preview_target %}
+                        {% set preview_html = (base_url_relative_frontend|rtrim('/') ~ (p.home ? '' : p.route)) ?: '/' %}
+                        {% set preview_link = p.routable ? '<a class="page-view" target="' ~ preview_target ~ '" href="' ~ preview_html ~ '" title="' ~ "PLUGIN_ADMIN.PREVIEW"|tu ~ '"> <i class="fa fa-fw fa-eye"></i></a>' : '' %}
+                    {% else %}
+                        {% set preview_html = (base_url|rtrim('/') ~ '/preview' ~ (p.home ? '' : p.route)) ?: '/' %}
+                        {% set preview_link = p.routable ? '<a class="page-view" href="' ~ preview_html ~ '" title="' ~ "PLUGIN_ADMIN.PREVIEW"|tu ~ '"> <i class="fa fa-fw fa-eye"></i></a>' : '' %}
+                    {% endif %}
+                    {{ preview_link|raw }}
+                    {% if warn %}
+                        <a href="#delete" data-remodal-target="delete" data-delete-url="{{ uri.addNonce(page_url ~ '/task' ~ separator ~ 'delete', 'admin-form', 'admin-nonce') }}" class="page-delete" ><i class="fa fa-close"></i></a>
+                    {% else %}
+                        <a href="{{ uri.addNonce(page_url ~ '/task' ~ separator ~ 'delete', 'admin-form', 'admin-nonce') }}" class="page-delete" ><i class="fa fa-close"></i></a>
+                    {% endif %}
+                </span>
+            </div>
+            {% if p.children().count > 0 %}
+                <ul class="depth-{{ depth + 1 }}" style="display:none;">
+                    {{ self.loop(p, depth + 1, twig_vars) }}
+                </ul>
+            {% endif %}
+        </li>
+    {% endfor %}
+{% endmacro %}
+
+{% import _self as macro %}
+
 {% if admin.route %}
     {% set context = admin.page(true) %}
 {% endif %}
@@ -50,85 +131,8 @@
     {% set preview_link = context.routable ? '<a class="button" href="' ~ preview_html ~ '" title="' ~ "PLUGIN_ADMIN.PREVIEW"|tu ~ '"> <i class="fa fa-fw fa-eye" style="font-size:18px;margin-right:0;"></i></a>' : '' %}
 {% endif %}
 
-{% macro loop(page, depth, twig_vars) %}
-    {% set config = twig_vars['config'] %}
-    {% set separator = config.system.param_sep %}
-    {% set display_field = config.plugins.admin.pages_list_display_field %}
-    {% set base_url = twig_vars['base_url_relative'] %}
-    {% set base_url_relative_frontend = twig_vars['base_url_relative_frontend'] %}
-    {% set base_url_simple = twig_vars['base_url_simple'] %}
-    {% set admin_route = twig_vars['admin_route'] %}
-    {% set admin_lang = twig_vars['admin_lang'] %}
-    {% set warn = twig_vars['warn'] %}
-    {% set uri = twig_vars['uri'] %}
-
-    {% if page.header.admin.children_display_order == 'collection' and page.header.content.order.by %}
-        {% if page.header.content.order.custom %}
-            {% set pcol = page.children().order(page.header.content.order.by, page.header.content.order.dir|default('asc'), page.header.content.order.custom) %}
-        {% else %}
-            {% set pcol = page.children().order(page.header.content.order.by, page.header.content.order.dir|default('asc')) %}
-        {% endif %}
-    {% else %}
-        {% set pcol = page.children() %}
-    {% endif %}
-
-    {% for p in pcol %}
-        {% set description = (not p.page ? "PLUGIN_ADMIN.FOLDER"|tu ~ ' &bull; ' : "PLUGIN_ADMIN.PAGE"|tu ~ ' &bull; ') ~
-                             (p.modular ? "PLUGIN_ADMIN.MODULAR"|tu ~ ' &bull; ' : '') ~
-                             (p.routable ? "PLUGIN_ADMIN.ROUTABLE"|tu ~ ' &bull; ' : "PLUGIN_ADMIN.NON_ROUTABLE"|tu ~ ' &bull; ') ~
-                             (p.visible ? "PLUGIN_ADMIN.VISIBLE"|tu ~ ' &bull; ' : "PLUGIN_ADMIN.NON_VISIBLE"|tu ~ ' &bull; ') ~
-                             (p.published ? "PLUGIN_ADMIN.PUBLISHED"|tu ~ ' &bull; ' : "PLUGIN_ADMIN.NON_PUBLISHED"|tu ~ ' &bull; ') %}
-
-        {% set page_url = getPageUrl(p) %}
-
-        <li class="page-item" data-nav-id="{{ p.route }}">
-            <div class="row page-item__row">
-                <span class="page-item__toggle" {{ p.children(0).count > 0 ? 'data-toggle="children"' : ''}}>
-                    <i class="page-icon fa fa-fw fa-circle-o {{ p.children(0).count > 0 ? 'children-closed' : ''}} {{ p.modular ? 'modular' : (not p.routable ? 'not-routable' : (not p.visible ? 'not-visible' : (not p.page ? 'folder' :  ''))) }}"></i>
-                </span>
-                <div class="page-item__content">
-                    <div class="page-item__content-name">
-                        <span data-hint="{{ description|trim(' &bull; ')|raw }}" class="hint--top page-item__content-hint">
-                            {% set page_label = attribute(p.header, display_field)|defined(attribute(p, display_field))|defined(p.title) %}
-                            <a href="{{ page_url }}" class="page-edit">{{ page_label|e }}</a>
-                        </span>
-                        {% if p.language %}
-                            <span class="badge lang {% if p.language == admin_lang %}info{% endif %}">{{p.language}}</span>
-                        {% endif %}
-                        {% if p.home %}
-                            <span class="page-home"><i class="fa fa-home"></i></span>
-                        {% endif %}
-                    </div>
-                    <p class="page-route">{{ p.header.routes.default ?: p.route }} <span class="spacer"><i class="fa fa-long-arrow-right"></i></span> {{ p.template() }}</p>
-                </div>
-                <span class="page-item__tools">
-                    {% if config.plugins.admin.frontend_preview_target != 'inline' %}
-                        {% set preview_target = config.plugins.admin.frontend_preview_target %}
-                        {% set preview_html = (base_url_relative_frontend|rtrim('/') ~ (p.home ? '' : p.route)) ?: '/' %}
-                        {% set preview_link = p.routable ? '<a class="page-view" target="' ~ preview_target ~ '" href="' ~ preview_html ~ '" title="' ~ "PLUGIN_ADMIN.PREVIEW"|tu ~ '"> <i class="fa fa-fw fa-eye"></i></a>' : '' %}
-                    {% else %}
-                        {% set preview_html = (base_url|rtrim('/') ~ '/preview' ~ (p.home ? '' : p.route)) ?: '/' %}
-                        {% set preview_link = p.routable ? '<a class="page-view" href="' ~ preview_html ~ '" title="' ~ "PLUGIN_ADMIN.PREVIEW"|tu ~ '"> <i class="fa fa-fw fa-eye"></i></a>' : '' %}
-                    {% endif %}
-                    {{ preview_link|raw }}
-                    {% if warn %}
-                        <a href="#delete" data-remodal-target="delete" data-delete-url="{{ uri.addNonce(page_url ~ '/task' ~ separator ~ 'delete', 'admin-form', 'admin-nonce') }}" class="page-delete" ><i class="fa fa-close"></i></a>
-                    {% else %}
-                        <a href="{{ uri.addNonce(page_url ~ '/task' ~ separator ~ 'delete', 'admin-form', 'admin-nonce') }}" class="page-delete" ><i class="fa fa-close"></i></a>
-                    {% endif %}
-                </span>
-            </div>
-            {% if p.children().count > 0 %}
-                <ul class="depth-{{ depth + 1 }}" style="display:none;">
-                    {{ _self.loop(p, depth + 1, twig_vars) }}
-                </ul>
-            {% endif %}
-        </li>
-    {% endfor %}
-{% endmacro %}
-
-
 {% block titlebar %}
+
     <div class="button-bar">
         {% if mode == 'list' %}
             <a class="button" href="{{ base_url }}"><i class="fa fa-reply"></i> {{ "PLUGIN_ADMIN.BACK"|tu }}</a>
@@ -301,8 +305,8 @@
                 {% set normalText = "PLUGIN_ADMIN.NORMAL"|tu %}
                 {% set expertText = "PLUGIN_ADMIN.EXPERT"|tu %}
                 {% set maxLen = max([normalText|length, expertText|length]) %}
-                {% set normalText = _self.spanToggle(normalText, maxLen) %}
-                {% set expertText = _self.spanToggle(expertText, maxLen) %}
+                {% set normalText = macro.spanToggle(normalText, maxLen) %}
+                {% set expertText = macro.spanToggle(expertText, maxLen) %}
                 <form id="admin-mode-toggle">
                     <div class="switch-toggle switch-grav">
                         <input type="radio" value="normal" data-leave-url="{{ base_url }}/pages/{{ admin.route|trim('/') }}/mode{{ config.system.param_sep }}normal" id="normal" name="mode-switch" class="highlight" {% if admin.session.expert == '0' %} checked="checked"{% endif %}>
@@ -316,6 +320,11 @@
 
             </div>
 
+            {# Set current form data back into page content #}
+            {% if current_form_data %}
+                {% do context.header(current_form_data.header) %}
+                {% do context.content(current_form_data.content) %}
+            {% endif %}
             {% if context.blueprints.fields and admin.session.expert == '0' %}
                 {% include 'partials/blueprints.html.twig' with { blueprints: context.blueprints, data: context } %}
             {% else %}
@@ -337,7 +346,7 @@
         </form>
         <div class="pages-list">
             <ul class="depth-0">
-                {{ _self.loop(pages, 0, _context) }}
+                {{ macro.loop(pages, 0, _context) }}
             </ul>
             {% include 'partials/page-legend.html.twig' %}
         </div>

user/plugins/admin/themes/grav/templates/partials/dashboard-pages.html.twig

@@ -1,7 +1,7 @@
 {% if authorize(['admin.pages', 'admin.super']) %}
     <div id="latest">
         <div class="button-bar">
-            <a class="button" href="{{ uri.route(true) }}/pages"><i class="fa fa-fw fa-file-text-o"></i>{{ "PLUGIN_ADMIN.MANAGE_PAGES"|tu }}</a>
+            <a class="button" href="{{ base_url_relative }}/pages"><i class="fa fa-fw fa-file-text-o"></i>{{ "PLUGIN_ADMIN.MANAGE_PAGES"|tu }}</a>
         </div>
         <h1>{{ "PLUGIN_ADMIN.LATEST_PAGE_UPDATES"|tu }}</h1>
         <table>

user/plugins/admin/themes/grav/templates/partials/login-twofa.html.twig

@@ -16,7 +16,7 @@
     {% endfor %}
 
     <div class="{{ form_button_outer_classes ?: 'form-actions secondary-accent' }}">
-        <div class="form-actionst">
+        <div class="form-actions primary-accent">
             <button type="submit" class="button primary" name="task" value="twofa">{{ 'PLUGIN_LOGIN.BTN_LOGIN'|t }}</button>
         </div>
     </div>

user/plugins/admin/themes/grav/templates/partials/login.html.twig

@@ -15,7 +15,7 @@
 
         {% block integration %}{% endblock %}
 
-        {% set redirect = redirect ?: uri.route(false) %}
+        {% set redirect = redirect ?: uri.path ~ uri.params ~ (uri.query ? '?' ~ uri.query : '') %}
 
         <form method="post" action="{{ base_url_relative }}">
             <div class="padding">

user/plugins/admin/themes/grav/templates/partials/media-list-wrapper__sidebar.html.twig

@@ -1,13 +1,6 @@
-<div class="pages-list-container clear block size-1-4">
-    <h5>{{ "PLUGIN_ADMIN.PAGES"|tu|e }}</h5>
-    <div class="mediapicker-scroll">
-        <ul class="pages-list depth-0">
-            {{ _self.loop(pages, 0, _context) }}
-        </ul>
-    </div>
-</div>
-
 {% macro loop(page, depth, twig_vars) %}
+    {% import _self as self %}
+
     {% set separator = twig_vars['config'].system.param_sep %}
     {% set base_url = twig_vars['base_url_relative'] %}
     {% set base_url_simple = twig_vars['base_url_simple'] %}
@@ -37,10 +30,21 @@
             </div>
             {% if p.children().count > 0 %}
 
-            <ul class="depth-{{ depth + 1 }}" style="display:none;">
-                {{ _self.loop(p, depth + 1, twig_vars) }}
-            </ul>
+                <ul class="depth-{{ depth + 1 }}" style="display:none;">
+                    {{ self.loop(p, depth + 1, twig_vars) }}
+                </ul>
             {% endif %}
         </li>
     {% endfor %}
-{% endmacro %}
+{% endmacro %}
+
+{% import _self as macro %}
+
+<div class="pages-list-container clear block size-1-4">
+    <h5>{{ "PLUGIN_ADMIN.PAGES"|tu|e }}</h5>
+    <div class="mediapicker-scroll">
+        <ul class="pages-list depth-0">
+            {{ macro.loop(pages, 0, _context) }}
+        </ul>
+    </div>
+</div>

user/plugins/admin/themes/grav/templates/partials/plugins-details.html.twig

@@ -48,7 +48,7 @@
                 {% set gumroad_loaded = true %}
                 <script src="//gumroad.com/js/gumroad.js"></script>
             {% endif %}
-            <a class="gumroad-button button" href="https://gum.co/{{ plugin.premium.product_permalink }}" target="_blank" data-gumroad-single-product="true"><i class="fa fa-shopping-cart"></i> {{ "Buy Now"|tu }}</a>
+            <a class="gumroad-button button" href="https://gum.co/{{ plugin.premium.permalink }}" target="_blank" data-gumroad-single-product="true"><i class="fa fa-shopping-cart"></i> {{ "Buy Now"|tu }}</a>
         {% else %}
             <a class="button" href="#" data-remodal-target="add-package" data-packages-slugs="{{ plugin.slug }}" data-plugin-action="start-package-installation"><i class="fa fa-plus"></i> {{ "PLUGIN_ADMIN.INSTALL_PLUGIN"|tu }}</a>
         {% endif %}

user/plugins/admin/themes/grav/templates/partials/plugins-list.html.twig

@@ -52,7 +52,7 @@
                             {% set gumroad_loaded = true %}
                             <script src="//gumroad.com/js/gumroad.js"></script>
                         {% endif %}
-                        <a class="gumroad-button button" href="https://gum.co/{{ plugin.premium.product_permalink }}" target="_blank" data-gumroad-single-product="true"><i class="fa fa-shopping-cart"></i> {{ "Buy Now"|tu }}</a>
+                        <a class="gumroad-button button" href="https://gum.co/{{ plugin.premium.permalink }}" target="_blank" data-gumroad-single-product="true"><i class="fa fa-shopping-cart"></i> {{ "Buy Now"|tu }}</a>
                     {% else %}
                 <a class="button" href="#" data-remodal-target="add-package" data-packages-slugs="{{ plugin.slug }}" data-plugin-action="start-package-installation"><i class="fa fa-plus"></i> {{ "PLUGIN_ADMIN.INSTALL"|tu }}</a>
                     {% endif %}