Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-05 04:46:03 +01:00
Code Issues Packages Projects Releases Activity

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

Browse Source
This commit is contained in:
Andy Miller
2015-09-15 16:07:11 -06:00
parent 36e741bc7a c4c7f5b3f2
commit 1ce6688a61
5 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
classes/controller.php
View File

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

11
themes/grav/js/admin-all.js
View File

@@ -518,9 +518,10 @@ $(function () {
remodal.find('.button.continue').attr('href', $(e.target).attr('href')); 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
setInterval(function() { if ($(document).find('[data-grav-keepalive="true"]').length > 0) {
keepAlive(); setInterval(function() {
}, (GravAdmin.config.admin_timeout/2)*1000); //Call keepAlive() 60s before the admin session timeouts keepAlive();
}, (GravAdmin.config.admin_timeout/2)*1000); //Call keepAlive() 60s before the admin session timeouts
}
}); });

2
themes/grav/templates/partials/blueprints-new.html.twig
View File

@@ -1,6 +1,6 @@
{% set form_id = form_id ? form_id : 'blueprints' %} {% 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 %} {% for field in blueprints.fields %}
{% if field.type %} {% if field.type %}
{% set value = data.value(field.name) %} {% set value = data.value(field.name) %}

2
themes/grav/templates/partials/blueprints-raw.html.twig
View File

@@ -1,6 +1,6 @@
{% set form_id = form_id ? form_id : 'blueprints' %} {% 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 %} {% for field in blueprints.fields %}
{% if field.type %} {% if field.type %}
{% set value = data.value(field.name) %} {% set value = data.value(field.name) %}

2
themes/grav/templates/partials/blueprints.html.twig
View File

@@ -1,6 +1,6 @@
{% set form_id = form_id ? form_id : 'blueprints' %} {% 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 %} {% for field in blueprints.fields %}
{% if field.type %} {% if field.type %}
{% set value = data.value(field.name) %} {% set value = data.value(field.name) %}