D3Public/daux.io
8
0
Fork 0
Code Pull Requests Releases Activity

Fix breadcrumb support of multiple folders with the same name. Fixes #54

Browse Source
This commit is contained in:
Stéphane Goetz 2018-06-05 23:02:01 +02:00
parent 049e5cd498
commit 0570fb7971
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/Format/HTML/ContentPage.php
View File

@ -52,7 +52,7 @@ class ContentPage extends \Todaymade\Daux\Format\Base\ContentPage
if (!empty($parents)) { if (!empty($parents)) {
foreach ($parents as $node) { foreach ($parents as $node) {
$page = $node->getIndexPage() ?: $node->getFirstPage(); $page = $node->getIndexPage() ?: $node->getFirstPage();
$breadcrumb_trail[$node->getTitle()] = $page ? $page->getUrl() : ''; $breadcrumb_trail[] = ['title' => $node->getTitle(), 'url' => $page ? $page->getUrl() : ''];
} }
} }
@ -98,7 +98,7 @@ class ContentPage extends \Todaymade\Daux\Format\Base\ContentPage
$page['breadcrumb_separator'] = $params['html']['breadcrumb_separator']; $page['breadcrumb_separator'] = $params['html']['breadcrumb_separator'];
if ($this->homepage) { if ($this->homepage) {
$page['breadcrumb_trail'] = [$this->file->getTitle() => '']; $page['breadcrumb_trail'] = [['title' => $this->file->getTitle(), 'url' => '']];
} }
} }

4
libs/Format/HTML/Template.php
View File

@ -99,8 +99,8 @@ class Template
$title = ''; $title = '';
$breadcrumb_trail = $page['breadcrumb_trail']; $breadcrumb_trail = $page['breadcrumb_trail'];
$separator = $this->getSeparator($page['breadcrumb_separator']); $separator = $this->getSeparator($page['breadcrumb_separator']);
foreach ($breadcrumb_trail as $key => $value) { foreach ($breadcrumb_trail as $value) {
$title .= '<a href="' . $base_page . $value . '">' . $key . '</a>' . $separator; $title .= '<a href="' . $base_page . $value['url'] . '">' . $value['title'] . '</a>' . $separator;
} }
if ($page['filename'] === 'index' || $page['filename'] === '_index') { if ($page['filename'] === 'index' || $page['filename'] === '_index') {
if ($page['title'] != '') { if ($page['title'] != '') {