[pLog-svn] r1192 - in templates/trunk: 3-column-liquid Boxed Boxed-Green Mac-Stripe Matrix-Code Modish Soft-Blue Soft-Green Soft-Red Very-Clean Vicksburg blorange blufill buddha cab darkfire dots drove-all-night flower gutenberg human_condition lemons mars-spirit minitemplate outback pastel-blocks pink_lilies reic roof rubric silver simple_sky splat standard_green standard_happy standard_red toni toto tribal water_play white wordplog zen

jondaley at devel.plogworld.net jondaley at devel.plogworld.net
Thu Feb 24 03:16:27 GMT 2005


Author: jondaley
Date: 2005-02-24 03:16:26 +0000 (Thu, 24 Feb 2005)
New Revision: 1192

Modified:
   templates/trunk/3-column-liquid/aboutme.html.template
   templates/trunk/3-column-liquid/album.template
   templates/trunk/3-column-liquid/albums.template
   templates/trunk/3-column-liquid/commentarticle.template
   templates/trunk/3-column-liquid/error.template
   templates/trunk/3-column-liquid/main.template
   templates/trunk/3-column-liquid/postandcomments.template
   templates/trunk/3-column-liquid/posttrackbacks.template
   templates/trunk/3-column-liquid/resource.template
   templates/trunk/Boxed-Green/header.template
   templates/trunk/Boxed/header.template
   templates/trunk/Mac-Stripe/album.template
   templates/trunk/Mac-Stripe/albums.template
   templates/trunk/Mac-Stripe/commentarticle.template
   templates/trunk/Mac-Stripe/error.template
   templates/trunk/Mac-Stripe/header.template
   templates/trunk/Mac-Stripe/main.template
   templates/trunk/Mac-Stripe/postandcomments.template
   templates/trunk/Mac-Stripe/posttrackbacks.template
   templates/trunk/Matrix-Code/header.template
   templates/trunk/Modish/header.template
   templates/trunk/Soft-Blue/header.template
   templates/trunk/Soft-Green/header.template
   templates/trunk/Soft-Red/header.template
   templates/trunk/Very-Clean/header.template
   templates/trunk/Vicksburg/header.template
   templates/trunk/blorange/about.template
   templates/trunk/blorange/album.template
   templates/trunk/blorange/albums.template
   templates/trunk/blorange/commentarticle.template
   templates/trunk/blorange/error.template
   templates/trunk/blorange/main.template
   templates/trunk/blorange/postandcomments.template
   templates/trunk/blorange/posttrackbacks.template
   templates/trunk/blorange/resource.template
   templates/trunk/blufill/commentform.template
   templates/trunk/buddha/about.template
   templates/trunk/buddha/album.template
   templates/trunk/buddha/albums.template
   templates/trunk/buddha/commentarticle.template
   templates/trunk/buddha/error.template
   templates/trunk/buddha/main.template
   templates/trunk/buddha/postandcomments.template
   templates/trunk/buddha/posttrackbacks.template
   templates/trunk/buddha/resource.template
   templates/trunk/cab/about.template
   templates/trunk/cab/album.template
   templates/trunk/cab/albums.template
   templates/trunk/cab/commentarticle.template
   templates/trunk/cab/error.template
   templates/trunk/cab/main.template
   templates/trunk/cab/postandcomments.template
   templates/trunk/cab/posttrackbacks.template
   templates/trunk/cab/resource.template
   templates/trunk/darkfire/about.template
   templates/trunk/darkfire/album.template
   templates/trunk/darkfire/albums.template
   templates/trunk/darkfire/commentarticle.template
   templates/trunk/darkfire/error.template
   templates/trunk/darkfire/main.template
   templates/trunk/darkfire/postandcomments.template
   templates/trunk/darkfire/posttrackbacks.template
   templates/trunk/darkfire/resource.template
   templates/trunk/dots/about.template
   templates/trunk/dots/album.template
   templates/trunk/dots/albums.template
   templates/trunk/dots/commentarticle.template
   templates/trunk/dots/error.template
   templates/trunk/dots/main.template
   templates/trunk/dots/postandcomments.template
   templates/trunk/dots/posttrackbacks.template
   templates/trunk/dots/resource.template
   templates/trunk/drove-all-night/about.template
   templates/trunk/drove-all-night/album.template
   templates/trunk/drove-all-night/albums.template
   templates/trunk/drove-all-night/commentarticle.template
   templates/trunk/drove-all-night/error.template
   templates/trunk/drove-all-night/main.template
   templates/trunk/drove-all-night/postandcomments.template
   templates/trunk/drove-all-night/posttrackbacks.template
   templates/trunk/drove-all-night/resource.template
   templates/trunk/flower/about.template
   templates/trunk/flower/album.template
   templates/trunk/flower/albums.template
   templates/trunk/flower/commentarticle.template
   templates/trunk/flower/error.template
   templates/trunk/flower/main.template
   templates/trunk/flower/postandcomments.template
   templates/trunk/flower/posttrackbacks.template
   templates/trunk/flower/resource.template
   templates/trunk/gutenberg/about.template
   templates/trunk/gutenberg/album.template
   templates/trunk/gutenberg/albums.template
   templates/trunk/gutenberg/commentarticle.template
   templates/trunk/gutenberg/error.template
   templates/trunk/gutenberg/main.template
   templates/trunk/gutenberg/postandcomments.template
   templates/trunk/gutenberg/posttrackbacks.template
   templates/trunk/gutenberg/resource.template
   templates/trunk/human_condition/about.template
   templates/trunk/human_condition/album.template
   templates/trunk/human_condition/albums.template
   templates/trunk/human_condition/commentarticle.template
   templates/trunk/human_condition/error.template
   templates/trunk/human_condition/main.template
   templates/trunk/human_condition/postandcomments.template
   templates/trunk/human_condition/posttrackbacks.template
   templates/trunk/human_condition/resource.template
   templates/trunk/lemons/resource.template
   templates/trunk/mars-spirit/about.template
   templates/trunk/mars-spirit/album.template
   templates/trunk/mars-spirit/albums.template
   templates/trunk/mars-spirit/commentarticle.template
   templates/trunk/mars-spirit/error.template
   templates/trunk/mars-spirit/main.template
   templates/trunk/mars-spirit/postandcomments.template
   templates/trunk/mars-spirit/posttrackbacks.template
   templates/trunk/mars-spirit/resource.template
   templates/trunk/minitemplate/album.template
   templates/trunk/minitemplate/albums.template
   templates/trunk/minitemplate/commentarticle.template
   templates/trunk/minitemplate/error.template
   templates/trunk/minitemplate/footer.template
   templates/trunk/minitemplate/footersimple.template
   templates/trunk/minitemplate/header.template
   templates/trunk/minitemplate/main.template
   templates/trunk/minitemplate/postandcomments.template
   templates/trunk/minitemplate/posttrackbacks.template
   templates/trunk/minitemplate/readme.txt
   templates/trunk/minitemplate/resource.template
   templates/trunk/minitemplate/searchresults.template
   templates/trunk/outback/about.template
   templates/trunk/outback/album.template
   templates/trunk/outback/albums.template
   templates/trunk/outback/commentarticle.template
   templates/trunk/outback/error.template
   templates/trunk/outback/main.template
   templates/trunk/outback/postandcomments.template
   templates/trunk/outback/posttrackbacks.template
   templates/trunk/outback/resource.template
   templates/trunk/pastel-blocks/album.template
   templates/trunk/pastel-blocks/albums.template
   templates/trunk/pastel-blocks/commentarticle.template
   templates/trunk/pastel-blocks/demosites.template
   templates/trunk/pastel-blocks/error.template
   templates/trunk/pastel-blocks/features.template
   templates/trunk/pastel-blocks/footer.template
   templates/trunk/pastel-blocks/header.template
   templates/trunk/pastel-blocks/main.template
   templates/trunk/pastel-blocks/postandcomments.template
   templates/trunk/pastel-blocks/posttrackbacks.template
   templates/trunk/pastel-blocks/resource.template
   templates/trunk/pastel-blocks/samplerss.template
   templates/trunk/pink_lilies/about.template
   templates/trunk/pink_lilies/album.template
   templates/trunk/pink_lilies/albums.template
   templates/trunk/pink_lilies/commentarticle.template
   templates/trunk/pink_lilies/error.template
   templates/trunk/pink_lilies/main.template
   templates/trunk/pink_lilies/postandcomments.template
   templates/trunk/pink_lilies/posttrackbacks.template
   templates/trunk/pink_lilies/resource.template
   templates/trunk/reic/album.template
   templates/trunk/reic/albums.template
   templates/trunk/reic/commentarticle.template
   templates/trunk/reic/error.template
   templates/trunk/reic/header.template
   templates/trunk/reic/main.template
   templates/trunk/reic/postandcomments.template
   templates/trunk/reic/posttrackbacks.template
   templates/trunk/reic/resource.template
   templates/trunk/roof/album.template
   templates/trunk/roof/albums.template
   templates/trunk/roof/commentarticle.template
   templates/trunk/roof/error.template
   templates/trunk/roof/main.template
   templates/trunk/roof/postandcomments.template
   templates/trunk/roof/posttrackbacks.template
   templates/trunk/roof/resource.template
   templates/trunk/rubric/about.template
   templates/trunk/rubric/album.template
   templates/trunk/rubric/albums.template
   templates/trunk/rubric/commentarticle.template
   templates/trunk/rubric/error.template
   templates/trunk/rubric/main.template
   templates/trunk/rubric/postandcomments.template
   templates/trunk/rubric/posttrackbacks.template
   templates/trunk/rubric/resource.template
   templates/trunk/silver/about.template
   templates/trunk/silver/album.template
   templates/trunk/silver/albums.template
   templates/trunk/silver/commentarticle.template
   templates/trunk/silver/error.template
   templates/trunk/silver/main.template
   templates/trunk/silver/postandcomments.template
   templates/trunk/silver/posttrackbacks.template
   templates/trunk/silver/resource.template
   templates/trunk/simple_sky/about.template
   templates/trunk/simple_sky/album.template
   templates/trunk/simple_sky/albums.template
   templates/trunk/simple_sky/commentarticle.template
   templates/trunk/simple_sky/error.template
   templates/trunk/simple_sky/main.template
   templates/trunk/simple_sky/postandcomments.template
   templates/trunk/simple_sky/posttrackbacks.template
   templates/trunk/simple_sky/resource.template
   templates/trunk/splat/about.template
   templates/trunk/splat/album.template
   templates/trunk/splat/albums.template
   templates/trunk/splat/commentarticle.template
   templates/trunk/splat/error.template
   templates/trunk/splat/main.template
   templates/trunk/splat/postandcomments.template
   templates/trunk/splat/posttrackbacks.template
   templates/trunk/splat/resource.template
   templates/trunk/standard_green/album.template
   templates/trunk/standard_green/albums.template
   templates/trunk/standard_green/archives.template
   templates/trunk/standard_green/commentarticle.template
   templates/trunk/standard_green/error.template
   templates/trunk/standard_green/links.template
   templates/trunk/standard_green/main.template
   templates/trunk/standard_green/postandcomments.template
   templates/trunk/standard_green/posttrackbacks.template
   templates/trunk/standard_green/resource.template
   templates/trunk/standard_happy/album.template
   templates/trunk/standard_happy/albums.template
   templates/trunk/standard_happy/archives.template
   templates/trunk/standard_happy/commentarticle.template
   templates/trunk/standard_happy/error.template
   templates/trunk/standard_happy/links.template
   templates/trunk/standard_happy/main.template
   templates/trunk/standard_happy/postandcomments.template
   templates/trunk/standard_happy/posttrackbacks.template
   templates/trunk/standard_happy/resource.template
   templates/trunk/standard_red/album.template
   templates/trunk/standard_red/albums.template
   templates/trunk/standard_red/archives.template
   templates/trunk/standard_red/commentarticle.template
   templates/trunk/standard_red/error.template
   templates/trunk/standard_red/links.template
   templates/trunk/standard_red/main.template
   templates/trunk/standard_red/postandcomments.template
   templates/trunk/standard_red/posttrackbacks.template
   templates/trunk/standard_red/resource.template
   templates/trunk/toni/about.template
   templates/trunk/toni/album.template
   templates/trunk/toni/albums.template
   templates/trunk/toni/commentarticle.template
   templates/trunk/toni/error.template
   templates/trunk/toni/main.template
   templates/trunk/toni/postandcomments.template
   templates/trunk/toni/posttrackbacks.template
   templates/trunk/toni/resource.template
   templates/trunk/toto/about.template
   templates/trunk/toto/album.template
   templates/trunk/toto/albums.template
   templates/trunk/toto/commentarticle.template
   templates/trunk/toto/error.template
   templates/trunk/toto/main.template
   templates/trunk/toto/postandcomments.template
   templates/trunk/toto/posttrackbacks.template
   templates/trunk/toto/resource.template
   templates/trunk/tribal/about.template
   templates/trunk/tribal/album.template
   templates/trunk/tribal/albums.template
   templates/trunk/tribal/commentarticle.template
   templates/trunk/tribal/error.template
   templates/trunk/tribal/main.template
   templates/trunk/tribal/postandcomments.template
   templates/trunk/tribal/posttrackbacks.template
   templates/trunk/tribal/resource.template
   templates/trunk/water_play/about.template
   templates/trunk/water_play/album.template
   templates/trunk/water_play/albums.template
   templates/trunk/water_play/commentarticle.template
   templates/trunk/water_play/error.template
   templates/trunk/water_play/main.template
   templates/trunk/water_play/postandcomments.template
   templates/trunk/water_play/posttrackbacks.template
   templates/trunk/water_play/resource.template
   templates/trunk/white/album.template
   templates/trunk/white/albums.template
   templates/trunk/white/commentarticle.template
   templates/trunk/white/error.template
   templates/trunk/white/main.template
   templates/trunk/white/postandcomments.template
   templates/trunk/white/posttrackbacks.template
   templates/trunk/white/resource.template
   templates/trunk/wordplog/about.template
   templates/trunk/wordplog/album.tableless.template
   templates/trunk/wordplog/album.template
   templates/trunk/wordplog/albums.template
   templates/trunk/wordplog/commentarticle.template
   templates/trunk/wordplog/error.template
   templates/trunk/wordplog/main.template
   templates/trunk/wordplog/panel.template
   templates/trunk/wordplog/post.template
   templates/trunk/wordplog/posttrackbacks.template
   templates/trunk/wordplog/resource.template
   templates/trunk/wordplog/searchresults.template
   templates/trunk/zen/about.template
   templates/trunk/zen/album.template
   templates/trunk/zen/albums.template
   templates/trunk/zen/commentarticle.template
   templates/trunk/zen/error.template
   templates/trunk/zen/main.template
   templates/trunk/zen/postandcomments.template
   templates/trunk/zen/posttrackbacks.template
   templates/trunk/zen/resource.template
Log:
all templates should use $blogtemplate and getTemplateFile, and not getUrl or tpldir, etc.

Modified: templates/trunk/3-column-liquid/aboutme.html.template
===================================================================
--- templates/trunk/3-column-liquid/aboutme.html.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/3-column-liquid/aboutme.html.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="3-column-liquid/header.template"}
+{include file="$blogtemplate/header.template"}
   <h1>About Me!</h1>
   <p>
    You could put here some information about yourself.
   </p>
-{include file="3-column-liquid/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/3-column-liquid/album.template
===================================================================
--- templates/trunk/3-column-liquid/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/3-column-liquid/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="3-column-liquid/header.template"}
+{include file="$blogtemplate/header.template"}
 <div class="posttitle">{$album->getName()}</div>
 <p>
  {$album->getDescription()}
@@ -82,4 +82,4 @@
 </div>
  <!-- end of album contents -->
 
-{include file="3-column-liquid/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/3-column-liquid/albums.template
===================================================================
--- templates/trunk/3-column-liquid/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/3-column-liquid/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="3-column-liquid/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="container">
 <!-- album contents go here -->
 <br/>
@@ -25,4 +25,4 @@
  </div>
  <!-- end of the albums -->
 </div>
-{include file="3-column-liquid/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/3-column-liquid/commentarticle.template
===================================================================
--- templates/trunk/3-column-liquid/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/3-column-liquid/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="3-column-liquid/header.template"}
+{include file="$blogtemplate/header.template"}
 <h3>{$locale->tr("add_comment")}</h3>
- {include file="3-column-liquid/commentform.template"}
-{include file="3-column-liquid/footer.template"}
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/3-column-liquid/error.template
===================================================================
--- templates/trunk/3-column-liquid/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/3-column-liquid/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="3-column-liquid/header.template"}
+{include file="$blogtemplate/header.template"}
  <h1>{$locale->tr("error")}</h1>
  {$locale->tr($message)}
-{include file="3-column-liquid/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/3-column-liquid/main.template
===================================================================
--- templates/trunk/3-column-liquid/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/3-column-liquid/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,5 +1,5 @@
-{include file="3-column-liquid/header.template"}
+{include file="$blogtemplate/header.template"}
  {foreach from=$posts item=post}
-  {include file="3-column-liquid/post.template"}
+  {include file="$blogtemplate/post.template"}
  {/foreach}
-{include file="3-column-liquid/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/3-column-liquid/postandcomments.template
===================================================================
--- templates/trunk/3-column-liquid/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/3-column-liquid/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="3-column-liquid/header.template"}
+{include file="$blogtemplate/header.template"}
   <p style="text-align: center">
    {* I am not so keen on using if's in templates, but can't think of another way... *}
    {if $prevpost == true}
@@ -8,7 +8,7 @@
      | <a href="{$url->postPermalink($nextpost)}" title="Next post">{$nextpost->getTopic()} &raquo;</a>
    {/if}
    {assign var="poster" value=$post->getUserInfo()}
-   {include file="3-column-liquid/post.template"}
+   {include file="$blogtemplate/post.template"}
    {if $post->getTotalComments() > 0 }
    <div id="postcomments">
    <div class="posttitle">User Comments</div>
@@ -35,6 +35,6 @@
   {/if}
 {if $blogsettings->getValue("comments_enabled")}
    <div class="posttitle">Add Comment</div>
- {include file="3-column-liquid/commentform.template"}
+ {include file="$blogtemplate/commentform.template"}
 {/if}
-{include file="3-column-liquid/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/3-column-liquid/posttrackbacks.template
===================================================================
--- templates/trunk/3-column-liquid/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/3-column-liquid/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="3-column-liquid/header.template"}
+{include file="$blogtemplate/header.template"}
   <p>
     {$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>":
   </p>
@@ -11,4 +11,4 @@
    <b>{$locale->tr("date")}:</b> {$locale->formatDate($trackbackDate, "%d/%m/%Y %H:%M")}<br/><br/>
   {/foreach}
   </p>
-{include file="3-column-liquid/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/3-column-liquid/resource.template
===================================================================
--- templates/trunk/3-column-liquid/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/3-column-liquid/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
  <head>
   <title>{$blog->getBlog()}</title>
-  <link rel="stylesheet" title="default" type="text/css" media="screen" href="{$url->getUrl("/templates/3-column-liquid/style_default.css")}" />
+  <link rel="stylesheet" title="default" type="text/css" media="screen" href="{$url->getTemplateFile("style_default.css")}" />
   <meta http-equiv="content-type" content="text/html; charset={$locale->getCharset()}" />
  </head>
  <body>

Modified: templates/trunk/Boxed/header.template
===================================================================
--- templates/trunk/Boxed/header.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/Boxed/header.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,8 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 
-{assign var=tpldir value=$url->getUrl("/templates/$blogtemplate")}
-
 <head>
 <title>{$blog->getBlog()}</title>
 <meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}" />

Modified: templates/trunk/Boxed-Green/header.template
===================================================================
--- templates/trunk/Boxed-Green/header.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/Boxed-Green/header.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,8 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 
-{assign var=tpldir value=$url->getUrl("/templates/$blogtemplate")}
-
 <head>
 <title>{$blog->getBlog()}</title>
 <meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}" />

Modified: templates/trunk/Mac-Stripe/album.template
===================================================================
--- templates/trunk/Mac-Stripe/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/Mac-Stripe/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="Mac-Stripe/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="container">
 <p>
  {$album->getDescription()}
@@ -83,4 +83,4 @@
  
  </div>
 </div>
-{include file="Mac-Stripe/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Mac-Stripe/albums.template
===================================================================
--- templates/trunk/Mac-Stripe/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/Mac-Stripe/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="Mac-Stripe/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="container">
 <!-- album contents go here -->
 <br/>
@@ -22,4 +22,4 @@
  </table>
  <!-- end of the albums -->
 </div>
-{include file="Mac-Stripe/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Mac-Stripe/commentarticle.template
===================================================================
--- templates/trunk/Mac-Stripe/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/Mac-Stripe/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="Mac-Stripe/header.template"}
+{include file="$blogtemplate/header.template"}
 <h3>{$locale->tr("add_comment")}</h3>
- {include file="Mac-Stripe/commentform.template"}
-{include file="Mac-Stripe/footer.template"}
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Mac-Stripe/error.template
===================================================================
--- templates/trunk/Mac-Stripe/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/Mac-Stripe/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="Mac-Stripe/header.template"}
+{include file="$blogtemplate/header.template"}
  <h3>{$locale->tr("error")}</h3>
  {$locale->tr($message)}
-{include file="Mac-Stripe/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Mac-Stripe/header.template
===================================================================
--- templates/trunk/Mac-Stripe/header.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/Mac-Stripe/header.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,8 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 
-{assign var=tpldir value=$url->getUrl("/templates/Mac-Stripe")}
-
 <head>
 <title>{$blog->getBlog()}</title>
 <meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}" />

Modified: templates/trunk/Mac-Stripe/main.template
===================================================================
--- templates/trunk/Mac-Stripe/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/Mac-Stripe/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="Mac-Stripe/header.template"}
+{include file="$blogtemplate/header.template"}
  {foreach from=$posts item=post}
    {assign var="postDate" value=$post->getDateObject()}
    {if $prevDay != $postDate->getDay()}
@@ -6,7 +6,7 @@
    {/if}
    <div class="blogbody">
    {assign var="prevDay" value=$post->getDay()}
-   {include file="Mac-Stripe/post.template"}
+   {include file="$blogtemplate/post.template"}
    </div>
  {/foreach}
-{include file="Mac-Stripe/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Mac-Stripe/postandcomments.template
===================================================================
--- templates/trunk/Mac-Stripe/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/Mac-Stripe/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,9 +1,9 @@
-{include file="Mac-Stripe/header.template"}
+{include file="$blogtemplate/header.template"}
    {assign var="poster" value=$post->getUserInfo()}
    {assign var="postDate" value=$post->getDateObject()}
    <h2 class="date">{$locale->formatDate($postDate, "%A, %B %d, %Y")}</h2>
    <div class="blogbody">
-   <p>{include file="Mac-Stripe/post.template"}</p>
+   <p>{include file="$blogtemplate/post.template"}</p>
    </div>
    {foreach from=$comments item=comment}
    <div class="blogbody">
@@ -24,7 +24,7 @@
 {if $post->getCommentsEnabled()}
 <p>
 <h3>{$locale->tr("add_comment")}</h3>
-{include file="Mac-Stripe/commentform.template"}
+{include file="$blogtemplate/commentform.template"}
 </p>
 {/if}
-{include file="Mac-Stripe/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Mac-Stripe/posttrackbacks.template
===================================================================
--- templates/trunk/Mac-Stripe/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/Mac-Stripe/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="Mac-Stripe/header.template"}
+{include file="$blogtemplate/header.template"}
   <p>
     {$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>":
   </p>
@@ -11,4 +11,4 @@
    <b>{$locale->tr("date")}:</b> {$locale->formatDate($trackbackDate, "%d/%m/%Y %H:%M")}<br/><br/>
   {/foreach}
   </p>
-{include file="Mac-Stripe/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Matrix-Code/header.template
===================================================================
--- templates/trunk/Matrix-Code/header.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/Matrix-Code/header.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,8 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 
-{assign var=tpldir value=$url->getUrl("/templates/$blogtemplate")}
-
 <head>
 <title>{$blog->getBlog()}</title>
 <meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}" />

Modified: templates/trunk/Modish/header.template
===================================================================
--- templates/trunk/Modish/header.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/Modish/header.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,8 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 
-{assign var=tpldir value=$url->getUrl("/templates/$blogtemplate")}
-
 <head>
 <title>{$blog->getBlog()}</title>
 <meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}" />

Modified: templates/trunk/Soft-Blue/header.template
===================================================================
--- templates/trunk/Soft-Blue/header.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/Soft-Blue/header.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,8 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 
-{assign var=tpldir value=$url->getUrl("/templates/$blogtemplate")}
-
 <head>
 <title>{$blog->getBlog()}</title>
 <meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}" />

Modified: templates/trunk/Soft-Green/header.template
===================================================================
--- templates/trunk/Soft-Green/header.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/Soft-Green/header.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,8 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 
-{assign var=tpldir value=$url->getUrl("/templates/$blogtemplate")}
-
 <head>
 <title>{$blog->getBlog()}</title>
 <meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}" />

Modified: templates/trunk/Soft-Red/header.template
===================================================================
--- templates/trunk/Soft-Red/header.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/Soft-Red/header.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,8 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 
-{assign var=tpldir value=$url->getUrl("/templates/$blogtemplate")}
-
 <head>
 <title>{$blog->getBlog()}</title>
 <meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}" />

Modified: templates/trunk/Very-Clean/header.template
===================================================================
--- templates/trunk/Very-Clean/header.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/Very-Clean/header.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,8 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 
-{assign var=tpldir value=$url->getUrl("/templates/$blogtemplate")}
-
 <head>
 <title>{$blog->getBlog()}</title>
 <meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}" />

Modified: templates/trunk/Vicksburg/header.template
===================================================================
--- templates/trunk/Vicksburg/header.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/Vicksburg/header.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,8 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 
-{assign var=tpldir value=$url->getUrl("/templates/$blogtemplate")}
-
 <head>
 <title>{$blog->getBlog()}</title>
 <meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}" />

Modified: templates/trunk/blorange/about.template
===================================================================
--- templates/trunk/blorange/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/blorange/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="blorange/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -11,5 +11,5 @@
   <br />
  </div>
 </div>
-{include file="blorange/panel.template"}
-{include file="blorange/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/blorange/album.template
===================================================================
--- templates/trunk/blorange/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/blorange/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="blorange/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="blorange/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/blorange/albums.template
===================================================================
--- templates/trunk/blorange/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/blorange/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="blorange/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <h2>{$locale->tr("resource_albums")|capitalize}</h2>
 {foreach from=$albums item=album}
@@ -22,4 +22,4 @@
  </div>
 {/foreach}
 </div>
-{include file="blorange/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/blorange/commentarticle.template
===================================================================
--- templates/trunk/blorange/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/blorange/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="blorange/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="blorange/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="blorange/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/blorange/error.template
===================================================================
--- templates/trunk/blorange/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/blorange/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="blorange/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="blorange/panel.template"}
-{include file="blorange/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/blorange/main.template
===================================================================
--- templates/trunk/blorange/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/blorange/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,12 +1,12 @@
-{include file="blorange/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="blorange/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="blorange/panel.template"}
-{include file="blorange/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/blorange/postandcomments.template
===================================================================
--- templates/trunk/blorange/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/blorange/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="blorange/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
     {assign var="postDate" value=$post->getDateObject()}
@@ -6,7 +6,7 @@
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
     
     <div class="post">
-        {include file="blorange/post.template"}
+        {include file="$blogtemplate/post.template"}
     
         <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
         
@@ -32,10 +32,10 @@
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
             <br style="clear: both;" />
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="blorange/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="blorange/panel.template"}
-{include file="blorange/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/blorange/posttrackbacks.template
===================================================================
--- templates/trunk/blorange/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/blorange/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="blorange/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="blorange/panel.template"}
-{include file="blorange/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/blorange/resource.template
===================================================================
--- templates/trunk/blorange/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/blorange/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="blorange/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -54,4 +54,4 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
-{include file="blorange/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/blufill/commentform.template
===================================================================
--- templates/trunk/blufill/commentform.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/blufill/commentform.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -15,12 +15,12 @@
   <div id="toolbar">
    <img class="button" onmouseover="mouseover(this);"  onMouseOut="mouseout(this);" 
         onMouseDown="mousedown(this);" onmouseup="mouseup(this);" onclick="wrapSelection(document.comments_form.commentText, 'b');" 
-        src="{$url->getUrl("/templates/$blogtemplate/bold.gif")}" width="16" height="16" align="middle" alt="Bold" />
+        src="{$url->getTemplateFile("bold.gif")}" width="16" height="16" align="middle" alt="Bold" />
    <img class="button" onmouseover="mouseover(this);" onmouseout="mouseout(this);" onmousedown="mousedown(this);" 
-        onMouseUp="mouseup(this);" onclick="wrapSelection(document.comments_form.commentText, 'i');" src="{$url->getUrl("/templates/$blogtemplate/italic.gif")}" 
+        onMouseUp="mouseup(this);" onclick="wrapSelection(document.comments_form.commentText, 'i');" src="{$url->getTemplateFile("italic.gif")}" 
         width="16" height="16" align="middle" alt="Italic" />
    <img class="button" onmouseover="mouseover(this);" onmouseout="mouseout(this);" onmousedown="mousedown(this);" 
-        onmouseup="mouseup(this);" onclick="insertLink(document.comments_form.commentText);" src="{$url->getUrl("/templates/$blogtemplate/link.gif")}"
+        onmouseup="mouseup(this);" onclick="insertLink(document.comments_form.commentText);" src="{$url->getTemplateFile("link.gif")}"
         width="16" height="16" align="middle"  alt="Link" />
   </div>  
   <textarea tabindex="5" id="text" name="commentText" rows="8" cols="38"></textarea><br />

Modified: templates/trunk/buddha/about.template
===================================================================
--- templates/trunk/buddha/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/buddha/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="buddha/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -11,5 +11,5 @@
   <br />
  </div>
 </div>
-{include file="buddha/panel.template"}
-{include file="buddha/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/buddha/album.template
===================================================================
--- templates/trunk/buddha/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/buddha/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="buddha/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="buddha/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/buddha/albums.template
===================================================================
--- templates/trunk/buddha/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/buddha/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="buddha/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <h2>{$locale->tr("resource_albums")|capitalize}</h2>
 {foreach from=$albums item=album}
@@ -22,4 +22,4 @@
  </div>
 {/foreach}
 </div>
-{include file="buddha/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/buddha/commentarticle.template
===================================================================
--- templates/trunk/buddha/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/buddha/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="buddha/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="buddha/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="buddha/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/buddha/error.template
===================================================================
--- templates/trunk/buddha/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/buddha/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="buddha/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="buddha/panel.template"}
-{include file="buddha/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/buddha/main.template
===================================================================
--- templates/trunk/buddha/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/buddha/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,12 +1,12 @@
-{include file="buddha/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="buddha/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="buddha/panel.template"}
-{include file="buddha/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/buddha/postandcomments.template
===================================================================
--- templates/trunk/buddha/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/buddha/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="buddha/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
     {assign var="postDate" value=$post->getDateObject()}
@@ -6,7 +6,7 @@
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
     
     <div class="post">
-        {include file="buddha/post.template"}
+        {include file="$blogtemplate/post.template"}
     
         <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
         
@@ -32,10 +32,10 @@
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
             <br style="clear: both;" />
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="buddha/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="buddha/panel.template"}
-{include file="buddha/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/buddha/posttrackbacks.template
===================================================================
--- templates/trunk/buddha/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/buddha/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="buddha/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="buddha/panel.template"}
-{include file="buddha/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/buddha/resource.template
===================================================================
--- templates/trunk/buddha/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/buddha/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="buddha/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -54,4 +54,4 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
-{include file="buddha/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/cab/about.template
===================================================================
--- templates/trunk/cab/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/cab/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="cab/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -11,5 +11,5 @@
   <br />
  </div>
 </div>
-{include file="cab/panel.template"}
-{include file="cab/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/cab/album.template
===================================================================
--- templates/trunk/cab/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/cab/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="cab/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="cab/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/cab/albums.template
===================================================================
--- templates/trunk/cab/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/cab/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="cab/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <h2>{$locale->tr("resource_albums")|capitalize}</h2>
 {foreach from=$albums item=album}
@@ -22,4 +22,4 @@
  </div>
 {/foreach}
 </div>
-{include file="cab/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/cab/commentarticle.template
===================================================================
--- templates/trunk/cab/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/cab/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="cab/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="cab/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="cab/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/cab/error.template
===================================================================
--- templates/trunk/cab/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/cab/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="cab/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="cab/panel.template"}
-{include file="cab/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/cab/main.template
===================================================================
--- templates/trunk/cab/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/cab/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,12 +1,12 @@
-{include file="cab/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="cab/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="cab/panel.template"}
-{include file="cab/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/cab/postandcomments.template
===================================================================
--- templates/trunk/cab/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/cab/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="cab/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
     {assign var="postDate" value=$post->getDateObject()}
@@ -6,7 +6,7 @@
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
     
     <div class="post">
-        {include file="cab/post.template"}
+        {include file="$blogtemplate/post.template"}
     
         <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
         
@@ -32,10 +32,10 @@
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
             <br style="clear: both;" />
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="cab/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="cab/panel.template"}
-{include file="cab/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/cab/posttrackbacks.template
===================================================================
--- templates/trunk/cab/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/cab/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="cab/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="cab/panel.template"}
-{include file="cab/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/cab/resource.template
===================================================================
--- templates/trunk/cab/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/cab/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="cab/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -54,4 +54,4 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
-{include file="cab/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/darkfire/about.template
===================================================================
--- templates/trunk/darkfire/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/darkfire/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="darkfire/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -11,5 +11,5 @@
   <br />
  </div>
 </div>
-{include file="darkfire/panel.template"}
-{include file="darkfire/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/darkfire/album.template
===================================================================
--- templates/trunk/darkfire/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/darkfire/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="darkfire/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="darkfire/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/darkfire/albums.template
===================================================================
--- templates/trunk/darkfire/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/darkfire/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="darkfire/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <h2>{$locale->tr("resource_albums")|capitalize}</h2>
 {foreach from=$albums item=album}
@@ -22,4 +22,4 @@
  </div>
 {/foreach}
 </div>
-{include file="darkfire/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/darkfire/commentarticle.template
===================================================================
--- templates/trunk/darkfire/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/darkfire/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="darkfire/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="darkfire/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="darkfire/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/darkfire/error.template
===================================================================
--- templates/trunk/darkfire/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/darkfire/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="darkfire/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="darkfire/panel.template"}
-{include file="darkfire/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/darkfire/main.template
===================================================================
--- templates/trunk/darkfire/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/darkfire/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,12 +1,12 @@
-{include file="darkfire/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="darkfire/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="darkfire/panel.template"}
-{include file="darkfire/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/darkfire/postandcomments.template
===================================================================
--- templates/trunk/darkfire/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/darkfire/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="darkfire/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
     {assign var="postDate" value=$post->getDateObject()}
@@ -6,7 +6,7 @@
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
     
     <div class="post">
-        {include file="darkfire/post.template"}
+        {include file="$blogtemplate/post.template"}
     
         <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
         
@@ -32,10 +32,10 @@
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
             <br style="clear: both;" />
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="darkfire/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="darkfire/panel.template"}
-{include file="darkfire/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/darkfire/posttrackbacks.template
===================================================================
--- templates/trunk/darkfire/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/darkfire/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="darkfire/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="darkfire/panel.template"}
-{include file="darkfire/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/darkfire/resource.template
===================================================================
--- templates/trunk/darkfire/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/darkfire/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="darkfire/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -54,4 +54,4 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
-{include file="darkfire/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/dots/about.template
===================================================================
--- templates/trunk/dots/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/dots/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="dots/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -11,5 +11,5 @@
   <br />
  </div>
 </div>
-{include file="dots/panel.template"}
-{include file="dots/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/dots/album.template
===================================================================
--- templates/trunk/dots/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/dots/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="dots/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="dots/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/dots/albums.template
===================================================================
--- templates/trunk/dots/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/dots/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="dots/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <h2>{$locale->tr("resource_albums")|capitalize}</h2>
 {foreach from=$albums item=album}
@@ -22,4 +22,4 @@
  </div>
 {/foreach}
 </div>
-{include file="dots/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/dots/commentarticle.template
===================================================================
--- templates/trunk/dots/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/dots/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="dots/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="dots/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="dots/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/dots/error.template
===================================================================
--- templates/trunk/dots/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/dots/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="dots/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="dots/panel.template"}
-{include file="dots/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/dots/main.template
===================================================================
--- templates/trunk/dots/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/dots/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,12 +1,12 @@
-{include file="dots/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="dots/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="dots/panel.template"}
-{include file="dots/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/dots/postandcomments.template
===================================================================
--- templates/trunk/dots/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/dots/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="dots/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
     {assign var="postDate" value=$post->getDateObject()}
@@ -6,7 +6,7 @@
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
     
     <div class="post">
-        {include file="dots/post.template"}
+        {include file="$blogtemplate/post.template"}
     
         <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
         
@@ -32,10 +32,10 @@
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
             <br style="clear: both;" />
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="dots/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="dots/panel.template"}
-{include file="dots/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/dots/posttrackbacks.template
===================================================================
--- templates/trunk/dots/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/dots/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="dots/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="dots/panel.template"}
-{include file="dots/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/dots/resource.template
===================================================================
--- templates/trunk/dots/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/dots/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="dots/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -54,4 +54,4 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
-{include file="dots/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/drove-all-night/about.template
===================================================================
--- templates/trunk/drove-all-night/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/drove-all-night/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="drove-all-night/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -11,5 +11,5 @@
   <br />
  </div>
 </div>
-{include file="drove-all-night/panel.template"}
-{include file="drove-all-night/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/drove-all-night/album.template
===================================================================
--- templates/trunk/drove-all-night/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/drove-all-night/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="drove-all-night/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="drove-all-night/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/drove-all-night/albums.template
===================================================================
--- templates/trunk/drove-all-night/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/drove-all-night/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="drove-all-night/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <h2>{$locale->tr("resource_albums")|capitalize}</h2>
 {foreach from=$albums item=album}
@@ -22,4 +22,4 @@
  </div>
 {/foreach}
 </div>
-{include file="drove-all-night/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/drove-all-night/commentarticle.template
===================================================================
--- templates/trunk/drove-all-night/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/drove-all-night/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="drove-all-night/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="drove-all-night/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="drove-all-night/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/drove-all-night/error.template
===================================================================
--- templates/trunk/drove-all-night/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/drove-all-night/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="drove-all-night/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="drove-all-night/panel.template"}
-{include file="drove-all-night/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/drove-all-night/main.template
===================================================================
--- templates/trunk/drove-all-night/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/drove-all-night/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,12 +1,12 @@
-{include file="drove-all-night/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="drove-all-night/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="drove-all-night/panel.template"}
-{include file="drove-all-night/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/drove-all-night/postandcomments.template
===================================================================
--- templates/trunk/drove-all-night/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/drove-all-night/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="drove-all-night/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
     {assign var="postDate" value=$post->getDateObject()}
@@ -6,7 +6,7 @@
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
     
     <div class="post">
-        {include file="drove-all-night/post.template"}
+        {include file="$blogtemplate/post.template"}
     
         <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
         
@@ -32,10 +32,10 @@
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
             <br style="clear: both;" />
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="drove-all-night/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="drove-all-night/panel.template"}
-{include file="drove-all-night/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/drove-all-night/posttrackbacks.template
===================================================================
--- templates/trunk/drove-all-night/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/drove-all-night/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="drove-all-night/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="drove-all-night/panel.template"}
-{include file="drove-all-night/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/drove-all-night/resource.template
===================================================================
--- templates/trunk/drove-all-night/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/drove-all-night/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="drove-all-night/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -54,4 +54,4 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
-{include file="drove-all-night/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/flower/about.template
===================================================================
--- templates/trunk/flower/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/flower/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="flower/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -11,5 +11,5 @@
   <br />
  </div>
 </div>
-{include file="flower/panel.template"}
-{include file="flower/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/flower/album.template
===================================================================
--- templates/trunk/flower/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/flower/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="flower/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="flower/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/flower/albums.template
===================================================================
--- templates/trunk/flower/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/flower/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="flower/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <h2>{$locale->tr("resource_albums")|capitalize}</h2>
 {foreach from=$albums item=album}
@@ -22,4 +22,4 @@
  </div>
 {/foreach}
 </div>
-{include file="flower/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/flower/commentarticle.template
===================================================================
--- templates/trunk/flower/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/flower/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="flower/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="flower/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="flower/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/flower/error.template
===================================================================
--- templates/trunk/flower/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/flower/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="flower/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="flower/panel.template"}
-{include file="flower/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/flower/main.template
===================================================================
--- templates/trunk/flower/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/flower/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,12 +1,12 @@
-{include file="flower/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="flower/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="flower/panel.template"}
-{include file="flower/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/flower/postandcomments.template
===================================================================
--- templates/trunk/flower/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/flower/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="flower/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
     {assign var="postDate" value=$post->getDateObject()}
@@ -6,7 +6,7 @@
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
     
     <div class="post">
-        {include file="flower/post.template"}
+        {include file="$blogtemplate/post.template"}
     
         <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
         
@@ -32,10 +32,10 @@
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
             <br style="clear: both;" />
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="flower/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="flower/panel.template"}
-{include file="flower/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/flower/posttrackbacks.template
===================================================================
--- templates/trunk/flower/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/flower/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="flower/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="flower/panel.template"}
-{include file="flower/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/flower/resource.template
===================================================================
--- templates/trunk/flower/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/flower/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="flower/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -54,4 +54,4 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
-{include file="flower/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/gutenberg/about.template
===================================================================
--- templates/trunk/gutenberg/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/gutenberg/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="gutenberg/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -11,5 +11,5 @@
   <br />
  </div>
 </div>
-{include file="gutenberg/panel.template"}
-{include file="gutenberg/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/gutenberg/album.template
===================================================================
--- templates/trunk/gutenberg/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/gutenberg/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="gutenberg/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="gutenberg/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/gutenberg/albums.template
===================================================================
--- templates/trunk/gutenberg/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/gutenberg/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="gutenberg/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <h2>{$locale->tr("resource_albums")|capitalize}</h2>
 {foreach from=$albums item=album}
@@ -22,4 +22,4 @@
  </div>
 {/foreach}
 </div>
-{include file="gutenberg/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/gutenberg/commentarticle.template
===================================================================
--- templates/trunk/gutenberg/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/gutenberg/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="gutenberg/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="gutenberg/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="gutenberg/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/gutenberg/error.template
===================================================================
--- templates/trunk/gutenberg/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/gutenberg/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="gutenberg/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="gutenberg/panel.template"}
-{include file="gutenberg/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/gutenberg/main.template
===================================================================
--- templates/trunk/gutenberg/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/gutenberg/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,12 +1,12 @@
-{include file="gutenberg/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="gutenberg/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="gutenberg/panel.template"}
-{include file="gutenberg/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/gutenberg/postandcomments.template
===================================================================
--- templates/trunk/gutenberg/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/gutenberg/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="gutenberg/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
     {assign var="postDate" value=$post->getDateObject()}
@@ -6,7 +6,7 @@
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
     
     <div class="post">
-        {include file="gutenberg/post.template"}
+        {include file="$blogtemplate/post.template"}
     
         <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
         
@@ -32,10 +32,10 @@
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
             <br style="clear: both;" />
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="gutenberg/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="gutenberg/panel.template"}
-{include file="gutenberg/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/gutenberg/posttrackbacks.template
===================================================================
--- templates/trunk/gutenberg/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/gutenberg/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="gutenberg/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="gutenberg/panel.template"}
-{include file="gutenberg/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/gutenberg/resource.template
===================================================================
--- templates/trunk/gutenberg/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/gutenberg/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="gutenberg/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -54,4 +54,4 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
-{include file="gutenberg/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/human_condition/about.template
===================================================================
--- templates/trunk/human_condition/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/human_condition/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="human_condition/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -11,5 +11,5 @@
   <br />
  </div>
 </div>
-{include file="human_condition/panel.template"}
-{include file="human_condition/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/human_condition/album.template
===================================================================
--- templates/trunk/human_condition/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/human_condition/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="human_condition/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="human_condition/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/human_condition/albums.template
===================================================================
--- templates/trunk/human_condition/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/human_condition/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="human_condition/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <h2>{$locale->tr("resource_albums")|capitalize}</h2>
 {foreach from=$albums item=album}
@@ -22,4 +22,4 @@
  </div>
 {/foreach}
 </div>
-{include file="human_condition/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/human_condition/commentarticle.template
===================================================================
--- templates/trunk/human_condition/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/human_condition/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="human_condition/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="human_condition/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="human_condition/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/human_condition/error.template
===================================================================
--- templates/trunk/human_condition/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/human_condition/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="human_condition/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="human_condition/panel.template"}
-{include file="human_condition/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/human_condition/main.template
===================================================================
--- templates/trunk/human_condition/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/human_condition/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,12 +1,12 @@
-{include file="human_condition/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="human_condition/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="human_condition/panel.template"}
-{include file="human_condition/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/human_condition/postandcomments.template
===================================================================
--- templates/trunk/human_condition/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/human_condition/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="human_condition/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
     {assign var="postDate" value=$post->getDateObject()}
@@ -6,7 +6,7 @@
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
     
     <div class="post">
-        {include file="human_condition/post.template"}
+        {include file="$blogtemplate/post.template"}
     
         <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
         
@@ -32,10 +32,10 @@
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
             <br style="clear: both;" />
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="human_condition/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="human_condition/panel.template"}
-{include file="human_condition/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/human_condition/posttrackbacks.template
===================================================================
--- templates/trunk/human_condition/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/human_condition/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="human_condition/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="human_condition/panel.template"}
-{include file="human_condition/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/human_condition/resource.template
===================================================================
--- templates/trunk/human_condition/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/human_condition/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="human_condition/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -54,4 +54,4 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
-{include file="human_condition/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/lemons/resource.template
===================================================================
--- templates/trunk/lemons/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/lemons/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}">
 <meta name="MSSmartTagsPreventParsing" content="TRUE">
 <title>{$blog->getBlog()}</title>
-<link rel="stylesheet" href="{$url->getUrl("/styles/lemons.css")}" type="text/css">
+<link rel="stylesheet" href="{$url->getTemplateFile("lemons.css")}" type="text/css">
 <script language="JavaScript">
 </script>
 </head>

Modified: templates/trunk/mars-spirit/about.template
===================================================================
--- templates/trunk/mars-spirit/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/mars-spirit/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="mars-spirit/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -11,5 +11,5 @@
   <br />
  </div>
 </div>
-{include file="mars-spirit/panel.template"}
-{include file="mars-spirit/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/mars-spirit/album.template
===================================================================
--- templates/trunk/mars-spirit/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/mars-spirit/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="mars-spirit/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="mars-spirit/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/mars-spirit/albums.template
===================================================================
--- templates/trunk/mars-spirit/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/mars-spirit/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="mars-spirit/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <h2>{$locale->tr("resource_albums")|capitalize}</h2>
 {foreach from=$albums item=album}
@@ -22,4 +22,4 @@
  </div>
 {/foreach}
 </div>
-{include file="mars-spirit/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/mars-spirit/commentarticle.template
===================================================================
--- templates/trunk/mars-spirit/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/mars-spirit/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="mars-spirit/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="mars-spirit/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="mars-spirit/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/mars-spirit/error.template
===================================================================
--- templates/trunk/mars-spirit/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/mars-spirit/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="mars-spirit/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="mars-spirit/panel.template"}
-{include file="mars-spirit/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/mars-spirit/main.template
===================================================================
--- templates/trunk/mars-spirit/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/mars-spirit/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,12 +1,12 @@
-{include file="mars-spirit/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="mars-spirit/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="mars-spirit/panel.template"}
-{include file="mars-spirit/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/mars-spirit/postandcomments.template
===================================================================
--- templates/trunk/mars-spirit/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/mars-spirit/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="mars-spirit/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
     {assign var="postDate" value=$post->getDateObject()}
@@ -6,7 +6,7 @@
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
     
     <div class="post">
-        {include file="mars-spirit/post.template"}
+        {include file="$blogtemplate/post.template"}
     
         <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
         
@@ -32,10 +32,10 @@
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
             <br style="clear: both;" />
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="mars-spirit/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="mars-spirit/panel.template"}
-{include file="mars-spirit/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/mars-spirit/posttrackbacks.template
===================================================================
--- templates/trunk/mars-spirit/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/mars-spirit/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="mars-spirit/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="mars-spirit/panel.template"}
-{include file="mars-spirit/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/mars-spirit/resource.template
===================================================================
--- templates/trunk/mars-spirit/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/mars-spirit/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="mars-spirit/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -54,4 +54,4 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
-{include file="mars-spirit/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/minitemplate/album.template
===================================================================
--- templates/trunk/minitemplate/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/minitemplate/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="minitemplate/header.template"}
+{include file="$blogtemplate/header.template"}
 
  <!-- album contents go here -->
 <div id="album">
@@ -69,4 +69,4 @@
 </div>
  <!-- end of album contents -->
  
- {include file="minitemplate/footersimple.template"}
+ {include file="$blogtemplate/footersimple.template"}

Modified: templates/trunk/minitemplate/albums.template
===================================================================
--- templates/trunk/minitemplate/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/minitemplate/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="minitemplate/header.template"}
+{include file="$blogtemplate/header.template"}
 	<div class="BlockTitle">
 		{$locale->tr("albums")}
 	</div>
@@ -11,4 +11,4 @@
 		</div>
 	{/foreach}
  <!-- end of the albums -->
-{include file="minitemplate/footersimple.template"}
+{include file="$blogtemplate/footersimple.template"}

Modified: templates/trunk/minitemplate/commentarticle.template
===================================================================
--- templates/trunk/minitemplate/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/minitemplate/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="minitemplate/header.template"}
+{include file="$blogtemplate/header.template"}
 	<div class="AddComment">
 		{$locale->tr("add_comment")}
 	</div>
-{include file="minitemplate/commentform.template"}
-{include file="minitemplate/footer.template"}
+{include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/minitemplate/error.template
===================================================================
--- templates/trunk/minitemplate/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/minitemplate/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="minitemplate/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="ErrorTopic">{$locale->tr("error")}</div>
 <div id="ErrorMessage">{$locale->tr($message)}</div>
-{include file="minitemplate/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/minitemplate/footer.template
===================================================================
--- templates/trunk/minitemplate/footer.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/minitemplate/footer.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -2,10 +2,10 @@
 <!--// Content End //-->
 
 <!--// Sidebar Begain //-->
-  {include file="minitemplate/sidebar.template"}
+  {include file="$blogtemplate/sidebar.template"}
 <!--// SideBar End//-->
 <!--// Bottom Begain //-->		
-  {include file="minitemplate/copyright.template"}
+  {include file="$blogtemplate/copyright.template"}
 <!--// Bottom End //-->
 	 </div>
 <!--// Main End//-->

Modified: templates/trunk/minitemplate/footersimple.template
===================================================================
--- templates/trunk/minitemplate/footersimple.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/minitemplate/footersimple.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -3,7 +3,7 @@
 
 
 <!--// Bottom Begain //-->		
-  {include file="minitemplate/copyright.template"}
+  {include file="$blogtemplate/copyright.template"}
 <!--// Bottom End //-->
 	 </div>
 <!--// Main End//-->

Modified: templates/trunk/minitemplate/header.template
===================================================================
--- templates/trunk/minitemplate/header.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/minitemplate/header.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -22,7 +22,7 @@
 <!--//  Container Begain//-->
  <div id="Container">
 <!--// Topmenu Begain //-->
-	{include file="minitemplate/topmenu.template"}
+	{include file="$blogtemplate/topmenu.template"}
 <!--// Topmen End //-->
 
 <!--// Main Begain //-->

Modified: templates/trunk/minitemplate/main.template
===================================================================
--- templates/trunk/minitemplate/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/minitemplate/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="minitemplate/header.template"}
+{include file="$blogtemplate/header.template"}
 {$blogtimes->show()}
  {foreach from=$posts item=post}
-  {include file="minitemplate/post.template"}
+  {include file="$blogtemplate/post.template"}
  {/foreach}
-{include file="minitemplate/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/minitemplate/postandcomments.template
===================================================================
--- templates/trunk/minitemplate/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/minitemplate/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,5 +1,5 @@
-{include file="minitemplate/header.template"}
-{include file="minitemplate/post.template"}
+{include file="$blogtemplate/header.template"}
+{include file="$blogtemplate/post.template"}
 
 {foreach name=comment from=$comments item=comment}
 	<div class="CommentBlock">
@@ -27,8 +27,8 @@
 		{$locale->tr("add_comment")}
 	</div>
 
-{include file="minitemplate/commentform.template"}
+{include file="$blogtemplate/commentform.template"}
 
 {/if}
 
-{include file="minitemplate/footersimple.template"}
+{include file="$blogtemplate/footersimple.template"}

Modified: templates/trunk/minitemplate/posttrackbacks.template
===================================================================
--- templates/trunk/minitemplate/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/minitemplate/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="minitemplate/header.template"}
+{include file="$blogtemplate/header.template"}
 <div class="BlockTitle">
     {$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>":
 </div>
@@ -11,4 +11,4 @@
    <b>{$locale->tr("date")}:</b> {$locale->formatDate($trackbackDate, "%d/%m/%Y %H:%M")}<br/><br/>
   {/foreach}
 </div>
-{include file="minitemplate/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/minitemplate/readme.txt
===================================================================
--- templates/trunk/minitemplate/readme.txt	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/minitemplate/readme.txt	2005-02-24 03:16:26 UTC (rev 1192)
@@ -16,7 +16,7 @@
 and modify it to your own url for ani file.
 
 4.there is a random image in topmenu, if you don't like that, you can find
-"<SCRIPT LANGUAGE="JavaScript" SRC="{$url->getUrl("/templates/minitemplate/bgimg.js")}"></SCRIPT>" 
+"<SCRIPT LANGUAGE="JavaScript" SRC="{$url->getTemplateFile("bgimg.js")}"></SCRIPT>" 
 in header.template and remove it , the image will be static. If you want replace with 
 your own static image, your can modify the style.css ,find "url(./img/topic_dewdrop.jpg)" 
-and change it to your own url.
\ No newline at end of file
+and change it to your own url.

Modified: templates/trunk/minitemplate/resource.template
===================================================================
--- templates/trunk/minitemplate/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/minitemplate/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,5 +1,5 @@
 
-{include file="minitemplate/header.template"}
+{include file="$blogtemplate/header.template"}
 <!--// Topmen End //-->
 	{assign var=metadata value=$resource->getMetadataReader()}
 	{assign var=updated value=$resource->getTimestamp()}
@@ -52,4 +52,4 @@
 		</div>
 
 		
-{include file="minitemplate/footersimple.template"}
+{include file="$blogtemplate/footersimple.template"}

Modified: templates/trunk/minitemplate/searchresults.template
===================================================================
--- templates/trunk/minitemplate/searchresults.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/minitemplate/searchresults.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="minitemplate/header.template"}
+{include file="$blogtemplate/header.template"}
 {$searchhighlight->start()}
 <div class="BlockTitle">
 	{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}
@@ -21,4 +21,4 @@
 	</div> 
 {/foreach}
 {$searchhighlight->end()}
-{include file="minitemplate/footersimple.template"}
+{include file="$blogtemplate/footersimple.template"}

Modified: templates/trunk/outback/about.template
===================================================================
--- templates/trunk/outback/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/outback/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="outback/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -11,5 +11,5 @@
   <br />
  </div>
 </div>
-{include file="outback/panel.template"}
-{include file="outback/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/outback/album.template
===================================================================
--- templates/trunk/outback/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/outback/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="outback/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="outback/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/outback/albums.template
===================================================================
--- templates/trunk/outback/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/outback/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="outback/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <h2>{$locale->tr("resource_albums")|capitalize}</h2>
 {foreach from=$albums item=album}
@@ -22,4 +22,4 @@
  </div>
 {/foreach}
 </div>
-{include file="outback/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/outback/commentarticle.template
===================================================================
--- templates/trunk/outback/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/outback/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="outback/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="outback/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="outback/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/outback/error.template
===================================================================
--- templates/trunk/outback/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/outback/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="outback/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="outback/panel.template"}
-{include file="outback/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/outback/main.template
===================================================================
--- templates/trunk/outback/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/outback/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,12 +1,12 @@
-{include file="outback/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="outback/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="outback/panel.template"}
-{include file="outback/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/outback/postandcomments.template
===================================================================
--- templates/trunk/outback/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/outback/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="outback/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
     {assign var="postDate" value=$post->getDateObject()}
@@ -6,7 +6,7 @@
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
     
     <div class="post">
-        {include file="outback/post.template"}
+        {include file="$blogtemplate/post.template"}
     
         <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
         
@@ -32,10 +32,10 @@
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
             <br style="clear: both;" />
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="outback/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="outback/panel.template"}
-{include file="outback/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/outback/posttrackbacks.template
===================================================================
--- templates/trunk/outback/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/outback/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="outback/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="outback/panel.template"}
-{include file="outback/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/outback/resource.template
===================================================================
--- templates/trunk/outback/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/outback/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="outback/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -54,4 +54,4 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
-{include file="outback/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/pastel-blocks/album.template
===================================================================
--- templates/trunk/pastel-blocks/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pastel-blocks/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="pastel-blocks/header.template"}
+{include file="$blogtemplate/header.template"}
 
     <div class="block-shadow">
      <div class="block-main">
@@ -93,4 +93,4 @@
      </div>
     </div>
  
- {include file="pastel-blocks/footer.template"}
+ {include file="$blogtemplate/footer.template"}

Modified: templates/trunk/pastel-blocks/albums.template
===================================================================
--- templates/trunk/pastel-blocks/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pastel-blocks/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="pastel-blocks/header.template"}
+{include file="$blogtemplate/header.template"}
 
     <div class="block-shadow">
      <div class="block-main">
@@ -35,4 +35,4 @@
      </div>
     </div>
 
-{include file="pastel-blocks/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/pastel-blocks/commentarticle.template
===================================================================
--- templates/trunk/pastel-blocks/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pastel-blocks/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="pastel-blocks/header.template"}
+{include file="$blogtemplate/header.template"}
 
- {include file="pastel-blocks/commentform.template"}
-{include file="pastel-blocks/footer.template"}
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/pastel-blocks/demosites.template
===================================================================
--- templates/trunk/pastel-blocks/demosites.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pastel-blocks/demosites.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="pastel-blocks/header.template"}
+{include file="$blogtemplate/header.template"}
 
     <div class="block-shadow">
      <div class="block-main">
@@ -27,4 +27,4 @@
      </div>
     </div>
 
-{include file="pastel-blocks/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/pastel-blocks/error.template
===================================================================
--- templates/trunk/pastel-blocks/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pastel-blocks/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="pastel-blocks/header.template"}
+{include file="$blogtemplate/header.template"}
 
     <div class="block-shadow">
      <div class="block-main">
@@ -15,4 +15,4 @@
     </div>
 
 
-{include file="pastel-blocks/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/pastel-blocks/features.template
===================================================================
--- templates/trunk/pastel-blocks/features.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pastel-blocks/features.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="pastel-blocks/header.template"}
+{include file="$blogtemplate/header.template"}
 
     <div class="block-shadow">
      <div class="block-main">
@@ -15,4 +15,4 @@
      </div>
     </div>
 
-{include file="pastel-blocks/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/pastel-blocks/footer.template
===================================================================
--- templates/trunk/pastel-blocks/footer.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pastel-blocks/footer.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="pastel-blocks/block-endcredits.template"}
+{include file="$blogtemplate/block-endcredits.template"}
 
   </div>
  </body>

Modified: templates/trunk/pastel-blocks/header.template
===================================================================
--- templates/trunk/pastel-blocks/header.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pastel-blocks/header.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -49,13 +49,13 @@
   <div class="column"
        id="left">
 
-{include file="pastel-blocks/block-calendar.template"}
-{include file="pastel-blocks/block-links.template"}
-{include file="pastel-blocks/block-categories.template"}
-{include file="pastel-blocks/block-recently.template"}
-{include file="pastel-blocks/block-archives.template"}
-{include file="pastel-blocks/block-syndicate.template"}
-{include file="pastel-blocks/block-resources.template"}
+{include file="$blogtemplate/block-calendar.template"}
+{include file="$blogtemplate/block-links.template"}
+{include file="$blogtemplate/block-categories.template"}
+{include file="$blogtemplate/block-recently.template"}
+{include file="$blogtemplate/block-archives.template"}
+{include file="$blogtemplate/block-syndicate.template"}
+{include file="$blogtemplate/block-resources.template"}
 
 
   </div>

Modified: templates/trunk/pastel-blocks/main.template
===================================================================
--- templates/trunk/pastel-blocks/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pastel-blocks/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,9 +1,9 @@
-{include file="pastel-blocks/header.template"}
+{include file="$blogtemplate/header.template"}
 
  {foreach from=$posts item=post}
-  {include file="pastel-blocks/post.template"}
+  {include file="$blogtemplate/post.template"}
  {/foreach}
 
-{include file="pastel-blocks/footer.template"}
+{include file="$blogtemplate/footer.template"}
 
 

Modified: templates/trunk/pastel-blocks/postandcomments.template
===================================================================
--- templates/trunk/pastel-blocks/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pastel-blocks/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
 {assign var="postPageTitle" value=$post->getTopic()}
 {assign var="postPageTitle" value=" | $postPageTitle"}
-{include file="pastel-blocks/header.template"}
+{include file="$blogtemplate/header.template"}
 
     <div class="block-shadow">
      <div class="block-main">
@@ -25,7 +25,7 @@
     </div>
 
    {assign var="poster" value=$post->getUserInfo()}
-   {include file="pastel-blocks/post.template"}
+   {include file="$blogtemplate/post.template"}
    {foreach from=$comments item=comment}
 
     <div class="block-shadow">
@@ -66,6 +66,6 @@
   {/foreach}
  {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
  
- {include file="pastel-blocks/commentform.template"}
+ {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="pastel-blocks/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/pastel-blocks/posttrackbacks.template
===================================================================
--- templates/trunk/pastel-blocks/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pastel-blocks/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="pastel-blocks/header.template"}
+{include file="$blogtemplate/header.template"}
 
     <div class="block-shadow">
      <div class="block-main">
@@ -50,4 +50,4 @@
 
   {/foreach}
 
-{include file="pastel-blocks/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/pastel-blocks/resource.template
===================================================================
--- templates/trunk/pastel-blocks/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pastel-blocks/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="pastel-blocks/header.template"}
+{include file="$blogtemplate/header.template"}
 
     <div class="block-shadow">
      <div class="block-main">
@@ -61,4 +61,4 @@
      </div>
     </div>
 
-{include file="pastel-blocks/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/pastel-blocks/samplerss.template
===================================================================
--- templates/trunk/pastel-blocks/samplerss.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pastel-blocks/samplerss.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="pastel-blocks/header.template"}
+{include file="$blogtemplate/header.template"}
 
     <div class="block-shadow">
      <div class="block-main">
@@ -222,4 +222,4 @@
      </div>
     </div>
 
-{include file="pastel-blocks/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/pink_lilies/about.template
===================================================================
--- templates/trunk/pink_lilies/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pink_lilies/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="pink_lilies/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -11,5 +11,5 @@
   <br />
  </div>
 </div>
-{include file="pink_lilies/panel.template"}
-{include file="pink_lilies/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/pink_lilies/album.template
===================================================================
--- templates/trunk/pink_lilies/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pink_lilies/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="pink_lilies/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="pink_lilies/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/pink_lilies/albums.template
===================================================================
--- templates/trunk/pink_lilies/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pink_lilies/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="pink_lilies/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <h2>{$locale->tr("resource_albums")|capitalize}</h2>
 {foreach from=$albums item=album}
@@ -22,4 +22,4 @@
  </div>
 {/foreach}
 </div>
-{include file="pink_lilies/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/pink_lilies/commentarticle.template
===================================================================
--- templates/trunk/pink_lilies/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pink_lilies/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="pink_lilies/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="pink_lilies/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="pink_lilies/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/pink_lilies/error.template
===================================================================
--- templates/trunk/pink_lilies/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pink_lilies/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="pink_lilies/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="pink_lilies/panel.template"}
-{include file="pink_lilies/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/pink_lilies/main.template
===================================================================
--- templates/trunk/pink_lilies/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pink_lilies/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,12 +1,12 @@
-{include file="pink_lilies/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="pink_lilies/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="pink_lilies/panel.template"}
-{include file="pink_lilies/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/pink_lilies/postandcomments.template
===================================================================
--- templates/trunk/pink_lilies/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pink_lilies/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="pink_lilies/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
     {assign var="postDate" value=$post->getDateObject()}
@@ -6,7 +6,7 @@
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
     
     <div class="post">
-        {include file="pink_lilies/post.template"}
+        {include file="$blogtemplate/post.template"}
     
         <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
         
@@ -32,10 +32,10 @@
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
             <br style="clear: both;" />
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="pink_lilies/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="pink_lilies/panel.template"}
-{include file="pink_lilies/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/pink_lilies/posttrackbacks.template
===================================================================
--- templates/trunk/pink_lilies/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pink_lilies/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="pink_lilies/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="pink_lilies/panel.template"}
-{include file="pink_lilies/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/pink_lilies/resource.template
===================================================================
--- templates/trunk/pink_lilies/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/pink_lilies/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="pink_lilies/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -54,4 +54,4 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
-{include file="pink_lilies/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/reic/album.template
===================================================================
--- templates/trunk/reic/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/reic/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,11 +1,11 @@
-{include file="reic/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="container">
 {assign var="postDate" value=$album->getTimestamp()}
 <div class="blog">
  <h2 class="date">{$album->getName()}</h2>
  <div class="blogbody">
   <div class="posted">
-   <img alt="Album" src="{$url->getUrl("/templates/reic/folderblue.gif")}" width="10" height="11" style="border:0px;" />
+   <img alt="Album" src="{$url->getTemplateFile("folderblue.gif")}" width="10" height="11" style="border:0px;" />
    <a href="{$url->albumLink($album)}">
      {$locale->tr("resources")} ({$album->getNumResources()})
     </a> | {$locale->tr("created")} {$locale->formatDate($postDate,"%d %b, %Y")}
@@ -97,4 +97,4 @@
  
  </div>
 </div>
-{include file="reic/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/reic/albums.template
===================================================================
--- templates/trunk/reic/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/reic/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="reic/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
 {foreach from=$albums item=album}
  {assign var="aDate" value=$album->getTimestamp()}
@@ -6,7 +6,7 @@
  <h2 class="date">{$album->getName()}</h2>
  <div class="blogbody">
   <div class="posted">
-   <img alt="Album" src="{$url->getUrl("/templates/reic/folderblue.gif")}" width="10" height="11" style="border:0px;" />
+   <img alt="Album" src="{$url->getTemplateFile("folderblue.gif")}" width="10" height="11" style="border:0px;" />
    <a href="{$url->albumLink($album)}">  
      {$locale->tr("view")} ({$album->getNumResources()})
     </a>| {$locale->tr("created")} {$locale->formatDate($aDate,"%d %b, %Y")}
@@ -16,4 +16,4 @@
 </div>
 {/foreach}
 </div>
-{include file="reic/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/reic/commentarticle.template
===================================================================
--- templates/trunk/reic/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/reic/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,7 +1,7 @@
-{include file="reic/header.template"}
+{include file="$blogtemplate/header.template"}
  <div class="comments-head"><a name="comments"></a>Comments</div>
  {if $blogsettings->getValue("comments_enabled")}
   <div class="comments-head">Post a comment</div>
-  {include file="reic/commentform.template"}
+  {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="reic/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/reic/error.template
===================================================================
--- templates/trunk/reic/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/reic/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="reic/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="container">
  <div class="blog">
   <div class="blogbody">
@@ -9,7 +9,7 @@
    <table>
     <tr>
      <td>
-      <img src="{$url->getUrl("/templates/reic/error.gif")}" height="32" width="32" alt="Error"/>
+      <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
      </td>
      <td>
       {$locale->tr($message)}
@@ -19,4 +19,4 @@
   </div>
  </div>
 </div>
-{include file="reic/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/reic/header.template
===================================================================
--- templates/trunk/reic/header.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/reic/header.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -19,5 +19,5 @@
 </div>
 
    <div id="nav_r">
-   {include file="reic/nav_bar.inc"}
+   {include file="$blogtemplate/nav_bar.inc"}
    </div>

Modified: templates/trunk/reic/main.template
===================================================================
--- templates/trunk/reic/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/reic/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,10 +1,10 @@
-{include file="reic/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
 <div class="blog">
  {foreach from=$posts item=post}
-  {include file="reic/post.template"}
+  {include file="$blogtemplate/post.template"}
  {/foreach}
 </div>
 </div>
-{include file="reic/panel.template"}
-{include file="reic/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/reic/postandcomments.template
===================================================================
--- templates/trunk/reic/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/reic/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="reic/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var="postDate" value=$post->getDateObject()}
 {assign var="postOwner" value=$post->getUserInfo()}
 <div id="container">
@@ -13,12 +13,12 @@
    </div>
 {* End of article_index *}
 <div class="blog">
- {include file="reic/post.template"}
+ {include file="$blogtemplate/post.template"}
 </div>
  {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
   <div class="blog">
    <div class="comments-head">{$locale->tr("add_comment")}</div>
-   {include file="reic/commentform.template"}
+   {include file="$blogtemplate/commentform.template"}
   </div>
  {/if}
  <div class="blog">
@@ -63,5 +63,5 @@
  </ul>
  </div>
 </div>
-{include file="reic/panel.template"} 
-{include file="reic/footer.template"}
+{include file="$blogtemplate/panel.template"} 
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/reic/posttrackbacks.template
===================================================================
--- templates/trunk/reic/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/reic/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="reic/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="reic/panel.template"}
-{include file="reic/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/reic/resource.template
===================================================================
--- templates/trunk/reic/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/reic/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="reic/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="container">
@@ -6,7 +6,7 @@
   <h2 class="date">{$resource->getFileName()}</h2>
   <div class="blogbody">
    <div class="posted">
-    <img src="{$url->getUrl("/templates/reic/download.gif")}" width="10" height="11" alt="Download" style="border:0px;" />
+    <img src="{$url->getTemplateFile("download.gif")}" width="10" height="11" alt="Download" style="border:0px;" />
     <a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a> 
     ({$metadata->getRoundedSize()}) | {$locale->tr("created")} {$locale->formatDate($updated,"%d %b, %Y")}
    </div>
@@ -51,4 +51,4 @@
   </p>
  </div>
 </div>
-{include file="reic/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/roof/album.template
===================================================================
--- templates/trunk/roof/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/roof/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="roof/header.template"}
+{include file="$blogtemplate/header.template"}
 <h1>{$album->getName()}</h1>
 <p>
  {$album->getDescription()}
@@ -82,4 +82,4 @@
 </div>
  <!-- end of album contents -->
  
- {include file="roof/footer.template"}
+ {include file="$blogtemplate/footer.template"}

Modified: templates/trunk/roof/albums.template
===================================================================
--- templates/trunk/roof/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/roof/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="roof/header.template"}
+{include file="$blogtemplate/header.template"}
 <h1>{$locale->tr("albums")}</h1>
  <!-- album contents go here -->
 <div id="album">
@@ -22,4 +22,4 @@
  </table>
  </div>
  <!-- end of the albums -->
-{include file="roof/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/roof/commentarticle.template
===================================================================
--- templates/trunk/roof/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/roof/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="roof/header.template"}
+{include file="$blogtemplate/header.template"}
 <h3>{$locale->tr("add_comment")}</h3>
- {include file="roof/commentform.template"}
-{include file="roof/footer.template"}
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/roof/error.template
===================================================================
--- templates/trunk/roof/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/roof/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="roof/header.template"}
+{include file="$blogtemplate/header.template"}
  <h3>{$locale->tr("error")}</h3>
  {$locale->tr($message)}
-{include file="roof/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/roof/main.template
===================================================================
--- templates/trunk/roof/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/roof/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,10 +1,10 @@
-{include file="roof/header.template"}
+{include file="$blogtemplate/header.template"}
  {foreach from=$posts item=post}
    {assign var="postDate" value=$post->getDateObject()}
    {if $prevDay != $postDate->getDay()}
     <h3>{$locale->formatDate($postDate, "%A, %B %d, %Y")}</h3>
    {/if}
    {assign var="prevDay" value=$post->getDay()}
-   {include file="roof/post.template"}
+   {include file="$blogtemplate/post.template"}
  {/foreach}
-{include file="roof/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/roof/postandcomments.template
===================================================================
--- templates/trunk/roof/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/roof/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,8 +1,8 @@
-{include file="roof/header.template"}
+{include file="$blogtemplate/header.template"}
    {assign var="poster" value=$post->getUserInfo()}
    {assign var="postDate" value=$post->getDateObject()}
    <h3>{$locale->formatDate($postDate, "%A, %B %d, %Y")}</h3>
-   {include file="roof/post.template"}
+   {include file="$blogtemplate/post.template"}
    {foreach from=$comments item=comment}
     <p class="commentheader">
      <img src="imgs/comment_icon1.gif"/> {$comment->getTopic()} <span class="categoryinfo">[<a href="{$url->replyCommentLink($post,$comment)}">{$locale->tr("reply")}</a>]</span>
@@ -20,5 +20,5 @@
     {$locale->formatDate($commentDate, "%d/%m/%Y %H:%M")}</div>
   {/foreach}
  <h3>{$locale->tr("add_comment")}</h3>
- {include file="roof/commentform.template"}
-{include file="roof/footer.template"}
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/roof/posttrackbacks.template
===================================================================
--- templates/trunk/roof/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/roof/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="roof/header.template"}
+{include file="$blogtemplate/header.template"}
   <p>
     {$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>":
   </p>
@@ -11,4 +11,4 @@
    <b>{$locale->tr("date")}:</b> {$locale->formatDate($trackbackDate, "%d/%m/%Y %H:%M")}<br/><br/>
   {/foreach}
   </p>
-{include file="roof/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/roof/resource.template
===================================================================
--- templates/trunk/roof/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/roof/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -20,7 +20,7 @@
 	<style type="text/css">
     {literal}
 	body {
-		{/literal}background : White url("{$url->getUrl("/templates/roof/bm_roof.jpg")}") no-repeat fixed top left;{literal}
+		{/literal}background : White url("{$url->getTemplateFile("bm_roof.jpg")}") no-repeat fixed top left;{literal}
 		font : 12px Verdana, Geneva, Arial, Helvetica, sans-serif;
 		color : #000033;
 	}

Modified: templates/trunk/rubric/about.template
===================================================================
--- templates/trunk/rubric/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/rubric/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="rubric/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -11,5 +11,5 @@
   <br />
  </div>
 </div>
-{include file="rubric/panel.template"}
-{include file="rubric/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/rubric/album.template
===================================================================
--- templates/trunk/rubric/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/rubric/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="rubric/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="rubric/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/rubric/albums.template
===================================================================
--- templates/trunk/rubric/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/rubric/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="rubric/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <h2>{$locale->tr("resource_albums")|capitalize}</h2>
 {foreach from=$albums item=album}
@@ -22,4 +22,4 @@
  </div>
 {/foreach}
 </div>
-{include file="rubric/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/rubric/commentarticle.template
===================================================================
--- templates/trunk/rubric/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/rubric/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="rubric/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="rubric/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="rubric/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/rubric/error.template
===================================================================
--- templates/trunk/rubric/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/rubric/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="rubric/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="rubric/panel.template"}
-{include file="rubric/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/rubric/main.template
===================================================================
--- templates/trunk/rubric/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/rubric/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,12 +1,12 @@
-{include file="rubric/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="rubric/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="rubric/panel.template"}
-{include file="rubric/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/rubric/postandcomments.template
===================================================================
--- templates/trunk/rubric/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/rubric/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="rubric/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
     {assign var="postDate" value=$post->getDateObject()}
@@ -6,7 +6,7 @@
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
     
     <div class="post">
-        {include file="rubric/post.template"}
+        {include file="$blogtemplate/post.template"}
     
         <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
         
@@ -32,10 +32,10 @@
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
             <br style="clear: both;" />
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="rubric/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="rubric/panel.template"}
-{include file="rubric/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/rubric/posttrackbacks.template
===================================================================
--- templates/trunk/rubric/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/rubric/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="rubric/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="rubric/panel.template"}
-{include file="rubric/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/rubric/resource.template
===================================================================
--- templates/trunk/rubric/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/rubric/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="rubric/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -54,4 +54,4 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
-{include file="rubric/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/silver/about.template
===================================================================
--- templates/trunk/silver/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/silver/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="silver/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -11,5 +11,5 @@
   <br />
  </div>
 </div>
-{include file="silver/panel.template"}
-{include file="silver/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/silver/album.template
===================================================================
--- templates/trunk/silver/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/silver/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="silver/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="silver/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/silver/albums.template
===================================================================
--- templates/trunk/silver/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/silver/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="silver/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <h2>{$locale->tr("resource_albums")|capitalize}</h2>
 {foreach from=$albums item=album}
@@ -22,4 +22,4 @@
  </div>
 {/foreach}
 </div>
-{include file="silver/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/silver/commentarticle.template
===================================================================
--- templates/trunk/silver/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/silver/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="silver/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="silver/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="silver/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/silver/error.template
===================================================================
--- templates/trunk/silver/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/silver/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="silver/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="silver/panel.template"}
-{include file="silver/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/silver/main.template
===================================================================
--- templates/trunk/silver/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/silver/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,12 +1,12 @@
-{include file="silver/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="silver/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="silver/panel.template"}
-{include file="silver/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/silver/postandcomments.template
===================================================================
--- templates/trunk/silver/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/silver/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="silver/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
     {assign var="postDate" value=$post->getDateObject()}
@@ -6,7 +6,7 @@
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
     
     <div class="post">
-        {include file="silver/post.template"}
+        {include file="$blogtemplate/post.template"}
     
         <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
         
@@ -32,10 +32,10 @@
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
             <br style="clear: both;" />
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="silver/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="silver/panel.template"}
-{include file="silver/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/silver/posttrackbacks.template
===================================================================
--- templates/trunk/silver/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/silver/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="silver/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="silver/panel.template"}
-{include file="silver/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/silver/resource.template
===================================================================
--- templates/trunk/silver/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/silver/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="silver/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -54,4 +54,4 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
-{include file="silver/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/simple_sky/about.template
===================================================================
--- templates/trunk/simple_sky/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/simple_sky/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="simple_sky/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -11,5 +11,5 @@
   <br />
  </div>
 </div>
-{include file="simple_sky/panel.template"}
-{include file="simple_sky/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/simple_sky/album.template
===================================================================
--- templates/trunk/simple_sky/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/simple_sky/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="simple_sky/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="simple_sky/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/simple_sky/albums.template
===================================================================
--- templates/trunk/simple_sky/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/simple_sky/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="simple_sky/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <h2>{$locale->tr("resource_albums")|capitalize}</h2>
 {foreach from=$albums item=album}
@@ -22,4 +22,4 @@
  </div>
 {/foreach}
 </div>
-{include file="simple_sky/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/simple_sky/commentarticle.template
===================================================================
--- templates/trunk/simple_sky/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/simple_sky/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="simple_sky/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="simple_sky/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="simple_sky/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/simple_sky/error.template
===================================================================
--- templates/trunk/simple_sky/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/simple_sky/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="simple_sky/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="simple_sky/panel.template"}
-{include file="simple_sky/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/simple_sky/main.template
===================================================================
--- templates/trunk/simple_sky/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/simple_sky/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,12 +1,12 @@
-{include file="simple_sky/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="simple_sky/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="simple_sky/panel.template"}
-{include file="simple_sky/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/simple_sky/postandcomments.template
===================================================================
--- templates/trunk/simple_sky/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/simple_sky/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="simple_sky/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
     {assign var="postDate" value=$post->getDateObject()}
@@ -6,7 +6,7 @@
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
     
     <div class="post">
-        {include file="simple_sky/post.template"}
+        {include file="$blogtemplate/post.template"}
     
         <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
         
@@ -32,10 +32,10 @@
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
             <br style="clear: both;" />
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="simple_sky/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="simple_sky/panel.template"}
-{include file="simple_sky/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/simple_sky/posttrackbacks.template
===================================================================
--- templates/trunk/simple_sky/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/simple_sky/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="simple_sky/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="simple_sky/panel.template"}
-{include file="simple_sky/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/simple_sky/resource.template
===================================================================
--- templates/trunk/simple_sky/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/simple_sky/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="simple_sky/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -54,4 +54,4 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
-{include file="simple_sky/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/splat/about.template
===================================================================
--- templates/trunk/splat/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/splat/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="splat/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -11,5 +11,5 @@
   <br />
  </div>
 </div>
-{include file="splat/panel.template"}
-{include file="splat/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/splat/album.template
===================================================================
--- templates/trunk/splat/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/splat/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="splat/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="splat/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/splat/albums.template
===================================================================
--- templates/trunk/splat/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/splat/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="splat/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <h2>{$locale->tr("resource_albums")|capitalize}</h2>
 {foreach from=$albums item=album}
@@ -22,4 +22,4 @@
  </div>
 {/foreach}
 </div>
-{include file="splat/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/splat/commentarticle.template
===================================================================
--- templates/trunk/splat/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/splat/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="splat/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="splat/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="splat/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/splat/error.template
===================================================================
--- templates/trunk/splat/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/splat/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="splat/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="splat/panel.template"}
-{include file="splat/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/splat/main.template
===================================================================
--- templates/trunk/splat/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/splat/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,12 +1,12 @@
-{include file="splat/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="splat/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="splat/panel.template"}
-{include file="splat/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/splat/postandcomments.template
===================================================================
--- templates/trunk/splat/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/splat/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="splat/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
     {assign var="postDate" value=$post->getDateObject()}
@@ -6,7 +6,7 @@
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
     
     <div class="post">
-        {include file="splat/post.template"}
+        {include file="$blogtemplate/post.template"}
     
         <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
         
@@ -32,10 +32,10 @@
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
             <br style="clear: both;" />
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="splat/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="splat/panel.template"}
-{include file="splat/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/splat/posttrackbacks.template
===================================================================
--- templates/trunk/splat/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/splat/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="splat/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="splat/panel.template"}
-{include file="splat/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/splat/resource.template
===================================================================
--- templates/trunk/splat/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/splat/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="splat/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -54,4 +54,4 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
-{include file="splat/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/standard_green/album.template
===================================================================
--- templates/trunk/standard_green/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_green/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-   		{include file="standard_green/header.template"}
+   		{include file="$blogtemplate/header.template"}
 
 <h2>{$locale->tr("albums")}</h2>
 
@@ -76,4 +76,4 @@
 
 <!-- end of album contents -->
  
-		{include file="standard_green/footer.template"}
\ No newline at end of file
+		{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/standard_green/albums.template
===================================================================
--- templates/trunk/standard_green/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_green/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_green/header.template"}
+		{include file="$blogtemplate/header.template"}
 
 <h2>{$locale->tr("albums")}</h2>
 
@@ -26,4 +26,4 @@
 <!-- end of the albums -->
 
 		
-		{include file="standard_green/footer.template"}
+		{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/standard_green/archives.template
===================================================================
--- templates/trunk/standard_green/archives.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_green/archives.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_green/header.template"}
+		{include file="$blogtemplate/header.template"}
 <h2>{$locale->tr("archives")}</h2>
 
 <div id="Archives">
@@ -10,4 +10,4 @@
     	</ul>
 </div>
    	
-   		{include file="standard_green/footer.template"}
\ No newline at end of file
+   		{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/standard_green/commentarticle.template
===================================================================
--- templates/trunk/standard_green/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_green/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,5 +1,5 @@
-		{include file="standard_green/header.template"}
+		{include file="$blogtemplate/header.template"}
 		
-		{include file="standard_green/commentform.template"}
+		{include file="$blogtemplate/commentform.template"}
 		
-		{include file="standard_green/footer.template"}
+		{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/standard_green/error.template
===================================================================
--- templates/trunk/standard_green/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_green/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_green/header.template"}
+		{include file="$blogtemplate/header.template"}
  	<h2>{$locale->tr("error")}</h2>
  		{$locale->tr($message)}
-		{include file="standard_green/footer.template"}
+		{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/standard_green/links.template
===================================================================
--- templates/trunk/standard_green/links.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_green/links.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_green/header.template"}
+		{include file="$blogtemplate/header.template"}
   
 <div id="Links">
 	<h2>{$locale->tr("my_links")}</h2>
@@ -12,4 +12,4 @@
   		{/foreach}
   	</div>
   
-		{include file="standard_green/footer.template"}
\ No newline at end of file
+		{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/standard_green/main.template
===================================================================
--- templates/trunk/standard_green/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_green/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,9 +1,9 @@
-		{include file="standard_green/header.template"}
+		{include file="$blogtemplate/header.template"}
 
 		{foreach from=$posts item=post}
 		
-		{include file="standard_green/post.template"}
+		{include file="$blogtemplate/post.template"}
 		
 		{/foreach}
 
-		{include file="standard_green/footer.template"}
\ No newline at end of file
+		{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/standard_green/postandcomments.template
===================================================================
--- templates/trunk/standard_green/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_green/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_green/header.template"}
+		{include file="$blogtemplate/header.template"}
   
 <p id="Nextpost">
 		{if $nextpost == true}
@@ -11,7 +11,7 @@
    
    		{assign var="poster" value=$post->getUserInfo()}
    		
-   		{include file="standard_green/post.template"}
+   		{include file="$blogtemplate/post.template"}
    		
    		{foreach from=$comments item=comment}
 
@@ -32,7 +32,7 @@
   		{/foreach}
 
 		{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
-		{include file="standard_green/commentform.template"}
+		{include file="$blogtemplate/commentform.template"}
 		{/if}
 		
-		{include file="standard_green/footer.template"}
+		{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/standard_green/posttrackbacks.template
===================================================================
--- templates/trunk/standard_green/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_green/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_green/header.template"}
+		{include file="$blogtemplate/header.template"}
 		
 <h2>{$locale->tr("trackbacks")}</h2>
 		
@@ -18,4 +18,4 @@
 </dl>
   		{/foreach}
 
-{include file="standard_green/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/standard_green/resource.template
===================================================================
--- templates/trunk/standard_green/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_green/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_green/header.template"}
+		{include file="$blogtemplate/header.template"}
 
 <h2>{$locale->tr("albums")}</h2>
 

Modified: templates/trunk/standard_happy/album.template
===================================================================
--- templates/trunk/standard_happy/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_happy/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-   		{include file="standard_happy/header.template"}
+   		{include file="$blogtemplate/header.template"}
 
 <h2>{$locale->tr("albums")}</h2>
 
@@ -76,4 +76,4 @@
 
 <!-- end of album contents -->
  
-		{include file="standard_happy/footer.template"}
\ No newline at end of file
+		{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/standard_happy/albums.template
===================================================================
--- templates/trunk/standard_happy/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_happy/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_happy/header.template"}
+		{include file="$blogtemplate/header.template"}
 
 <h2>{$locale->tr("albums")}</h2>
 
@@ -26,4 +26,4 @@
 <!-- end of the albums -->
 
 		
-		{include file="standard_happy/footer.template"}
+		{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/standard_happy/archives.template
===================================================================
--- templates/trunk/standard_happy/archives.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_happy/archives.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_happy/header.template"}
+		{include file="$blogtemplate/header.template"}
 <h2>{$locale->tr("archives")}</h2>
 
 <div id="Archives">
@@ -10,4 +10,4 @@
     	</ul>
 </div>
    	
-   		{include file="standard_happy/footer.template"}
\ No newline at end of file
+   		{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/standard_happy/commentarticle.template
===================================================================
--- templates/trunk/standard_happy/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_happy/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,5 +1,5 @@
-		{include file="standard_happy/header.template"}
+		{include file="$blogtemplate/header.template"}
 		
-		{include file="standard_happy/commentform.template"}
+		{include file="$blogtemplate/commentform.template"}
 		
-		{include file="standard_happy/footer.template"}
+		{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/standard_happy/error.template
===================================================================
--- templates/trunk/standard_happy/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_happy/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_happy/header.template"}
+		{include file="$blogtemplate/header.template"}
  	<h2>{$locale->tr("error")}</h2>
  		{$locale->tr($message)}
-		{include file="standard_happy/footer.template"}
+		{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/standard_happy/links.template
===================================================================
--- templates/trunk/standard_happy/links.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_happy/links.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_happy/header.template"}
+		{include file="$blogtemplate/header.template"}
   
 <div id="Links">
 	<h2>{$locale->tr("my_links")}</h2>
@@ -12,4 +12,4 @@
   		{/foreach}
   	</div>
   
-		{include file="standard_happy/footer.template"}
\ No newline at end of file
+		{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/standard_happy/main.template
===================================================================
--- templates/trunk/standard_happy/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_happy/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,9 +1,9 @@
-		{include file="standard_happy/header.template"}
+		{include file="$blogtemplate/header.template"}
 
 		{foreach from=$posts item=post}
 		
-		{include file="standard_happy/post.template"}
+		{include file="$blogtemplate/post.template"}
 		
 		{/foreach}
 
-		{include file="standard_happy/footer.template"}
\ No newline at end of file
+		{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/standard_happy/postandcomments.template
===================================================================
--- templates/trunk/standard_happy/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_happy/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_happy/header.template"}
+		{include file="$blogtemplate/header.template"}
   
 <p id="Nextpost">
 		{if $nextpost == true}
@@ -11,7 +11,7 @@
    
    		{assign var="poster" value=$post->getUserInfo()}
    		
-   		{include file="standard_happy/post.template"}
+   		{include file="$blogtemplate/post.template"}
    		
    		{foreach from=$comments item=comment}
 
@@ -32,7 +32,7 @@
   		{/foreach}
 
 		{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
-		{include file="standard_happy/commentform.template"}
+		{include file="$blogtemplate/commentform.template"}
 		{/if}
 		
-		{include file="standard_happy/footer.template"}
+		{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/standard_happy/posttrackbacks.template
===================================================================
--- templates/trunk/standard_happy/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_happy/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_happy/header.template"}
+		{include file="$blogtemplate/header.template"}
 		
 <h2>{$locale->tr("trackbacks")}</h2>
 		
@@ -18,4 +18,4 @@
 </dl>
   		{/foreach}
 
-{include file="standard_happy/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/standard_happy/resource.template
===================================================================
--- templates/trunk/standard_happy/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_happy/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_happy/header.template"}
+		{include file="$blogtemplate/header.template"}
 
 <h2>{$locale->tr("albums")}</h2>
 

Modified: templates/trunk/standard_red/album.template
===================================================================
--- templates/trunk/standard_red/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_red/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-   		{include file="standard_red/header.template"}
+   		{include file="$blogtemplate/header.template"}
 
 <h2>{$locale->tr("albums")}</h2>
 
@@ -75,4 +75,4 @@
 </div>
 
 <!-- end of album contents --> 
-		{include file="standard_red/footer.template"}
\ No newline at end of file
+		{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/standard_red/albums.template
===================================================================
--- templates/trunk/standard_red/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_red/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_red/header.template"}
+		{include file="$blogtemplate/header.template"}
 
 <h2>{$locale->tr("albums")}</h2>
 
@@ -26,4 +26,4 @@
 <!-- end of the albums -->
 
 		
-		{include file="standard_red/footer.template"}
+		{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/standard_red/archives.template
===================================================================
--- templates/trunk/standard_red/archives.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_red/archives.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_red/header.template"}
+		{include file="$blogtemplate/header.template"}
 <h2>{$locale->tr("archives")}</h2>
 
 <div id="Archives">
@@ -10,4 +10,4 @@
     	</ul>
 </div>
    	
-   		{include file="standard_red/footer.template"}
\ No newline at end of file
+   		{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/standard_red/commentarticle.template
===================================================================
--- templates/trunk/standard_red/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_red/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,5 +1,5 @@
-		{include file="standard_red/header.template"}
+		{include file="$blogtemplate/header.template"}
 		
-		{include file="standard_red/commentform.template"}
+		{include file="$blogtemplate/commentform.template"}
 		
-		{include file="standard_red/footer.template"}
+		{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/standard_red/error.template
===================================================================
--- templates/trunk/standard_red/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_red/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_red/header.template"}
+		{include file="$blogtemplate/header.template"}
  	<h2>{$locale->tr("error")}</h2>
  		{$locale->tr($message)}
-		{include file="standard_red/footer.template"}
+		{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/standard_red/links.template
===================================================================
--- templates/trunk/standard_red/links.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_red/links.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_red/header.template"}
+		{include file="$blogtemplate/header.template"}
   
 <div id="Links">
 	<h2>{$locale->tr("my_links")}</h2>
@@ -12,4 +12,4 @@
   		{/foreach}
   	</div>
   
-		{include file="standard_red/footer.template"}
\ No newline at end of file
+		{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/standard_red/main.template
===================================================================
--- templates/trunk/standard_red/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_red/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,9 +1,9 @@
-		{include file="standard_red/header.template"}
+		{include file="$blogtemplate/header.template"}
 
 		{foreach from=$posts item=post}
 		
-		{include file="standard_red/post.template"}
+		{include file="$blogtemplate/post.template"}
 		
 		{/foreach}
 
-		{include file="standard_red/footer.template"}
\ No newline at end of file
+		{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/standard_red/postandcomments.template
===================================================================
--- templates/trunk/standard_red/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_red/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_red/header.template"}
+		{include file="$blogtemplate/header.template"}
   
 <p id="Nextpost">
 		{if $nextpost == true}
@@ -11,7 +11,7 @@
    
    		{assign var="poster" value=$post->getUserInfo()}
    		
-   		{include file="standard_red/post.template"}
+   		{include file="$blogtemplate/post.template"}
    		
    		{foreach from=$comments item=comment}
 
@@ -32,7 +32,7 @@
   		{/foreach}
 
 		{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
-		{include file="standard_red/commentform.template"}
+		{include file="$blogtemplate/commentform.template"}
 		{/if}
 		
-		{include file="standard_red/footer.template"}
+		{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/standard_red/posttrackbacks.template
===================================================================
--- templates/trunk/standard_red/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_red/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_red/header.template"}
+		{include file="$blogtemplate/header.template"}
 		
 <h2>{$locale->tr("trackbacks")}</h2>
 		
@@ -18,4 +18,4 @@
 </dl>
   		{/foreach}
 
-{include file="standard_red/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/standard_red/resource.template
===================================================================
--- templates/trunk/standard_red/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/standard_red/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-		{include file="standard_red/header.template"}
+		{include file="$blogtemplate/header.template"}
 
 <h2>{$locale->tr("albums")}</h2>
 

Modified: templates/trunk/toni/about.template
===================================================================
--- templates/trunk/toni/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/toni/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="toni/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -11,5 +11,5 @@
   <br />
  </div>
 </div>
-{include file="toni/panel.template"}
-{include file="toni/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/toni/album.template
===================================================================
--- templates/trunk/toni/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/toni/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="toni/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="toni/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/toni/albums.template
===================================================================
--- templates/trunk/toni/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/toni/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="toni/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <h2>{$locale->tr("resource_albums")|capitalize}</h2>
 {foreach from=$albums item=album}
@@ -22,4 +22,4 @@
  </div>
 {/foreach}
 </div>
-{include file="toni/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/toni/commentarticle.template
===================================================================
--- templates/trunk/toni/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/toni/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="toni/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="toni/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="toni/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/toni/error.template
===================================================================
--- templates/trunk/toni/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/toni/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="toni/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="toni/panel.template"}
-{include file="toni/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/toni/main.template
===================================================================
--- templates/trunk/toni/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/toni/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,12 +1,12 @@
-{include file="toni/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="toni/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="toni/panel.template"}
-{include file="toni/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/toni/postandcomments.template
===================================================================
--- templates/trunk/toni/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/toni/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="toni/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
     {assign var="postDate" value=$post->getDateObject()}
@@ -6,7 +6,7 @@
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
     
     <div class="post">
-        {include file="toni/post.template"}
+        {include file="$blogtemplate/post.template"}
     
         <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
         
@@ -32,10 +32,10 @@
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
             <br style="clear: both;" />
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="toni/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="toni/panel.template"}
-{include file="toni/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/toni/posttrackbacks.template
===================================================================
--- templates/trunk/toni/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/toni/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="toni/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="toni/panel.template"}
-{include file="toni/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/toni/resource.template
===================================================================
--- templates/trunk/toni/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/toni/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="toni/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -54,4 +54,4 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
-{include file="toni/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/toto/about.template
===================================================================
--- templates/trunk/toto/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/toto/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="toto/header.template"}
+{include file="$blogtemplate/header.template"}
   <tr>
     <td valign="top">
 	  <table width="100%"  border="0" cellspacing="0" cellpadding="0">
@@ -12,7 +12,7 @@
 <br /> Thanks.
 	</td>
     <td width="200" valign="top" class="panel">
-		{include file="toto/panel.template"}
+		{include file="$blogtemplate/panel.template"}
 	</td>
   </tr>
-{include file="toto/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/toto/album.template
===================================================================
--- templates/trunk/toto/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/toto/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="toto/header.template"}
+{include file="$blogtemplate/header.template"}
 <tr>
 <td>
 <div id="container">
@@ -101,4 +101,4 @@
 </div>
 </td>
 </tr>
-{include file="toto/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/toto/albums.template
===================================================================
--- templates/trunk/toto/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/toto/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="toto/header.template"}
+{include file="$blogtemplate/header.template"}
 <tr>
   <td valign="top">
   <table width="100%" cellpadding="2" cellspacing="2" border="0" class="article">
@@ -20,7 +20,7 @@
 </table>
 </td>
     <td width="200" valign="top" class="panel">
-		{include file="toto/panel.template"}
+		{include file="$blogtemplate/panel.template"}
 	</td>
 </tr>
-{include file="toto/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/toto/commentarticle.template
===================================================================
--- templates/trunk/toto/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/toto/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,11 +1,11 @@
-{include file="toto/header.template"}
+{include file="$blogtemplate/header.template"}
 <tr>
   <td>
  <div class="comments-head"><a name="comments"></a>Comments</div>
  {if $blogsettings->getValue("comments_enabled")}
   <div class="comments-head">Post a comment</div>
-  {include file="toto/commentform.template"}
+  {include file="$blogtemplate/commentform.template"}
  {/if}
  </td>
 </tr>
-{include file="toto/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/toto/error.template
===================================================================
--- templates/trunk/toto/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/toto/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="toto/header.template"}
+{include file="$blogtemplate/header.template"}
 <tr>
   <td>
    <h2 class="title">{$locale->tr("error")}</h2>
@@ -7,7 +7,7 @@
    <table>
     <tr>
      <td>
-      <img src="{$url->getUrl("/templates/toto/error.gif")}" height="32" width="32" alt="Error"/>
+      <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
      </td>
      <td>
       {$locale->tr($message)}
@@ -16,4 +16,4 @@
    </table>
 </td>
 </tr>
-{include file="toto/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/toto/main.template
===================================================================
--- templates/trunk/toto/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/toto/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="toto/header.template"}
+{include file="$blogtemplate/header.template"}
   <tr>
     <td valign="top">
 	  <table width="100%"  border="0" cellspacing="0" cellpadding="0">
@@ -7,11 +7,11 @@
         </tr>
       </table>
 	 {foreach from=$posts item=post}
-	  {include file="toto/post.template"}
+	  {include file="$blogtemplate/post.template"}
 	 {/foreach}
 	</td>
     <td width="200" valign="top" class="panel">
-		{include file="toto/panel.template"}
+		{include file="$blogtemplate/panel.template"}
 	</td>
   </tr>
-{include file="toto/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/toto/postandcomments.template
===================================================================
--- templates/trunk/toto/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/toto/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="toto/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var="postDate" value=$post->getDateObject()}
 {assign var="postOwner" value=$post->getUserInfo()}
   <tr>
@@ -6,7 +6,7 @@
 <table width="100%"  border="0" cellspacing="2" cellpadding="2">
   <tr>
     <td>
-	{include file="toto/post.template"}
+	{include file="$blogtemplate/post.template"}
     </td>
   </tr>
   <tr>
@@ -35,14 +35,14 @@
   <tr>
     <td>
    <div class="comments-head">{$locale->tr("add_comment")}</div>
-   {include file="toto/commentform.template"}
+   {include file="$blogtemplate/commentform.template"}
     </td>
   </tr>
  {/if}
 </table> 
 </td>
     <td width="200" valign="top" class="panel">
-		{include file="toto/panel.template"}
+		{include file="$blogtemplate/panel.template"}
 	</td>
 </tr>
-{include file="toto/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/toto/posttrackbacks.template
===================================================================
--- templates/trunk/toto/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/toto/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="toto/header.template"}
+{include file="$blogtemplate/header.template"}
 <tr>
   <td>
    <h2 class="title">{$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>"</h2>
@@ -12,7 +12,7 @@
 
 	</td>
     <td width="200" valign="top" class="panel">
-		{include file="toto/panel.template"}
+		{include file="$blogtemplate/panel.template"}
 	</td>
   </tr>
-{include file="toto/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/toto/resource.template
===================================================================
--- templates/trunk/toto/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/toto/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="toto/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <tr>
@@ -51,4 +51,4 @@
   </p>
 </td>
 </tr>
-{include file="toto/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/tribal/about.template
===================================================================
--- templates/trunk/tribal/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/tribal/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="tribal/header.template"}
+{include file="$blogtemplate/header.template"}
 <h1>{$locale->tr("about")}</h1>
 <p>You can change the contents of this page by editing the templates/tribal/about.template file.</p>
-{include file="tribal/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/tribal/album.template
===================================================================
--- templates/trunk/tribal/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/tribal/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="tribal/header.template"}
+{include file="$blogtemplate/header.template"}
 <h1>{$album->getName()}</h1>
 <p><strong>{$album->getDescription()}</strong></p>
 <!-- album contents go here -->
@@ -48,4 +48,4 @@
 </p>
 {/foreach}
 <!-- end of album contents -->
-{include file="tribal/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/tribal/albums.template
===================================================================
--- templates/trunk/tribal/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/tribal/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="tribal/header.template"}
+{include file="$blogtemplate/header.template"}
 <h1>{$locale->tr("albums")}</h1>
 <!-- album contents go here -->
 {foreach from=$albums item=album}
@@ -7,4 +7,4 @@
 </p> 
 {/foreach}
  <!-- end of the albums -->
-{include file="tribal/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/tribal/commentarticle.template
===================================================================
--- templates/trunk/tribal/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/tribal/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="tribal/header.template"}
+{include file="$blogtemplate/header.template"}
 <div class="commtitle">{$locale->tr("add_comment")}</div>
-{include file="tribal/commentform.template"}
-{include file="tribal/footer.template"}
+{include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/tribal/error.template
===================================================================
--- templates/trunk/tribal/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/tribal/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="tribal/header.template"}
+{include file="$blogtemplate/header.template"}
  <h1>{$locale->tr("error")}</h1>
  <p>
  <strong>{$locale->tr($message)}</strong>
  </p>
-{include file="tribal/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/tribal/main.template
===================================================================
--- templates/trunk/tribal/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/tribal/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,5 +1,5 @@
-{include file="tribal/header.template"}
+{include file="$blogtemplate/header.template"}
  {foreach from=$posts item=post}
-  {include file="tribal/post.template"}
+  {include file="$blogtemplate/post.template"}
  {/foreach}
-{include file="tribal/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/tribal/postandcomments.template
===================================================================
--- templates/trunk/tribal/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/tribal/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="tribal/header.template"}
+{include file="$blogtemplate/header.template"}
    {assign var="poster" value=$post->getUserInfo()}
-   {include file="tribal/post.template"}
+   {include file="$blogtemplate/post.template"}
    {if $post->getTotalComments()!=0}
    <a name="comments" id="comments"></a>
    <div class="commtitle">{$locale->tr("comments")}</div>
@@ -13,6 +13,6 @@
    {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
    <a id="formcomment" name="formcomment"></a>
    <div class="commtitle">{$locale->tr("add_comment")}</div>
-   {include file="tribal/commentform.template"}
+   {include file="$blogtemplate/commentform.template"}
    {/if}
-   {include file="tribal/footer.template"}
+   {include file="$blogtemplate/footer.template"}

Modified: templates/trunk/tribal/posttrackbacks.template
===================================================================
--- templates/trunk/tribal/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/tribal/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="tribal/header.template"}
+{include file="$blogtemplate/header.template"}
   <h1>{$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>":</h1>
   <p>
   {foreach from=$trackbacks item=trackback}
@@ -9,4 +9,4 @@
    <strong>{$locale->tr("date")}:</strong> {$locale->formatDate($trackbackDate, "%d/%m/%Y %H:%M")}<br/><br/>
   {/foreach}
   </p>
-{include file="tribal/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/tribal/resource.template
===================================================================
--- templates/trunk/tribal/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/tribal/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="tribal/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <h1>{$resource->getFileName()}</h1>
@@ -40,4 +40,4 @@
 {/if}
 </p>
 <p><a href="javascript:history.go(-1);">{$locale->tr("back")}</a></p>
-{include file="tribal/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/water_play/about.template
===================================================================
--- templates/trunk/water_play/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/water_play/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="water_play/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -11,5 +11,5 @@
   <br />
  </div>
 </div>
-{include file="water_play/panel.template"}
-{include file="water_play/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/water_play/album.template
===================================================================
--- templates/trunk/water_play/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/water_play/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="water_play/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="water_play/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/water_play/albums.template
===================================================================
--- templates/trunk/water_play/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/water_play/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="water_play/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <h2>{$locale->tr("resource_albums")|capitalize}</h2>
 {foreach from=$albums item=album}
@@ -22,4 +22,4 @@
  </div>
 {/foreach}
 </div>
-{include file="water_play/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/water_play/commentarticle.template
===================================================================
--- templates/trunk/water_play/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/water_play/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="water_play/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="water_play/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="water_play/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/water_play/error.template
===================================================================
--- templates/trunk/water_play/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/water_play/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="water_play/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="water_play/panel.template"}
-{include file="water_play/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/water_play/main.template
===================================================================
--- templates/trunk/water_play/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/water_play/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,12 +1,12 @@
-{include file="water_play/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="water_play/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="water_play/panel.template"}
-{include file="water_play/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/water_play/postandcomments.template
===================================================================
--- templates/trunk/water_play/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/water_play/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="water_play/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
     {assign var="postDate" value=$post->getDateObject()}
@@ -6,7 +6,7 @@
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
     
     <div class="post">
-        {include file="water_play/post.template"}
+        {include file="$blogtemplate/post.template"}
     
         <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
         
@@ -32,10 +32,10 @@
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
             <br style="clear: both;" />
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="water_play/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="water_play/panel.template"}
-{include file="water_play/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/water_play/posttrackbacks.template
===================================================================
--- templates/trunk/water_play/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/water_play/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="water_play/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="water_play/panel.template"}
-{include file="water_play/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/water_play/resource.template
===================================================================
--- templates/trunk/water_play/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/water_play/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="water_play/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -54,4 +54,4 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
-{include file="water_play/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/white/album.template
===================================================================
--- templates/trunk/white/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/white/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="white/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="container">
 <p>
  {$album->getDescription()}
@@ -83,4 +83,4 @@
  
  </div>
 </div>
-{include file="white/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/white/albums.template
===================================================================
--- templates/trunk/white/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/white/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="white/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="container">
 <!-- album contents go here -->
 <br/>
@@ -22,4 +22,4 @@
  </table>
  <!-- end of the albums -->
 </div>
-{include file="white/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/white/commentarticle.template
===================================================================
--- templates/trunk/white/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/white/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="white/header.template"}
+{include file="$blogtemplate/header.template"}
 <h3>{$locale->tr("add_comment")}</h3>
- {include file="white/commentform.template"}
-{include file="white/footer.template"}
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/white/error.template
===================================================================
--- templates/trunk/white/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/white/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="white/header.template"}
+{include file="$blogtemplate/header.template"}
  <h3>{$locale->tr("error")}</h3>
  {$locale->tr($message)}
-{include file="white/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/white/main.template
===================================================================
--- templates/trunk/white/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/white/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,10 +1,10 @@
-{include file="white/header.template"}
+{include file="$blogtemplate/header.template"}
  {foreach from=$posts item=post}
    {assign var="postDate" value=$post->getDateObject()}
    {if $prevDay != $postDate->getDay()}
     <h3>{$locale->formatDate($postDate, "%A, %B %d, %Y")}</h3>
    {/if}
    {assign var="prevDay" value=$post->getDay()}
-   {include file="white/post.template"}
+   {include file="$blogtemplate/post.template"}
  {/foreach}
-{include file="white/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/white/postandcomments.template
===================================================================
--- templates/trunk/white/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/white/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,8 +1,8 @@
-{include file="white/header.template"}
+{include file="$blogtemplate/header.template"}
    {assign var="poster" value=$post->getUserInfo()}
    {assign var="postDate" value=$post->getDateObject()}
    <h3>{$locale->formatDate($postDate, "%A, %B %d, %Y")}</h3>
-   {include file="white/post.template"}
+   {include file="$blogtemplate/post.template"}
    {foreach from=$comments item=comment}
     <p class="commentheader">
      <img src="{$url->getUrl("/imgs/comment_icon1.gif")}"/> {$comment->getTopic()} <span class="categoryinfo">[<a href="{$url->replyCommentLink($post,$comment)}">{$locale->tr("reply")}</a>]</span>
@@ -20,5 +20,5 @@
     {$locale->formatDate($commentDate, "%d/%m/%Y %H:%M")}</div>
   {/foreach}
  <h3>{$locale->tr("add_comment")}</h3>
- {include file="white/commentform.template"}
-{include file="white/footer.template"}
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/white/posttrackbacks.template
===================================================================
--- templates/trunk/white/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/white/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="white/header.template"}
+{include file="$blogtemplate/header.template"}
   <p>
     {$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>":
   </p>
@@ -11,4 +11,4 @@
    <b>{$locale->tr("date")}:</b> {$locale->formatDate($trackbackDate, "%d/%m/%Y %H:%M")}<br/><br/>
   {/foreach}
   </p>
-{include file="white/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/white/resource.template
===================================================================
--- templates/trunk/white/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/white/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -9,7 +9,7 @@
 <title>{$blog->getBlog()}</title>
 <meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}" />
 <meta name="MSSmartTagsPreventParsing" content="TRUE" />
-<style type="text/css" media="screen">@import "{$url->getUrl("/templates/white/white.css")}";</style>
+<style type="text/css" media="screen">@import "{$url->getTemplateFile("white.css")}";</style>
 </head>
 <body>
 <!-- empty div to create header -->

Modified: templates/trunk/wordplog/about.template
===================================================================
--- templates/trunk/wordplog/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/wordplog/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,5 +1,5 @@
 {assign var="postPageTitle" value="WordpLog User Guide | "}
-{include file="wordplog/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="post">
   <h3 class="storytitle"><a href="{$url->templatePage("about")}">WordpLog User Guide</a></h3>
@@ -53,5 +53,5 @@
   </div>
  </div>
 </div>
-{include file="wordplog/panel.template"}
-{include file="wordplog/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/wordplog/album.tableless.template
===================================================================
--- templates/trunk/wordplog/album.tableless.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/wordplog/album.tableless.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
 {assign var="postPageTitle" value=$album->getName()}
 {assign var="postPageTitle" value="$postPageTitle | "}
-{include file="wordplog/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="post">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -76,5 +76,5 @@
 
  </div>
 </div>
-{include file="wordplog/panel.template"}
-{include file="wordplog/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/wordplog/album.template
===================================================================
--- templates/trunk/wordplog/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/wordplog/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
 {assign var="postPageTitle" value=$album->getName()}
 {assign var="postPageTitle" value="$postPageTitle | "}
-{include file="wordplog/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="post">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -97,5 +97,5 @@
  
  </div>
 </div>
-{include file="wordplog/panel.template"}
-{include file="wordplog/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/wordplog/albums.template
===================================================================
--- templates/trunk/wordplog/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/wordplog/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
 {assign var="postPageTitle" value=$locale->tr("resource_albums")}
 {assign var="postPageTitle" value="$postPageTitle | "}
-{include file="wordplog/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="post">
 {foreach from=$albums item=album}
@@ -16,5 +16,5 @@
 </div>
 {/foreach}
 </div>
-{include file="wordplog/panel.template"}
-{include file="wordplog/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/wordplog/commentarticle.template
===================================================================
--- templates/trunk/wordplog/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/wordplog/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,7 +1,7 @@
-{include file="wordplog/header.template"}
+{include file="$blogtemplate/header.template"}
  <h2 id="comments"><a id="comments"></a>{$locale->tr("comments")}</h2>
  {if $blogsettings->getValue("comments_enabled")}
   <h2 id="postcomment">{$locale->tr("add_comment")}</h2>
-  {include file="wordplog/commentform.template"}
+  {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="wordplog/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/wordplog/error.template
===================================================================
--- templates/trunk/wordplog/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/wordplog/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
 {assign var="postPageTitle" value=$locale->tr("error")}
 {assign var="postPageTitle" value="$postPageTitle | "}
-{include file="wordplog/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="post">
    <h2 class="storytitle">{$locale->tr("error")}</h2>
@@ -19,5 +19,5 @@
    </table>
  </div>
 </div>
-{include file="wordplog/panel.template"}
-{include file="wordplog/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/wordplog/main.template
===================================================================
--- templates/trunk/wordplog/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/wordplog/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,14 +1,14 @@
-{include file="wordplog/header.template"}
+{include file="$blogtemplate/header.template"}
 		<div id="content">
 {if #searchhighlight# == 1}
 [searchhighlightplugin]
 {/if}
 {foreach from=$posts item=post}
-	{include file="wordplog/post.template"}
+	{include file="$blogtemplate/post.template"}
 {/foreach}
 {if #blogtimes# == 1}
-{include file="wordplog/plugin_blogtimes.inc"}
+{include file="$blogtemplate/plugin_blogtimes.inc"}
 {/if}
 		</div>
-{include file="wordplog/panel.template"}
-{include file="wordplog/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/wordplog/panel.template
===================================================================
--- templates/trunk/wordplog/panel.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/wordplog/panel.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,46 +1,46 @@
 		<div id="menu">
 			<ul id="nav">
 				{if #calendar# == 1}
-				{include file="wordplog/module_calendar.inc"}
+				{include file="$blogtemplate/module_calendar.inc"}
 				{/if}
 				{if #postbrowse# == 1}
-				{include file="wordplog/module_postbrowse.inc"}
+				{include file="$blogtemplate/module_postbrowse.inc"}
 				{/if}
 				{if #searchform# == 1}
-				{include file="wordplog/module_searchform.inc"}
+				{include file="$blogtemplate/module_searchform.inc"}
 				{/if}
 				{if #styleswitcher# == 1}
-				{include file="wordplog/plugin_styleswitcher.inc"}
+				{include file="$blogtemplate/plugin_styleswitcher.inc"}
 				{/if}
 				{if #recententries# == 1}
-				{include file="wordplog/module_recententries.inc"}
+				{include file="$blogtemplate/module_recententries.inc"}
 				{/if}
 				{if #recentcomments# == 1}
-				{include file="wordplog/plugin_recentcomments.inc"}
+				{include file="$blogtemplate/plugin_recentcomments.inc"}
 				{/if}
 				{if #recenttrackbacks# == 1}
-				{include file="wordplog/plugin_recenttrackbacks.inc"}
+				{include file="$blogtemplate/plugin_recenttrackbacks.inc"}
 				{/if}
 				{if #categories# == 1}
-				{include file="wordplog/module_categories.inc"}
+				{include file="$blogtemplate/module_categories.inc"}
 				{/if}
 				{if #archieves# == 1}
-				{include file="wordplog/module_archieves.inc"}
+				{include file="$blogtemplate/module_archieves.inc"}
 				{/if}
 				{if #mylinks# == 1}
-				{include file="wordplog/module_mylinks.inc"}
+				{include file="$blogtemplate/module_mylinks.inc"}
 				{/if}
 				{if #topcommentposts# == 1 || #topcommentvisitors# == 1 || #topkarmaposts# == 1 || #topreadposts# == 1}
-				{include file="wordplog/plugin_toprank.inc"}
+				{include file="$blogtemplate/plugin_toprank.inc"}
 				{/if}
 				{if #blogstatistics# == 1}
-				{include file="wordplog/plugin_blogstatistics.inc"}
+				{include file="$blogtemplate/plugin_blogstatistics.inc"}
 				{/if}
 				{if #menu# == 1}
-				{include file="wordplog/module_menu.inc"}
+				{include file="$blogtemplate/module_menu.inc"}
 				{/if}
 				{if #syndicate# == 1}
-				{include file="wordplog/module_syndicate.inc"}
+				{include file="$blogtemplate/module_syndicate.inc"}
 				{/if}
 			</ul>
 		</div>
\ No newline at end of file

Modified: templates/trunk/wordplog/post.template
===================================================================
--- templates/trunk/wordplog/post.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/wordplog/post.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -28,10 +28,10 @@
 					<a href="{$url->postPermalink($post)}#comments" title="{#locale_read_comments#}">{$locale->tr("comments")|capitalize} ({$post->getTotalComments()})</a>
 					 :: <a href="{$url->postTrackbackStatsLink($post)}" title="{#locale_trackback_records#}">{$locale->tr("trackbacks")|capitalize} ({$post->getNumTrackbacks()})</a>
 					{if #karma# == 1}
-					 :: {include file="wordplog/plugin_karma.inc"}
+					 :: {include file="$blogtemplate/plugin_karma.inc"}
 					{/if}
 					{if #printview# == 1}
-					 :: {include file="wordplog/plugin_printview.inc"}
+					 :: {include file="$blogtemplate/plugin_printview.inc"}
 					{/if}
 				</div>
 			</div>

Modified: templates/trunk/wordplog/posttrackbacks.template
===================================================================
--- templates/trunk/wordplog/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/wordplog/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="wordplog/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="post">
    <h3 class="storytitle">{$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>"</h3>
@@ -11,5 +11,5 @@
     {/foreach}
  </div>
 </div>
-{include file="wordplog/panel.template"}
-{include file="wordplog/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/wordplog/resource.template
===================================================================
--- templates/trunk/wordplog/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/wordplog/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
 {assign var="postPageTitle" value=$locale->tr("resource_center")}
 {assign var="postPageTitle" value="$postPageTitle | "}
-{include file="wordplog/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -50,4 +50,4 @@
   </p>
  </div>
 </div>
-{include file="wordplog/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/wordplog/searchresults.template
===================================================================
--- templates/trunk/wordplog/searchresults.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/wordplog/searchresults.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
 {assign var="postPageTitle" value=$locale->tr("search_results")}
 {assign var="postPageTitle" value="$postPageTitle | "}
-{include file="wordplog/header.template"}
+{include file="$blogtemplate/header.template"}
 		<div id="content">
 			<div class="post">
 			<div class="storycontent">
@@ -24,5 +24,5 @@
 			</div>
 		</div>
 {$searchhighlight->end()}
-{include file="wordplog/panel.template"}
-{include file="wordplog/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/zen/about.template
===================================================================
--- templates/trunk/zen/about.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/zen/about.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="zen/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -11,5 +11,5 @@
   <br />
  </div>
 </div>
-{include file="zen/panel.template"}
-{include file="zen/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/zen/album.template
===================================================================
--- templates/trunk/zen/album.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/zen/album.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="zen/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="zen/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/zen/albums.template
===================================================================
--- templates/trunk/zen/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/zen/albums.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="zen/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <h2>{$locale->tr("resource_albums")|capitalize}</h2>
 {foreach from=$albums item=album}
@@ -22,4 +22,4 @@
  </div>
 {/foreach}
 </div>
-{include file="zen/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/zen/commentarticle.template
===================================================================
--- templates/trunk/zen/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/zen/commentarticle.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,6 +1,6 @@
-{include file="zen/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="zen/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="zen/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/zen/error.template
===================================================================
--- templates/trunk/zen/error.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/zen/error.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="zen/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="zen/panel.template"}
-{include file="zen/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/zen/main.template
===================================================================
--- templates/trunk/zen/main.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/zen/main.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,12 +1,12 @@
-{include file="zen/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="zen/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="zen/panel.template"}
-{include file="zen/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/zen/postandcomments.template
===================================================================
--- templates/trunk/zen/postandcomments.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/zen/postandcomments.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="zen/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
     {assign var="postDate" value=$post->getDateObject()}
@@ -6,7 +6,7 @@
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
     
     <div class="post">
-        {include file="zen/post.template"}
+        {include file="$blogtemplate/post.template"}
     
         <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
         
@@ -32,10 +32,10 @@
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
             <br style="clear: both;" />
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="zen/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="zen/panel.template"}
-{include file="zen/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/zen/posttrackbacks.template
===================================================================
--- templates/trunk/zen/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/zen/posttrackbacks.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="zen/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="content">
  <div class="blog">
   <div class="blogbody">
@@ -13,5 +13,5 @@
   </div>
  </div>
 </div>
-{include file="zen/panel.template"}
-{include file="zen/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/zen/resource.template
===================================================================
--- templates/trunk/zen/resource.template	2005-02-24 02:28:05 UTC (rev 1191)
+++ templates/trunk/zen/resource.template	2005-02-24 03:16:26 UTC (rev 1192)
@@ -1,4 +1,4 @@
-{include file="zen/header.template"}
+{include file="$blogtemplate/header.template"}
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="content">
@@ -54,4 +54,4 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
-{include file="zen/footer.template"}
+{include file="$blogtemplate/footer.template"}




More information about the pLog-svn mailing list