Merge branch 'master' of github.com:lupo49/dokuwiki

3 files changed, 12 insertions, 20 deletions

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 53f6db0cc..a6b0624bc 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -31,20 +31,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
     var $specials = array();
 
     /**
-     * return some info
-     */
-    function getInfo(){
-        return array(
-            'author' => 'Andreas Gohr',
-            'email'  => 'andi@splitbrain.org',
-            'date'   => '2011-04-16',
-            'name'   => 'ACL Manager',
-            'desc'   => 'Manage Page Access Control Lists',
-            'url'    => 'http://dokuwiki.org/plugin:acl',
-        );
-    }
-
-    /**
      * return prompt for admin menu
      */
     function getMenuText($language) {
diff --git a/lib/plugins/acl/plugin.info.txt b/lib/plugins/acl/plugin.info.txt
new file mode 100644
index 000000000..f108a2390
--- /dev/null
+++ b/lib/plugins/acl/plugin.info.txt
@@ -0,0 +1,6 @@
+author Andreas Gohr
+email  andi@splitbrain.org
+date   2011-04-16
+name   ACL Manager
+desc   Manage Page Access Control Lists
+url    http://dokuwiki.org/plugin:acl
diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js
index 4fc97aeb5..2598bcef8 100644
--- a/lib/plugins/acl/script.js
+++ b/lib/plugins/acl/script.js
@@ -33,7 +33,7 @@ var dw_acl = {
                                show_sublist,
                                'html'
                            );
-                       },
+    },
 
                        toggle_display: function ($clicky, opening) {
                            $clicky.attr('src',
@@ -93,13 +93,13 @@ var dw_acl = {
 
         $link = jQuery(this);
 
-        // remove highlighting
-        jQuery('#acl__tree a.cur').removeClass('cur');
+            // remove highlighting
+            jQuery('#acl__tree a.cur').removeClass('cur');
 
-        // add new highlighting
+            // add new highlighting
         $link.addClass('cur');
 
-        // set new page to detail form
+            // set new page to detail form
         $frm = jQuery('#acl__detail form');
         if ($link.hasClass('wikilink1')) {
             $frm.find('input[name=ns]').val('');
@@ -107,7 +107,7 @@ var dw_acl = {
         } else if ($link.hasClass('idx_dir')) {
             $frm.find('input[name=ns]').val(dw_acl.parseatt($link[0].search).ns);
             $frm.find('input[name=id]').val('');
-        }
+            }
         dw_acl.loadinfo();
 
         return false;