Added template fallback support

diff --git a/garden.php b/garden.php
index 99cb0123ac8f07091403252717e70e4058d05b80..6035ee8dde8192d670e60058f0b082b9d2700f09 100644 (file)
--- a/garden.php
+++ b/garden.php
@@ -260,7 +260,11 @@ function garden_template_render($name, $variables = null) {
        $output = '';
        while ($name != null) {
                $path = garden_path(GARDEN_TEMPLATE_DIR, $name . '.php');
        $output = '';
        while ($name != null) {
                $path = garden_path(GARDEN_TEMPLATE_DIR, $name . '.php');

-               
+
+               if (file_exists($path) == false) {
+                       $path = garden_path(GARDEN_FALLBACK_TEMPLATE_DIR, $name . '.php');
+               }
+

                $base_template = null;
                $base_template_variables = null;
 
                $base_template = null;
                $base_template_variables = null;
 


@@ -312,8 +316,6 @@ function garden_site_url(...$url_segments) {
        return GARDEN_SITE_BASE_URL . garden_url(...$url_segments);
 }
 
        return GARDEN_SITE_BASE_URL . garden_url(...$url_segments);
 }
 

-
-

 ///////////////////////////////////////////////////////////////////////////////
 // Images
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 // Images
 ///////////////////////////////////////////////////////////////////////////////


@@ -605,6 +607,8 @@ function garden() {
 assert(extension_loaded('imagick'), 'Needs Imagick');
 assert($argc >= 2, 'Please provide configuration file');
 
 assert(extension_loaded('imagick'), 'Needs Imagick');
 assert($argc >= 2, 'Please provide configuration file');
 

+define('GARDEN_FALLBACK_TEMPLATE_DIR', garden_path(__DIR__, 'templates'));
+

 // First parameter needs to be the configuration php
 $config_file = $argv[1];
 
 // First parameter needs to be the configuration php
 $config_file = $argv[1];
 

diff --git a/templates/base.php b/templates/base.php
index 2961a4bf7ea5fb606a906209f4a4ac5372fa6928..5a6a7435dc8be4d26dd0b4bea559201a438bf005 100644 (file)
--- a/templates/base.php
+++ b/templates/base.php
@@ -13,7 +13,7 @@
                <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
                <link rel="stylesheet" href="<?= garden_site_url('style', 'screen.css') ?>">
                <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
                <link rel="stylesheet" href="<?= garden_site_url('style', 'screen.css') ?>">

-               
+

                <link rel="alternate" type="application/atom+xml" href="<?= garden_site_url('feed.atom') ?>">
                <link rel="alternate" type="application/feed+json" href="<?= garden_site_url('feed.json') ?>">
        </head>
                <link rel="alternate" type="application/atom+xml" href="<?= garden_site_url('feed.atom') ?>">
                <link rel="alternate" type="application/feed+json" href="<?= garden_site_url('feed.json') ?>">
        </head>