From e70461b641ed4b4f0b4c559eba615851dcb22308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ste=CC=81phane=20Goetz?= Date: Sat, 18 Jul 2015 23:50:47 +0200 Subject: [PATCH] Fix and simplify homepage detection in HTML generator --- libs/Format/HTML/MarkdownPage.php | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/libs/Format/HTML/MarkdownPage.php b/libs/Format/HTML/MarkdownPage.php index fa0faef..ba2c0bd 100644 --- a/libs/Format/HTML/MarkdownPage.php +++ b/libs/Format/HTML/MarkdownPage.php @@ -1,5 +1,8 @@ homepage = false; - if ($this->title === 'index') { - $minimum_parent_dir_size = ($this->params['multilanguage']) ? 2 : 1; - if (count($this->file->getParents()) >= $minimum_parent_dir_size) { - $this->title = $this->file->getParent()->getTitle(); - } else { - $this->homepage = ($this->file->getName() === '_index'); - $this->title = $this->params['title']; + if ($this->file->getParent()->getIndexPage() == $this->file) { + if ($this->params['multilanguage']) { + if ($this->file->getParent()->getParent() instanceof Root) { + $this->homepage = true; + } + } elseif ($this->file->getParent() instanceof Root) { + $this->homepage = true; } } @@ -50,7 +53,7 @@ class MarkdownPage extends \Todaymade\Daux\Format\Base\MarkdownPage $params = $this->params; $entry_page = []; - if ($params['request'] === $params['index_key']) { + if ($this->homepage) { if ($params['multilanguage']) { foreach ($params['languages'] as $key => $name) { $entry_page[$name] = $params['base_page'] . $params['entry_page'][$key]->getUrl(); @@ -58,8 +61,6 @@ class MarkdownPage extends \Todaymade\Daux\Format\Base\MarkdownPage } else { $entry_page['View Documentation'] = $params['base_page'] . $params['entry_page']->getUrl(); } - } elseif ($params['file_uri'] === 'index') { - $entry_page[$params['entry_page']->getTitle()] = $params['base_page'] . $params['entry_page']->getUrl(); } $page = [