diff options
Diffstat (limited to 'lib/plugins/acl')
| -rw-r--r-- | lib/plugins/acl/admin.php | 11 | ||||
| -rw-r--r-- | lib/plugins/acl/ajax.php | 11 | ||||
| -rw-r--r-- | lib/plugins/acl/lang/sv/lang.php | 1 |
3 files changed, 7 insertions, 16 deletions
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index ea4184ca3..7c12b3374 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -253,19 +253,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>'; } 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/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'; |