diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/plugins/acl/admin.php | 4 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/css/design.css | 47 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/images/sitetools.png | bin | 2225 -> 0 bytes | |||
| -rw-r--r-- | lib/tpl/dokuwiki/images/usertools.png | bin | 0 -> 1541 bytes | |||
| -rw-r--r-- | lib/tpl/dokuwiki/tpl_header.php | 3 |
5 files changed, 17 insertions, 37 deletions
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index c3461b78b..1f88c6ff9 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -84,7 +84,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { $this->who = '@'.ltrim($auth->cleanGroup($who),'@'); }elseif($_REQUEST['acl_t'] == '__u__' && $who){ $this->who = ltrim($who,'@'); - if($this->who != '%USER%'){ #keep wildcard as is + if($this->who != '%USER%' && $this->who != '%GROUP%'){ #keep wildcard as is $this->who = $auth->cleanUser($this->who); } }elseif($_REQUEST['acl_t'] && @@ -140,7 +140,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { if ($who!='@ALL') { $who = '@'.ltrim($auth->cleanGroup($who),'@'); } - } elseif ($who != '%USER%'){ #keep wildcard as is + } elseif ($who != '%USER%' && $who != '%GROUP%'){ #keep wildcard as is $who = $auth->cleanUser($who); } $who = auth_nameencode($who,true); diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 059decf49..4f18b79e8 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -95,13 +95,11 @@ text-overflow: ellipsis; } -#dokuwiki__usertools a.action, -#dokuwiki__sitetools a.action { +#dokuwiki__usertools a.action { padding-left: 20px; - background: transparent url(images/sitetools.png) no-repeat 0 0; + background: transparent url(images/usertools.png) no-repeat 0 0; } -[dir=rtl] #dokuwiki__usertools a.action, -[dir=rtl] #dokuwiki__sitetools a.action { +[dir=rtl] #dokuwiki__usertools a.action { padding-left: 0; padding-right: 20px; } @@ -133,34 +131,34 @@ } #dokuwiki__usertools a.action.admin { - background-position: left -96px; + background-position: left 0; } [dir=rtl] #dokuwiki__usertools a.action.admin { - background-position: right -96px; + background-position: right 0; } #dokuwiki__usertools a.action.profile { - background-position: left -128px; + background-position: left -32px; } [dir=rtl] #dokuwiki__usertools a.action.profile { - background-position: right -128px; + background-position: right -32px; } #dokuwiki__usertools a.action.register { - background-position: left -160px; + background-position: left -64px; } [dir=rtl] #dokuwiki__usertools a.action.register { - background-position: right -160px; + background-position: right -64px; } #dokuwiki__usertools a.action.login { - background-position: left -192px; + background-position: left -96px; } [dir=rtl] #dokuwiki__usertools a.action.login { - background-position: right -192px; + background-position: right -96px; } #dokuwiki__usertools a.action.logout { - background-position: left -224px; + background-position: left -128px; } [dir=rtl] #dokuwiki__usertools a.action.logout { - background-position: right -224px; + background-position: right -128px; } @@ -207,25 +205,6 @@ #dokuwiki__sitetools li { } -#dokuwiki__sitetools a.action.recent { - background-position: left 0; -} -[dir=rtl] #dokuwiki__sitetools a.action.recent { - background-position: right 0; -} -#dokuwiki__sitetools a.action.media { - background-position: left -32px; -} -[dir=rtl] #dokuwiki__sitetools a.action.media { - background-position: right -32px; -} -#dokuwiki__sitetools a.action.index { - background-position: left -64px; -} -[dir=rtl] #dokuwiki__sitetools a.action.index { - background-position: right -64px; -} - /*____________ breadcrumbs ____________*/ .dokuwiki div.breadcrumbs { diff --git a/lib/tpl/dokuwiki/images/sitetools.png b/lib/tpl/dokuwiki/images/sitetools.png Binary files differdeleted file mode 100644 index dc5764647..000000000 --- a/lib/tpl/dokuwiki/images/sitetools.png +++ /dev/null diff --git a/lib/tpl/dokuwiki/images/usertools.png b/lib/tpl/dokuwiki/images/usertools.png Binary files differnew file mode 100644 index 000000000..e99b6596e --- /dev/null +++ b/lib/tpl/dokuwiki/images/usertools.png diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php index 1d2517ee1..f2e720308 100644 --- a/lib/tpl/dokuwiki/tpl_header.php +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -1,7 +1,6 @@ <!-- ********** HEADER ********** --> <div id="dokuwiki__header"><div class="pad group"> - <?php html_msgarea() ?> <?php tpl_includeFile('header.html') ?> <div class="headings group"> @@ -77,5 +76,7 @@ </div> <?php endif ?> + <?php html_msgarea() ?> + <hr class="a11y" /> </div></div><!-- /header --> |
