From b106800e8dbca5d4ba375221c1aafa08c53b6684 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Thu, 21 Jun 2012 15:14:17 -0400
Subject: [PATCH] Moved layouts under templates directory to shorten search
 stack and work more closely with ZF2 defaults.

---
 module/VuFind/src/VuFind/Theme.php                             | 3 +--
 .../blueprint/{layouts => templates/layout}/layout.phtml       | 0
 .../blueprint/{layouts => templates/layout}/lightbox.phtml     | 0
 .../jquerymobile/{layouts => templates/layout}/layout.phtml    | 0
 themes/vufind/root/{layouts => templates/layout}/help.phtml    | 0
 5 files changed, 1 insertion(+), 2 deletions(-)
 rename themes/vufind/blueprint/{layouts => templates/layout}/layout.phtml (100%)
 rename themes/vufind/blueprint/{layouts => templates/layout}/lightbox.phtml (100%)
 rename themes/vufind/jquerymobile/{layouts => templates/layout}/layout.phtml (100%)
 rename themes/vufind/root/{layouts => templates/layout}/help.phtml (100%)

diff --git a/module/VuFind/src/VuFind/Theme.php b/module/VuFind/src/VuFind/Theme.php
index b2486b819fa..1369cc30aef 100644
--- a/module/VuFind/src/VuFind/Theme.php
+++ b/module/VuFind/src/VuFind/Theme.php
@@ -390,9 +390,8 @@ class Theme
                 );
             }
 
-            // Add template and layout paths:
+            // Add template path:
             $templatePathStack[] = $this->baseDir . "/$key/templates";
-            $templatePathStack[] = $this->baseDir . "/$key/layouts";
 
             // Add CSS and JS dependencies:
             if ($css = $currentThemeInfo->get('css')) {
diff --git a/themes/vufind/blueprint/layouts/layout.phtml b/themes/vufind/blueprint/templates/layout/layout.phtml
similarity index 100%
rename from themes/vufind/blueprint/layouts/layout.phtml
rename to themes/vufind/blueprint/templates/layout/layout.phtml
diff --git a/themes/vufind/blueprint/layouts/lightbox.phtml b/themes/vufind/blueprint/templates/layout/lightbox.phtml
similarity index 100%
rename from themes/vufind/blueprint/layouts/lightbox.phtml
rename to themes/vufind/blueprint/templates/layout/lightbox.phtml
diff --git a/themes/vufind/jquerymobile/layouts/layout.phtml b/themes/vufind/jquerymobile/templates/layout/layout.phtml
similarity index 100%
rename from themes/vufind/jquerymobile/layouts/layout.phtml
rename to themes/vufind/jquerymobile/templates/layout/layout.phtml
diff --git a/themes/vufind/root/layouts/help.phtml b/themes/vufind/root/templates/layout/help.phtml
similarity index 100%
rename from themes/vufind/root/layouts/help.phtml
rename to themes/vufind/root/templates/layout/help.phtml
-- 
GitLab