diff --git a/.htaccess b/.htaccess index 484d1ad..cf625b4 100644 --- a/.htaccess +++ b/.htaccess @@ -1,4 +1,4 @@ - + RewriteEngine On @@ -64,9 +64,6 @@ RewriteRule (^|/)\.(?!well-known\/) index.php [L] RewriteRule ^(system\/typemill\/author\/css\/) - [L] RewriteRule ^(system\/typemill\/author\/img\/) - [L] RewriteRule ^(system\/typemill\/author\/js\/) - [L] -RewriteRule ^(system\/author\/css\/) - [L] -RewriteRule ^(system\/author\/img\/) - [L] -RewriteRule ^(system\/author\/js\/) - [L] # redirect all other direct requests to the following physical folders to the index.php so pages with same name work RewriteRule ^(system|content|data|settings|(media\/files\/)) index.php [QSA,L] diff --git a/system/typemill/Extensions/TwigPagelistExtension.php b/system/typemill/Extensions/TwigPagelistExtension.php new file mode 100644 index 0000000..4eb5fea --- /dev/null +++ b/system/typemill/Extensions/TwigPagelistExtension.php @@ -0,0 +1,35 @@ + $item) + { + # set item active, needed to move item in navigation + if($item->urlRelWoF === $url) + { + $item->active = true; + $result = $item; + } + elseif($item->elementType === "folder") + { + $result = $this->getList($item->folderContent, $url, $result); + } + } + + return $result; + } +} \ No newline at end of file diff --git a/system/typemill/system.php b/system/typemill/system.php index 79ad182..fe55eb4 100644 --- a/system/typemill/system.php +++ b/system/typemill/system.php @@ -34,6 +34,7 @@ use Typemill\Extensions\TwigUserExtension; use Typemill\Extensions\TwigLanguageExtension; use Typemill\Extensions\TwigMarkdownExtension; use Typemill\Extensions\TwigMetaExtension; +use Typemill\Extensions\TwigPagelistExtension; use Typemill\Extensions\TwigCaptchaExtension; $timer = []; @@ -275,6 +276,7 @@ $container->set('view', function() use ($settings, $urlinfo, $translations) { $twig->addExtension(new TwigLanguageExtension( $translations )); $twig->addExtension(new TwigMarkdownExtension()); $twig->addExtension(new TwigMetaExtension()); + $twig->addExtension(new TwigPagelistExtension()); $twig->addExtension(new TwigCaptchaExtension()); return $twig;