mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-07-30 19:00:32 +02:00
Code Issues Releases Wiki Activity

finished TOC feature

Browse Source
This commit is contained in:
Sebastian
2017-11-29 21:51:47 +01:00
parent 4bea02cb16
commit 7da2060cae
30 changed files with 605 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/Controllers/Controller.php
View File

@@ -4,7 +4,7 @@ namespace Typemill\Controllers;
/* Use the slim-container */
use Interop\Container\ContainerInterface;
use Typemill\Events\RenderSiteEvent;
use Typemill\Events\RenderPageEvent;
abstract class Controller
{
@@ -17,7 +17,7 @@ abstract class Controller
protected function render($response, $route, $data)
{
$data = $this->c->dispatcher->dispatch('beforeRenderSite', new RenderSiteEvent($data))->getData();
$data = $this->c->dispatcher->dispatch('onPageRendered', new RenderPageEvent($data))->getData();
return $this->c->view->render($response, $route, $data);
}

10
system/Controllers/PageController.php
View File

@@ -9,9 +9,10 @@ use Typemill\Models\WriteYaml;
use \Symfony\Component\Yaml\Yaml;
use Typemill\Models\VersionCheck;
use Typemill\Models\Helpers;
use Typemill\Events\LoadStructureEvent;
use Typemill\Events\LoadPagetreeEvent;
use Typemill\Events\LoadMarkdownEvent;
use Typemill\Events\ParseHtmlEvent;
use Typemill\Extensions\ParsedownExtension;
class PageController extends Controller
{
@@ -63,7 +64,7 @@ class PageController extends Controller
}
/* dispatch event and let others manipulate the structure */
$structure = $this->c->dispatcher->dispatch('onStructureLoaded', new LoadStructureEvent($structure))->getData();
$structure = $this->c->dispatcher->dispatch('onPagetreeLoaded', new LoadPagetreeEvent($structure))->getData();
}
catch (Exception $e)
{
@@ -122,7 +123,8 @@ class PageController extends Controller
$contentMD = $this->c->dispatcher->dispatch('onMarkdownLoaded', new LoadMarkdownEvent($contentMD))->getData();
/* initialize parsedown */
$Parsedown = new \ParsedownExtra();
// $Parsedown = new \ParsedownExtra();
$Parsedown = new ParsedownExtension();
/* parse markdown-file to html-string */
$contentHTML = $Parsedown->text($contentMD);
@@ -141,7 +143,7 @@ class PageController extends Controller
*/
$route = empty($args) && $settings['startpage'] ? '/cover.twig' : '/index.twig';
$this->render($response, $route, array('navigation' => $structure, 'content' => $contentHTML, 'item' => $item, 'breadcrumb' => $breadcrumb, 'settings' => $settings, 'title' => $title, 'description' => $description, 'base_url' => $base_url ));
}