Merge branch 'master' into stable

Conflicts:
	doku.php

25 files changed, 170 insertions, 158 deletions

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index ea4184ca3..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) {
@@ -253,19 +239,12 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         $data = $this->_get_tree($ns);
 
         // wrap a list with the root level around the other namespaces
-        $item = array( 'level' => 0, 'id' => '*', 'type' => 'd',
-                   'open' =>'true', 'label' => '['.$lang['mediaroot'].']');
+        array_unshift($data, array( 'level' => 0, 'id' => '*', 'type' => 'd',
+                   'open' =>'true', 'label' => '['.$lang['mediaroot'].']'));
 
-        echo '<ul class="acltree">';
-        echo $this->_html_li_acl($item);
-        echo '<div class="li">';
-        echo $this->_html_list_acl($item);
-        echo '</div>';
         echo html_buildlist($data,'acl',
                             array($this,'_html_list_acl'),
                             array($this,'_html_li_acl'));
-        echo '</li>';
-        echo '</ul>';
 
     }
 
@@ -547,7 +526,8 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
 
 
     function _html_li_acl($item){
-            return '<li class="level'.$item['level'].'">';
+        return '<li class="level' . $item['level'] . ' ' .
+               ($item['open'] ? 'open' : 'closed') . '">';
     }
 
 
diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php
index d91586a5d..d704fa8c9 100644
--- a/lib/plugins/acl/ajax.php
+++ b/lib/plugins/acl/ajax.php
@@ -44,13 +44,10 @@ if($ajax == 'info'){
 
     $data = $acl->_get_tree($ns,$ns);
 
-    foreach($data as $item){
-        $item['level'] = $lvl+1;
-        echo $acl->_html_li_acl($item);
-        echo '<div class="li">';
-        echo $acl->_html_list_acl($item);
-        echo '</div>';
-        echo '</li>';
+    foreach(array_keys($data) as $item){
+        $data[$item]['level'] = $lvl+1;
     }
+    echo html_buildlist($data, 'acl', array($acl, '_html_list_acl'),
+                        array($acl, '_html_li_acl'));
 }
 
diff --git a/lib/plugins/acl/lang/bg/lang.php b/lib/plugins/acl/lang/bg/lang.php
index 0746e32c9..e260be918 100644
--- a/lib/plugins/acl/lang/bg/lang.php
+++ b/lib/plugins/acl/lang/bg/lang.php
@@ -21,7 +21,7 @@ $lang['p_group_ns']            = 'Членовете на групата <b clas
 $lang['p_choose_id']           = 'Моля, <b>въведете потребител или група</b> в полето отгоре, за да видите или промените правата за страницата <b class="aclpage">%s</b>.';
 $lang['p_choose_ns']           = 'Моля, <b>въведете потребител или група</b> в полето отгоре, за да видите или промените правата за именното пространство <b class="aclns">%s</b>.';
 $lang['p_inherited']           = 'Бележка: Тези разрешения не са зададени директно, а са наследени от други групи или именни пространства.';
-$lang['p_isadmin']             = 'Бележка: Избраната група или потребител има всички права, защото е определен за суперпотребител.';
+$lang['p_isadmin']             = 'Бележка: Избраната група или потребител има всички права, защото е определен за супер потребител.';
 $lang['p_include']             = 'Висши права включват по-нисшите такива. Правата за създаване, качване и изтриване са приложими само за именни пространства, но не  за страници.';
 $lang['current']               = 'Текущи ACL права';
 $lang['where']                 = 'Страница/Именно пространство';
diff --git a/lib/plugins/acl/lang/de-informal/lang.php b/lib/plugins/acl/lang/de-informal/lang.php
index e24584a55..3f4b08c2a 100644
--- a/lib/plugins/acl/lang/de-informal/lang.php
+++ b/lib/plugins/acl/lang/de-informal/lang.php
@@ -7,6 +7,7 @@
  * @author Marcel Metz <marcel_metz@gmx.de>
  * @author Matthias Schulte <post@lupo49.de>
  * @author Christian Wichmann <nospam@zone0.de>
+ * @author Pierre Corell <info@joomla-praxis.de>
  */
 $lang['admin_acl']             = 'Zugriffskontrollsystem Management';
 $lang['acl_group']             = 'Gruppe';
diff --git a/lib/plugins/acl/lang/de/lang.php b/lib/plugins/acl/lang/de/lang.php
index 3c6bf8cf0..eb23636c4 100644
--- a/lib/plugins/acl/lang/de/lang.php
+++ b/lib/plugins/acl/lang/de/lang.php
@@ -19,6 +19,8 @@
  * @author Robert Bogenschneider <robog@gmx.de>
  * @author Niels Lange <niels@boldencursief.nl>
  * @author Christian Wichmann <nospam@zone0.de>
+ * @author Paul Lachewsky <kaeptn.haddock@gmail.com>
+ * @author Pierre Corell <info@joomla-praxis.de>
  */
 $lang['admin_acl']             = 'Zugangsverwaltung';
 $lang['acl_group']             = 'Gruppe';
diff --git a/lib/plugins/acl/lang/el/lang.php b/lib/plugins/acl/lang/el/lang.php
index e2f6c35dc..e1cd26755 100644
--- a/lib/plugins/acl/lang/el/lang.php
+++ b/lib/plugins/acl/lang/el/lang.php
@@ -13,6 +13,7 @@
  * @author Αθανάσιος Νταής <homunculus@wana.gr>
  * @author Konstantinos Koryllos <koryllos@gmail.com>
  * @author George Petsagourakis <petsagouris@gmail.com>
+ * @author Petros Vidalis <pvidalis@gmail.com>
  */
 $lang['admin_acl']             = 'Διαχείριση Δικαιωμάτων Πρόσβασης';
 $lang['acl_group']             = 'Ομάδα';
diff --git a/lib/plugins/acl/lang/eo/lang.php b/lib/plugins/acl/lang/eo/lang.php
index 85b262e8c..239578f57 100644
--- a/lib/plugins/acl/lang/eo/lang.php
+++ b/lib/plugins/acl/lang/eo/lang.php
@@ -10,6 +10,7 @@
  * @author Erik Pedersen <erik.pedersen@shaw.ca>
  * @author Robert Bogenschneider <robog@GMX.de>
  * @author Robert BOGENSCHNEIDER <robog@gmx.de>
+ * @author Robert BOGENSCHNEIDER <bogi@UEA.org>
  */
 $lang['admin_acl']             = 'Administrado de Alirkontrola Listo (ACL)';
 $lang['acl_group']             = 'Grupo';
diff --git a/lib/plugins/acl/lang/es/lang.php b/lib/plugins/acl/lang/es/lang.php
index 096320af9..ee50a7530 100644
--- a/lib/plugins/acl/lang/es/lang.php
+++ b/lib/plugins/acl/lang/es/lang.php
@@ -20,6 +20,8 @@
  * @author Victor Castelan <victorcastelan@gmail.com>
  * @author Mauro Javier Giamberardino <mgiamberardino@gmail.com>
  * @author emezeta <emezeta@infoprimo.com>
+ * @author Oscar Ciudad <oscar@jacho.net>
+ * @author Ruben Figols <ruben.figols@gmail.com>
  */
 $lang['admin_acl']             = 'Administración de lista de control de acceso';
 $lang['acl_group']             = 'Grupo';
diff --git a/lib/plugins/acl/lang/et/lang.php b/lib/plugins/acl/lang/et/lang.php
index 04ce0c08a..bc4c73a16 100644
--- a/lib/plugins/acl/lang/et/lang.php
+++ b/lib/plugins/acl/lang/et/lang.php
@@ -7,6 +7,7 @@
  * @author Aari Juhanson <aari@vmg.vil.ee>
  * @author Kaiko Kaur <kaiko@kultuur.edu.ee>
  * @author kristian.kankainen@kuu.la
+ * @author Rivo Zängov <eraser@eraser.ee>
  */
 $lang['admin_acl']             = 'Ligipääsukontrolli nimekirja haldamine';
 $lang['acl_group']             = 'Grupp';
@@ -14,8 +15,14 @@ $lang['acl_user']              = 'Kasutaja';
 $lang['acl_perms']             = 'Lubatud';
 $lang['page']                  = 'leht';
 $lang['namespace']             = 'alajaotus';
+$lang['btn_select']            = 'Vali';
+$lang['who']                   = 'Kasutaja/Grupp';
+$lang['perm']                  = 'Õigused';
+$lang['acl_perm0']             = 'Pole';
 $lang['acl_perm1']             = 'Lugemine';
 $lang['acl_perm2']             = 'Toimetamine';
 $lang['acl_perm4']             = 'Tekitamine';
 $lang['acl_perm8']             = 'Üles laadimine';
+$lang['acl_perm16']            = 'Kustuta';
 $lang['acl_new']               = 'Uue kirje lisamine';
+$lang['acl_mod']               = 'Muuda sissekannet';
diff --git a/lib/plugins/acl/lang/fi/lang.php b/lib/plugins/acl/lang/fi/lang.php
index 04074d8d4..4f145e0f6 100644
--- a/lib/plugins/acl/lang/fi/lang.php
+++ b/lib/plugins/acl/lang/fi/lang.php
@@ -5,6 +5,7 @@
  * @author otto@valjakko.net
  * @author Otto Vainio <otto@valjakko.net>
  * @author Teemu Mattila <ghcsystems@gmail.com>
+ * @author Sami Olmari <sami@olmari.fi>
  */
 $lang['admin_acl']             = 'Käyttöoikeudet (ACL)';
 $lang['acl_group']             = 'Ryhmä';
diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php
index 36323a51f..86f493b52 100644
--- a/lib/plugins/acl/lang/fr/lang.php
+++ b/lib/plugins/acl/lang/fr/lang.php
@@ -7,11 +7,10 @@
  * @author Antoine Fixary <antoine.fixary@freesbee.fr>
  * @author cumulus <pta-n56@myamail.com>
  * @author Gwenn Gueguen <contact@demisel.net>
- * @author Guy Brand <gb@isis.u-strasbg.fr>
+ * @author Guy Brand <gb@unistra.fr>
  * @author Fabien Chabreuil <fabien@integralpersonality.com>
  * @author Stéphane Chamberland <stephane.chamberland@ec.gc.ca>
  * @author Maurice A. LeBlanc <leblancma@cooptel.qc.ca>
- * @author gb@isis.u-strasbg.fr
  * @author stephane.gully@gmail.com
  * @author Guillaume Turri <guillaume.turri@gmail.com>
  * @author Erik Pedersen <erik.pedersen@shaw.ca>
@@ -21,6 +20,7 @@
  * @author Florian Gaub <floriang@floriang.net>
  * @author Samuel Dorsaz samuel.dorsaz@novelion.net
  * @author Johan Guilbaud <guilbaud.johan@gmail.com>
+ * @author schplurtz@laposte.net
  */
 $lang['admin_acl']             = 'Gestion de la liste des contrôles d\'accès (ACL)';
 $lang['acl_group']             = 'Groupe';
diff --git a/lib/plugins/acl/lang/hr/help.txt b/lib/plugins/acl/lang/hr/help.txt
new file mode 100644
index 000000000..4e7cfc3c2
--- /dev/null
+++ b/lib/plugins/acl/lang/hr/help.txt
@@ -0,0 +1,11 @@
+=== Brza Pomoć: ===
+
+Na ovoj stranici možeš dodavati i brisati dozvole za imenske prostore i stranice u svom wiki-u.
+
+Lijevi prozor prikazuje sve dostupne imenske prostore i stranice.
+
+Forma iznad ti omogućuje pregled i mijenjanje dozvola odabranom korisniku ili grupi.
+
+U tablici ispod prikazana su sva trenutno postavljena pravila kontrole pristupa. Koristite je za višestruko brisanje ili mijenjanje pravila.
+
+Čitanje [[doku>acl|službena dokumentacija o ACL]] može vam pomoći potpuno razumijeti kako kontrola pristupa radi u DokuWiki.
\ No newline at end of file
diff --git a/lib/plugins/acl/lang/hr/lang.php b/lib/plugins/acl/lang/hr/lang.php
index d2094b77b..8c21f1b0b 100644
--- a/lib/plugins/acl/lang/hr/lang.php
+++ b/lib/plugins/acl/lang/hr/lang.php
@@ -4,4 +4,33 @@
  *
  * @author Branko Rihtman <theney@gmail.com>
  * @author Dražen Odobašić <dodobasic@gmail.com>
+ * @author Dejan Igrec dejan.igrec@gmail.com
  */
+$lang['admin_acl']             = 'Upravljanje listom kontrole pristupa';
+$lang['acl_group']             = 'Grupa';
+$lang['acl_user']              = 'Korisnik';
+$lang['acl_perms']             = 'Dozvole za';
+$lang['page']                  = 'Stranica';
+$lang['namespace']             = 'Imenski prostor';
+$lang['btn_select']            = 'Odaberi';
+$lang['p_user_id']             = 'Korisnik <b class="acluser">%s</b> trenutno ima sljedeće dozvole na stranici <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Korisnik <b class="acluser">%s</b> trenutno ima sljedeće dozvole u imenskom prostoru <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Članovi grupe <b class="aclgroup">%s</b> trenutno imaju sljedeće dozvole na stranici <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Članovi grupe <b class="aclgroup">%s</b> trenutno imaju sljedeće dozvole u imenskom prostoru <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Molim <b>unesti korisnika ili grupu</b> u gornju formu za pregled ili uređivanje dozvola postavljenih za stranicu <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Molim <b>unesti korisnika ili grupu</b> u gornju formu za pregled ili uređivanje dozvola postavljenih za imenski prostor <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Napomena: Ove dozvole nisu postavljene eksplicitno već su naslijeđene od drugih grupa ili nadređenih imenskih prostora.';
+$lang['p_isadmin']             = 'Napomena: Odabrana grupa ili korisnik uvijek ima sve dozvole jer je postavljen kao superuser.';
+$lang['p_include']             = 'Više dozvole uključuju sve niže. Dozvole Kreiraj, Učitaj i Briši se primjenjuju samo na imenske prostore, ne stranice.';
+$lang['current']               = 'Trenutna ACL Pravila';
+$lang['where']                 = 'Stranica/Imenski prostor';
+$lang['who']                   = 'Korisnik/Grupa';
+$lang['perm']                  = 'Dozvole';
+$lang['acl_perm0']             = 'Ništa';
+$lang['acl_perm1']             = 'Čitaj';
+$lang['acl_perm2']             = 'Uredi';
+$lang['acl_perm4']             = 'Kreiraj';
+$lang['acl_perm8']             = 'Učitaj';
+$lang['acl_perm16']            = 'Briši';
+$lang['acl_new']               = 'Dodaj novi Zapis';
+$lang['acl_mod']               = 'Promijeni Zapis';
diff --git a/lib/plugins/acl/lang/hu/lang.php b/lib/plugins/acl/lang/hu/lang.php
index 30401b315..255d838b6 100644
--- a/lib/plugins/acl/lang/hu/lang.php
+++ b/lib/plugins/acl/lang/hu/lang.php
@@ -7,6 +7,7 @@
  * @author schilling.janos@gmail.com
  * @author Szabó Dávid <szabo.david@gyumolcstarhely.hu>
  * @author Sándor TIHANYI <stihanyi+dw@gmail.com>
+ * @author David Szabo <szabo.david@gyumolcstarhely.hu>
  */
 $lang['admin_acl']             = 'Hozzáférési lista (ACL) kezelő';
 $lang['acl_group']             = 'Csoport:';
diff --git a/lib/plugins/acl/lang/kk/lang.php b/lib/plugins/acl/lang/kk/lang.php
new file mode 100644
index 000000000..dde5b9577
--- /dev/null
+++ b/lib/plugins/acl/lang/kk/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * kazakh language file
+ *
+ * @author Nurgozha Kaliaskarov astana08@gmail.com
+ */
diff --git a/lib/plugins/acl/lang/nl/lang.php b/lib/plugins/acl/lang/nl/lang.php
index f9adb5f04..686909644 100644
--- a/lib/plugins/acl/lang/nl/lang.php
+++ b/lib/plugins/acl/lang/nl/lang.php
@@ -16,6 +16,7 @@
  * @author Matthias Carchon webmaster@c-mattic.be
  * @author Marijn Hofstra <hofstra.m@gmail.com>
  * @author Timon Van Overveldt <timonvo@gmail.com>
+ * @author Jeroen
  */
 $lang['admin_acl']             = 'Toegangsrechten';
 $lang['acl_group']             = 'Groep';
diff --git a/lib/plugins/acl/lang/no/lang.php b/lib/plugins/acl/lang/no/lang.php
index cd9e2edfb..587f9c2fc 100644
--- a/lib/plugins/acl/lang/no/lang.php
+++ b/lib/plugins/acl/lang/no/lang.php
@@ -15,6 +15,8 @@
  * @author Lisa Ditlefsen <lisa@vervesearch.com>
  * @author Erik Pedersen <erik.pedersen@shaw.ca>
  * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca>
+ * @author Rune Rasmussen syntaxerror.no@gmail.com
+ * @author Jon Bøe <jonmagneboe@hotmail.com>
  */
 $lang['admin_acl']             = 'Administrasjon av lister for adgangskontroll (ACL)';
 $lang['acl_group']             = 'Gruppe';
@@ -39,7 +41,7 @@ $lang['perm']                  = 'Tillatelser';
 $lang['acl_perm0']             = 'Ingen';
 $lang['acl_perm1']             = 'Lese';
 $lang['acl_perm2']             = 'Redigere';
-$lang['acl_perm4']             = 'Lage';
+$lang['acl_perm4']             = 'Opprette';
 $lang['acl_perm8']             = 'Laste opp';
 $lang['acl_perm16']            = 'Slette';
 $lang['acl_new']               = 'Legg til ny oppføring';
diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php
index c954abe2a..a72b6af11 100644
--- a/lib/plugins/acl/lang/pl/lang.php
+++ b/lib/plugins/acl/lang/pl/lang.php
@@ -11,6 +11,7 @@
  * @author Leszek Stachowski <shazarre@gmail.com>
  * @author maros <dobrimaros@yahoo.pl>
  * @author Grzegorz Widła <dzesdzes@gmail.com>
+ * @author Łukasz Chmaj <teachmeter@gmail.com>
  */
 $lang['admin_acl']             = 'Zarządzanie uprawnieniami';
 $lang['acl_group']             = 'Grupa';
diff --git a/lib/plugins/acl/lang/pt-br/lang.php b/lib/plugins/acl/lang/pt-br/lang.php
index 0ebcbf509..a0c997600 100644
--- a/lib/plugins/acl/lang/pt-br/lang.php
+++ b/lib/plugins/acl/lang/pt-br/lang.php
@@ -18,6 +18,7 @@
  * @author Luis Dantas <luisdantas@gmail.com>
  * @author Sergio Motta sergio@cisne.com.br
  * @author Isaias Masiero Filho <masiero@masiero.org>
+ * @author Balaco Baco <balacobaco@imap.cc>
  */
 $lang['admin_acl']             = 'Administração da Lista de Controles de Acesso';
 $lang['acl_group']             = 'Grupo';
diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php
index 296baa291..0c13d7223 100644
--- a/lib/plugins/acl/lang/ro/lang.php
+++ b/lib/plugins/acl/lang/ro/lang.php
@@ -8,6 +8,7 @@
  * @author Emanuel-Emeric Andrași <n30@mandrivausers.ro>
  * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro>
  * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro>
+ * @author Marius OLAR <olarmariusalex@gmail.com>
  */
 $lang['admin_acl']             = 'Managementul Listei de Control a Accesului';
 $lang['acl_group']             = 'Grup';
diff --git a/lib/plugins/acl/lang/sv/lang.php b/lib/plugins/acl/lang/sv/lang.php
index b5fd3b866..7f963d5e1 100644
--- a/lib/plugins/acl/lang/sv/lang.php
+++ b/lib/plugins/acl/lang/sv/lang.php
@@ -15,6 +15,7 @@
  * @author Bogge Bogge <bogge@bogge.com>
  * @author Peter Åström <eaustreum@gmail.com>
  * @author Håkan Sandell <hakan.sandell@home.se>
+ * @author mikael@mallander.net
  */
 $lang['admin_acl']             = 'Hantera behörighetslistan (ACL)';
 $lang['acl_group']             = 'Grupp';
diff --git a/lib/plugins/acl/lang/zh/lang.php b/lib/plugins/acl/lang/zh/lang.php
index 581d08539..986fa769a 100644
--- a/lib/plugins/acl/lang/zh/lang.php
+++ b/lib/plugins/acl/lang/zh/lang.php
@@ -13,6 +13,7 @@
  * @author caii <zhoucaiqi@gmail.com>
  * @author Hiphen Lee <jacob.b.leung@gmail.com>
  * @author caii, patent agent in China <zhoucaiqi@gmail.com>
+ * @author lainme993@gmail.com
  */
 $lang['admin_acl']             = '访问控制列表（ACL）管理器';
 $lang['acl_group']             = '组';
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 d5d0371a9..d912a2407 100644
--- a/lib/plugins/acl/script.js
+++ b/lib/plugins/acl/script.js
@@ -1,59 +1,69 @@
-acl = {
-    init: function(){
-        this.ctl = $('acl_manager');
-        if(!this.ctl) return;
+/**
+ * ACL Manager AJAX enhancements
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+var dw_acl = {
+    /**
+     * Initialize the object and attach the event handlers
+     */
+    init: function () {
+        var $tree;
 
-        var sel = $('acl__user').getElementsByTagName('select')[0];
+        //FIXME only one underscore!!
+        if (jQuery('#acl_manager').length === 0) {
+            return;
+        }
 
-        addEvent(sel,'change',acl.userselhandler);
-        addEvent($('acl__tree'),'click',acl.treehandler);
-        addEvent($('acl__user').getElementsByTagName('input')[1],'click',acl.loadinfo);
+        jQuery('#acl__user select').change(dw_acl.userselhandler);
+        jQuery('#acl__user input[type=submit]').click(dw_acl.loadinfo);
+
+        $tree = jQuery('#acl__tree');
+        $tree.dw_tree({toggle_selector: 'img',
+                       load_data: function (show_sublist, $clicky) {
+                           // get the enclosed link and the edit form
+                           var $frm = jQuery('#acl__detail form');
+
+                           jQuery.post(
+                               DOKU_BASE + 'lib/plugins/acl/ajax.php',
+                               jQuery.extend(dw_acl.parseatt($clicky.parent().find('a')[0].search),
+                                             {ajax: 'tree',
+                                              current_ns: $frm.find('input[name=ns]').val(),
+                                              current_id: $frm.find('input[name=id]').val()}),
+                               show_sublist,
+                               'html'
+                           );
+                       },
+
+                       toggle_display: function ($clicky, opening) {
+                           $clicky.attr('src',
+                                        DOKU_BASE + 'lib/images/' +
+                                        (opening ? 'minus' : 'plus') + '.gif');
+                       }});
+        $tree.delegate('a', 'click', dw_acl.treehandler);
     },
 
-
     /**
      * Handle user dropdown
+     *
+     * Hides or shows the user/group entry box depending on what was selected in the
+     * dropdown element
      */
-    userselhandler: function(e){
+    userselhandler: function () {
         // make entry field visible/invisible
-        if(this.value == '__g__' || this.value == '__u__'){
-            $('acl__user').getElementsByTagName('input')[0].style.display = ''; //acl_w
-            $('acl__user').getElementsByTagName('input')[1].style.display = ''; //submit
-        }else{
-            $('acl__user').getElementsByTagName('input')[0].style.display = 'none';
-            $('acl__user').getElementsByTagName('input')[1].style.display = 'none';
-        }
-
-        acl.loadinfo();
+        jQuery('#acl__user input').toggle(this.value === '__g__' ||
+                                          this.value === '__u__');
+        dw_acl.loadinfo();
     },
 
     /**
      * Load the current permission info and edit form
-     *
-     * @param frm - Form element with needed data
      */
-    loadinfo: function(){
-        // get form
-        var frm = $('acl__detail').getElementsByTagName('form')[0];
-
-        // prepare an AJAX call
-        var ajax = new sack(DOKU_BASE + 'lib/plugins/acl/ajax.php');
-        ajax.AjaxFailedAlert = '';
-        ajax.encodeURIString = false;
-        if(ajax.failed) return true;
-
-        // prepare data
-        var data = Array();
-        data[0] = ajax.encVar('ns',frm.elements['ns'].value);
-        data[1] = ajax.encVar('id',frm.elements['id'].value);
-        data[2] = ajax.encVar('acl_t',frm.elements['acl_t'].value);
-        data[3] = ajax.encVar('acl_w',frm.elements['acl_w'].value);
-        data[4] = ajax.encVar('sectok',frm.elements['sectok'].value);
-        data[5] = ajax.encVar('ajax','info');
-
-        ajax.elementObj = $('acl__info');
-
-        ajax.runAJAX(data.join('&'));
+    loadinfo: function () {
+        jQuery('#acl__info').load(
+            DOKU_BASE + 'lib/plugins/acl/ajax.php',
+            jQuery('#acl__detail form').serialize() + '&ajax=info'
+        );
         return false;
     },
 
@@ -62,11 +72,13 @@ acl = {
      *
      * @todo put into global script lib?
      */
-    parseatt: function(str){
-        if(str[0] == '?') str = str.substr(1);
+    parseatt: function (str) {
+        if (str[0] === '?') {
+            str = str.substr(1);
+        }
         var attributes = {};
         var all = str.split('&');
-        for(var i=0; i<all.length; i++){
+        for (var i = 0; i < all.length; i++) {
             var att = all[i].split('=');
             attributes[att[0]] = decodeURIComponent(att[1]);
         }
@@ -74,94 +86,40 @@ acl = {
     },
 
     /**
-     * htmlspecialchars equivalent
-     *
-     * @todo put in gloabl scripts lib?
+     * Handles clicks to the tree nodes
      */
-    hsc: function(str) {
-        str = str.replace(/&/g,"&amp;");
-        str = str.replace(/\"/g,"&quot;");
-        str = str.replace(/\'/g,"&#039;");
-        str = str.replace(/</g,"&lt;");
-        str = str.replace(/>/g,"&gt;");
-        return str;
-    },
+    treehandler: function () {
+        var $link, $frm;
 
+        $link = jQuery(this);
 
-    /**
-     * Open or close a subtree using AJAX
-     *
-     * @author Andreas Gohr <andi@splitbrain.org>
-     */
-    treetoggle: function(clicky){
-        var listitem = clicky.parentNode.parentNode;
-
-        // if already open, close by removing the sublist
-        var sublists = listitem.getElementsByTagName('ul');
-        if(sublists.length){
-            listitem.removeChild(sublists[0]);
-            clicky.src = DOKU_BASE+'lib/images/plus.gif';
-            clicky.alt = '+';
-            return false;
-        }
-
-        // get the enclosed link (is always the first one)
-        var link = listitem.getElementsByTagName('a')[0];
-
-        // prepare an AJAX call to fetch the subtree
-        var ajax = new sack(DOKU_BASE + 'lib/plugins/acl/ajax.php');
-        ajax.AjaxFailedAlert = '';
-        ajax.encodeURIString = false;
-        if(ajax.failed) return true;
-
-        //prepare the new ul
-        var ul = document.createElement('ul');
-        listitem.appendChild(ul);
-        ajax.elementObj = ul;
-        ajax.setVar('ajax', 'tree');
-        var frm = $('acl__detail').getElementsByTagName('form')[0];
-        ajax.setVar('current_ns', encodeURIComponent(frm.elements['ns'].value));
-        ajax.setVar('current_id', encodeURIComponent(frm.elements['id'].value));
-        ajax.runAJAX(link.search.substr(1));
-        clicky.src = DOKU_BASE+'lib/images/minus.gif';
-        return false;
-    },
-
-    /**
-     * Handles all clicks in the tree, dispatching the right action based on the
-     * clicked element
-     */
-    treehandler: function(e){
-        if(e.target.src){ // is it an image?
-            acl.treetoggle(e.target);
-        } else if(e.target.href){ // is it a link?
             // remove highlighting
-            var obj = getElementsByClass('cur',$('acl__tree'),'a');
-            for(var i=0; i<obj.length; i++){
-                obj[i].className = obj[i].className.replace(/ cur/,'');
-            }
+            jQuery('#acl__tree a.cur').removeClass('cur');
 
             // add new highlighting
-            e.target.className += ' cur';
+        $link.addClass('cur');
 
             // set new page to detail form
-            var frm = $('acl__detail').getElementsByTagName('form')[0];
-            if(e.target.className.search(/wikilink1/) > -1){
-                frm.elements['ns'].value = '';
-                frm.elements['id'].value = acl.hsc(acl.parseatt(e.target.search)['id']);
-            }else if(e.target.className.search(/idx_dir/) > -1){
-                frm.elements['ns'].value = acl.hsc(acl.parseatt(e.target.search)['ns']);
-                frm.elements['id'].value = '';
+        $frm = jQuery('#acl__detail form');
+        if ($link.hasClass('wikilink1')) {
+            $frm.find('input[name=ns]').val('');
+            $frm.find('input[name=id]').val(dw_acl.parseatt($link[0].search).id);
+        } 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();
 
-            acl.loadinfo();
-        }
-
-        e.stopPropagation();
-        e.preventDefault();
         return false;
     }
-
 };
 
-addInitEvent(acl.init);
+jQuery(dw_acl.init);
+
+var acl = {
+    init: DEPRECATED_WRAP(dw_acl.init, dw_acl),
+    userselhandler: DEPRECATED_WRAP(dw_acl.userselhandler, dw_acl),
+    loadinfo: DEPRECATED_WRAP(dw_acl.loadinfo, dw_acl),
+    parseatt: DEPRECATED_WRAP(dw_acl.parseatt, dw_acl),
+    treehandler: DEPRECATED_WRAP(dw_acl.treehandler, dw_acl)
+};
diff --git a/lib/plugins/acl/style.css b/lib/plugins/acl/style.css
index 0c5a9819b..b7154aa78 100644
--- a/lib/plugins/acl/style.css
+++ b/lib/plugins/acl/style.css
@@ -22,6 +22,7 @@ div#acl_manager div#acl__tree ul {
 
 div#acl_manager div#acl__tree li {
     padding-left: 1em;
+    list-style-image: none;
 }
 
 div#acl_manager div#acl__tree ul img {