From 366d93314d70c228a69a06a0bc50d650e301bd25 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Wed, 26 May 2010 14:04:00 +0000 Subject: [PATCH] Some reorganization of templates. Restored entitylist as destination of links on index page, since new individuallist controller/templates not finished yet. --- themes/vivo-basic/ftl/page/default.ftl | 16 ++++++++-------- .../ftl/{components => page/partials}/footer.ftl | 2 +- .../partials}/googleAnalytics.ftl | 0 .../{components => page/partials}/identity.ftl | 0 .../ftl/{components => page/partials}/menu.ftl | 0 .../ftl/{components => page/partials}/search.ftl | 0 6 files changed, 9 insertions(+), 9 deletions(-) rename themes/vivo-basic/ftl/{components => page/partials}/footer.ftl (99%) rename themes/vivo-basic/ftl/{components => page/partials}/googleAnalytics.ftl (100%) rename themes/vivo-basic/ftl/{components => page/partials}/identity.ftl (100%) rename themes/vivo-basic/ftl/{components => page/partials}/menu.ftl (100%) rename themes/vivo-basic/ftl/{components => page/partials}/search.ftl (100%) diff --git a/themes/vivo-basic/ftl/page/default.ftl b/themes/vivo-basic/ftl/page/default.ftl index b87c869c..34cf3ea3 100644 --- a/themes/vivo-basic/ftl/page/default.ftl +++ b/themes/vivo-basic/ftl/page/default.ftl @@ -1,22 +1,22 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -<#include "/components/doctype.html"> +<#include "partials/doctype.html"> -<#include "/components/head.ftl"> +<#include "partials/head.ftl">
@@ -29,11 +29,11 @@
- <#include "/components/footer.ftl"> + <#include "partials/footer.ftl"> - <#include "/components/scripts.ftl"> + <#include "partials/scripts.ftl"> diff --git a/themes/vivo-basic/ftl/components/footer.ftl b/themes/vivo-basic/ftl/page/partials/footer.ftl similarity index 99% rename from themes/vivo-basic/ftl/components/footer.ftl rename to themes/vivo-basic/ftl/page/partials/footer.ftl index 489f5ede..c167f9b3 100644 --- a/themes/vivo-basic/ftl/components/footer.ftl +++ b/themes/vivo-basic/ftl/page/partials/footer.ftl @@ -20,7 +20,7 @@ <#include "copyright.ftl"> - + All Rights Reserved. Terms of Use diff --git a/themes/vivo-basic/ftl/components/googleAnalytics.ftl b/themes/vivo-basic/ftl/page/partials/googleAnalytics.ftl similarity index 100% rename from themes/vivo-basic/ftl/components/googleAnalytics.ftl rename to themes/vivo-basic/ftl/page/partials/googleAnalytics.ftl diff --git a/themes/vivo-basic/ftl/components/identity.ftl b/themes/vivo-basic/ftl/page/partials/identity.ftl similarity index 100% rename from themes/vivo-basic/ftl/components/identity.ftl rename to themes/vivo-basic/ftl/page/partials/identity.ftl diff --git a/themes/vivo-basic/ftl/components/menu.ftl b/themes/vivo-basic/ftl/page/partials/menu.ftl similarity index 100% rename from themes/vivo-basic/ftl/components/menu.ftl rename to themes/vivo-basic/ftl/page/partials/menu.ftl diff --git a/themes/vivo-basic/ftl/components/search.ftl b/themes/vivo-basic/ftl/page/partials/search.ftl similarity index 100% rename from themes/vivo-basic/ftl/components/search.ftl rename to themes/vivo-basic/ftl/page/partials/search.ftl