Merge branch 'release/0.1.1'

getgrav · Aug 4, 2015 · b1e9541 · b1e9541
2 parents fbea806 + d2e0873
commit b1e9541
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git 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/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
@@ -229,7 +229,6 @@ public function onTwigSiteVariables()
     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

diff --git a/blueprints.yaml b/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:

diff --git a/themes/grav/templates/partials/base.html.twig b/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>

diff --git a/themes/grav/templates/partials/plugins-list.html.twig b/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>