Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2026-01-08 16:42:56 +01:00
Code Issues Packages Projects Releases Activity

Add config.param_sep option to JS files

Browse Source
This commit is contained in:
Sommerregen
2015-08-08 17:41:53 +02:00
parent 0165f53d44
commit fa8db3dd90
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,13 +123,14 @@ $(function () {
$(this).attr('disabled','disabled').find('> .fa').removeClass('fa-cloud-download').addClass('fa-refresh fa-spin');
var url = $(this).data('maintenanceUpdate');
var task = 'task' + GravAdmin.config.param_sep;
GravAjax({
dataType: "json",
url: url,
toastErrors: true,
success: function(result, status) {
if (url.indexOf('task:updategrav') !== -1) {
if (url.indexOf(task + 'updategrav') !== -1) {
if (result.status == 'success') {
$('[data-gpm-grav]').remove();
toastr.success(result.message + window.grav_available_version);
@@ -181,6 +182,7 @@ $(function () {
url: url,
toastErrors: true,
success: function(result, status) {
var task = 'task' + GravAdmin.config.param_sep;
var toastrBackup = {};
if (result.toastr) {
@@ -198,7 +200,7 @@ $(function () {
}
}
if (url.indexOf('task:backup') !== -1) {
if (url.indexOf(task + 'backup') !== -1) {
//Reset backup days count
$('.backups-chart .numeric').html("0 <em>days</em>");
@@ -255,13 +257,14 @@ $(function () {
success: function (response) {
var grav = response.payload.grav,
installed = response.payload.installed,
resources = response.payload.resources;
resources = response.payload.resources,
task = 'task' + GravAdmin.config.param_sep;
// grav updatable
if (grav.isUpdatable) {
var icon = '<i class="fa fa-bullhorn"></i> ';
content = 'Grav <b>v{available}</b> is now available! <span class="less">(Current: v{version})</span> ',
button = '<button data-maintenance-update="' + GravAdmin.config.base_url_relative + '/update.json/task:updategrav" class="button button-small secondary" id="grav-update-button">Update Grav Now</button>';
button = '<button data-maintenance-update="' + GravAdmin.config.base_url_relative + '/update.json/' + task + 'updategrav" class="button button-small secondary" id="grav-update-button">Update Grav Now</button>';
if (grav.isSymlink) {
button = '<span class="hint--left" style="float: right;" data-hint="Grav is symbolically linked. Upgrade won\'t be available."><i class="fa fa-fw fa-link"></i></span>';
@@ -293,7 +296,7 @@ $(function () {
var length,
icon = '<i class="fa fa-bullhorn"></i>',
content = '{updates} of your {type} have an <strong>update available</strong>',
button = '<a href="{location}/task:update" class="button button-small secondary">Update {Type}</a>',
button = '<a href="{location}/' + task + 'update" class="button button-small secondary">Update {Type}</a>',
plugins = $('.grav-update.plugins'),
themes = $('.grav-update.themes'),
sidebar = {plugins: $('#admin-menu a[href$="/plugins"]'), themes: $('#admin-menu a[href$="/themes"]')};

5
themes/grav/js/mdeditor.js
View File

@@ -36,7 +36,8 @@
].join('');
var MDEditor = function(editor, options){
var tpl = template, $this = this;
var tpl = template, $this = this,
task = 'task' + GravAdmin.config.param_sep;
this.defaults = {
markdown : false,
@@ -93,7 +94,7 @@
if ($(this).hasClass('grav-mdeditor-button-preview')) {
GravAjax({
dataType: 'JSON',
url: $this.element.data('grav-urlpreview') + '/task:processmarkdown',
url: $this.element.data('grav-urlpreview') + '/' + task + 'processmarkdown',
method: 'post',
data: $this.element.parents('form').serialize(),
toastErrors: true,

3
themes/grav/js/pages-all.js
View File

@@ -76,6 +76,7 @@ $(function(){
restoreStates();
var startFilterPages = function () {
var task = 'task' + GravAdmin.config.param_sep;
$('input[name="page-search"]').focus();
var flags = $('input[name="page-filter"]').val(),
@@ -89,7 +90,7 @@ $(function(){
GravAjax({
dataType: 'json',
method: 'POST',
url: GravAdmin.config.base_url_relative + '/pages-filter.json/task:filterPages',
url: GravAdmin.config.base_url_relative + '/pages-filter.json/' + task + 'filterPages',
data: {
flags: flags,
query: query

5
themes/grav/templates/partials/javascript-config.html.twig
View File

@@ -1,6 +1,7 @@
<script type="text/javascript">
window.GravAdmin = window.GravAdmin || {};
window.GravAdmin.config = {
base_url_relative: '{{ base_url_relative }}'
base_url_relative: '{{ base_url_relative }}',
param_sep: '{{ config.system.param_sep }}'
};
</script>
</script>