From 6e5ea1fc9f25cb56d4c942fc77fd298e633a9b4f Mon Sep 17 00:00:00 2001 From: Are0h Date: Wed, 21 Apr 2021 18:48:53 -0700 Subject: [PATCH] matched template pathing to fipamo structure --- index.php | 12 +++++++----- .../theme-fipamo-default/fipamo-default/archive.twig | 2 +- .../theme-fipamo-default/fipamo-default/index.twig | 2 +- .../theme-fipamo-default/fipamo-default/page.twig | 2 +- .../theme-fipamo-default/fipamo-default/tags.twig | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/index.php b/index.php index 20a1626..99c8333 100644 --- a/index.php +++ b/index.php @@ -10,7 +10,9 @@ class ThemeEngine public function __construct() { $this->data = json_decode(file_get_contents("./config.json"), true); - $this->loader = new \Twig\Loader\FilesystemLoader("src/themes/"); + $this->loader = new \Twig\Loader\FilesystemLoader( + "src/themes/theme-fipamo-default/" + ); $this->twig = new \Twig\Environment($this->loader, []); $this->router($_SERVER["REQUEST_URI"]); } @@ -29,7 +31,7 @@ class ThemeEngine case "/": $recent = $this->data["recent_posts"]; $featured = $this->data["featured_posts"]; - $template = "theme-fipamo-default/fipamo-default/index.twig"; + $template = "fipamo-default/index.twig"; $pageOptions = [ "debug" => true, @@ -45,7 +47,7 @@ class ThemeEngine case "/page": $content = $this->data["content"]; $meta = $this->data["meta"]; - $template = "theme-fipamo-default/fipamo-default/page.twig"; + $template = "fipamo-default/page.twig"; $pageOptions = [ "debug" => true, "title" => "Page Title", @@ -59,7 +61,7 @@ class ThemeEngine break; case "/tags": $tags = $this->data["tag_list"]; - $template = "theme-fipamo-default/fipamo-default/tags.twig"; + $template = "fipamo-default/tags.twig"; $pageOptions = [ "debug" => true, "title" => "Pages Tagged as Tag", @@ -72,7 +74,7 @@ class ThemeEngine break; case "/archive": $archive = $this->data["archives"]; - $template = "theme-fipamo-default/fipamo-default/archive.twig"; + $template = "fipamo-default/archive.twig"; $pageOptions = [ "debug" => true, "title" => "Archive", diff --git a/src/themes/theme-fipamo-default/fipamo-default/archive.twig b/src/themes/theme-fipamo-default/fipamo-default/archive.twig index b792d89..9152ce4 100644 --- a/src/themes/theme-fipamo-default/fipamo-default/archive.twig +++ b/src/themes/theme-fipamo-default/fipamo-default/archive.twig @@ -1,4 +1,4 @@ -{% extends "theme-fipamo-default/fipamo-default/frame.twig" %} +{% extends "fipamo-default/frame.twig" %} {% block title %} {{ title }} diff --git a/src/themes/theme-fipamo-default/fipamo-default/index.twig b/src/themes/theme-fipamo-default/fipamo-default/index.twig index 8f69e9f..68dd8c5 100644 --- a/src/themes/theme-fipamo-default/fipamo-default/index.twig +++ b/src/themes/theme-fipamo-default/fipamo-default/index.twig @@ -1,4 +1,4 @@ -{% extends "theme-fipamo-default/fipamo-default/frame.twig" %} +{% extends "fipamo-default/frame.twig" %} {% block title %} {{ title }} diff --git a/src/themes/theme-fipamo-default/fipamo-default/page.twig b/src/themes/theme-fipamo-default/fipamo-default/page.twig index b60bb0b..434b8a6 100644 --- a/src/themes/theme-fipamo-default/fipamo-default/page.twig +++ b/src/themes/theme-fipamo-default/fipamo-default/page.twig @@ -1,4 +1,4 @@ -{% extends "theme-fipamo-default/fipamo-default/frame.twig" %} +{% extends "fipamo-default/frame.twig" %} {% block title %} {{ title }} diff --git a/src/themes/theme-fipamo-default/fipamo-default/tags.twig b/src/themes/theme-fipamo-default/fipamo-default/tags.twig index 46b0ffb..2c239f4 100644 --- a/src/themes/theme-fipamo-default/fipamo-default/tags.twig +++ b/src/themes/theme-fipamo-default/fipamo-default/tags.twig @@ -1,4 +1,4 @@ -{% extends "theme-fipamo-default/fipamo-default/frame.twig" %} +{% extends "fipamo-default/frame.twig" %} {% block title %} {{ title }}