From bf263f41be4f51a07b744138381479149dde5ef5 Mon Sep 17 00:00:00 2001 From: The Gitter Badger Date: Tue, 4 Aug 2015 19:41:10 +0000 Subject: [PATCH 1/5] Added Gitter badge --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index f1ade979..8dd4e7c1 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Grav Standard Administration Panel Plugin +[![Join the chat at https://gitter.im/getgrav/grav-plugin-admin](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/getgrav/grav-plugin-admin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + This **admin plugin** for [Grav](http://github.com/getgrav/grav) is an HTML user interface that provides a convenient way to configure Grav and easily create and modify pages. This will remain a totally optional plugin, and is not in any way required or needed to use Grav effectively. In fact, the admin provides an intentionally limited view to ensure it remains easy to use and not overwhelming. I'm sure power users will still prefer to work with the configuration files directly. | IMPORTANT!!! This plugin is currently in development as is to be considered a **beta release**. As such, use this in a production environment **at your own risk!**. From c83ee772e0627057ddc967f386db20bb677c8dc1 Mon Sep 17 00:00:00 2001 From: Djamil Legato Date: Tue, 4 Aug 2015 12:53:03 -0700 Subject: [PATCH 2/5] Various fixes --- README.md | 6 +++--- admin.php | 1 - blueprints.yaml | 2 +- themes/grav/templates/partials/base.html.twig | 2 +- themes/grav/templates/partials/plugins-list.html.twig | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f1ade979..ed2df862 100644 --- a/README.md +++ b/README.md @@ -32,9 +32,9 @@ This **admin plugin** for [Grav](http://github.com/getgrav/grav) is an HTML user We have tested internally, but we hope to use this public beta phase to identify, isolate, and fix issues related to the plugin to ensure it is as solid and reliable as possible. -For **live chatting**, please use the dedicated [Gitter Chat Room for the admin plugin](https://gitter.im/grav/grav-plugin-admin) for dicussions directly related to the admin plugin. +For **live chatting**, please use the dedicated [Gitter Chat Room for the admin plugin](https://gitter.im/getgrav/grav-plugin-admin) for dicussions directly related to the admin plugin. -For **bugs, features, improvements**, please ensure you [create issues in the admin plugin GitHub repository](https://github.com/grav/grav-plugin-admin). +For **bugs, features, improvements**, please ensure you [create issues in the admin plugin GitHub repository](https://github.com/getgrav/grav-plugin-admin). # Installation @@ -46,7 +46,7 @@ $ bin/gpm install admin # Usage -Upon completion of the installation the next thing you need to do is create a user account in a file called `users/accounts/admin.yaml`: +Upon completion of the installation the next thing you need to do is create a user account in a file called `user/accounts/admin.yaml`: ``` username: admin diff --git a/admin.php b/admin.php index 011cd010..5ce62c00 100644 --- a/admin.php +++ b/admin.php @@ -229,7 +229,6 @@ class AdminPlugin extends Plugin public function onShutdown() { // Just so we know that we're in this debug mode - echo 'system.debugger.shutdown.close_connection = false'; if ($this->config->get('plugins.admin.popularity.enabled')) { // Only track non-admin diff --git a/blueprints.yaml b/blueprints.yaml index 33a1628d..c5d9baf9 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,4 +1,4 @@ -name: Administration Panel - Standard +name: Admin Panel version: 0.1.0 description: Adds an advanced administration panel to manage your site icon: empire diff --git a/themes/grav/templates/partials/base.html.twig b/themes/grav/templates/partials/base.html.twig index c8ee2fed..d79d5fa4 100644 --- a/themes/grav/templates/partials/base.html.twig +++ b/themes/grav/templates/partials/base.html.twig @@ -92,7 +92,7 @@ {% block content %}{% endblock %} {% if config.plugins.admin.show_beta_msg %} -
{{ 'ADMIN_REPORT_ISSUE'|t }}
+
{{ 'ADMIN_REPORT_ISSUE'|t }}
{% endif %} {% block content_bottom %}{% endblock %} diff --git a/themes/grav/templates/partials/plugins-list.html.twig b/themes/grav/templates/partials/plugins-list.html.twig index 99f09260..645dc2bd 100644 --- a/themes/grav/templates/partials/plugins-list.html.twig +++ b/themes/grav/templates/partials/plugins-list.html.twig @@ -24,7 +24,7 @@ v{{ plugin.version }} - {% if (not installing and plugin.form.fields.enabled) %} + {% if (not installing and plugin.form.fields.enabled and (plugin.form.fields.enabled.type != 'hidden')) %} From d2e0873412be3b014634d09a58f9420be38e0ba6 Mon Sep 17 00:00:00 2001 From: Djamil Legato Date: Tue, 4 Aug 2015 12:55:38 -0700 Subject: [PATCH 3/5] Updated version and changelog --- CHANGELOG.md | 8 ++++++++ blueprints.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24a0762c..97f18bf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v0.1.1 +## 08/04/2015 + +1. [](#bugfix) + * Fixed GitHub URLs + * Hiding toggle for disabling Admin plugin + * Removed extra text not needed + # v0.1.0 ## 08/04/2015 diff --git a/blueprints.yaml b/blueprints.yaml index c5d9baf9..421dc0a6 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,5 +1,5 @@ name: Admin Panel -version: 0.1.0 +version: 0.1.1 description: Adds an advanced administration panel to manage your site icon: empire author: From 1c2b6c093b2305d1580d48e3b12e532c7525f2fd Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Wed, 5 Aug 2015 18:40:24 +0200 Subject: [PATCH 4/5] Add "Back to Themes" button when navigating new Themes. refs #5 --- themes/grav/templates/themes.html.twig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/themes/grav/templates/themes.html.twig b/themes/grav/templates/themes.html.twig index 5ef4204a..04895f16 100644 --- a/themes/grav/templates/themes.html.twig +++ b/themes/grav/templates/themes.html.twig @@ -11,7 +11,7 @@ {% set installed = false %} {% endif %} - {% set theme = package.toArray() %} + {% set theme = package.toArray() %} {% endif %} {% block titlebar %} @@ -30,6 +30,10 @@ Back to Themes + {% else %} +
+ Back to Themes +
{% endif %}

Theme: {{ theme.name|e }}

{% endif %} From be52b042142d0f88e5f79575eaca86fe8a58e713 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Wed, 5 Aug 2015 18:49:19 +0200 Subject: [PATCH 5/5] Add missing event parameter. refs #6 --- themes/grav/js/forms/fields/array.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/grav/js/forms/fields/array.js b/themes/grav/js/forms/fields/array.js index 36befe36..53b9589c 100644 --- a/themes/grav/js/forms/fields/array.js +++ b/themes/grav/js/forms/fields/array.js @@ -85,21 +85,21 @@ return formValues; }; - ArrayField.prototype.add = function() { + ArrayField.prototype.add = function(event) { $(this._getNewField()).insertAfter($(event.target).closest('[data-grav-array-type="row"]')); if (this.isValueOnly()) { this.refreshAll(); } }; - ArrayField.prototype.remove = function() { + ArrayField.prototype.remove = function(event) { $(event.target).closest('[data-grav-array-type="row"]').remove(); if (this.isValueOnly()) { this.refreshAll(); } }; - ArrayField.prototype.update = function() { + ArrayField.prototype.update = function(event) { var keyField = $(event.target), valueField = keyField.closest('[data-grav-array-type="row"]').find('[data-grav-array-type="value"]');