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

# By Djamil Legato (2) and others
# Via Djamil Legato (2) and others
* 'develop' of https://github.com/getgrav/grav-plugin-admin:
  Add missing event parameter. refs #6
  Add "Back to Themes" button when navigating new Themes. refs #5
  Updated version and changelog
  Various fixes
  Added Gitter badge

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
 

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!**.
@@ -32,9 +34,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
 
@@ -52,7 +54,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

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 '<span style="color:red">system.debugger.shutdown.close_connection = false</span>';
         if ($this->config->get('plugins.admin.popularity.enabled')) {
 
             // Only track non-admin

blueprints.yaml

@@ -1,5 +1,5 @@
-name: Administration Panel - Standard
-version: 0.1.0
+name: Admin Panel
+version: 0.1.1
 description: Adds an advanced administration panel to manage your site
 icon: empire
 author:

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"]');
 

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

@@ -92,7 +92,7 @@
                         {% block content %}{% endblock %}
                     </div>
                     {% if config.plugins.admin.show_beta_msg %}
-                    <div class="notice alert"><i class="fa fa-github"></i> <a href="https://github.com/getgrav/grav/grav-plugin-admin/issues">{{ 'ADMIN_REPORT_ISSUE'|t }}</a></div>
+                    <div class="notice alert"><i class="fa fa-github"></i> <a href="https://github.com/getgrav/grav-plugin-admin/issues">{{ 'ADMIN_REPORT_ISSUE'|t }}</a></div>
                     {% endif %}
                     {% block content_bottom %}{% endblock %}
                 </div>

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

@@ -24,7 +24,7 @@
                 <span class="gpm-version">v{{ plugin.version }}</span>
             </td>
             <td class="gpm-actions">
-                {% if (not installing and plugin.form.fields.enabled) %}
+                {% if (not installing and plugin.form.fields.enabled and (plugin.form.fields.enabled.type != 'hidden')) %}
                     <a class="{{ data.get('enabled') ? 'enabled' : 'disabled' }}" href="{{ base_url_relative }}/plugins/{{ slug }}/task:{{ data.get('enabled') ? 'disable' : 'enable' }}">
                         <i class="fa fa-fw fa-toggle-{{ data.get('enabled') ? 'on' : 'off' }}"></i>
                     </a>

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 @@
             <a class="button" href="{{ base_url_relative }}/themes"><i class="fa fa-arrow-left"></i> Back to Themes</a>
             <button class="button" type="submit" name="task" value="save" form="blueprints"><i class="fa fa-check"></i> Save</button>
         </div>
+        {% else %}
+        <div class="button-bar">
+            <a class="button" href="{{ base_url_relative }}/themes/install"><i class="fa fa-arrow-left"></i> Back to Themes</a>
+        </div>
         {% endif %}
         <h1><i class="fa fa-fw fa-plug"></i> Theme: {{ theme.name|e }}</h1>
     {% endif %}