Various cleanups

docs/config.json

@@ -4,7 +4,6 @@
     "author": "Justin Walsh",
     "image": "app.png",
     "theme": "daux-blue",
-    "template": "default",
     "clean_urls": true,
     "toggle_code": true,
     "breadcrumbs": true,

libs/DauxHelper.php

@@ -2,30 +2,6 @@
 
 class DauxHelper
 {
-
-    public static function getBreadcrumbFromRequest($request, $separator = 'Chevrons', $multilanguage = false)
-    {
-        if ($multilanguage) {
-            $request = substr($request, strpos($request, '/') + 1);
-        }
-        $request = str_replace('_', ' ', $request);
-        switch ($separator) {
-            case 'Chevrons':
-                $request = str_replace('/', ' <i class="glyphicon glyphicon-chevron-right"></i> ', $request);
-                return $request;
-            case 'Colons':
-                $request = str_replace('/', ': ', $request);
-                return $request;
-            case 'Spaces':
-                $request = str_replace('/', ' ', $request);
-                return $request;
-            default:
-                $request = str_replace('/', $separator, $request);
-                return $request;
-        }
-        return $request;
-    }
-
     public static function getTheme($theme_name, $base_url, $local_base, $current_url)
     {
         $theme_folder = $local_base . DS . 'resources' . DS . 'themes' . DS . $theme_name;

libs/MarkdownPage.php

@@ -8,7 +8,6 @@ class MarkdownPage extends SimplePage
     private $params;
     private $language;
     private $homepage;
-    private $breadcrumb_trail;
 
     public function __construct()
     {
@@ -28,22 +27,18 @@ class MarkdownPage extends SimplePage
         $this->params = $params;
         $this->title = $file->title;
 
-		$this->homepage = false;
+        $this->homepage = false;
         if ($this->title === 'index') {
             $minimum_parent_dir_size = ($params['multilanguage']) ? 2 : 1;
             if (count($file->getParents()) >= $minimum_parent_dir_size) {
                 $parents = $file->getParents();
-                $parent = end($parents);
+                $this->title = end($parents)->getTitle();
-                $this->title = $parent->getTitle();
             } else {
-				$this->homepage = ($this->file->getName() === '_index');
+                $this->homepage = ($this->file->getName() === '_index');
                 $this->title = $params['title'];
             }
         }
 
-        if ($params['breadcrumbs']) {
-            $this->breadcrumb_trail = $this->buildBreadcrumbTrail($file->getParents(), $params['multilanguage']);
-        }
         $this->language = '';
         if ($params['multilanguage'] && count($file->getParents())) {
             reset($file->getParents());
@@ -52,7 +47,7 @@ class MarkdownPage extends SimplePage
         }
     }
 
-    private function buildBreadcrumbTrail($parents, $multilanguage)
+    private function getBreadcrumbTrail($parents, $multilanguage)
     {
         if ($multilanguage && !empty($parents)) {
             $parents = array_splice($parents, 1);
@@ -93,22 +88,24 @@ class MarkdownPage extends SimplePage
             $entry_page[$params['entry_page']->title] = $params['base_page'] . $params['entry_page']->getUrl();
         }
 
-        $page['entry_page'] = $entry_page;
+        $page = [
-        $page['homepage'] = $this->homepage;
+            'entry_page' => $entry_page,
-        $page['title'] = $this->file->getTitle();
+            'homepage' => $this->homepage,
-        $page['filename'] = $this->file->getName();
+            'title' => $this->file->getTitle(),
-        if ($page['breadcrumbs'] = $params['breadcrumbs']) {
+            'filename' => $this->file->getName(),
-            $page['breadcrumb_trail'] = $this->breadcrumb_trail;
+            'language' => $this->language,
+            'path' => $this->file->getPath(),
+            'modified_time' => filemtime($this->file->getPath()),
+            'markdown' => $this->content,
+            'request' => $params['request'],
+            'content' => (new \Parsedown())->text($this->content),
+            'breadcrumbs' => $params['breadcrumbs']
+        ];
+
+        if ($page['breadcrumbs']) {
+            $page['breadcrumb_trail'] = $this->getBreadcrumbTrail($this->file->getParents(), $params['multilanguage']);
             $page['breadcrumb_separator'] = $params['breadcrumb_separator'];
         }
-        $page['language'] = $this->language;
-        $page['path'] = $this->file->getPath();
-        $page['modified_time'] = filemtime($this->file->getPath());
-        $page['markdown'] = $this->content;
-        $page['request'] = $params['request'];
-
-        $Parsedown = new \Parsedown();
-        $page['content'] = $Parsedown->text($this->content);
 
         $template = new Template($params['templates'], $params['theme']['templates']);
         return $template->render($this->homepage? 'home' : 'content', ['page' => $page, 'params' => $params]);

libs/Template.php

@@ -4,7 +4,6 @@ use League\Plates\Engine;
 
 class Template
 {
-
     protected $engine;
 
     public function __construct($base, $theme)
@@ -61,7 +60,6 @@ class Template
     {
         $nav = "";
         foreach ($entries as $entry) {
-
             if (array_key_exists('children', $entry)) {
                 if (array_key_exists('href', $entry)) {
                     $link = '<a href="' . $entry['href'] . '" class="folder">' . $entry['title'] . '</a>';
@@ -106,7 +104,7 @@ class Template
                     'class' => (strpos($current_url, $link) === 0)? 'open' : '',
                 ];
 
-                if ($mode === \TodayMade\Daux\Daux::STATIC_MODE) {
+                if ($mode === Daux::STATIC_MODE) {
                     $link .= "/index.html";
                 }
 

templates/layout/00_layout.php

@@ -24,8 +24,6 @@
     <![endif]-->
 </head>
 <body>
-
-
     <?= $this->section('content'); ?>
 
     <?php if ($params['google_analytics']) {