diff options
| -rw-r--r-- | inc/template.php | 41 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/css/mixins.less | 15 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/css/structure.less | 15 |
3 files changed, 15 insertions, 56 deletions
diff --git a/inc/template.php b/inc/template.php index a4ace1a63..88b6b14b8 100644 --- a/inc/template.php +++ b/inc/template.php @@ -894,12 +894,12 @@ function tpl_breadcrumbs($sep = '•') { * @author Nigel McNie <oracle.shinoda@gmail.com> * @author Sean Coates <sean@caedmon.net> * @author <fredrik@averpil.com> - * @author Mark C. Prins <mprins@users.sf.net> + * @todo May behave strangely in RTL languages * * @param string $sep Separator between entries * @return bool */ -function tpl_youarehere($sep = ' → ') { +function tpl_youarehere($sep = ' » ') { global $conf; global $ID; global $lang; @@ -910,15 +910,12 @@ function tpl_youarehere($sep = ' → ') { $parts = explode(':', $ID); $count = count($parts); - echo '<nav><h2 class="bchead">'.$lang['youarehere'].': </h2>'; - echo '<ul class="navlist">'; - // always print the startpage - if ($count > 1) { - echo '<li class="home">'.html_wikilink(':'.$conf['start']).$sep.'</li>'; - } else { - echo '<li class="home">'.$conf['start'].'</li>'; - } + echo '<span class="bchead">'.$lang['youarehere'].' </span>'; + // always print the startpage + echo '<span class="home">'; + tpl_pagelink(':'.$conf['start']); + echo '</span>'; // print intermediate namespace links $part = ''; @@ -927,28 +924,18 @@ function tpl_youarehere($sep = ' → ') { $page = $part; if($page == $conf['start']) continue; // Skip startpage - echo '<li>'.html_wikilink($page); - if ($i < $count - 2) { - echo $sep.'</li>'; - } else { - echo '</li>'; - } + // output + echo $sep; + tpl_pagelink($page); } // print current page, skipping start page, skipping for namespace index resolve_pageid('', $page, $exists); - if(isset($page) && $page == $part.$parts[$i]) { - echo '</li></ul></nav>'; - return true; - } - + if(isset($page) && $page == $part.$parts[$i]) return true; $page = $part.$parts[$i]; - if($page == $conf['start']) { - echo '</li></ul></nav>'; - return true; - } - - echo $sep.'</li><li class="curid">'.noNSorNS($page).'</li></ul></nav>'; + if($page == $conf['start']) return true; + echo $sep; + tpl_pagelink($page); return true; } diff --git a/lib/tpl/dokuwiki/css/mixins.less b/lib/tpl/dokuwiki/css/mixins.less index 4b15bb600..a88767e97 100644 --- a/lib/tpl/dokuwiki/css/mixins.less +++ b/lib/tpl/dokuwiki/css/mixins.less @@ -7,17 +7,4 @@ background: -o-linear-gradient( @declaration); background: -ms-linear-gradient( @declaration); background: linear-gradient( @declaration); -} - -/** - * provides inline list styling. - */ -.inline-list(){ - list-style-type: none; - - & li { - margin: 0; - padding: 0; - display: inline; - } -} +}
\ No newline at end of file diff --git a/lib/tpl/dokuwiki/css/structure.less b/lib/tpl/dokuwiki/css/structure.less index f7dea3948..3ea2f83eb 100644 --- a/lib/tpl/dokuwiki/css/structure.less +++ b/lib/tpl/dokuwiki/css/structure.less @@ -87,18 +87,3 @@ body { #dokuwiki__footer { clear: both; } - -.dokuwiki .navlist { - display: inline; - padding: 0; - .inline-list; -} - -.bchead { - display: inline; - font-size: inherit; -} - -.curid { - font-weight: bold; -} |