Mercurial > hg > chronicle

changeset 39:6b5d3f055a8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-10-10 08:53:45 by steve Patches from Josh Grams - prefix handling updates and better dates.
author steve
date Wed, 10 Oct 2007 08:53:45 +0000
parents bd73942eec73
children 5d0ae147378c
files bin/chronicle themes/blocky/entry.template themes/blocky/index.template themes/blocky/index.xml.template themes/blocky/month.template themes/blocky/month.xml.template themes/blocky/tags.template themes/blocky/tags.xml.template themes/copyrighteous/entry.template themes/copyrighteous/index.template themes/copyrighteous/index.xml.template themes/copyrighteous/month.template themes/copyrighteous/month.xml.template themes/copyrighteous/tags.template themes/copyrighteous/tags.xml.template themes/default/entry.template themes/default/index.template themes/default/index.xml.template themes/default/month.template themes/default/month.xml.template themes/default/tags.template themes/default/tags.xml.template
diffstat 22 files changed, 191 insertions(+), 223 deletions(-) [+]
line wrap: on
line diff
--- a/bin/chronicle	Tue Sep 04 10:51:24 2007 +0000
+++ b/bin/chronicle	Wed Oct 10 08:53:45 2007 +0000
@@ -74,7 +74,7 @@
  --
  http://www.steve.org.uk/
 
- $Id: chronicle,v 1.16 2007-09-04 10:51:11 steve Exp $
+ $Id: chronicle,v 1.17 2007-10-10 08:53:45 steve Exp $
 
 =cut
 
@@ -93,6 +93,7 @@
 use strict;
 use warnings;
 use Date::Parse;
+use Date::Format;
 use Time::Local;
 use File::Copy;
 use File::Path;
@@ -166,7 +167,7 @@
 #
 #  Find each unique month + year we've used.
 #
-my %all_dates = findAllMonths();
+my %all_dates;
 %all_dates = findAllMonths() unless( $CONFIG{'no-archive'} );
 
 
@@ -181,9 +182,18 @@
 
 
 #
-#  Make sure our output directory exists.
+#  Create the output directories.
 #
 mkpath( $CONFIG{'output'}, 0, 0755 ) if ( ! -d $CONFIG{'output'} );
+foreach my $tag ( keys %all_tags )
+{
+    mkpath( "$CONFIG{'output'}/tags/$tag", 0, 0755 );
+}
+foreach my $date ( keys %all_dates )
+{
+    next unless ( $date =~ /^([0-9]{4})-([0-9]{2})/ );
+    mkpath( "$CONFIG{'output'}/archive/$1/$2", 0, 0755 );
+}
 
 
 #
@@ -356,7 +366,7 @@
 
     if ( $VERSION )
     {
-        my $REVISION      = '$Revision: 1.16 $';
+        my $REVISION      = '$Revision: 1.17 $';
         if ( $REVISION =~ /1.([0-9.]+) / )
         {
             $REVISION = $1;
@@ -573,18 +583,9 @@
         my $h    = $data{$f};
         next if ( !$h );
 
-        my $date = $h->{'date'} || undef;
+        my $date = time2str("%Y-%m", str2time($h->{'date'})) || undef;
         next if ( !$date );
 
-        #
-        #  Strip to month
-        #
-        my ($ss,$mm,$hh,$day,$month,$year,$zone) = strptime($date);
-        my @abbr = qw( January February March April May June July August September October November December );
-        $month = $abbr[$month];
-        $year += 1900;
-        $date = $month . " " . $year;
-
         $allDates{$date}+=1;
     }
 
@@ -606,51 +607,34 @@
 
 sub createDateCloud
 {
-    my( %unique ) = ( @_ );
+    my( %entry_dates ) = ( @_ );
 
     my $results;
+    my $year;
+    my $months;
+    my @names = qw( January February March April May June July August September October November December );
 
-    #
-    #  First find the distinct years.
-    #
-    my %years;
-    foreach my $key ( sort keys %unique  )
+    foreach my $date ( sort keys %entry_dates )
     {
-        if ( $key =~ /([0-9]+)/ )
+        next unless ( $date =~ /^([0-9]{4})-([0-9]{2})/ );
+
+        if ( $year and $1 ne $year )
         {
-            my $year = $1;
-            $years{$year} += 1;
+            push( @$results, { year => $year,
+                    months => $months } );
+            undef $months;
         }
+        $year = $1;
+
+        push( @$months, { month => $2,
+                month_name => $names[$2-1],
+                count => $entry_dates{$date} } );
+
     }
 
-    #
-    #  Now for each year we want to push on the number of
-    # months
-    #
-    foreach my $year ( keys %years )
-    {
-        my $months;
+    push( @$results, { year => $year,
+                       months => $months } );
 
-        foreach my $key ( keys %unique )
-        {
-            if ( $key =~ /(.*) ([0-9]+)/ )
-            {
-                my $y  = $2;
-                my $m = $1;
-                if ( $year eq $y )
-                {
-                    my $count = $unique{ $key };
-                    my $month = $m;
-
-                    push( @$months, { month => $m,
-                                      count => $count } );
-                }
-            }
-        }
-
-        push( @$results, { year => $year,
-                           months => $months } );
-    }
     return $results;
 }
 
@@ -814,9 +798,7 @@
     #
     my $index = $CONFIG{'filename'} || "index.html";
 
-    open( OUTPUT, ">", "$CONFIG{'output'}/$index" );
-    print OUTPUT $template->output();
-    close( OUTPUT );
+    outputTemplate( $template, $index );
 
     #
     #  Output the RSS feed
@@ -824,9 +806,7 @@
     $template = loadTemplate( "index.xml.template",
                               die_on_bad_params => 0 );
     $template->param( entries => $entries ) if ( $entries );
-    open( OUTPUT, ">", "$CONFIG{'output'}/index.rss" );
-    print OUTPUT $template->output();
-    close( OUTPUT );
+    outputTemplate( $template, "index.rss" );
 }
 
 
@@ -844,17 +824,7 @@
 {
     my ( $tagName ) = ( @_ );
 
-    #
-    #  Make the tag directory.
-    #
-    my $dir = "$CONFIG{'output'}/tags/";
-    mkpath( $dir, 0, 0755 ) if ( ! -d $dir );
-
-    #
-    #  Now the specific one.
-    #
-    $dir = "$CONFIG{'output'}/tags/$tagName";
-    mkdir $dir, 0755 if ( ! -d $dir );
+    my $dir = "tags/$tagName";
 
     my %allTags;
     my %tagEntries;
@@ -922,9 +892,7 @@
     #
     my $index = $CONFIG{'filename'} || "index.html";
 
-    open( OUTPUT, ">", "$dir/$index" );
-    print OUTPUT $template->output();
-    close( OUTPUT );
+    outputTemplate( $template, "$dir/$index" );
 
     #
     #  Now output the .xml file
@@ -932,10 +900,7 @@
     $template = loadTemplate( "tags.xml.template", die_on_bad_params => 0 );
     $template->param( entries => $entries ) if ( $entries );
     $template->param( tagname => $tagName ) if ( $tagName );
-    open( OUTPUT, ">", "$dir/$tagName.rss" );
-    print OUTPUT $template->output();
-    close( OUTPUT );
-
+    outputTemplate( $template, "$dir/$tagName.rss" );
 }
 
 
@@ -969,43 +934,27 @@
 
     my $year = '';
     my $month = '';
-    if ( $date =~ /(.*) ([0-9]+)/ )
+    if ( $date =~ /^([0-9]{4})-([0-9]{2})/ )
     {
-        $year  = $2;
-        $month = $1;
+        $year  = $1;
+        $month = $2;
     }
 
     #
     #  Make the directory
     #
-    my $dir = "$CONFIG{'output'}/archive/$year";
-    mkpath( $dir, 0, 0755 ) if ( ! -d $dir );
-
-    $dir .= "/$month";
-    mkdir $dir, 0755 if ( ! -d $dir );
+    my $dir = "archive/$year/$month";
 
     my $entries;
 
 
-    my %allDates;
     my %dateEntries;
     foreach my $f ( keys %data )
     {
         my $h    = $data{$f};
-        my $date = $h->{'date'} || undef;
-        $allDates{$date}+=1;
+        my $date = time2str("%Y-%m", str2time($h->{'date'})) || undef;
 
-        #
-        #  Strip to month
-        #
-        my ($ss,$mm,$hh,$day,$month,$year,$zone) = strptime($date);
-        my @abbr = qw( January February March April May June July August September October November December );
-        $month = $abbr[$month];
-        $year += 1900;
-        $date = $month . " " . $year;
-        my $a = $dateEntries{$date};
-        push @$a, $f ;
-        $dateEntries{$date}= $a;
+        push @{$dateEntries{$date}}, $f ;
     }
 
 
@@ -1053,9 +1002,7 @@
     #  Page to use
     #
     my $index = $CONFIG{'filename'} || "index.html";
-    open( OUTPUT, ">", "$dir/$index" );
-    print OUTPUT $template->output();
-    close( OUTPUT );
+    outputTemplate( $template, "$dir/$index" );
 
     #
     #  Now the RSS page.
@@ -1063,9 +1010,7 @@
     $template = loadTemplate( "month.xml.template", die_on_bad_params => 0 );
     $template->param( entries => $entries ) if ( $entries );
     $template->param( month => $month, year => $year );
-    open( OUTPUT, ">", "$dir/$month.rss" );
-    print OUTPUT $template->output();
-    close( OUTPUT );
+    outputTemplate( $template, "$dir/$month.rss" );
 }
 
 
@@ -1117,7 +1062,6 @@
     #  Convert to suitable filename.
     #
     my $file = fileToTitle($title);
-    $file    = $CONFIG{'output'} . "/" . $file;
 
     #
     #  The entry.
@@ -1141,10 +1085,7 @@
     $template->param( blog_subtitle => $CONFIG{'blog_subtitle'} )
       if ( $CONFIG{'blog_subtitle'} );
 
-    open( OUTPUT, ">", $file );
-    print OUTPUT $template->output();
-    close( OUTPUT );
-
+    outputTemplate( $template, $file );
 }
 
 
@@ -1383,15 +1324,42 @@
                                  global_vars       => 1,
                                  %params );
 
+    return( $t );
+}
+
+
+
+=begin doc
+
+  Set URL for top directory and output a template.
+
+=end doc
+
+=cut
+
+sub outputTemplate
+{
+    my( $template, $path ) = ( @_ );
+
     #
-    #  Global setting.
+    # Select relative/absolute URL prefix.
     #
+    my $top;
     if ( $CONFIG{'url_prefix'} )
     {
-        $t->param( url_prefix => $CONFIG{'url_prefix'} );
+        $top = $CONFIG{'url_prefix'};
     }
+    else
+    {
+        $top = $path;
+        $top =~ s'[^/]+/'../'g;
+        $top =~ s'[^/]*$'';
+    }
+    $template->param( top => $top );
 
-    return( $t );
+    open( OUTPUT, ">", "$CONFIG{'output'}/$path" );
+    print OUTPUT $template->output();
+    close( OUTPUT );
 }
 
 
--- a/themes/blocky/entry.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/blocky/entry.template	Wed Oct 10 08:53:45 2007 +0000
@@ -3,13 +3,13 @@
 <html>
  <head>
   <title>Blog: <!-- tmpl_var name='title' --></title>
-  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='url_prefix' -->style.css">
+  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='top' -->style.css">
  </head>
  <body>
 
  <div class="title">
   <h1><!-- tmpl_if name='blog_title' -->
-       <a href="<!-- tmpl_var name='url_prefix' -->"><!-- tmpl_var name='blog_title' --></a>
+       <a href="<!-- tmpl_var name='top' -->"><!-- tmpl_var name='blog_title' --></a>
       <!-- tmpl_else -->
        Untitled Blog
       <!-- /tmpl_if -->
@@ -30,7 +30,7 @@
   <table width="100%">
   <tr><td>
   <!-- tmpl_if name='tags' -->
-  <div class="tags">Tags: <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_var name='url_prefix' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop --></div>
+  <div class="tags">Tags: <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop --></div>
    <!-- /tmpl_if -->
   </td><td align="right"><!-- tmpl_var name='date' --></td></tr></table>
  </fieldset>
@@ -44,7 +44,7 @@
 <li><!-- tmpl_var name='year' -->
 <ul>
 <!-- tmpl_loop name='months' -->
-<li><a href="<!-- tmpl_var name='url_prefix' -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month' --> (<!-- tmpl_var name='count' -->)</a></li>
+<li><a href="<!-- tmpl_var name='top' -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month_name' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul></li>
 <!-- /tmpl_loop -->
@@ -56,11 +56,11 @@
 <fieldset>
  <legend>Tags</legend>
  <!-- tmpl_loop name='tagcloud' -->
- <span style="font-size: <!-- tmpl_var name='size' -->px"><a href="<!-- tmpl_var name='url_prefix' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --></span>
+ <span style="font-size: <!-- tmpl_var name='size' -->px"><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --></span>
 <!-- /tmpl_loop -->
 </fieldset>
 <!-- /tmpl_if -->
 
 </td></tr></table>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/themes/blocky/index.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/blocky/index.template	Wed Oct 10 08:53:45 2007 +0000
@@ -3,15 +3,15 @@
 <html>
  <head>
   <title><!-- tmpl_var name='blog_title' --></title>
-  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='url_prefix' -->style.css">
-  <link rel="alternate" title="RSS Feed" href="<!-- tmpl_var name='url_prefix' -->index.rss" type="application/rss+xml">
+  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='top' -->style.css">
+  <link rel="alternate" title="RSS Feed" href="<!-- tmpl_var name='top' -->index.rss" type="application/rss+xml">
 
  </head>
  <body>
 
  <div class="title">
   <h1><!-- tmpl_if name='blog_title' -->
-       <a href="<!-- tmpl_var name='url_prefix' -->"><!-- tmpl_var name='blog_title' --></a>
+       <a href="<!-- tmpl_var name='top' -->"><!-- tmpl_var name='blog_title' --></a>
       <!-- tmpl_else -->
        Untitled Blog
       <!-- /tmpl_if -->
@@ -29,7 +29,7 @@
 
  <!-- tmpl_loop name='entries' -->
  <fieldset>
-   <legend><a href="<!-- tmpl_var name='url_prefix' --><!-- tmpl_var name='link' -->"><!-- tmpl_var name='title' --></a></legend>
+   <legend><a href="<!-- tmpl_var name='top' --><!-- tmpl_var name='link' -->"><!-- tmpl_var name='title' --></a></legend>
 
    <div class="body"><!-- tmpl_var name='body' --></div>
 
@@ -37,7 +37,7 @@
    <tr>
     <td>
      <!-- tmpl_if name='tags' -->
-       Tags: <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_var name='url_prefix' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop --> 
+       Tags: <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop --> 
      <!-- tmpl_else -->
         No tags
      <!-- /tmpl_if --> 
@@ -51,7 +51,7 @@
  </fieldset>
  <p></p>
  <!-- /tmpl_loop -->
- <p style="text-align: right;"><a href="index.rss"><img src="<!-- tmpl_var name='url_prefix' -->xml.gif"></a></p>
+ <p style="text-align: right;"><a href="index.rss"><img src="<!-- tmpl_var name='top' -->xml.gif"></a></p>
 
 </td>
 <td width="20%" valign="top">
@@ -63,7 +63,7 @@
 <li><!-- tmpl_var name='year' -->
 <ul>
 <!-- tmpl_loop name='months' -->
-<li><a href="<!-- tmpl_var name='url_prefix' -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month' --> (<!-- tmpl_var name='count' -->)</a></li>
+<li><a href="<!-- tmpl_var name='top' -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month_name' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul></li>
 <!-- /tmpl_loop -->
@@ -75,7 +75,7 @@
 <fieldset>
  <legend>Tags</legend>
  <!-- tmpl_loop name='tagcloud' -->
- <span style="font-size: <!-- tmpl_var name='size' -->px"><a href="<!-- tmpl_var name='url_prefix' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --></span>
+ <span style="font-size: <!-- tmpl_var name='size' -->px"><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --></span>
 <!-- /tmpl_loop -->
 </fieldset>
 <!-- /tmpl_if -->
--- a/themes/blocky/index.xml.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/blocky/index.xml.template	Wed Oct 10 08:53:45 2007 +0000
@@ -7,8 +7,8 @@
 	<!-- tmpl_loop name="entries" -->
 	<item>
 		<title><!-- tmpl_var name="title" escape='html' --></title>
-		<link><!-- tmpl_var name='url_prefix' --><!-- tmpl_var name='link' --></link>        
-		<guid isPermaLink="true"><!-- tmpl_var name='url_prefix' --><!-- tmpl_var name='link' --></guid>
+		<link><!-- tmpl_var name='top' --><!-- tmpl_var name='link' --></link>        
+		<guid isPermaLink="true"><!-- tmpl_var name='top' --><!-- tmpl_var name='link' --></guid>
 		<description><!-- tmpl_var name="body" escape='html' --></description>
 	</item>
 	<!-- /tmpl_loop -->
--- a/themes/blocky/month.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/blocky/month.template	Wed Oct 10 08:53:45 2007 +0000
@@ -2,8 +2,8 @@
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
  <head>
-  <title>Blog : Entries from <!-- tmpl_var name='month' --> <!-- tmpl_var name='year' --></title>
-  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->style.css">
+  <title>Blog : Entries from <!-- tmpl_var name='month_name' --> <!-- tmpl_var name='year' --></title>
+  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='top' -->style.css">
   <link rel="alternate" title="RSS Feed" href="<!-- tmpl_var name='month' escape='html' -->.rss" type="application/rss+xml">
  </head>
  <body>
@@ -11,7 +11,7 @@
 
  <div class="title">
   <h1><!-- tmpl_if name='blog_title' -->
-       <a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->"><!-- tmpl_var name='blog_title' --></a>
+       <a href="<!-- tmpl_var name='top' -->"><!-- tmpl_var name='blog_title' --></a>
       <!-- tmpl_else -->
        Untitled Blog
       <!-- /tmpl_if -->
@@ -25,11 +25,11 @@
 <table width="100%">
 <tr><td valign="top">
 
- <p>Entries from <!-- tmpl_var name='month' escape='html' --> <!-- tmpl_var name='year' escape='html' -->.</p>
+ <p>Entries from <!-- tmpl_var name='month_name' escape='html' --> <!-- tmpl_var name='year' escape='html' -->.</p>
 
 <!-- tmpl_loop name='entries' -->
 <fieldset>
- <legend><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if --><!-- tmpl_var name='link' -->"><!-- tmpl_var name='title' --></a></legend>
+ <legend><a href="<!-- tmpl_var name='top' --><!-- tmpl_var name='link' -->"><!-- tmpl_var name='title' --></a></legend>
 
  <div class="body">
   <!-- tmpl_var name='body' -->
@@ -38,7 +38,7 @@
  <table width="100%">
  <tr><td>
  <!-- tmpl_if name='tags' -->
-  Tags: <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop -->
+  Tags: <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop -->
  <!-- tmpl_else -->
   No tags
  <!-- /tmpl_if -->
@@ -50,7 +50,7 @@
 </fieldset>
  <p></p>
 <!-- /tmpl_loop -->
- <p style="text-align: right;"><a href="<!-- tmpl_var name='month' escape='html' -->.rss"><img src="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->xml.gif"></a></p>
+ <p style="text-align: right;"><a href="<!-- tmpl_var name='month' escape='html' -->.rss"><img src="<!-- tmpl_var name='top' -->xml.gif"></a></p>
 
 
 </td>
@@ -63,7 +63,7 @@
 <li><!-- tmpl_var name='year' -->
 <ul>
 <!-- tmpl_loop name='months' -->
-<li><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month' --> (<!-- tmpl_var name='count' -->)</a></li>
+<li><a href="<!-- tmpl_var name='top' -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month_name' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul></li>
 <!-- /tmpl_loop -->
@@ -74,11 +74,11 @@
 <fieldset>
  <legend>Tags</legend>
  <!-- tmpl_loop name='tagcloud' -->
- <span style="font-size: <!-- tmpl_var name='size' -->px"><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --></span>
+ <span style="font-size: <!-- tmpl_var name='size' -->px"><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --></span>
 <!-- /tmpl_loop -->
 </fieldset>
 
 <!-- /tmpl_if -->
 </td></tr></table>
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/themes/blocky/month.xml.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/blocky/month.xml.template	Wed Oct 10 08:53:45 2007 +0000
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <rss version='2.0' xmlns:lj='http://www.livejournal.org/rss/lj/1.0/'>
 	<channel>
-		<title>Entries from <!-- tmpl_var name='month' --> <!-- tmpl_var name='year' --></title>
-		<description>Entries from <!-- tmpl_var name='month' --> <!-- tmpl_var name='year' --></description>
+		<title>Entries from <!-- tmpl_var name='month_name' --> <!-- tmpl_var name='year' --></title>
+		<description>Entries from <!-- tmpl_var name='month_name' --> <!-- tmpl_var name='year' --></description>
 
 	<!-- tmpl_loop name="entries" -->
 	<item>
 		<title><!-- tmpl_var name="title" escape='html' --></title>
-		<link><!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if --><!-- tmpl_var name='link' --></link>        
-		<guid isPermaLink="true"><!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if --><!-- tmpl_var name='link' --></guid>
+		<link><!-- tmpl_var name='top' --><!-- tmpl_var name='link' --></link>        
+		<guid isPermaLink="true"><!-- tmpl_var name='top' --><!-- tmpl_var name='link' --></guid>
 		<description><!-- tmpl_var name="body" escape='html' --></description>
 	</item>
 	<!-- /tmpl_loop -->
--- a/themes/blocky/tags.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/blocky/tags.template	Wed Oct 10 08:53:45 2007 +0000
@@ -3,14 +3,14 @@
 <html>
  <head>
   <title>Blog : Entries Tagged <!-- tmpl_var name='tagname' --></title> 
-  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->style.css">
+  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='top' -->style.css">
   <link rel="alternate" title="RSS Feed" href="<!-- tmpl_var name='tagname' escape='html' -->.rss" type="application/rss+xml">
  </head>
  <body>
 
  <div class="title">
   <h1><!-- tmpl_if name='blog_title' -->
-       <a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->"><!-- tmpl_var name='blog_title' --></a>
+       <a href="<!-- tmpl_var name='top' -->"><!-- tmpl_var name='blog_title' --></a>
       <!-- tmpl_else -->
        Untitled Blog
       <!-- /tmpl_if -->
@@ -29,7 +29,7 @@
 
 <!-- tmpl_loop name='entries' -->
 <fieldset>
- <legend><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if --><!-- tmpl_var name='link' -->"><!-- tmpl_var name='title' --></a></legend>
+ <legend><a href="<!-- tmpl_var name='top' --><!-- tmpl_var name='link' -->"><!-- tmpl_var name='title' --></a></legend>
  <div class="body">
   <!-- tmpl_var name='body' -->
  </div>
@@ -37,14 +37,14 @@
  <tr><td>
  <!-- tmpl_if name='tags' -->
  <div class="tags">
-  Tags: <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop -->
+  Tags: <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop -->
  </div>
  <!-- /tmpl_if -->
   </td><td align="right"><!-- tmpl_var name='date' --></td></tr></table>
 </fieldset>
 <p></p>
 <!-- /tmpl_loop -->
- <p style="text-align: right;"><a href="<!-- tmpl_var name='tagname' escape='html' -->.rss"><img src="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->xml.gif"></a></p>
+ <p style="text-align: right;"><a href="<!-- tmpl_var name='tagname' escape='html' -->.rss"><img src="<!-- tmpl_var name='top' -->xml.gif"></a></p>
 
 
 
@@ -58,7 +58,7 @@
 <li><!-- tmpl_var name='year' -->
 <ul>
 <!-- tmpl_loop name='months' -->
-<li><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month' --> (<!-- tmpl_var name='count' -->)</a></li>
+<li><a href="<!-- tmpl_var name='top' -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month_name' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul></li>
 <!-- /tmpl_loop -->
@@ -69,7 +69,7 @@
 <fieldset>
  <legend>Tags</legend>
  <!-- tmpl_loop name='tagcloud' -->
- <span style="font-size: <!-- tmpl_var name='size' -->px"><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --></span>
+ <span style="font-size: <!-- tmpl_var name='size' -->px"><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --></span>
 <!-- /tmpl_loop -->
 </fieldset>
 
--- a/themes/blocky/tags.xml.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/blocky/tags.xml.template	Wed Oct 10 08:53:45 2007 +0000
@@ -7,8 +7,8 @@
 	<!-- tmpl_loop name="entries" -->
 	<item>
 		<title><!-- tmpl_var name="title" escape='html' --></title>
-		<link><!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if --><!-- tmpl_var name='link' --></link>        
-		<guid isPermaLink="true"><!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if --><!-- tmpl_var name='link' --></guid>
+		<link><!-- tmpl_var name='top' --><!-- tmpl_var name='link' --></link>        
+		<guid isPermaLink="true"><!-- tmpl_var name='top' --><!-- tmpl_var name='link' --></guid>
 		<description><!-- tmpl_var name="body" escape='html' --></description>
 	</item>
 	<!-- /tmpl_loop -->
--- a/themes/copyrighteous/entry.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/copyrighteous/entry.template	Wed Oct 10 08:53:45 2007 +0000
@@ -2,13 +2,13 @@
 <html>
 <head>
  <title>copyrighteous: <!-- tmpl_var name='title' --></title>
- <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='url_prefix' -->style.css">
+ <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='top' -->style.css">
 </head>
 
 <body>
 <div id='content'>
 <div id='title'>
-<span class="title"><a href="<!-- tmpl_var name='url_prefix' -->">
+<span class="title"><a href="<!-- tmpl_var name='top' -->">
   <!-- tmpl_if name='blog_title' -->
     <!-- tmpl_var name='blog_title' -->
   <!-- tmpl_else -->
@@ -31,7 +31,7 @@
 <!-- tmpl_var name='body' -->
 </div>
 Permalink 
-<span class="tags"><!-- tmpl_if name='tags' -->| <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_var name='url_prefix' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop --><!-- /tmpl_if --> </span> 
+<span class="tags"><!-- tmpl_if name='tags' -->| <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop --><!-- /tmpl_if --> </span> 
 </div>
 </div>
 </div>
@@ -44,7 +44,7 @@
 <li><!-- tmpl_var name='year' -->
 <ul>
 <!-- tmpl_loop name='months' -->
-<li><a href="<!-- tmpl_var name='url_prefix' -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month' --> (<!-- tmpl_var name='count' -->)</a></li>
+<li><a href="<!-- tmpl_var name='top' -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month_name' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul></li>
 <!-- /tmpl_loop -->
@@ -56,7 +56,7 @@
 <span class="rightMenu">Tags</span><br />
 <ul>
 <!-- tmpl_loop name='tagcloud' -->
- <li><a href="<!-- tmpl_var name='url_prefix' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --> (<!-- tmpl_var name='count' -->)</a></li>
+ <li><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul>
 <!-- /tmpl_if -->
--- a/themes/copyrighteous/index.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/copyrighteous/index.template	Wed Oct 10 08:53:45 2007 +0000
@@ -2,14 +2,14 @@
 <html>
 <head>
  <title>copyrighteous: <!-- tmpl_var name='blog_title' --></title>
-  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='url_prefix' -->style.css">
-  <link rel="alternate" title="RSS Feed" href="<!-- tmpl_var name='url_prefix' -->index.rss" type="application/rss+xml">
+  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='top' -->style.css">
+  <link rel="alternate" title="RSS Feed" href="<!-- tmpl_var name='top' -->index.rss" type="application/rss+xml">
 </head>
 
 <body>
 <div id='content'>
 <div id='title'>
-<span class="title"><a href="<!-- tmpl_var name='url_prefix' -->">
+<span class="title"><a href="<!-- tmpl_var name='top' -->">
   <!-- tmpl_if name='blog_title' -->
     <!-- tmpl_var name='blog_title' -->
   <!-- tmpl_else -->
@@ -34,8 +34,8 @@
 <div id="story">
 <!-- tmpl_var name='body' -->
 </div>
-<a href="<!-- tmpl_var name='url_prefix' --><!-- tmpl_var name='link' -->">Permalink</a>
-<span class="tags"><!-- tmpl_if name='tags' -->| <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_var name='url_prefix' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop --><!-- /tmpl_if --> </span> 
+<a href="<!-- tmpl_var name='top' --><!-- tmpl_var name='link' -->">Permalink</a>
+<span class="tags"><!-- tmpl_if name='tags' -->| <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop --><!-- /tmpl_if --> </span> 
 </div>
 </div>
 <!-- /tmpl_loop -->
@@ -55,7 +55,7 @@
 <li><!-- tmpl_var name='year' -->
 <ul>
 <!-- tmpl_loop name='months' -->
-<li><a href="<!-- tmpl_var name='url_prefix' -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month' --> (<!-- tmpl_var name='count' -->)</a></li>
+<li><a href="<!-- tmpl_var name='top' -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month_name' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul></li>
 <!-- /tmpl_loop -->
@@ -67,11 +67,11 @@
 <span class="rightMenu">Tags</span><br />
 <ul>
 <!-- tmpl_loop name='tagcloud' -->
- <li><a href="<!-- tmpl_var name='url_prefix' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --> (<!-- tmpl_var name='count' -->)</a></li>
+ <li><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul>
 <!-- /tmpl_if -->
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/themes/copyrighteous/index.xml.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/copyrighteous/index.xml.template	Wed Oct 10 08:53:45 2007 +0000
@@ -7,8 +7,8 @@
 	<!-- tmpl_loop name="entries" -->
 	<item>
 		<title><!-- tmpl_var name="title" escape='html' --></title>
-		<link><!-- tmpl_var name='url_prefix' --><!-- tmpl_var name='link' --></link>        
-		<guid isPermaLink="true"><!-- tmpl_var name='url_prefix' --><!-- tmpl_var name='link' --></guid>
+		<link><!-- tmpl_var name='top' --><!-- tmpl_var name='link' --></link>        
+		<guid isPermaLink="true"><!-- tmpl_var name='top' --><!-- tmpl_var name='link' --></guid>
 		<description><!-- tmpl_var name="body" escape='html' --></description>
 	</item>
 	<!-- /tmpl_loop -->
--- a/themes/copyrighteous/month.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/copyrighteous/month.template	Wed Oct 10 08:53:45 2007 +0000
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <html>
 <head>
- <title>copyrighteous: Items from <!-- tmpl_var name='month' --> <!-- tmpl_var name='year' --></title>
-  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='url_prefix' -->style.css">
+ <title>copyrighteous: Items from <!-- tmpl_var name='month_name' --> <!-- tmpl_var name='year' --></title>
+  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='top' -->style.css">
   <link rel="alternate" title="RSS Feed" href="<!-- tmpl_var name='month' escape='html' -->.rss" type="application/rss+xml">
 </head>
 
 <body>
 <div id='content'>
 <div id='title'>
-<span class="title"><a href="<!-- tmpl_var name='url_prefix' -->">
+<span class="title"><a href="<!-- tmpl_var name='top' -->">
   <!-- tmpl_if name='blog_title' -->
     <!-- tmpl_var name='blog_title' -->
   <!-- tmpl_else -->
@@ -34,8 +34,8 @@
 <div id="story">
 <!-- tmpl_var name='body' -->
 </div>
-<a href="<!-- tmpl_var name='url_prefix' --><!-- tmpl_var name='link' -->">Permalink</a>
-<span class="tags"><!-- tmpl_if name='tags' -->| <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop --><!-- /tmpl_if --> </span> 
+<a href="<!-- tmpl_var name='top' --><!-- tmpl_var name='link' -->">Permalink</a>
+<span class="tags"><!-- tmpl_if name='tags' -->| <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop --><!-- /tmpl_if --> </span> 
 </div>
 </div>
 <!-- /tmpl_loop -->
@@ -50,7 +50,7 @@
 <li><!-- tmpl_var name='year' -->
 <ul>
 <!-- tmpl_loop name='months' -->
-<li><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month' --> (<!-- tmpl_var name='count' -->)</a></li>
+<li><a href="<!-- tmpl_var name='top' -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month_name' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul></li>
 <!-- /tmpl_loop -->
@@ -62,7 +62,7 @@
 <span class="rightMenu">Tags</span><br />
 <ul>
 <!-- tmpl_loop name='tagcloud' -->
- <li><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --> (<!-- tmpl_var name='count' -->)</a></li>
+ <li><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul>
 <!-- /tmpl_if -->
--- a/themes/copyrighteous/month.xml.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/copyrighteous/month.xml.template	Wed Oct 10 08:53:45 2007 +0000
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <rss version='2.0' xmlns:lj='http://www.livejournal.org/rss/lj/1.0/'>
 	<channel>
-		<title>Entries from <!-- tmpl_var name='month' --> <!-- tmpl_var name='year' --></title>
-		<description>Entries from <!-- tmpl_var name='month' --> <!-- tmpl_var name='year' --></description>
+		<title>Entries from <!-- tmpl_var name='month_name' --> <!-- tmpl_var name='year' --></title>
+		<description>Entries from <!-- tmpl_var name='month_name' --> <!-- tmpl_var name='year' --></description>
 
 	<!-- tmpl_loop name="entries" -->
 	<item>
 		<title><!-- tmpl_var name="title" escape='html' --></title>
-		<link><!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if --><!-- tmpl_var name='link' --></link>        
-		<guid isPermaLink="true"><!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if --><!-- tmpl_var name='link' --></guid>
+		<link><!-- tmpl_var name='top' --><!-- tmpl_var name='link' --></link>        
+		<guid isPermaLink="true"><!-- tmpl_var name='top' --><!-- tmpl_var name='link' --></guid>
 		<description><!-- tmpl_var name="body" escape='html' --></description>
 	</item>
 	<!-- /tmpl_loop -->
--- a/themes/copyrighteous/tags.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/copyrighteous/tags.template	Wed Oct 10 08:53:45 2007 +0000
@@ -2,14 +2,14 @@
 <html>
 <head>
  <title>copyrighteous: Items tagged <!-- tmpl_var name='tagname' --></title>
-  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='url_prefix' -->style.css">
+  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='top' -->style.css">
   <link rel="alternate" title="RSS Feed" href="<!-- tmpl_var name='tagname' escape='html' -->.rss" type="application/rss+xml">
 </head>
 
 <body>
 <div id='content'>
 <div id='title'>
-<span class="title"><a href="<!-- tmpl_var name='url_prefix' -->">
+<span class="title"><a href="<!-- tmpl_var name='top' -->">
   <!-- tmpl_if name='blog_title' -->
     <!-- tmpl_var name='blog_title' -->
   <!-- tmpl_else -->
@@ -34,8 +34,8 @@
 <div id="story">
 <!-- tmpl_var name='body' -->
 </div>
-<a href="<!-- tmpl_var name='url_prefix' --><!-- tmpl_var name='link' -->">Permalink</a>
-<span class="tags"><!-- tmpl_if name='tags' -->| <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop --><!-- /tmpl_if --> </span> 
+<a href="<!-- tmpl_var name='top' --><!-- tmpl_var name='link' -->">Permalink</a>
+<span class="tags"><!-- tmpl_if name='tags' -->| <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop --><!-- /tmpl_if --> </span> 
 </div>
 </div>
 <!-- /tmpl_loop -->
@@ -50,7 +50,7 @@
 <li><!-- tmpl_var name='year' -->
 <ul>
 <!-- tmpl_loop name='months' -->
-<li><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month' --> (<!-- tmpl_var name='count' -->)</a></li>
+<li><a href="<!-- tmpl_var name='top' -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month_name' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul></li>
 <!-- /tmpl_loop -->
@@ -62,10 +62,10 @@
 <span class="rightMenu">Tags</span><br />
 <ul>
 <!-- tmpl_loop name='tagcloud' -->
- <li><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --> (<!-- tmpl_var name='count' -->)</a></li>
+ <li><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul>
 <!-- /tmpl_if -->
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/themes/copyrighteous/tags.xml.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/copyrighteous/tags.xml.template	Wed Oct 10 08:53:45 2007 +0000
@@ -7,8 +7,8 @@
 	<!-- tmpl_loop name="entries" -->
 	<item>
 		<title><!-- tmpl_var name="title" escape='html' --></title>
-		<link><!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if --><!-- tmpl_var name='link' --></link>        
-		<guid isPermaLink="true"><!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if --><!-- tmpl_var name='link' --></guid>
+		<link><!-- tmpl_var name='top' --><!-- tmpl_var name='link' --></link>        
+		<guid isPermaLink="true"><!-- tmpl_var name='top' --><!-- tmpl_var name='link' --></guid>
 		<description><!-- tmpl_var name="body" escape='html' --></description>
 	</item>
 	<!-- /tmpl_loop -->
--- a/themes/default/entry.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/default/entry.template	Wed Oct 10 08:53:45 2007 +0000
@@ -3,13 +3,13 @@
 <html>
  <head>
   <title>Blog: <!-- tmpl_var name='title' --></title>
-  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='url_prefix' -->style.css">
+  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='top' -->style.css">
  </head>
  <body>
 
  <div class="title">
   <h1><!-- tmpl_if name='blog_title' -->
-       <a href="<!-- tmpl_var name='url_prefix' -->"><!-- tmpl_var name='blog_title' --></a>
+       <a href="<!-- tmpl_var name='top' -->"><!-- tmpl_var name='blog_title' --></a>
       <!-- tmpl_else -->
        Untitled Blog
       <!-- /tmpl_if -->
@@ -25,7 +25,7 @@
   <div class="date"><!-- tmpl_var name='date' --></div>
   <div class="body"><!-- tmpl_var name='body' --></div>
   <!-- tmpl_if name='tags' -->
-  <div class="tags">Tags: <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_var name='url_prefix' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop --></div>
+  <div class="tags">Tags: <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop --></div>
    <!-- /tmpl_if -->
   </div>
 
@@ -37,7 +37,7 @@
 <li><!-- tmpl_var name='year' -->
 <ul>
 <!-- tmpl_loop name='months' -->
-<li><a href="<!-- tmpl_var name='url_prefix' -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month' --> (<!-- tmpl_var name='count' -->)</a></li>
+<li><a href="<!-- tmpl_var name='top' -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month_name' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul></li>
 <!-- /tmpl_loop -->
@@ -48,10 +48,10 @@
 <h2>Tags</h2>
 <ul>
 <!-- tmpl_loop name='tagcloud' -->
- <li><a href="<!-- tmpl_var name='url_prefix' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --> (<!-- tmpl_var name='count' -->)</a></li>
+ <li><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul>
 <!-- /tmpl_if -->
 </div>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/themes/default/index.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/default/index.template	Wed Oct 10 08:53:45 2007 +0000
@@ -3,15 +3,15 @@
 <html>
  <head>
   <title><!-- tmpl_var name='blog_title' --></title>
-  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='url_prefix' -->style.css">
-  <link rel="alternate" title="RSS Feed" href="<!-- tmpl_var name='url_prefix' -->index.rss" type="application/rss+xml">
+  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='top' -->style.css">
+  <link rel="alternate" title="RSS Feed" href="<!-- tmpl_var name='top' -->index.rss" type="application/rss+xml">
 
  </head>
  <body>
 
  <div class="title">
   <h1><!-- tmpl_if name='blog_title' -->
-       <a href="<!-- tmpl_var name='url_prefix' -->"><!-- tmpl_var name='blog_title' --></a>
+       <a href="<!-- tmpl_var name='top' -->"><!-- tmpl_var name='blog_title' --></a>
       <!-- tmpl_else -->
        Untitled Blog
       <!-- /tmpl_if -->
@@ -24,12 +24,12 @@
 
  <!-- tmpl_loop name='entries' -->
  <div class="entry">
-  <div class="title"><a href="<!-- tmpl_var name='url_prefix' --><!-- tmpl_var name='link' -->"><!-- tmpl_var name='title' --></a></div>
+  <div class="title"><a href="<!-- tmpl_var name='top' --><!-- tmpl_var name='link' -->"><!-- tmpl_var name='title' --></a></div>
   <div class="date"><!-- tmpl_var name='date' --></div>
   <div class="body"><!-- tmpl_var name='body' --></div>
   <div class="tags">
    <!-- tmpl_if name='tags' -->
-   Tags: <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_var name='url_prefix' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop --> 
+   Tags: <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop --> 
   <!-- tmpl_else -->
     No tags
   <!-- /tmpl_if -->
@@ -37,7 +37,7 @@
  </div>
  <div class="padding"></div>
  <!-- /tmpl_loop -->
- <p style="text-align: right;"><a href="index.rss"><img src="<!-- tmpl_var name='url_prefix' -->xml.gif"></a></p>
+ <p style="text-align: right;"><a href="index.rss"><img src="<!-- tmpl_var name='top' -->xml.gif"></a></p>
 
 <div id="sidebar">
 
@@ -48,7 +48,7 @@
 <li><!-- tmpl_var name='year' -->
 <ul>
 <!-- tmpl_loop name='months' -->
-<li><a href="<!-- tmpl_var name='url_prefix' -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month' --> (<!-- tmpl_var name='count' -->)</a></li>
+<li><a href="<!-- tmpl_var name='top' -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month_name' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul></li>
 <!-- /tmpl_loop -->
@@ -59,7 +59,7 @@
 <h2>Tags</h2>
 <ul>
 <!-- tmpl_loop name='tagcloud' -->
- <li><a href="<!-- tmpl_var name='url_prefix' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --> (<!-- tmpl_var name='count' -->)</a></li>
+ <li><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul>
 <!-- /tmpl_if -->
--- a/themes/default/index.xml.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/default/index.xml.template	Wed Oct 10 08:53:45 2007 +0000
@@ -7,8 +7,8 @@
 	<!-- tmpl_loop name="entries" -->
 	<item>
 		<title><!-- tmpl_var name="title" escape='html' --></title>
-		<link><!-- tmpl_var name='url_prefix' --><!-- tmpl_var name='link' --></link>        
-		<guid isPermaLink="true"><!-- tmpl_var name='url_prefix' --><!-- tmpl_var name='link' --></guid>
+		<link><!-- tmpl_var name='top' --><!-- tmpl_var name='link' --></link>        
+		<guid isPermaLink="true"><!-- tmpl_var name='top' --><!-- tmpl_var name='link' --></guid>
 		<description><!-- tmpl_var name="body" escape='html' --></description>
 	</item>
 	<!-- /tmpl_loop -->
--- a/themes/default/month.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/default/month.template	Wed Oct 10 08:53:45 2007 +0000
@@ -2,8 +2,8 @@
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
  <head>
-  <title>Blog : Entries from <!-- tmpl_var name='month' --> <!-- tmpl_var name='year' --></title>
-  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->style.css">
+  <title>Blog : Entries from <!-- tmpl_var name='month_name' --> <!-- tmpl_var name='year' --></title>
+  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='top' -->style.css">
   <link rel="alternate" title="RSS Feed" href="<!-- tmpl_var name='month' escape='html' -->.rss" type="application/rss+xml">
  </head>
  <body>
@@ -11,7 +11,7 @@
 
  <div class="title">
   <h1><!-- tmpl_if name='blog_title' -->
-       <a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->"><!-- tmpl_var name='blog_title' --></a>
+       <a href="<!-- tmpl_var name='top' -->"><!-- tmpl_var name='blog_title' --></a>
       <!-- tmpl_else -->
        Untitled Blog
       <!-- /tmpl_if -->
@@ -21,12 +21,12 @@
   <!-- /tmpl_if -->
  </div>
 
- <p>Entries from <!-- tmpl_var name='month' escape='html' --> <!-- tmpl_var name='year' escape='html' -->.</p>
+ <p>Entries from <!-- tmpl_var name='month_name' escape='html' --> <!-- tmpl_var name='year' escape='html' -->.</p>
 
 <!-- tmpl_loop name='entries' -->
 <div class="entry">
  <div class="title">
- <a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if --><!-- tmpl_var name='link' -->"><!-- tmpl_var name='title' --></a>
+ <a href="<!-- tmpl_var name='top' --><!-- tmpl_var name='link' -->"><!-- tmpl_var name='title' --></a>
  </div>
  <div class="date">
   <!-- tmpl_var name='date' -->
@@ -37,7 +37,7 @@
  </div>
  <div class="tags">
  <!-- tmpl_if name='tags' -->
-  Tags: <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop -->
+  Tags: <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop -->
  <!-- tmpl_else -->
   No tags
  <!-- /tmpl_if -->
@@ -45,7 +45,7 @@
 </div>
  <div class="padding"></div>
 <!-- /tmpl_loop -->
- <p style="text-align: right;"><a href="<!-- tmpl_var name='month' escape='html' -->.rss"><img src="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->xml.gif"></a></p>
+ <p style="text-align: right;"><a href="<!-- tmpl_var name='month' escape='html' -->.rss"><img src="<!-- tmpl_var name='top' -->xml.gif"></a></p>
 
 
 
@@ -57,7 +57,7 @@
 <li><!-- tmpl_var name='year' -->
 <ul>
 <!-- tmpl_loop name='months' -->
-<li><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month' --> (<!-- tmpl_var name='count' -->)</a></li>
+<li><a href="<!-- tmpl_var name='top' -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month_name' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul></li>
 <!-- /tmpl_loop -->
@@ -68,10 +68,10 @@
 <h2>Tags</h2>
 <ul>
 <!-- tmpl_loop name='tagcloud' -->
- <li><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --> (<!-- tmpl_var name='count' -->)</a></li>
+ <li><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul>
 <!-- /tmpl_if -->
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/themes/default/month.xml.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/default/month.xml.template	Wed Oct 10 08:53:45 2007 +0000
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <rss version='2.0' xmlns:lj='http://www.livejournal.org/rss/lj/1.0/'>
 	<channel>
-		<title>Entries from <!-- tmpl_var name='month' --> <!-- tmpl_var name='year' --></title>
-		<description>Entries from <!-- tmpl_var name='month' --> <!-- tmpl_var name='year' --></description>
+		<title>Entries from <!-- tmpl_var name='month_name' --> <!-- tmpl_var name='year' --></title>
+		<description>Entries from <!-- tmpl_var name='month_name' --> <!-- tmpl_var name='year' --></description>
 
 	<!-- tmpl_loop name="entries" -->
 	<item>
 		<title><!-- tmpl_var name="title" escape='html' --></title>
-		<link><!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if --><!-- tmpl_var name='link' --></link>        
-		<guid isPermaLink="true"><!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if --><!-- tmpl_var name='link' --></guid>
+		<link><!-- tmpl_var name='top' --><!-- tmpl_var name='link' --></link>        
+		<guid isPermaLink="true"><!-- tmpl_var name='top' --><!-- tmpl_var name='link' --></guid>
 		<description><!-- tmpl_var name="body" escape='html' --></description>
 	</item>
 	<!-- /tmpl_loop -->
--- a/themes/default/tags.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/default/tags.template	Wed Oct 10 08:53:45 2007 +0000
@@ -3,14 +3,14 @@
 <html>
  <head>
   <title>Blog : Entries Tagged <!-- tmpl_var name='tagname' --></title> 
-  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->style.css">
+  <link rel="stylesheet" type="text/css" media="screen" href="<!-- tmpl_var name='top' -->style.css">
   <link rel="alternate" title="RSS Feed" href="<!-- tmpl_var name='tagname' escape='html' -->.rss" type="application/rss+xml">
  </head>
  <body>
 
  <div class="title">
   <h1><!-- tmpl_if name='blog_title' -->
-       <a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->"><!-- tmpl_var name='blog_title' --></a>
+       <a href="<!-- tmpl_var name='top' -->"><!-- tmpl_var name='blog_title' --></a>
       <!-- tmpl_else -->
        Untitled Blog
       <!-- /tmpl_if -->
@@ -27,7 +27,7 @@
 <!-- tmpl_loop name='entries' -->
 <div class="entry">
  <div class="title">
- <a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if --><!-- tmpl_var name='link' -->"><!-- tmpl_var name='title' --></a>
+ <a href="<!-- tmpl_var name='top' --><!-- tmpl_var name='link' -->"><!-- tmpl_var name='title' --></a>
  </div>
  <div class="date">
   <!-- tmpl_var name='date' -->
@@ -38,13 +38,13 @@
  </div>
  <!-- tmpl_if name='tags' -->
  <div class="tags">
-  Tags: <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop -->
+  Tags: <!-- tmpl_loop name='tags' --><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --></a><!-- tmpl_if name="__last__" -->.<!-- tmpl_else -->, <!-- /tmpl_if --><!-- /tmpl_loop -->
  </div>
  <!-- /tmpl_if -->
 </div>
 <div class="padding"></div>
 <!-- /tmpl_loop -->
- <p style="text-align: right;"><a href="<!-- tmpl_var name='tagname' escape='html' -->.rss"><img src="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->xml.gif"></a></p>
+ <p style="text-align: right;"><a href="<!-- tmpl_var name='tagname' escape='html' -->.rss"><img src="<!-- tmpl_var name='top' -->xml.gif"></a></p>
 
 
 
@@ -57,7 +57,7 @@
 <li><!-- tmpl_var name='year' -->
 <ul>
 <!-- tmpl_loop name='months' -->
-<li><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month' --> (<!-- tmpl_var name='count' -->)</a></li>
+<li><a href="<!-- tmpl_var name='top' -->archive/<!-- tmpl_var name='year' -->/<!-- tmpl_var name='month' -->/"><!-- tmpl_var name='month_name' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul></li>
 <!-- /tmpl_loop -->
@@ -68,7 +68,7 @@
 <h2>Tags</h2>
 <ul>
 <!-- tmpl_loop name='tagcloud' -->
- <li><a href="<!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --> (<!-- tmpl_var name='count' -->)</a></li>
+ <li><a href="<!-- tmpl_var name='top' -->tags/<!-- tmpl_var name='tag' -->"><!-- tmpl_var name='tag' --> (<!-- tmpl_var name='count' -->)</a></li>
 <!-- /tmpl_loop -->
 </ul>
 <!-- /tmpl_if -->
--- a/themes/default/tags.xml.template	Tue Sep 04 10:51:24 2007 +0000
+++ b/themes/default/tags.xml.template	Wed Oct 10 08:53:45 2007 +0000
@@ -7,8 +7,8 @@
 	<!-- tmpl_loop name="entries" -->
 	<item>
 		<title><!-- tmpl_var name="title" escape='html' --></title>
-		<link><!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if --><!-- tmpl_var name='link' --></link>        
-		<guid isPermaLink="true"><!-- tmpl_if name='url_prefix' --><!-- tmpl_var name='url_prefix' --><!-- tmpl_else -->../../<!-- /tmpl_if --><!-- tmpl_var name='link' --></guid>
+		<link><!-- tmpl_var name='top' --><!-- tmpl_var name='link' --></link>        
+		<guid isPermaLink="true"><!-- tmpl_var name='top' --><!-- tmpl_var name='link' --></guid>
 		<description><!-- tmpl_var name="body" escape='html' --></description>
 	</item>
 	<!-- /tmpl_loop -->