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

classes/controller.php

@@ -1306,20 +1306,23 @@ class AdminController
         switch ($type) {
             case 'configuration':
             case 'system':
-                $permissions[] = ['admin.configuration'];
+                $permissions[] = 'admin.configuration';
                 break;
             case 'settings':
             case 'site':
-                $permissions[] = ['admin.settings'];
+                $permissions[] = 'admin.settings';
                 break;
             case 'plugins':
-                $permissions[] = ['admin.plugins'];
+                $permissions[] = 'admin.plugins';
                 break;
             case 'themes':
-                $permissions[] = ['admin.themes'];
+                $permissions[] = 'admin.themes';
                 break;
             case 'users':
-                $permissions[] = ['admin.users'];
+                $permissions[] = 'admin.users';
+                break;
+            case 'pages':
+                $permissions[] = 'admin.pages';
                 break;
         }
 

themes/grav/js/admin-all.js

@@ -518,9 +518,10 @@ $(function () {
         remodal.find('.button.continue').attr('href', $(e.target).attr('href'));
     });
 
-    // Keep-alive
+    // Setup keep-alive on pages that have at least one element with data-grav-keepalive="true" set
+    if ($(document).find('[data-grav-keepalive="true"]').length > 0) {
         setInterval(function() {
             keepAlive();
         }, (GravAdmin.config.admin_timeout/2)*1000); //Call keepAlive() 60s before the admin session timeouts
-
+    }
 });

themes/grav/templates/partials/blueprints-new.html.twig

@@ -1,6 +1,6 @@
 {% set form_id = form_id ? form_id : 'blueprints' %}
 
-<form id="{{ form_id }}" method="post" data-grav-form="{{ form_id }}">
+<form id="{{ form_id }}" method="post" data-grav-form="{{ form_id }}" data-grav-keepalive="true">
     {% for field in blueprints.fields %}
         {% if field.type %}
             {% set value = data.value(field.name) %}

themes/grav/templates/partials/blueprints-raw.html.twig

@@ -1,6 +1,6 @@
 {% set form_id = form_id ? form_id : 'blueprints' %}
 
-<form id="{{ form_id }}" method="post" data-grav-form="{{ form_id }}">
+<form id="{{ form_id }}" method="post" data-grav-form="{{ form_id }}" data-grav-keepalive="true">
     {% for field in blueprints.fields %}
         {% if field.type %}
             {% set value = data.value(field.name) %}

themes/grav/templates/partials/blueprints.html.twig

@@ -1,6 +1,6 @@
 {% set form_id = form_id ? form_id : 'blueprints' %}
 
-<form id="{{ form_id }}" method="post" data-grav-form="{{ form_id }}">
+<form id="{{ form_id }}" method="post" data-grav-form="{{ form_id }}" data-grav-keepalive="true">
     {% for field in blueprints.fields %}
         {% if field.type %}
             {% set value = data.value(field.name) %}