merge master in branch

17 files changed, 68 insertions, 76 deletions

diff --git a/lib/plugins/acl/lang/cs/lang.php b/lib/plugins/acl/lang/cs/lang.php
index feb160a02..a4e59287a 100644
--- a/lib/plugins/acl/lang/cs/lang.php
+++ b/lib/plugins/acl/lang/cs/lang.php
@@ -12,6 +12,7 @@
  * @author zbynek.krivka@seznam.cz
  * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com>
  * @author Jakub A. Těšínský (j@kub.cz)
+ * @author mkucera66@seznam.cz
  */
 $lang['admin_acl']             = 'Správa přístupových práv';
 $lang['acl_group']             = 'Skupina';
diff --git a/lib/plugins/acl/lang/de-informal/lang.php b/lib/plugins/acl/lang/de-informal/lang.php
index 05f7df037..45a993982 100644
--- a/lib/plugins/acl/lang/de-informal/lang.php
+++ b/lib/plugins/acl/lang/de-informal/lang.php
@@ -8,6 +8,8 @@
  * @author Matthias Schulte <dokuwiki@lupo49.de>
  * @author Christian Wichmann <nospam@zone0.de>
  * @author Pierre Corell <info@joomla-praxis.de>
+ * @author Frank Loizzi <contact@software.bacal.de>
+ * @author Volker Bödker <volker@boedker.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 e1cd26755..516d7bdf5 100644
--- a/lib/plugins/acl/lang/el/lang.php
+++ b/lib/plugins/acl/lang/el/lang.php
@@ -14,6 +14,7 @@
  * @author Konstantinos Koryllos <koryllos@gmail.com>
  * @author George Petsagourakis <petsagouris@gmail.com>
  * @author Petros Vidalis <pvidalis@gmail.com>
+ * @author Vasileios Karavasilis vasileioskaravasilis@gmail.com
  */
 $lang['admin_acl']             = 'Διαχείριση Δικαιωμάτων Πρόσβασης';
 $lang['acl_group']             = 'Ομάδα';
diff --git a/lib/plugins/acl/lang/en/help.txt b/lib/plugins/acl/lang/en/help.txt
index 2b80cc4c7..e865bbb23 100644
--- a/lib/plugins/acl/lang/en/help.txt
+++ b/lib/plugins/acl/lang/en/help.txt
@@ -1,12 +1,9 @@
 === Quick Help: ===
 
 On this page you can add and remove permissions for namespaces and pages in your wiki.
-
-The left pane displays all available namespaces and pages.
-
-The form above allows you to see and modify the permissions of a selected user or group.
-
-In the table below all currently set access control rules are shown. You can use it to quickly delete or change multiple rules.
+  * The left pane displays all available namespaces and pages.
+  * The form above allows you to see and modify the permissions of a selected user or group.
+  * In the table below all currently set access control rules are shown. You can use it to quickly delete or change multiple rules.
 
 Reading the [[doku>acl|official documentation on ACL]] might help you to fully understand how access control works in DokuWiki.
 
diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php
index e52bf51a0..538dd14d3 100644
--- a/lib/plugins/acl/lang/fr/lang.php
+++ b/lib/plugins/acl/lang/fr/lang.php
@@ -25,6 +25,7 @@
  * @author Yannick Aure <yannick.aure@gmail.com>
  * @author Olivier DUVAL <zorky00@gmail.com>
  * @author Anael Mobilia <contrib@anael.eu>
+ * @author Bruno Veilleux <bruno.vey@gmail.com>
  */
 $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/gl/lang.php b/lib/plugins/acl/lang/gl/lang.php
index 537e03eef..3325bfd07 100644
--- a/lib/plugins/acl/lang/gl/lang.php
+++ b/lib/plugins/acl/lang/gl/lang.php
@@ -4,7 +4,7 @@
  *
  * @author Medúlio <medulio@ciberirmandade.org>
  * @author Oscar M. Lage <r0sk10@gmail.com>
- * @author Leandro Regueiro <leandro.regueiro@gmail.com>
+ * @author Rodrigo Rega <rodrigorega@gmail.com>
  */
 $lang['admin_acl']             = 'Xestión da Lista de Control de Acceso (ACL)';
 $lang['acl_group']             = 'Grupo';
diff --git a/lib/plugins/acl/lang/ja/lang.php b/lib/plugins/acl/lang/ja/lang.php
index 5bebb58a9..0dd4d09c6 100644
--- a/lib/plugins/acl/lang/ja/lang.php
+++ b/lib/plugins/acl/lang/ja/lang.php
@@ -9,6 +9,7 @@
  * @author Daniel Dupriest <kououken@gmail.com>
  * @author Kazutaka Miyasaka <kazmiya@gmail.com>
  * @author Taisuke Shimamoto <dentostar@gmail.com>
+ * @author Satoshi Sahara <sahara.satoshi@gmail.com>
  */
 $lang['admin_acl']             = 'アクセスコントロール管理';
 $lang['acl_group']             = 'グループ';
diff --git a/lib/plugins/acl/lang/ko/help.txt b/lib/plugins/acl/lang/ko/help.txt
index 6a15b7a2e..0386b5990 100644
--- a/lib/plugins/acl/lang/ko/help.txt
+++ b/lib/plugins/acl/lang/ko/help.txt
@@ -1,11 +1,8 @@
 === 빠른 도움말: ===
 
 현재 문서에서 위키 이름공간과 문서에 대한 접근 권한을 추가하거나 삭제할 수 있습니다.
+* 왼쪽 영역에는 선택 가능한 이름공간과 문서 목록을 보여줍니다.
+* 위쪽 입력 양식에서 선택된 사용자와 그룹의 접근 권한을 보거나 바꿀 수 있습니다.
+* 아래 테이블에서 현재 설정된 모든 접근 제어 규칙을 볼 수 있으며, 즉시 여러 규칙을 삭제하거나 바꿀 수 있습니다.
 
-왼쪽 영역에는 선택 가능한 이름공간과 문서 목록을 보여줍니다.
-
-위쪽 입력 양식에서 선택된 사용자와 그룹의 접근 권한을 보거나 바꿀 수 있습니다.
-
-아래 테이블에서 현재 설정된 모든 접근 제어 규칙을 볼 수 있으며, 즉시 여러 규칙을 삭제하거나 바꿀 수 있습니다.
-
-DokuWiki에서 접근 제어가 어떻게 동작되는지 알아보려면  [[doku>acl|ACL 공식 문서]]를 읽어보기 바랍니다.
\ No newline at end of file
+DokuWiki에서 접근 제어가 어떻게 동작되는지 알아보려면  [[doku>acl|ACL 공식 문서]]를 읽어보시기 바랍니다.
\ No newline at end of file
diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php
index 5d2662ef8..7c1e9a43d 100644
--- a/lib/plugins/acl/lang/ko/lang.php
+++ b/lib/plugins/acl/lang/ko/lang.php
@@ -1,16 +1,15 @@
 <?php
 /**
- * korean language file
+ * Korean language file
  *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Anika Henke <anika@selfthinker.org>
  * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
  * @author jk Lee
  * @author dongnak@gmail.com
  * @author Song Younghwan <purluno@gmail.com>
- * @author SONG Younghwan <purluno@gmail.com>
- * @author Seung-Chul Yoo  <dryoo@live.com>
+ * @author Seung-Chul Yoo <dryoo@live.com>
  * @author erial2@gmail.com
  * @author Myeongjin <aranet100@gmail.com>
  */
@@ -25,8 +24,8 @@ $lang['p_user_id']             = '<b class="acluser">%s</b> 사용자는 현재
 $lang['p_user_ns']             = '<b class="acluser">%s</b> 사용자는 현재 <b class="aclns">%s</b>: <i>%s</i> 이름공간 접근이 가능합니다.';
 $lang['p_group_id']            = '<b class="aclgroup">%s</b> 그룹 구성원은 현재 <b class="aclpage">%s</b>: <i>%s</i> 문서 접근이 가능합니다.';
 $lang['p_group_ns']            = '<b class="aclgroup">%s</b> 그룹 구성원은 현재 <b class="aclns">%s</b>: <i>%s</i> 이름공간 접근이 가능합니다.';
-$lang['p_choose_id']           = '<b class="aclpage">%s</b> 문서 접근 권한을 보거나 바꾸려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하기 바랍니다.';
-$lang['p_choose_ns']           = '<b class="aclns">%s</b> 이름공간 접근 권한을 보거나 바꾸려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하기 바랍니다.';
+$lang['p_choose_id']           = '<b class="aclpage">%s</b> 문서 접근 권한을 보거나 바꾸려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하세요.';
+$lang['p_choose_ns']           = '<b class="aclns">%s</b> 이름공간 접근 권한을 보거나 바꾸려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하세요.';
 $lang['p_inherited']           = '참고: 권한이 명시적으로 설정되지 않았으므로 다른 그룹이나 상위 이름공간으로부터 가져왔습니다.';
 $lang['p_isadmin']             = '참고: 슈퍼유저로 설정되어 있으므로 선택된 그룹이나 사용자는 언제나 모든 접근 권한을 가집니다.';
 $lang['p_include']             = '더 높은 접근 권한은 하위를 포함합니다. 문서가 아닌 이름공간에는 만들기, 올리기, 삭제 권한만 적용됩니다.';
@@ -41,4 +40,4 @@ $lang['acl_perm4']             = '만들기';
 $lang['acl_perm8']             = '올리기';
 $lang['acl_perm16']            = '삭제';
 $lang['acl_new']               = '새 항목 추가';
-$lang['acl_mod']               = '선택 항목 수정';
+$lang['acl_mod']               = '항목 수정';
diff --git a/lib/plugins/acl/lang/nl/help.txt b/lib/plugins/acl/lang/nl/help.txt
index 255f21ba0..14c78e20a 100644
--- a/lib/plugins/acl/lang/nl/help.txt
+++ b/lib/plugins/acl/lang/nl/help.txt
@@ -1,11 +1,8 @@
 === Snelle hulp: ===
 
 Op deze pagina kun je bevoegdheden toevoegen en verwijderen voor namespaces en pagina's in je wiki.
-
-Het linkerpaneel geeft alle beschikbare namespaces en pagina's weer.
-
-In het formulier hierboven kun je bevoegdheden zien en aanpassen voor een selecteerde gebruiker of groep.
-
-In de tabel hieronder worden alle momenteel ingestelde toegangsregels weergegeven. Je kunt hier snel regels wijzigen of verwijderen.
+  * Het linkerpaneel geeft alle beschikbare namespaces en pagina's weer.
+  * In het formulier hierboven kun je bevoegdheden zien en aanpassen voor een selecteerde gebruiker of groep.
+  * In de tabel hieronder worden alle momenteel ingestelde toegangsregels weergegeven. Je kunt hier snel regels wijzigen of verwijderen.
 
 Lees de  [[doku>acl|documentatie over ACLs]] om de mogelijkheden volledig te begrijpen.
diff --git a/lib/plugins/acl/lang/pt-br/lang.php b/lib/plugins/acl/lang/pt-br/lang.php
index a0c997600..c49b430f8 100644
--- a/lib/plugins/acl/lang/pt-br/lang.php
+++ b/lib/plugins/acl/lang/pt-br/lang.php
@@ -19,6 +19,7 @@
  * @author Sergio Motta sergio@cisne.com.br
  * @author Isaias Masiero Filho <masiero@masiero.org>
  * @author Balaco Baco <balacobaco@imap.cc>
+ * @author Victor Westmann <victor.westmann@gmail.com>
  */
 $lang['admin_acl']             = 'Administração da Lista de Controles de Acesso';
 $lang['acl_group']             = 'Grupo';
diff --git a/lib/plugins/acl/lang/ru/lang.php b/lib/plugins/acl/lang/ru/lang.php
index 15ba78ef6..2501c00e2 100644
--- a/lib/plugins/acl/lang/ru/lang.php
+++ b/lib/plugins/acl/lang/ru/lang.php
@@ -16,6 +16,7 @@
  * @author Ladyko Andrey <fylh@succexy.spb.ru>
  * @author Eugene <windy.wanderer@gmail.com>
  * @author Johnny Utah <pcpa@cyberpunk.su>
+ * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
  */
 $lang['admin_acl']             = 'Управление списками контроля доступа';
 $lang['acl_group']             = 'Группа';
diff --git a/lib/plugins/acl/lang/sv/lang.php b/lib/plugins/acl/lang/sv/lang.php
index 7f963d5e1..388672fc0 100644
--- a/lib/plugins/acl/lang/sv/lang.php
+++ b/lib/plugins/acl/lang/sv/lang.php
@@ -16,6 +16,7 @@
  * @author Peter Åström <eaustreum@gmail.com>
  * @author Håkan Sandell <hakan.sandell@home.se>
  * @author mikael@mallander.net
+ * @author Smorkster Andersson smorkster@gmail.com
  */
 $lang['admin_acl']             = 'Hantera behörighetslistan (ACL)';
 $lang['acl_group']             = 'Grupp';
diff --git a/lib/plugins/acl/lang/vi/help.txt b/lib/plugins/acl/lang/vi/help.txt
index 23e258678..816e5ee71 100644
--- a/lib/plugins/acl/lang/vi/help.txt
+++ b/lib/plugins/acl/lang/vi/help.txt
@@ -1,12 +1,12 @@
-=== Trợ giúp nhanh: ===

-

-Trang này giúp bạn thêm hoặc xóa quyền được cấp cho 1 thư mục hoặc trang wiki của bạn.

-

-Của sổ bên trái hiển thị tất cả các thư mục và trang văn bản.

-

-Khung trên đây cho phép bạn xem và sửa quyền của một nhóm hoặc thành viên đã chọn.

-

-Bảng bên dưới hiển thị tất cả các quyền được cấp. Bạn có thể sửa hoặc hóa các quyền đó một cách nhanh chóng.

-

-Đọc [[doku>acl|tài liệu chính thức về ACL]] sẽ giúp bạn hiểu hơn về cách phân quyền ở DokuWiki.

-

+=== Trợ giúp nhanh: ===
+
+Trang này giúp bạn thêm hoặc xóa quyền được cấp cho 1 thư mục hoặc trang wiki của bạn.
+
+Của sổ bên trái hiển thị tất cả các thư mục và trang văn bản.
+
+Khung trên đây cho phép bạn xem và sửa quyền của một nhóm hoặc thành viên đã chọn.
+
+Bảng bên dưới hiển thị tất cả các quyền được cấp. Bạn có thể sửa hoặc hóa các quyền đó một cách nhanh chóng.
+
+Đọc [[doku>acl|tài liệu chính thức về ACL]] sẽ giúp bạn hiểu hơn về cách phân quyền ở DokuWiki.
+
diff --git a/lib/plugins/acl/plugin.info.txt b/lib/plugins/acl/plugin.info.txt
index 42babd71c..029dc82e7 100644
--- a/lib/plugins/acl/plugin.info.txt
+++ b/lib/plugins/acl/plugin.info.txt
@@ -1,7 +1,7 @@
 base   acl
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2012-09-06
+date   2013-02-17
 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 0ba91cdc9..c3763dc8d 100644
--- a/lib/plugins/acl/script.js
+++ b/lib/plugins/acl/script.js
@@ -117,11 +117,3 @@ var dw_acl = {
 };
 
 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 f4277c341..d8f0b53f3 100644
--- a/lib/plugins/acl/style.css
+++ b/lib/plugins/acl/style.css
@@ -1,5 +1,5 @@
 
-div#acl_manager div#acl__tree {
+#acl__tree {
     font-size: 90%;
     width: 25%;
     height: 300px;
@@ -8,61 +8,61 @@ div#acl_manager div#acl__tree {
     border: 1px solid __border__;
     text-align: left;
 }
-[dir=rtl] div#acl_manager div#acl__tree {
+[dir=rtl] #acl__tree {
     float: right;
     text-align: right;
 }
 
-div#acl_manager div#acl__tree a.cur {
+#acl__tree a.cur {
     background-color: __highlight__;
     font-weight: bold;
 }
 
-div#acl_manager div#acl__tree ul {
+#acl__tree ul {
     list-style-type: none;
     margin: 0;
     padding: 0;
 }
 
-div#acl_manager div#acl__tree li {
+#acl__tree li {
     padding-left: 1em;
     list-style-image: none;
 }
-[dir=rtl] div#acl_manager div#acl__tree li {
+[dir=rtl] #acl__tree li {
     padding-left: 0em;
     padding-right: 1em;
 }
 
-div#acl_manager div#acl__tree ul img {
+#acl__tree ul img {
     margin-right: 0.25em;
     cursor: pointer;
 }
-[dir=rtl] div#acl_manager div#acl__tree ul img {
+[dir=rtl] #acl__tree ul img {
     margin-left: 0.25em;
     margin-right: 0em;
 }
 
-div#acl_manager div#acl__detail {
+#acl__detail {
     width: 73%;
     height: 300px;
     float: right;
     overflow: auto;
 }
-[dir=rtl] div#acl_manager div#acl__detail {
+[dir=rtl] #acl__detail {
     float: left;
 }
 
-div#acl_manager div#acl__detail fieldset {
+#acl__detail fieldset {
     width: 90%;
 }
 
-div#acl_manager div#acl__detail div#acl__user {
+#acl__detail div#acl__user {
     border: 1px solid __border__;
     padding: 0.5em;
     margin-bottom: 0.6em;
 }
 
-div#acl_manager table.inline {
+#acl_manager table.inline {
     width: 100%;
     margin: 0;
 }
@@ -75,59 +75,60 @@ div#acl_manager table.inline {
     text-align: right;
 }
 
-div#acl_manager .aclgroup {
+#acl_manager .aclgroup {
     background: transparent url(pix/group.png) 0px 1px no-repeat;
     padding: 1px 0px 1px 18px;
 }
-[dir=rtl] div#acl_manager .aclgroup {
+[dir=rtl] #acl_manager .aclgroup {
     background: transparent url(pix/group.png) right 1px no-repeat;
     padding: 1px 18px 1px 0px;
     display: inline-block; /* needed for IE7 */
 }
 
-div#acl_manager .acluser {
+#acl_manager .acluser {
     background: transparent url(pix/user.png) 0px 1px no-repeat;
     padding: 1px 0px 1px 18px;
 }
-[dir=rtl] div#acl_manager .acluser {
+[dir=rtl] #acl_manager .acluser {
     background: transparent url(pix/user.png) right 1px no-repeat;
     padding: 1px 18px 1px 0px;
     display: inline-block; /* needed for IE7 */
 }
 
-div#acl_manager .aclpage {
+#acl_manager .aclpage {
     background: transparent url(pix/page.png) 0px 1px no-repeat;
     padding: 1px 0px 1px 18px;
 }
-[dir=rtl] div#acl_manager .aclpage {
+[dir=rtl] #acl_manager .aclpage {
     background: transparent url(pix/page.png) right 1px no-repeat;
     padding: 1px 18px 1px 0px;
     display: inline-block; /* needed for IE7 */
 }
 
-div#acl_manager .aclns {
+#acl_manager .aclns {
     background: transparent url(pix/ns.png) 0px 1px no-repeat;
     padding: 1px 0px 1px 18px;
 }
-[dir=rtl] div#acl_manager .aclns {
+[dir=rtl] #acl_manager .aclns {
     background: transparent url(pix/ns.png) right 1px no-repeat;
     padding: 1px 18px 1px 0px;
     display: inline-block; /* needed for IE7 */
 }
 
-div#acl_manager label.disabled {
-  color: __text_neu__!important;
+#acl_manager label.disabled {
+    opacity: .5;
+    cursor: auto;
 }
 
 #acl_manager label {
-  text-align: left;
-  font-weight: normal;
-  display: inline;
+    text-align: left;
+    font-weight: normal;
+    display: inline;
 }
 
 #acl_manager table {
-  margin-left: 10%;
-  width: 80%;
+    margin-left: 10%;
+    width: 80%;
 }
 
 #acl_manager table tr {