diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index 96f6aa4a52e71e8a9af26ae04e9653cd0ccc7086..8e0be08ceb4e3acad198cbc252bc37b18d42cb7c 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -170,6 +170,11 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { $this->_html_table(); echo '</div>'.NL; + echo '<div class="footnotes"><div class="fn">'.NL; + echo '<sup><a id="fn__1" class="fn_bot" name="fn__1" href="#fnt__1">1)</a></sup>'.NL; + echo $this->getLang('p_include'); + echo '</div></div>'; + echo '</div>'.NL; } @@ -535,7 +540,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo '<tr>'; echo '<th>'.$this->getLang('where').'</th>'; echo '<th>'.$this->getLang('who').'</th>'; - echo '<th>'.$this->getLang('perm').'</th>'; + echo '<th>'.$this->getLang('perm').'<sup><a id="fnt__1" class="fn_top" name="fnt__1" href="#fn__1">1)</a></sup></th>'; echo '<th>'.$lang['btn_delete'].'</th>'; echo '</tr>'; foreach($this->acl as $where => $set){ diff --git a/lib/plugins/acl/lang/en/lang.php b/lib/plugins/acl/lang/en/lang.php index 039f2ee16848feedf10207aae4b29e40e55f4f54..38ff20c88889b4da0087234933307f53b12bcaf5 100644 --- a/lib/plugins/acl/lang/en/lang.php +++ b/lib/plugins/acl/lang/en/lang.php @@ -28,6 +28,7 @@ $lang['p_choose_ns'] = 'Please <b>enter a user or group</b> in the form above t $lang['p_inherited'] = 'Note: Those permissions were not set explicitly but were inherited from other groups or higher namespaces.'; $lang['p_isadmin'] = 'Note: The selected group or user has always full permissions because it is configured as superuser.'; +$lang['p_include'] = 'Higher permissions include lower ones. Create, Upload and Delete permissions only apply to namespaces, not pages.'; $lang['current'] = 'Current ACL Rules'; $lang['where'] = 'Page/Namespace';