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

Small fixes in url generations

Browse Source
This commit is contained in:
Stéphane Goetz 2015-07-21 09:51:55 +02:00
parent 16f15ae2b2
commit 12739c2044
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/Format/HTML/MarkdownPage.php
View File

@ -40,7 +40,8 @@ class MarkdownPage extends \Todaymade\Daux\Format\Base\MarkdownPage
$breadcrumb_trail = array(); $breadcrumb_trail = array();
if (!empty($parents)) { if (!empty($parents)) {
foreach ($parents as $node) { foreach ($parents as $node) {
$breadcrumb_trail[$node->getTitle()] = $node->getUrl(); $page = $node->getIndexPage() ?: $node->getFirstPage();
$breadcrumb_trail[$node->getTitle()] = $page? $page->getUrl() : '';
} }
} }
return $breadcrumb_trail; return $breadcrumb_trail;

6
libs/Processor.php
View File

@ -2,7 +2,7 @@
use League\CommonMark\Environment; use League\CommonMark\Environment;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Todaymade\Daux\Tree\Directory; use Todaymade\Daux\Tree\Root;
class Processor class Processor
{ {
@ -38,9 +38,9 @@ class Processor
* the tree as you want, move pages, modify * the tree as you want, move pages, modify
* pages and even add new ones. * pages and even add new ones.
* *
* @param Directory $root * @param Root $root
*/ */
public function manipulateTree(Directory $root) public function manipulateTree(Root $root)
{ {
} }

4
libs/Tree/Builder.php
View File

@ -145,8 +145,10 @@ class Builder
*/ */
public static function getOrCreatePage(Directory $parent, $title) public static function getOrCreatePage(Directory $parent, $title)
{ {
$slug = DauxHelper::slug($title); $uri = $slug = DauxHelper::slug($title);
if ($parent->getConfig()['mode'] === Daux::STATIC_MODE) {
$uri = $slug . ".html"; $uri = $slug . ".html";
}
if (array_key_exists($uri, $parent->getEntries())) { if (array_key_exists($uri, $parent->getEntries())) {
return $parent->getEntries()[$uri]; return $parent->getEntries()[$uri];