[pLog-svn] r1186 - in templates/trunk: 3-column-liquid Boxed Boxed-Green Matrix-Code Modish Soft-Blue Soft-Green Soft-Red Very-Clean Vicksburg aubmach base blufill bubble-blue lemons minitemplate pastel-blocks reic standard_green standard_happy standard_red toto tribal wordplog

jondaley at devel.plogworld.net jondaley at devel.plogworld.net
Thu Feb 24 01:53:46 GMT 2005


Author: jondaley
Date: 2005-02-24 01:53:46 +0000 (Thu, 24 Feb 2005)
New Revision: 1186

Modified:
   templates/trunk/3-column-liquid/footer.template
   templates/trunk/3-column-liquid/header.template
   templates/trunk/Boxed-Green/album.template
   templates/trunk/Boxed-Green/albums.template
   templates/trunk/Boxed-Green/commentarticle.template
   templates/trunk/Boxed-Green/commentform.template
   templates/trunk/Boxed-Green/error.template
   templates/trunk/Boxed-Green/footer.template
   templates/trunk/Boxed-Green/header.template
   templates/trunk/Boxed-Green/main.template
   templates/trunk/Boxed-Green/post.template
   templates/trunk/Boxed-Green/postandcomments.template
   templates/trunk/Boxed-Green/posttrackbacks.template
   templates/trunk/Boxed-Green/style.css
   templates/trunk/Boxed/album.template
   templates/trunk/Boxed/albums.template
   templates/trunk/Boxed/commentarticle.template
   templates/trunk/Boxed/commentform.template
   templates/trunk/Boxed/error.template
   templates/trunk/Boxed/footer.template
   templates/trunk/Boxed/header.template
   templates/trunk/Boxed/main.template
   templates/trunk/Boxed/post.template
   templates/trunk/Boxed/postandcomments.template
   templates/trunk/Boxed/posttrackbacks.template
   templates/trunk/Boxed/style.css
   templates/trunk/Matrix-Code/album.template
   templates/trunk/Matrix-Code/albums.template
   templates/trunk/Matrix-Code/commentarticle.template
   templates/trunk/Matrix-Code/error.template
   templates/trunk/Matrix-Code/footer.template
   templates/trunk/Matrix-Code/header.template
   templates/trunk/Matrix-Code/main.template
   templates/trunk/Matrix-Code/post.template
   templates/trunk/Matrix-Code/postandcomments.template
   templates/trunk/Matrix-Code/posttrackbacks.template
   templates/trunk/Modish/album.template
   templates/trunk/Modish/albums.template
   templates/trunk/Modish/commentarticle.template
   templates/trunk/Modish/error.template
   templates/trunk/Modish/footer.template
   templates/trunk/Modish/header.template
   templates/trunk/Modish/main.template
   templates/trunk/Modish/post.template
   templates/trunk/Modish/postandcomments.template
   templates/trunk/Modish/posttrackbacks.template
   templates/trunk/Modish/style.css
   templates/trunk/Soft-Blue/album.template
   templates/trunk/Soft-Blue/albums.template
   templates/trunk/Soft-Blue/commentarticle.template
   templates/trunk/Soft-Blue/error.template
   templates/trunk/Soft-Blue/footer.template
   templates/trunk/Soft-Blue/header.template
   templates/trunk/Soft-Blue/main.template
   templates/trunk/Soft-Blue/post.template
   templates/trunk/Soft-Blue/postandcomments.template
   templates/trunk/Soft-Blue/posttrackbacks.template
   templates/trunk/Soft-Green/album.template
   templates/trunk/Soft-Green/albums.template
   templates/trunk/Soft-Green/commentarticle.template
   templates/trunk/Soft-Green/error.template
   templates/trunk/Soft-Green/footer.template
   templates/trunk/Soft-Green/header.template
   templates/trunk/Soft-Green/main.template
   templates/trunk/Soft-Green/post.template
   templates/trunk/Soft-Green/postandcomments.template
   templates/trunk/Soft-Green/posttrackbacks.template
   templates/trunk/Soft-Green/resource.template
   templates/trunk/Soft-Red/album.template
   templates/trunk/Soft-Red/albums.template
   templates/trunk/Soft-Red/commentarticle.template
   templates/trunk/Soft-Red/error.template
   templates/trunk/Soft-Red/footer.template
   templates/trunk/Soft-Red/header.template
   templates/trunk/Soft-Red/main.template
   templates/trunk/Soft-Red/post.template
   templates/trunk/Soft-Red/postandcomments.template
   templates/trunk/Soft-Red/posttrackbacks.template
   templates/trunk/Very-Clean/album.template
   templates/trunk/Very-Clean/albums.template
   templates/trunk/Very-Clean/commentarticle.template
   templates/trunk/Very-Clean/error.template
   templates/trunk/Very-Clean/footer.template
   templates/trunk/Very-Clean/header.template
   templates/trunk/Very-Clean/main.template
   templates/trunk/Very-Clean/post.template
   templates/trunk/Very-Clean/postandcomments.template
   templates/trunk/Very-Clean/posttrackbacks.template
   templates/trunk/Vicksburg/album.template
   templates/trunk/Vicksburg/albums.template
   templates/trunk/Vicksburg/commentarticle.template
   templates/trunk/Vicksburg/error.template
   templates/trunk/Vicksburg/footer.template
   templates/trunk/Vicksburg/header.template
   templates/trunk/Vicksburg/main.template
   templates/trunk/Vicksburg/post.template
   templates/trunk/Vicksburg/postandcomments.template
   templates/trunk/Vicksburg/posttrackbacks.template
   templates/trunk/Vicksburg/style.css
   templates/trunk/aubmach/about.template
   templates/trunk/aubmach/album.template
   templates/trunk/aubmach/albums.template
   templates/trunk/aubmach/commentarticle.template
   templates/trunk/aubmach/error.template
   templates/trunk/aubmach/main.template
   templates/trunk/aubmach/panel.template
   templates/trunk/aubmach/post.template
   templates/trunk/aubmach/postandcomments.template
   templates/trunk/aubmach/posttrackbacks.template
   templates/trunk/aubmach/resource.template
   templates/trunk/base/about.template
   templates/trunk/base/album.template
   templates/trunk/base/albums.template
   templates/trunk/base/commentarticle.template
   templates/trunk/base/error.template
   templates/trunk/base/main.template
   templates/trunk/base/panel.template
   templates/trunk/base/post.template
   templates/trunk/base/postandcomments.template
   templates/trunk/base/posttrackbacks.template
   templates/trunk/base/resource.template
   templates/trunk/blufill/album.template
   templates/trunk/blufill/albums.template
   templates/trunk/blufill/commentarticle.template
   templates/trunk/blufill/commentform.template
   templates/trunk/blufill/error.template
   templates/trunk/blufill/header.template
   templates/trunk/blufill/main.template
   templates/trunk/blufill/panel.template
   templates/trunk/blufill/post.template
   templates/trunk/blufill/postandcomments.template
   templates/trunk/blufill/posttrackbacks.template
   templates/trunk/blufill/resource.template
   templates/trunk/bubble-blue/album.template
   templates/trunk/bubble-blue/albums.template
   templates/trunk/bubble-blue/commentarticle.template
   templates/trunk/bubble-blue/error.template
   templates/trunk/bubble-blue/header.template
   templates/trunk/bubble-blue/main.template
   templates/trunk/bubble-blue/post.template
   templates/trunk/bubble-blue/postandcomments.template
   templates/trunk/bubble-blue/posttrackbacks.template
   templates/trunk/bubble-blue/resource.template
   templates/trunk/bubble-blue/samplerss.template
   templates/trunk/lemons/header.template
   templates/trunk/lemons/lemons.css
   templates/trunk/lemons/post.template
   templates/trunk/lemons/searchresults.template
   templates/trunk/minitemplate/post.template
   templates/trunk/pastel-blocks/post.template
   templates/trunk/reic/post.template
   templates/trunk/standard_green/post.template
   templates/trunk/standard_happy/post.template
   templates/trunk/standard_red/post.template
   templates/trunk/toto/post.template
   templates/trunk/tribal/post.template
   templates/trunk/wordplog/post.template
Log:
updated templates to 1.0.

Modified: templates/trunk/3-column-liquid/footer.template
===================================================================
--- templates/trunk/3-column-liquid/footer.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/3-column-liquid/footer.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -26,7 +26,7 @@
 <div id="sectionContent">
  <ul id="recently">
   {foreach from=$recentposts item=post}
-   <li><a title="{$post->getText()|truncate:150:"..."|escape}" href="{$utils->postLink($post)}">{$post->getTopic()}</a></li>
+   <li><a title="{$post->getText()|truncate:150:"..."|escape}" href="{$url->postLink($post)}">{$post->getTopic()}</a></li>
   {/foreach}
  </ul>
 </div>

Modified: templates/trunk/3-column-liquid/header.template
===================================================================
--- templates/trunk/3-column-liquid/header.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/3-column-liquid/header.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -30,7 +30,7 @@
      <ul id="recently">
       {foreach from=$articlecategories item=articleCategory}
        <li>
-         <a href="{$utils->categoryLink($articleCategory)}">
+         <a href="{$url->categoryLink($articleCategory)}">
           {$articleCategory->getName()}  
           [{$articleCategory->getNumArticles()}]
         </a>

Modified: templates/trunk/Boxed/album.template
===================================================================
--- templates/trunk/Boxed/album.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed/album.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Boxed/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="container">
 <p>
  {$album->getDescription()}
@@ -83,4 +83,4 @@
  
  </div>
 </div>
-{include file="Boxed/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Boxed/albums.template
===================================================================
--- templates/trunk/Boxed/albums.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed/albums.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Boxed/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="Boxed/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Boxed/commentarticle.template
===================================================================
--- templates/trunk/Boxed/commentarticle.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed/commentarticle.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Boxed/header.template"}
+{include file="$blogtemplate/header.template"}
 <h3>{$locale->tr("add_comment")}</h3>
- {include file="Boxed/commentform.template"}
-{include file="Boxed/footer.template"}
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Boxed/commentform.template
===================================================================
--- templates/trunk/Boxed/commentform.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed/commentform.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,7 +1,7 @@
   <form name="NewComment" action="{$url->getBaseUrl()}/index.php" method="post">
   <p>
-   {$locale->pr("comment_topic")}<br/><input type="text" style="width: 80%" name="commentTopic" value=""/>
-   <p>{$locale->pr("comment_text")} <br/><textarea rows="10" style="width: 80%" name="commentText"></textarea></p>
+   {$locale->pr("comment_topic")}<br/><input type="text"  name="commentTopic" value=""/>
+   <p>{$locale->pr("comment_text")} <br/><textarea rows="10"  name="commentText"></textarea></p>
    <p>{$locale->pr("comment_username")}<br/> <input type="text" name="userName" value=""/></p>
    <p>{$locale->pr("comment_email")}<br/> <input type="text" name="userEmail" value=""/></p>
    <p>{$locale->pr("comment_url")}<br/> <input type="text" name="userUrl" value=""/></p>

Modified: templates/trunk/Boxed/error.template
===================================================================
--- templates/trunk/Boxed/error.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed/error.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Boxed/header.template"}
+{include file="$blogtemplate/header.template"}
  <h3>{$locale->tr("error")}</h3>
  {$locale->tr($message)}
-{include file="Boxed/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Boxed/footer.template
===================================================================
--- templates/trunk/Boxed/footer.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed/footer.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -3,6 +3,16 @@
 
 <div id="links">
 
+<div class="sidetitle">{$locale->tr("search")}</div>
+<div class="side">
+   <form name="search_form" method="post" action="{$url->getIndexUrl()}">
+    <input type="text" name="searchTerms" value="" size="14" /><br/>
+    <input type="hidden" name="op" value="Search" />
+    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
+    <input type="submit" name="Search" value="{$locale->tr("search")|capitalize}" />
+   </form>
+</div>
+
 <div class="sidetitle">{$locale->tr("calendar")|capitalize}</div>
 <div class="side">
 <div align="center">

Modified: templates/trunk/Boxed/header.template
===================================================================
--- templates/trunk/Boxed/header.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed/header.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,7 +1,7 @@
 <!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/Boxed")}
+{assign var=tpldir value=$url->getUrl("/templates/$blogtemplate")}
 
 <head>
 <title>{$blog->getBlog()}</title>

Modified: templates/trunk/Boxed/main.template
===================================================================
--- templates/trunk/Boxed/main.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed/main.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Boxed/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="Boxed/post.template"}
+   {include file="$blogtemplate/post.template"}
    </div>
  {/foreach}
-{include file="Boxed/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Boxed/post.template
===================================================================
--- templates/trunk/Boxed/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,18 +1,23 @@
 <!-- {$url->postTrackbackLink($post)} -->
 {assign var="postDate" value=$post->getDateObject()}
 {assign var="postOwner" value=$post->getUserInfo()}
-{assign var=postCategory value=$post->getCategory()}
+
 <h3 class="title">{$post->getTopic()}</h3>
 <p>{$post->getText()}</p>
 <div class="posted">
  {$locale->tr("posted_by")} 
  <a href="{$url->postUserLink($postOwner)}">{$postOwner->getUsername()}</a>
-(<a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>)  
+
+ ({foreach name=categories from=$post->getCategories() item=postCategory}
+    <a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>
+  {if !$smarty.foreach.categories.last}, {/if}
+  {/foreach})
+  
  :: 
 {if $post->getCommentsEnabled()}
-<a href="{$url->postPermalink($post)}">{$locale->tr("comment")|capitalize}
-({$post->getTotalComments()})</a>
-{else}
-<a href="{$url->postPermalink($post)}">Permanent link</a>
+<a href="{$url->postPermalink($post)}">{$locale->tr("comments")|capitalize}
+({$post->getTotalComments()})</a>::
 {/if}
+<a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a>
+
 </div>

Modified: templates/trunk/Boxed/postandcomments.template
===================================================================
--- templates/trunk/Boxed/postandcomments.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed/postandcomments.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,9 +1,9 @@
-{include file="Boxed/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="Boxed/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="Boxed/commentform.template"}
+{include file="$blogtemplate/commentform.template"}
 </p>
 {/if}
-{include file="Boxed/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Boxed/posttrackbacks.template
===================================================================
--- templates/trunk/Boxed/posttrackbacks.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed/posttrackbacks.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Boxed/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="Boxed/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Boxed/style.css
===================================================================
--- templates/trunk/Boxed/style.css	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed/style.css	2005-02-24 01:53:46 UTC (rev 1186)
@@ -68,8 +68,9 @@
 
 #content {
     left: 250px;
-    right: 10px;
+    right:10px;
     top: 100px;
+    width: 700px;
     position: absolute;
 }
 

Modified: templates/trunk/Boxed-Green/album.template
===================================================================
--- templates/trunk/Boxed-Green/album.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed-Green/album.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Boxed-Green/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="container">
 <p>
  {$album->getDescription()}
@@ -83,4 +83,4 @@
  
  </div>
 </div>
-{include file="Boxed-Green/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Boxed-Green/albums.template
===================================================================
--- templates/trunk/Boxed-Green/albums.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed-Green/albums.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Boxed-Green/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="Boxed-Green/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Boxed-Green/commentarticle.template
===================================================================
--- templates/trunk/Boxed-Green/commentarticle.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed-Green/commentarticle.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Boxed-Green/header.template"}
+{include file="$blogtemplate/header.template"}
 <h3>{$locale->tr("add_comment")}</h3>
- {include file="Boxed-Green/commentform.template"}
-{include file="Boxed-Green/footer.template"}
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Boxed-Green/commentform.template
===================================================================
--- templates/trunk/Boxed-Green/commentform.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed-Green/commentform.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,7 +1,7 @@
   <form name="NewComment" action="{$url->getBaseUrl()}/index.php" method="post">
   <p>
-   {$locale->pr("comment_topic")}<br/><input type="text" style="width: 80%" name="commentTopic" value=""/>
-   <p>{$locale->pr("comment_text")} <br/><textarea rows="10" style="width: 80%" name="commentText"></textarea></p>
+   {$locale->pr("comment_topic")}<br/><input type="text"  name="commentTopic" value=""/>
+   <p>{$locale->pr("comment_text")} <br/><textarea rows="10"  name="commentText"></textarea></p>
    <p>{$locale->pr("comment_username")}<br/> <input type="text" name="userName" value=""/></p>
    <p>{$locale->pr("comment_email")}<br/> <input type="text" name="userEmail" value=""/></p>
    <p>{$locale->pr("comment_url")}<br/> <input type="text" name="userUrl" value=""/></p>

Modified: templates/trunk/Boxed-Green/error.template
===================================================================
--- templates/trunk/Boxed-Green/error.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed-Green/error.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Boxed-Green/header.template"}
+{include file="$blogtemplate/header.template"}
  <h3>{$locale->tr("error")}</h3>
  {$locale->tr($message)}
-{include file="Boxed-Green/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Boxed-Green/footer.template
===================================================================
--- templates/trunk/Boxed-Green/footer.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed-Green/footer.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -3,6 +3,16 @@
 
 <div id="links">
 
+<div class="sidetitle">{$locale->tr("search")}</div>
+<div class="side">
+   <form name="search_form" method="post" action="{$url->getIndexUrl()}">
+    <input type="text" name="searchTerms" value="" size="14" /><br/>
+    <input type="hidden" name="op" value="Search" />
+    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
+    <input type="submit" name="Search" value="{$locale->tr("search")|capitalize}" />
+   </form>
+</div>
+
 <div class="sidetitle">{$locale->tr("calendar")|capitalize}</div>
 <div class="side">
 <div align="center">

Modified: templates/trunk/Boxed-Green/header.template
===================================================================
--- templates/trunk/Boxed-Green/header.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed-Green/header.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,7 +1,7 @@
 <!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/Boxed-Green")}
+{assign var=tpldir value=$url->getUrl("/templates/$blogtemplate")}
 
 <head>
 <title>{$blog->getBlog()}</title>

Modified: templates/trunk/Boxed-Green/main.template
===================================================================
--- templates/trunk/Boxed-Green/main.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed-Green/main.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Boxed-Green/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="Boxed-Green/post.template"}
+   {include file="$blogtemplate/post.template"}
    </div>
  {/foreach}
-{include file="Boxed-Green/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Boxed-Green/post.template
===================================================================
--- templates/trunk/Boxed-Green/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed-Green/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,18 +1,23 @@
 <!-- {$url->postTrackbackLink($post)} -->
 {assign var="postDate" value=$post->getDateObject()}
 {assign var="postOwner" value=$post->getUserInfo()}
-{assign var=postCategory value=$post->getCategory()}
+
 <h3 class="title">{$post->getTopic()}</h3>
 <p>{$post->getText()}</p>
 <div class="posted">
  {$locale->tr("posted_by")} 
  <a href="{$url->postUserLink($postOwner)}">{$postOwner->getUsername()}</a>
-(<a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>)  
+
+ ({foreach name=categories from=$post->getCategories() item=postCategory}
+    <a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>
+  {if !$smarty.foreach.categories.last}, {/if}
+  {/foreach})
+  
  :: 
 {if $post->getCommentsEnabled()}
-<a href="{$url->postPermalink($post)}">{$locale->tr("comment")|capitalize}
-({$post->getTotalComments()})</a>
-{else}
-<a href="{$url->postPermalink($post)}">Permanent link</a>
+<a href="{$url->postPermalink($post)}">{$locale->tr("comments")|capitalize}
+({$post->getTotalComments()})</a>::
 {/if}
+<a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a>
+
 </div>

Modified: templates/trunk/Boxed-Green/postandcomments.template
===================================================================
--- templates/trunk/Boxed-Green/postandcomments.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed-Green/postandcomments.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,9 +1,9 @@
-{include file="Boxed-Green/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="Boxed-Green/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="Boxed-Green/commentform.template"}
+{include file="$blogtemplate/commentform.template"}
 </p>
 {/if}
-{include file="Boxed-Green/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Boxed-Green/posttrackbacks.template
===================================================================
--- templates/trunk/Boxed-Green/posttrackbacks.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed-Green/posttrackbacks.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Boxed-Green/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="Boxed-Green/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Boxed-Green/style.css
===================================================================
--- templates/trunk/Boxed-Green/style.css	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Boxed-Green/style.css	2005-02-24 01:53:46 UTC (rev 1186)
@@ -72,6 +72,7 @@
     left: 250px;
     right: 10px;
     top: 95px;
+    width :700px;
     position: absolute;
 }
 

Modified: templates/trunk/Matrix-Code/album.template
===================================================================
--- templates/trunk/Matrix-Code/album.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Matrix-Code/album.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Matrix-Code/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="container">
 <p>
  {$album->getDescription()}
@@ -83,4 +83,4 @@
  
  </div>
 </div>
-{include file="Matrix-Code/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Matrix-Code/albums.template
===================================================================
--- templates/trunk/Matrix-Code/albums.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Matrix-Code/albums.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Matrix-Code/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="Matrix-Code/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Matrix-Code/commentarticle.template
===================================================================
--- templates/trunk/Matrix-Code/commentarticle.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Matrix-Code/commentarticle.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Matrix-Code/header.template"}
+{include file="$blogtemplate/header.template"}
 <h3>{$locale->tr("add_comment")}</h3>
- {include file="Matrix-Code/commentform.template"}
-{include file="Matrix-Code/footer.template"}
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Matrix-Code/error.template
===================================================================
--- templates/trunk/Matrix-Code/error.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Matrix-Code/error.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Matrix-Code/header.template"}
+{include file="$blogtemplate/header.template"}
  <h3>{$locale->tr("error")}</h3>
  {$locale->tr($message)}
-{include file="Matrix-Code/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Matrix-Code/footer.template
===================================================================
--- templates/trunk/Matrix-Code/footer.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Matrix-Code/footer.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -3,6 +3,16 @@
 
 <div id="links">
 
+<div class="sidetitle">{$locale->tr("search")|capitalize}</div>
+<div class="sidecal">
+   <form name="search_form" method="post" action="{$url->getIndexUrl()}">
+    <input type="text" name="searchTerms" value="" size="14" /><br/>
+    <input type="hidden" name="op" value="Search" />
+    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
+    <input type="submit" name="Search" value="{$locale->tr("search")|capitalize}" />
+   </form>
+</div>
+
 <div class="sidetitle">{$locale->tr("calendar")|capitalize}</div>
 <div class="sidecal">
 {$calendar}
@@ -53,12 +63,20 @@
 <p>
    <li><a href="{$url->blogLink()}">{$locale->tr("main")}</a></li>
    <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
-   <li><a title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}">RSS feed</a></li>
-   <li><a title="Link to the Atom feed." href="{$url->rssLink("atom")}">Atom feed</a></li>
   </ul>
 </p> 
 </div>
-
+<div class="sidetitle">{$locale->tr("syndicate")|capitalize}</div>
+<div class="side">
+<ul>
+<p>
+    <li><a class="nodecoration" title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img src="{$url->getUrl("/imgs/rss090_logo.gif")}" style="border:0px;" alt="RSS 0.90" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img src="{$url->getUrl("/imgs/rss10_logo.gif")}" style="border:0px;" alt="RSS 1.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img src="{$url->getUrl("/imgs/rss20_logo.gif")}" style="border:0px;" alt="RSS 2.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img src="{$url->getUrl("/imgs/atom_logo.png")}" style="border:0px;" alt="Atom 0.3" /></a></li>	
+</p>
+</div>
+	
 <div class="powered">
 Powered by <a href="http://www.plogworld.net">pLog</a><br />    
 </div>

Modified: templates/trunk/Matrix-Code/header.template
===================================================================
--- templates/trunk/Matrix-Code/header.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Matrix-Code/header.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,7 +1,7 @@
 <!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/Matrix-Code")}
+{assign var=tpldir value=$url->getUrl("/templates/$blogtemplate")}
 
 <head>
 <title>{$blog->getBlog()}</title>

Modified: templates/trunk/Matrix-Code/main.template
===================================================================
--- templates/trunk/Matrix-Code/main.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Matrix-Code/main.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Matrix-Code/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="Matrix-Code/post.template"}
+   {include file="$blogtemplate/post.template"}
    </div>
  {/foreach}
-{include file="Matrix-Code/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Matrix-Code/post.template
===================================================================
--- templates/trunk/Matrix-Code/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Matrix-Code/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,18 +1,22 @@
 <!-- {$url->postTrackbackLink($post)} -->
 {assign var="postDate" value=$post->getDateObject()}
 {assign var="postOwner" value=$post->getUserInfo()}
-{assign var=postCategory value=$post->getCategory()}
+
 <h3 class="title">{$post->getTopic()}</h3>
 <p>{$post->getText()}</p>
 <div class="posted">
  {$locale->tr("posted_by")} 
  <a href="{$url->postUserLink($postOwner)}">{$postOwner->getUsername()}</a>
-(<a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>)  
+ 
+({foreach name=categories from=$post->getCategories() item=postCategory}
+	<a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>
+{if !$smarty.foreach.categories.last}, {/if}
+{/foreach})
  :: 
 {if $post->getCommentsEnabled()}
-<a href="{$url->postPermalink($post)}">{$locale->tr("comment")|capitalize}
-({$post->getTotalComments()})</a>
-{else}
-<a href="{$url->postPermalink($post)}">Permanent link</a>
+<a href="{$url->postPermalink($post)}">{$locale->tr("comments")|capitalize}
+({$post->getTotalComments()})</a>::
 {/if}
+<a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a>::
+<a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a> 
 </div>

Modified: templates/trunk/Matrix-Code/postandcomments.template
===================================================================
--- templates/trunk/Matrix-Code/postandcomments.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Matrix-Code/postandcomments.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,9 +1,9 @@
-{include file="Matrix-Code/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="Matrix-Code/post.template"}</p>
+   <p>{include file="$blogtemplate/post.template"}</p>
    </div>
    {foreach from=$comments item=comment}
    <div class="blogbody">
@@ -24,8 +24,8 @@
 {if $post->getCommentsEnabled()}
 <p><div style="padding-left: 20px">
 <h3>{$locale->tr("add_comment")}</h3>
-{include file="Matrix-Code/commentform.template"}
+{include file="$blogtemplate/commentform.template"}
 </div>
 </p>
 {/if}
-{include file="Matrix-Code/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Matrix-Code/posttrackbacks.template
===================================================================
--- templates/trunk/Matrix-Code/posttrackbacks.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Matrix-Code/posttrackbacks.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Matrix-Code/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="Matrix-Code/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Modish/album.template
===================================================================
--- templates/trunk/Modish/album.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Modish/album.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Modish/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="container">
 <p>
  {$album->getDescription()}
@@ -83,4 +83,4 @@
  
  </div>
 </div>
-{include file="Modish/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Modish/albums.template
===================================================================
--- templates/trunk/Modish/albums.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Modish/albums.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Modish/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="Modish/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Modish/commentarticle.template
===================================================================
--- templates/trunk/Modish/commentarticle.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Modish/commentarticle.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Modish/header.template"}
+{include file="$blogtemplate/header.template"}
 <h3>{$locale->tr("add_comment")}</h3>
- {include file="Modish/commentform.template"}
-{include file="Modish/footer.template"}
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Modish/error.template
===================================================================
--- templates/trunk/Modish/error.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Modish/error.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Modish/header.template"}
+{include file="$blogtemplate/header.template"}
  <h3>{$locale->tr("error")}</h3>
  {$locale->tr($message)}
-{include file="Modish/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Modish/footer.template
===================================================================
--- templates/trunk/Modish/footer.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Modish/footer.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -3,7 +3,17 @@
 
 <div id="links">
 
-<div align="center" class="calendar">
+<div class="sidetitle">{$locale->tr("search")|capitalize}</div>
+<div class="sidecal">
+   <form name="search_form" method="post" action="{$url->getIndexUrl()}">
+    <input type="text" name="searchTerms" value="" size="14" /><br/>
+    <input type="hidden" name="op" value="Search" />
+    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
+    <input type="submit" name="Search" value="{$locale->tr("search")|capitalize}" />
+   </form>
+</div>
+
+<div  class="calendar">
 <table border="0" cellspacing="4" cellpadding="0" summary="Monthly calendar with links to each day's posts">
 <caption class="calendarhead">{$locale->tr("calendar")|capitalize}</caption>
 <tr>
@@ -59,11 +69,19 @@
 <p>
    <li><a href="{$url->blogLink()}">{$locale->tr("main")}</a></li>
    <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
-   <li><a title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}">RSS feed</a></li>
-   <li><a title="Link to the Atom feed." href="{$url->rssLink("atom")}">Atom feed</a></li>
   </ul>
 </p> 
 </div>
+<div class="sidetitle">{$locale->tr("syndicate")|capitalize}</div>
+<div class="side">
+<ul>
+<p>
+    <li><a class="nodecoration" title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img src="{$url->getUrl("/imgs/rss090_logo.gif")}" style="border:0px;" alt="RSS 0.90" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img src="{$url->getUrl("/imgs/rss10_logo.gif")}" style="border:0px;" alt="RSS 1.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img src="{$url->getUrl("/imgs/rss20_logo.gif")}" style="border:0px;" alt="RSS 2.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img src="{$url->getUrl("/imgs/atom_logo.png")}" style="border:0px;" alt="Atom 0.3" /></a></li>	
+</p>
+</div>
 
 <div class="powered">
 Powered by <a href="http://www.plogworld.net">pLog</a><br />    

Modified: templates/trunk/Modish/header.template
===================================================================
--- templates/trunk/Modish/header.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Modish/header.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,7 +1,7 @@
 <!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/Modish")}
+{assign var=tpldir value=$url->getUrl("/templates/$blogtemplate")}
 
 <head>
 <title>{$blog->getBlog()}</title>

Modified: templates/trunk/Modish/main.template
===================================================================
--- templates/trunk/Modish/main.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Modish/main.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Modish/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="Modish/post.template"}
+   {include file="$blogtemplate/post.template"}
    </div>
  {/foreach}
-{include file="Modish/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Modish/post.template
===================================================================
--- templates/trunk/Modish/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Modish/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -7,12 +7,16 @@
 <div class="posted">
  {$locale->tr("posted_by")} 
  <a href="{$url->postUserLink($postOwner)}">{$postOwner->getUsername()}</a>
-(<a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>)  
+
+({foreach name=categories from=$post->getCategories() item=postCategory}
+	<a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>
+{if !$smarty.foreach.categories.last}, {/if}
+{/foreach})
  :: 
 {if $post->getCommentsEnabled()}
-<a href="{$url->postPermalink($post)}">{$locale->tr("comment")|capitalize}
-({$post->getTotalComments()})</a>
-{else}
-<a href="{$url->postPermalink($post)}">Permanent link</a>
+<a href="{$url->postPermalink($post)}">{$locale->tr("comments")|capitalize}
+({$post->getTotalComments()})</a>::
 {/if}
+<a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a>::
+<a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a> 
 </div>

Modified: templates/trunk/Modish/postandcomments.template
===================================================================
--- templates/trunk/Modish/postandcomments.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Modish/postandcomments.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,9 +1,9 @@
-{include file="Modish/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="Modish/post.template"}</p>
+   <p>{include file="$blogtemplate/post.template"}</p>
    </div>
    {foreach from=$comments item=comment}
    <div class="blogbody">
@@ -24,8 +24,8 @@
 {if $post->getCommentsEnabled()}
 <div style="color: #CCCCCC; padding-top: 20px">
 <h3>{$locale->tr("add_comment")}</h3>
-{include file="Modish/commentform.template"}
+{include file="$blogtemplate/commentform.template"}
 </div>
 </p>
 {/if}
-{include file="Modish/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Modish/posttrackbacks.template
===================================================================
--- templates/trunk/Modish/posttrackbacks.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Modish/posttrackbacks.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Modish/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="Modish/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Modish/style.css
===================================================================
--- templates/trunk/Modish/style.css	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Modish/style.css	2005-02-24 01:53:46 UTC (rev 1186)
@@ -20,6 +20,7 @@
 
 	h2 {
 		font-size: 18px;
+		color:#4B6FDB;
 	}
 
 	#banner {
@@ -193,6 +194,10 @@
   		background:#333;  		
  		}	
 		
+	.searchresult {
+		font-size:12px;
+		color:#666;
+	}
 	.powered {
 		font-family:verdana, arial, sans-serif;
 		color:#CCC;

Modified: templates/trunk/Soft-Blue/album.template
===================================================================
--- templates/trunk/Soft-Blue/album.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Blue/album.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Soft-Blue/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="container">
 <p>
  {$album->getDescription()}
@@ -83,4 +83,4 @@
  
  </div>
 </div>
-{include file="Soft-Blue/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Blue/albums.template
===================================================================
--- templates/trunk/Soft-Blue/albums.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Blue/albums.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Soft-Blue/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="Soft-Blue/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Blue/commentarticle.template
===================================================================
--- templates/trunk/Soft-Blue/commentarticle.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Blue/commentarticle.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Soft-Blue/header.template"}
+{include file="$blogtemplate/header.template"}
 <h3>{$locale->tr("add_comment")}</h3>
- {include file="Soft-Blue/commentform.template"}
-{include file="Soft-Blue/footer.template"}
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Blue/error.template
===================================================================
--- templates/trunk/Soft-Blue/error.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Blue/error.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Soft-Blue/header.template"}
+{include file="$blogtemplate/header.template"}
  <h3>{$locale->tr("error")}</h3>
  {$locale->tr($message)}
-{include file="Soft-Blue/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Blue/footer.template
===================================================================
--- templates/trunk/Soft-Blue/footer.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Blue/footer.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -3,6 +3,16 @@
 
 <div id="links">
 
+<div class="sidetitle">{$locale->tr("search")|capitalize}</div>
+<div class="sidecal">
+   <form name="search_form" method="post" action="{$url->getIndexUrl()}">
+    <input type="text" name="searchTerms" value="" size="14" /><br/>
+    <input type="hidden" name="op" value="Search" />
+    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
+    <input type="submit" name="Search" value="{$locale->tr("search")|capitalize}" />
+   </form>
+</div>
+
 <div class="sidetitle">{$locale->tr("calendar")|capitalize}</div>
 <div class="sidecal">{$calendar}</div>
 
@@ -51,12 +61,20 @@
 <p>
    <li><a href="{$url->blogLink()}">{$locale->tr("main")}</a></li>
    <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
-   <li><a title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}">RSS feed</a></li>
-   <li><a title="Link to the Atom feed." href="{$url->rssLink("atom")}">Atom feed</a></li>
   </ul>
 </p> 
 </div>
 
+<div class="sidetitle">{$locale->tr("syndicate")|capitalize}</div>
+<div class="side">
+<ul>
+<p>
+    <li><a class="nodecoration" title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img src="{$url->getUrl("/imgs/rss090_logo.gif")}" style="border:0px;" alt="RSS 0.90" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img src="{$url->getUrl("/imgs/rss10_logo.gif")}" style="border:0px;" alt="RSS 1.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img src="{$url->getUrl("/imgs/rss20_logo.gif")}" style="border:0px;" alt="RSS 2.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img src="{$url->getUrl("/imgs/atom_logo.png")}" style="border:0px;" alt="Atom 0.3" /></a></li>	
+</p>
+</div>
 <div class="powered">
 Powered by <a href="http://www.plogworld.net">pLog</a><br />    
 </div>

Modified: templates/trunk/Soft-Blue/header.template
===================================================================
--- templates/trunk/Soft-Blue/header.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Blue/header.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,7 +1,7 @@
 <!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/Soft-Blue")}
+{assign var=tpldir value=$url->getUrl("/templates/$blogtemplate")}
 
 <head>
 <title>{$blog->getBlog()}</title>

Modified: templates/trunk/Soft-Blue/main.template
===================================================================
--- templates/trunk/Soft-Blue/main.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Blue/main.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Soft-Blue/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="Soft-Blue/post.template"}
+   {include file="$blogtemplate/post.template"}
    </div>
  {/foreach}
-{include file="Soft-Blue/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Blue/post.template
===================================================================
--- templates/trunk/Soft-Blue/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Blue/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -7,12 +7,16 @@
 <div class="posted">
  {$locale->tr("posted_by")} 
  <a href="{$url->postUserLink($postOwner)}">{$postOwner->getUsername()}</a>
-(<a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>)  
+
+({foreach name=categories from=$post->getCategories() item=postCategory}
+	<a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>
+{if !$smarty.foreach.categories.last}, {/if}
+{/foreach})
  :: 
 {if $post->getCommentsEnabled()}
-<a href="{$url->postPermalink($post)}">{$locale->tr("comment")|capitalize}
-({$post->getTotalComments()})</a>
-{else}
-<a href="{$url->postPermalink($post)}">Permanent link</a>
+<a href="{$url->postPermalink($post)}">{$locale->tr("comments")|capitalize}
+({$post->getTotalComments()})</a>::
 {/if}
+<a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a>::
+<a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a> 
 </div>

Modified: templates/trunk/Soft-Blue/postandcomments.template
===================================================================
--- templates/trunk/Soft-Blue/postandcomments.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Blue/postandcomments.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,9 +1,9 @@
-{include file="Soft-Blue/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="Soft-Blue/post.template"}</p>
+   <p>{include file="$blogtemplate/post.template"}</p>
    </div>
    {foreach from=$comments item=comment}
    <div class="blogbody">
@@ -25,8 +25,8 @@
 <p>
 <div style="padding-left: 20px">
 <h3>{$locale->tr("add_comment")}</h3>
-{include file="Soft-Blue/commentform.template"}
+{include file="$blogtemplate/commentform.template"}
 </div>
 </p>
 {/if}
-{include file="Soft-Blue/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Blue/posttrackbacks.template
===================================================================
--- templates/trunk/Soft-Blue/posttrackbacks.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Blue/posttrackbacks.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Soft-Blue/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="Soft-Blue/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Green/album.template
===================================================================
--- templates/trunk/Soft-Green/album.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Green/album.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Soft-Green/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="container">
 <p>
  {$album->getDescription()}
@@ -83,4 +83,4 @@
  
  </div>
 </div>
-{include file="Soft-Green/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Green/albums.template
===================================================================
--- templates/trunk/Soft-Green/albums.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Green/albums.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Soft-Green/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="Soft-Green/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Green/commentarticle.template
===================================================================
--- templates/trunk/Soft-Green/commentarticle.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Green/commentarticle.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Soft-Green/header.template"}
+{include file="$blogtemplate/header.template"}
 <h3>{$locale->tr("add_comment")}</h3>
- {include file="Soft-Green/commentform.template"}
-{include file="Soft-Green/footer.template"}
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Green/error.template
===================================================================
--- templates/trunk/Soft-Green/error.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Green/error.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Soft-Green/header.template"}
+{include file="$blogtemplate/header.template"}
  <h3>{$locale->tr("error")}</h3>
  {$locale->tr($message)}
-{include file="Soft-Green/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Green/footer.template
===================================================================
--- templates/trunk/Soft-Green/footer.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Green/footer.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -3,6 +3,16 @@
 
 <div id="links">
 
+<div class="sidetitle">{$locale->tr("search")|capitalize}</div>
+<div class="sidecal">
+   <form name="search_form" method="post" action="{$url->getIndexUrl()}">
+    <input type="text" name="searchTerms" value="" size="14" /><br/>
+    <input type="hidden" name="op" value="Search" />
+    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
+    <input type="submit" name="Search" value="{$locale->tr("search")|capitalize}" />
+   </form>
+</div>
+
 <div class="sidetitle">{$locale->tr("calendar")|capitalize}</div>
 <div class="sidecal">{$calendar}</div>
 
@@ -51,12 +61,20 @@
 <p>
    <li><a href="{$url->blogLink()}">{$locale->tr("main")}</a></li>
    <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
-   <li><a title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}">RSS feed</a></li>
-   <li><a title="Link to the Atom feed." href="{$url->rssLink("atom")}">Atom feed</a></li>
   </ul>
 </p> 
 </div>
 
+<div class="sidetitle">{$locale->tr("syndicate")|capitalize}</div>
+<div class="side">
+<ul>
+<p>
+    <li><a class="nodecoration" title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img src="{$url->getUrl("/imgs/rss090_logo.gif")}" style="border:0px;" alt="RSS 0.90" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img src="{$url->getUrl("/imgs/rss10_logo.gif")}" style="border:0px;" alt="RSS 1.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img src="{$url->getUrl("/imgs/rss20_logo.gif")}" style="border:0px;" alt="RSS 2.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img src="{$url->getUrl("/imgs/atom_logo.png")}" style="border:0px;" alt="Atom 0.3" /></a></li>	
+</p>
+</div>
 <div class="powered">
 Powered by <a href="http://www.plogworld.net">pLog</a><br />    
 </div>

Modified: templates/trunk/Soft-Green/header.template
===================================================================
--- templates/trunk/Soft-Green/header.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Green/header.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,11 +1,13 @@
 <!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/Soft-Green")}
+
+{assign var=tpldir value=$url->getUrl("/templates/$blogtemplate")}
+
 <head>
 <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->getTemplateFile("/style.css")}";</style>
+<style type="text/css" media="screen">@import "{$url->getTemplateFile("style.css")}";</style>
 </head>
 
 <body>

Modified: templates/trunk/Soft-Green/main.template
===================================================================
--- templates/trunk/Soft-Green/main.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Green/main.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Soft-Green/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="Soft-Green/post.template"}
+   {include file="$blogtemplate/post.template"}
    </div>
  {/foreach}
-{include file="Soft-Green/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Green/post.template
===================================================================
--- templates/trunk/Soft-Green/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Green/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -7,12 +7,16 @@
 <div class="posted">
  {$locale->tr("posted_by")} 
  <a href="{$url->postUserLink($postOwner)}">{$postOwner->getUsername()}</a>
-(<a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>)  
+
+({foreach name=categories from=$post->getCategories() item=postCategory}
+	<a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>
+{if !$smarty.foreach.categories.last}, {/if}
+{/foreach})
  :: 
 {if $post->getCommentsEnabled()}
-<a href="{$url->postPermalink($post)}">{$locale->tr("comment")|capitalize}
-({$post->getTotalComments()})</a>
-{else}
-<a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a>
+<a href="{$url->postPermalink($post)}">{$locale->tr("comments")|capitalize}
+({$post->getTotalComments()})</a>::
 {/if}
+<a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a>::
+<a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a> 
 </div>

Modified: templates/trunk/Soft-Green/postandcomments.template
===================================================================
--- templates/trunk/Soft-Green/postandcomments.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Green/postandcomments.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,9 +1,9 @@
-{include file="Soft-Green/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="Soft-Green/post.template"}</p>
+   <p>{include file="$blogtemplate/post.template"}</p>
    </div>
    {foreach from=$comments item=comment}
    <div class="blogbody">
@@ -25,8 +25,8 @@
 <p>
 <div style="padding-left: 20px">
 <h3>{$locale->tr("add_comment")}</h3>
-{include file="Soft-Green/commentform.template"}
+{include file="$blogtemplate/commentform.template"}
 </div>
 </p>
 {/if}
-{include file="Soft-Green/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Green/posttrackbacks.template
===================================================================
--- templates/trunk/Soft-Green/posttrackbacks.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Green/posttrackbacks.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Soft-Green/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="Soft-Green/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Green/resource.template
===================================================================
--- templates/trunk/Soft-Green/resource.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Green/resource.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -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->getTemplateFile("style.css")}";</style>
+<style type="text/css" media="screen">@import "{$url->getTemplateFile("/style.css")}";</style>
 </head>
 <body>
 <div id="content">

Modified: templates/trunk/Soft-Red/album.template
===================================================================
--- templates/trunk/Soft-Red/album.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Red/album.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Soft-Red/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="container">
 <p>
  {$album->getDescription()}
@@ -83,4 +83,4 @@
  
  </div>
 </div>
-{include file="Soft-Red/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Red/albums.template
===================================================================
--- templates/trunk/Soft-Red/albums.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Red/albums.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Soft-Red/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="Soft-Red/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Red/commentarticle.template
===================================================================
--- templates/trunk/Soft-Red/commentarticle.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Red/commentarticle.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Soft-Red/header.template"}
+{include file="$blogtemplate/header.template"}
 <h3>{$locale->tr("add_comment")}</h3>
- {include file="Soft-Red/commentform.template"}
-{include file="Soft-Red/footer.template"}
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Red/error.template
===================================================================
--- templates/trunk/Soft-Red/error.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Red/error.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Soft-Red/header.template"}
+{include file="$blogtemplate/header.template"}
  <h3>{$locale->tr("error")}</h3>
  {$locale->tr($message)}
-{include file="Soft-Red/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Red/footer.template
===================================================================
--- templates/trunk/Soft-Red/footer.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Red/footer.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -3,6 +3,16 @@
 
 <div id="links">
 
+<div class="sidetitle">{$locale->tr("search")|capitalize}</div>
+<div class="sidecal">
+   <form name="search_form" method="post" action="{$url->getIndexUrl()}">
+    <input type="text" name="searchTerms" value="" size="14" /><br/>
+    <input type="hidden" name="op" value="Search" />
+    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
+    <input type="submit" name="Search" value="{$locale->tr("search")|capitalize}" />
+   </form>
+</div>
+
 <div class="sidetitle">{$locale->tr("calendar")|capitalize}</div>
 <div class="sidecal">{$calendar}</div>
 
@@ -51,12 +61,20 @@
 <p>
    <li><a href="{$url->blogLink()}">{$locale->tr("main")}</a></li>
    <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
-   <li><a title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}">RSS feed</a></li>
-   <li><a title="Link to the Atom feed." href="{$url->rssLink("atom")}">Atom feed</a></li>
   </ul>
 </p> 
 </div>
 
+<div class="sidetitle">{$locale->tr("syndicate")|capitalize}</div>
+<div class="side">
+<ul>
+<p>
+    <li><a class="nodecoration" title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img src="{$url->getUrl("/imgs/rss090_logo.gif")}" style="border:0px;" alt="RSS 0.90" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img src="{$url->getUrl("/imgs/rss10_logo.gif")}" style="border:0px;" alt="RSS 1.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img src="{$url->getUrl("/imgs/rss20_logo.gif")}" style="border:0px;" alt="RSS 2.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img src="{$url->getUrl("/imgs/atom_logo.png")}" style="border:0px;" alt="Atom 0.3" /></a></li>	
+</p>
+</div>
 <div class="powered">
 Powered by <a href="http://www.plogworld.net">pLog</a><br />    
 </div>

Modified: templates/trunk/Soft-Red/header.template
===================================================================
--- templates/trunk/Soft-Red/header.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Red/header.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,13 +1,13 @@
 <!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/Soft-Red")}
+{assign var=tpldir value=$url->getUrl("/templates/$blogtemplate")}
 
 <head>
 <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->getTemplateFile("/style.css")}";</style>
+<style type="text/css" media="screen">@import "{$url->getTemplateFile("style.css")}";</style>
 </head>
 
 <body>

Modified: templates/trunk/Soft-Red/main.template
===================================================================
--- templates/trunk/Soft-Red/main.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Red/main.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Soft-Red/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="Soft-Red/post.template"}
+   {include file="$blogtemplate/post.template"}
    </div>
  {/foreach}
-{include file="Soft-Red/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Red/post.template
===================================================================
--- templates/trunk/Soft-Red/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Red/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -7,12 +7,16 @@
 <div class="posted">
  {$locale->tr("posted_by")} 
  <a href="{$url->postUserLink($postOwner)}">{$postOwner->getUsername()}</a>
-(<a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>)  
+
+({foreach name=categories from=$post->getCategories() item=postCategory}
+	<a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>
+{if !$smarty.foreach.categories.last}, {/if}
+{/foreach})
  :: 
 {if $post->getCommentsEnabled()}
-<a href="{$url->postPermalink($post)}">{$locale->tr("comment")|capitalize}
-({$post->getTotalComments()})</a>
-{else}
-<a href="{$url->postPermalink($post)}">Permanent link</a>
+<a href="{$url->postPermalink($post)}">{$locale->tr("comments")|capitalize}
+({$post->getTotalComments()})</a>::
 {/if}
+<a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a>::
+<a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a> 
 </div>

Modified: templates/trunk/Soft-Red/postandcomments.template
===================================================================
--- templates/trunk/Soft-Red/postandcomments.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Red/postandcomments.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,9 +1,9 @@
-{include file="Soft-Red/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="Soft-Red/post.template"}</p>
+   <p>{include file="$blogtemplate/post.template"}</p>
    </div>
    {foreach from=$comments item=comment}
    <div class="blogbody">
@@ -25,8 +25,8 @@
 <p>
 <div style="padding-left: 20px">
 <h3>{$locale->tr("add_comment")}</h3>
-{include file="Soft-Red/commentform.template"}
+{include file="$blogtemplate/commentform.template"}
 </div>
 </p>
 {/if}
-{include file="Soft-Red/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Soft-Red/posttrackbacks.template
===================================================================
--- templates/trunk/Soft-Red/posttrackbacks.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Soft-Red/posttrackbacks.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Soft-Red/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="Soft-Red/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Very-Clean/album.template
===================================================================
--- templates/trunk/Very-Clean/album.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Very-Clean/album.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Very-Clean/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="container">
 <p>
  {$album->getDescription()}
@@ -83,4 +83,4 @@
  
  </div>
 </div>
-{include file="Very-Clean/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Very-Clean/albums.template
===================================================================
--- templates/trunk/Very-Clean/albums.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Very-Clean/albums.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Very-Clean/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="Very-Clean/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Very-Clean/commentarticle.template
===================================================================
--- templates/trunk/Very-Clean/commentarticle.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Very-Clean/commentarticle.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Very-Clean/header.template"}
+{include file="$blogtemplate/header.template"}
 <h3>{$locale->tr("add_comment")}</h3>
- {include file="Very-Clean/commentform.template"}
-{include file="Very-Clean/footer.template"}
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Very-Clean/error.template
===================================================================
--- templates/trunk/Very-Clean/error.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Very-Clean/error.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Very-Clean/header.template"}
+{include file="$blogtemplate/header.template"}
  <h3>{$locale->tr("error")}</h3>
  {$locale->tr($message)}
-{include file="Very-Clean/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Very-Clean/footer.template
===================================================================
--- templates/trunk/Very-Clean/footer.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Very-Clean/footer.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -3,17 +3,19 @@
 
 <div id="links">
 
-<div align="center" class="calendar">
-<table border="0" cellspacing="4" cellpadding="0" summary="Monthly calendar with links to each day's posts">
-<caption class="calendarhead">{$locale->tr("calendar")|capitalize}</caption>
-<tr>
-<td>
-{$calendar}
-</td>
-</tr>
-</table>
+<div class="sidetitle">{$locale->tr("search")|capitalize}</div>
+<div class="sidecal">
+   <form name="search_form" method="post" action="{$url->getIndexUrl()}">
+    <input type="text" name="searchTerms" value="" size="14" /><br/>
+    <input type="hidden" name="op" value="Search" />
+    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
+    <input type="submit" name="Search" value="{$locale->tr("search")|capitalize}" />
+   </form>
 </div>
 
+<div class="sidetitle">{$locale->tr("calendar")|capitalize}</div>
+<div class="sidecal">{$calendar}</div>
+
 <div class="sidetitle">{$locale->tr("archives")|capitalize}</div>
 <div class="side">
 <p>
@@ -59,12 +61,20 @@
 <p>
    <li><a href="{$url->blogLink()}">{$locale->tr("main")}</a></li>
    <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
-   <li><a title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}">RSS feed</a></li>
-   <li><a title="Link to the Atom feed." href="{$url->rssLink("atom")}">Atom feed</a></li>
   </ul>
 </p> 
 </div>
 
+<div class="sidetitle">{$locale->tr("syndicate")|capitalize}</div>
+<div class="side">
+<ul>
+<p>
+    <li><a class="nodecoration" title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img src="{$url->getUrl("/imgs/rss090_logo.gif")}" style="border:0px;" alt="RSS 0.90" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img src="{$url->getUrl("/imgs/rss10_logo.gif")}" style="border:0px;" alt="RSS 1.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img src="{$url->getUrl("/imgs/rss20_logo.gif")}" style="border:0px;" alt="RSS 2.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img src="{$url->getUrl("/imgs/atom_logo.png")}" style="border:0px;" alt="Atom 0.3" /></a></li>	
+</p>
+</div>
 <div class="powered">
 Powered by <a href="http://www.plogworld.net">pLog</a><br />    
 </div>

Modified: templates/trunk/Very-Clean/header.template
===================================================================
--- templates/trunk/Very-Clean/header.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Very-Clean/header.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,13 +1,13 @@
 <!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/Very-Clean")}
+{assign var=tpldir value=$url->getUrl("/templates/$blogtemplate")}
 
 <head>
 <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->getTemplateFile("/style.css")}";</style>
+<style type="text/css" media="screen">@import "{$url->getTemplateFile("style.css")}";</style>
 </head>
 
 <body>

Modified: templates/trunk/Very-Clean/main.template
===================================================================
--- templates/trunk/Very-Clean/main.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Very-Clean/main.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Very-Clean/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="Very-Clean/post.template"}
+   {include file="$blogtemplate/post.template"}
    </div>
  {/foreach}
-{include file="Very-Clean/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Very-Clean/post.template
===================================================================
--- templates/trunk/Very-Clean/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Very-Clean/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -7,12 +7,16 @@
 <div class="posted">
  {$locale->tr("posted_by")} 
  <a href="{$url->postUserLink($postOwner)}">{$postOwner->getUsername()}</a>
-(<a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>)  
+
+({foreach name=categories from=$post->getCategories() item=postCategory}
+	<a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>
+{if !$smarty.foreach.categories.last}, {/if}
+{/foreach})
  :: 
 {if $post->getCommentsEnabled()}
-<a href="{$url->postPermalink($post)}">{$locale->tr("comment")|capitalize}
-({$post->getTotalComments()})</a>
-{else}
-<a href="{$url->postPermalink($post)}">Permanent link</a>
+<a href="{$url->postPermalink($post)}">{$locale->tr("comments")|capitalize}
+({$post->getTotalComments()})</a>::
 {/if}
+<a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a>::
+<a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a> 
 </div>

Modified: templates/trunk/Very-Clean/postandcomments.template
===================================================================
--- templates/trunk/Very-Clean/postandcomments.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Very-Clean/postandcomments.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,9 +1,9 @@
-{include file="Very-Clean/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="Very-Clean/post.template"}</p>
+   <p>{include file="$blogtemplate/post.template"}</p>
    </div>
    {foreach from=$comments item=comment}
    <div class="blogbody">
@@ -23,8 +23,10 @@
   {/foreach}
 {if $post->getCommentsEnabled()}
 <p>
+<div style="padding-left: 20px">
 <h3>{$locale->tr("add_comment")}</h3>
-{include file="Very-Clean/commentform.template"}
+{include file="$blogtemplate/commentform.template"}
+</div>
 </p>
 {/if}
-{include file="Very-Clean/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Very-Clean/posttrackbacks.template
===================================================================
--- templates/trunk/Very-Clean/posttrackbacks.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Very-Clean/posttrackbacks.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Very-Clean/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="Very-Clean/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Vicksburg/album.template
===================================================================
--- templates/trunk/Vicksburg/album.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Vicksburg/album.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Vicksburg/header.template"}
+{include file="$blogtemplate/header.template"}
 <div id="container">
 <p>
  {$album->getDescription()}
@@ -83,4 +83,4 @@
  
  </div>
 </div>
-{include file="Vicksburg/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Vicksburg/albums.template
===================================================================
--- templates/trunk/Vicksburg/albums.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Vicksburg/albums.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Vicksburg/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="Vicksburg/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Vicksburg/commentarticle.template
===================================================================
--- templates/trunk/Vicksburg/commentarticle.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Vicksburg/commentarticle.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Vicksburg/header.template"}
+{include file="$blogtemplate/header.template"}
 <h3>{$locale->tr("add_comment")}</h3>
- {include file="Vicksburg/commentform.template"}
-{include file="Vicksburg/footer.template"}
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Vicksburg/error.template
===================================================================
--- templates/trunk/Vicksburg/error.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Vicksburg/error.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Vicksburg/header.template"}
+{include file="$blogtemplate/header.template"}
  <h3>{$locale->tr("error")}</h3>
  {$locale->tr($message)}
-{include file="Vicksburg/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Vicksburg/footer.template
===================================================================
--- templates/trunk/Vicksburg/footer.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Vicksburg/footer.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -3,11 +3,19 @@
 
 <div id="links">
 
-<div class="sidetitle">{$locale->tr("calendar")|capitalize}</div>
-<div class="side">
-<div align="center" style="letter-spacing: 0.2em;">{$calendar}</div>
+<div class="sidetitle">{$locale->tr("search")|capitalize}</div>
+<div class="sidecal">
+   <form name="search_form" method="post" action="{$url->getIndexUrl()}">
+    <input type="text" name="searchTerms" value="" size="14" /><br/>
+    <input type="hidden" name="op" value="Search" />
+    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
+    <input type="submit" name="Search" value="{$locale->tr("search")|capitalize}" />
+   </form>
 </div>
 
+<div class="sidetitle">{$locale->tr("calendar")|capitalize}</div>
+<div class="sidecal">{$calendar}</div>
+
 <div class="sidetitle">{$locale->tr("archives")|capitalize}</div>
 <div class="side">
 <p>
@@ -53,12 +61,20 @@
 <p>
    <li><a href="{$url->blogLink()}">{$locale->tr("main")}</a></li>
    <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
-   <li><a title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}">RSS feed</a></li>
-   <li><a title="Link to the Atom feed." href="{$url->rssLink("atom")}">Atom feed</a></li>
   </ul>
 </p> 
 </div>
 
+<div class="sidetitle">{$locale->tr("syndicate")|capitalize}</div>
+<div class="side">
+<ul>
+<p>
+    <li><a class="nodecoration" title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img src="{$url->getUrl("/imgs/rss090_logo.gif")}" style="border:0px;" alt="RSS 0.90" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img src="{$url->getUrl("/imgs/rss10_logo.gif")}" style="border:0px;" alt="RSS 1.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img src="{$url->getUrl("/imgs/rss20_logo.gif")}" style="border:0px;" alt="RSS 2.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img src="{$url->getUrl("/imgs/atom_logo.png")}" style="border:0px;" alt="Atom 0.3" /></a></li>	
+</p>
+</div>
 <div class="powered">
 Powered by <a href="http://www.plogworld.net">pLog</a><br />    
 </div>

Modified: templates/trunk/Vicksburg/header.template
===================================================================
--- templates/trunk/Vicksburg/header.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Vicksburg/header.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,13 +1,13 @@
 <!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/Vicksburg")}
+{assign var=tpldir value=$url->getUrl("/templates/$blogtemplate")}
 
 <head>
 <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->getTemplateFile("/style.css")}";</style>
+<style type="text/css" media="screen">@import "{$url->getTemplateFile("style.css")}";</style>
 </head>
 
 <body>

Modified: templates/trunk/Vicksburg/main.template
===================================================================
--- templates/trunk/Vicksburg/main.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Vicksburg/main.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Vicksburg/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="Vicksburg/post.template"}
+   {include file="$blogtemplate/post.template"}
    </div>
  {/foreach}
-{include file="Vicksburg/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Vicksburg/post.template
===================================================================
--- templates/trunk/Vicksburg/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Vicksburg/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -7,12 +7,16 @@
 <div class="posted">
  {$locale->tr("posted_by")} 
  <a href="{$url->postUserLink($postOwner)}">{$postOwner->getUsername()}</a>
-(<a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>)  
+
+({foreach name=categories from=$post->getCategories() item=postCategory}
+	<a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>
+{if !$smarty.foreach.categories.last}, {/if}
+{/foreach})
  :: 
 {if $post->getCommentsEnabled()}
-<a href="{$url->postPermalink($post)}">{$locale->tr("comment")|capitalize}
-({$post->getTotalComments()})</a>
-{else}
-<a href="{$url->postPermalink($post)}">Permanent link</a>
+<a href="{$url->postPermalink($post)}">{$locale->tr("comments")|capitalize}
+({$post->getTotalComments()})</a>::
 {/if}
+<a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a>::
+<a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a> 
 </div>

Modified: templates/trunk/Vicksburg/postandcomments.template
===================================================================
--- templates/trunk/Vicksburg/postandcomments.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Vicksburg/postandcomments.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,9 +1,9 @@
-{include file="Vicksburg/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="Vicksburg/post.template"}</p>
+   <p>{include file="$blogtemplate/post.template"}</p>
    </div>
    {foreach from=$comments item=comment}
    <div class="blogbody">
@@ -23,8 +23,10 @@
   {/foreach}
 {if $post->getCommentsEnabled()}
 <p>
+<div style="padding-left: 20px">
 <h3>{$locale->tr("add_comment")}</h3>
-{include file="Vicksburg/commentform.template"}
+{include file="$blogtemplate/commentform.template"}
+</div>
 </p>
 {/if}
-{include file="Vicksburg/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Vicksburg/posttrackbacks.template
===================================================================
--- templates/trunk/Vicksburg/posttrackbacks.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Vicksburg/posttrackbacks.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="Vicksburg/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="Vicksburg/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/Vicksburg/style.css
===================================================================
--- templates/trunk/Vicksburg/style.css	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/Vicksburg/style.css	2005-02-24 01:53:46 UTC (rev 1186)
@@ -22,10 +22,10 @@
 
 	#banner {
 		position: absolute;
-		top: 1%;
-		left: 1%;
+		top: 1px;
+		left: 1px;
 		height: 6%;
-		right: 1%;
+		width: 99%;
 		font-family:georgia, verdana, arial, sans-serif;
 		color:#FFF;
 		font-size:30px;
@@ -64,8 +64,8 @@
 				
 	#content {
 		position:absolute;
-		top: 12%;
-		width:69%;
+		top: 14%;
+		width:70%;
 		background:#FFF;
 		margin-right:15px;
 		margin-bottom:20px;
@@ -76,10 +76,10 @@
 		}
 
 	#links {
-                position: absolute;
-		top: 12%;
-                right: 1%;
-                width: 25%;
+        position: absolute;
+		top: 14%;
+        left: 71%;
+        width: 120px;
 		background:#999;
 		padding:15px;				
 		border:1px solid #FFF;			

Modified: templates/trunk/aubmach/about.template
===================================================================
--- templates/trunk/aubmach/about.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/aubmach/about.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="aubmach/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="aubmach/panel.template"}
-{include file="aubmach/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/aubmach/album.template
===================================================================
--- templates/trunk/aubmach/album.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/aubmach/album.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="aubmach/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -100,4 +100,4 @@
 
 </div>
 
-{include file="aubmach/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/aubmach/albums.template
===================================================================
--- templates/trunk/aubmach/albums.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/aubmach/albums.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="aubmach/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="aubmach/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/aubmach/commentarticle.template
===================================================================
--- templates/trunk/aubmach/commentarticle.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/aubmach/commentarticle.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,6 +1,6 @@
-{include file="aubmach/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="aubmach/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="aubmach/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/aubmach/error.template
===================================================================
--- templates/trunk/aubmach/error.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/aubmach/error.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="aubmach/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="aubmach/panel.template"}
-{include file="aubmach/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/aubmach/main.template
===================================================================
--- templates/trunk/aubmach/main.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/aubmach/main.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,12 +1,12 @@
-{include file="aubmach/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
-    {include file="aubmach/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="aubmach/panel.template"}
-{include file="aubmach/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/aubmach/panel.template
===================================================================
--- templates/trunk/aubmach/panel.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/aubmach/panel.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -4,15 +4,36 @@
     <li id="wordpress">
     {$locale->tr("menu")}
     <ul>
+     <li><a href="{$url->blogLink()}">{$locale->tr("main")}</a> </li>	
      <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
+     <li><a href="{$url->getAdminUrl()}">{$locale->tr("admin")}</a></li>
     </ul> 
     </li>
+<div class="Sidetitle">
+   <h4>{$locale->tr("search")}</h4>
+</div>
+<p> 
+   <form name="search_form" method="post" action="{$url->getIndexUrl()}">
+    <input type="text" name="searchTerms" value="" size="14" /><br/>
+    <input type="hidden" name="op" value="Search" />
+    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
+    <input type="submit" name="Search" value="{$locale->tr("search")|capitalize}" />
+   </form>
+  </p>
 
+ <li id="recently">
+ {$locale->tr("recently")}
+ <ul>
+    {foreach from=$recentposts item=recentpost}
+    <li><a title="{$recentpost->getText()|truncate:150:"..."|strip_tags|escape}" href="{$url->postLink($recentpost)}">{$recentpost->getTopic()}</a><br/>
+    {/foreach}
+</ul>
+</li>
  <li id="categories">
   {$locale->tr("categories")}
   <ul>
    {foreach from=$articlecategories item=articleCategory}
-    <li><a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} [{$articleCategory->getNumArticles()}]</a></li>
+    <li><a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} [{$articleCategory->getNumArticles()}]</a><a href="{$url->categoryRssLink($articleCategory)}"><img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" style="border:0px;" alt="RSS 0.90" /></a><br/></li>
    {/foreach}
    </ul>
  </li>
@@ -26,11 +47,12 @@
   </ul>
   </li>
   <li id="calendar">
+  	{$locale->tr("calendar")}
 	{$calendar}
   </li>
 
     <li id="meta">
-    Meta
+    {$locale->tr("syndicate")}
     <ul>
      <li><a title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}">RSS 0.90</a></li>
      <li><a title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}">RSS 1.0</a></li>

Modified: templates/trunk/aubmach/post.template
===================================================================
--- templates/trunk/aubmach/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/aubmach/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -3,13 +3,17 @@
 
 <h3 class="storytitle"><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h3>
 
-{assign var=postCategory value=$post->getCategory()}
-{assign var=postText value=$post->getText()}
 <div class="meta">
-<ul class="post-categories"><li><a href="{$url->categoryLink($postCategory)}" title="{$postCategory->getName()}">{$postCategory->getName()}</a></li></ul>
+
+  {foreach name=categories from=$post->getCategories() item=postCategory}
+	<ul class="post-categories"><li><a href="{$url->postCategoryLink($post)}" title="{$postCategory->getName()}">{$postCategory->getName()}</a></li></ul>
+  {if !$smarty.foreach.categories.last}, {/if}
+  {/foreach}
+
  &#8212; {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
 </div>
 <div class="storycontent">
+	{assign var=postText value=$post->getText()}
     {$postText} 
     <br style="clear: both;" />
  </div>

Modified: templates/trunk/aubmach/postandcomments.template
===================================================================
--- templates/trunk/aubmach/postandcomments.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/aubmach/postandcomments.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="aubmach/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="aubmach/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="aubmach/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="aubmach/panel.template"}
-{include file="aubmach/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/aubmach/posttrackbacks.template
===================================================================
--- templates/trunk/aubmach/posttrackbacks.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/aubmach/posttrackbacks.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="aubmach/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="aubmach/panel.template"}
-{include file="aubmach/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/aubmach/resource.template
===================================================================
--- templates/trunk/aubmach/resource.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/aubmach/resource.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="aubmach/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="aubmach/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/base/about.template
===================================================================
--- templates/trunk/base/about.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/base/about.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="base/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="base/panel.template"}
-{include file="base/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/base/album.template
===================================================================
--- templates/trunk/base/album.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/base/album.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="base/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 {assign var="postDate" value=$album->getTimestamp()}
@@ -104,4 +104,4 @@
   </p>
 </div>
 
-{include file="base/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/base/albums.template
===================================================================
--- templates/trunk/base/albums.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/base/albums.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="base/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="base/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/base/commentarticle.template
===================================================================
--- templates/trunk/base/commentarticle.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/base/commentarticle.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,6 +1,6 @@
-{include file="base/header.template"}
+{include file="$blogtemplate/header.template"}
  {if $blogsettings->getValue("comments_enabled")}
     <h2>{$locale->tr("add_comment")}</h2>
-    {include file="base/commentform.template"}
+    {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="base/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/base/error.template
===================================================================
--- templates/trunk/base/error.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/base/error.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="base/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
 
@@ -16,5 +16,5 @@
     </div>
 </div>
 
-{include file="base/panel.template"}
-{include file="base/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/base/main.template
===================================================================
--- templates/trunk/base/main.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/base/main.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,14 +1,14 @@
-{include file="base/header.template"}
+{include file="$blogtemplate/header.template"}
 
 <div id="content">
  {foreach from=$posts item=post}
   <div class="post">
     {assign var="postDate" value=$post->getDateObject()}
     <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
-    {include file="base/post.template"}
+    {include file="$blogtemplate/post.template"}
   </div>
  {/foreach}
 </div>
 
-{include file="base/panel.template"}
-{include file="base/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/base/panel.template
===================================================================
--- templates/trunk/base/panel.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/base/panel.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -8,7 +8,19 @@
     </ul> 
     </li>
 
- <li id="categories">
+  <li id="search">
+   <h4>{$locale->tr("search")}</h4>
+  <ul>
+  <form name="search_form" method="post" action="{$url->getIndexUrl()}">
+    <input type="text" name="searchTerms" value="" size="14" /><br/>
+    <input type="hidden" name="op" value="Search" />
+    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
+    <input type="submit" name="Search" value="{$locale->tr("search")|capitalize}" />
+   </form>
+  </ul>
+  </li>
+
+   <li id="categories">
   {$locale->tr("categories")}
   <ul>
    {foreach from=$articlecategories item=articleCategory}
@@ -26,17 +38,18 @@
   </ul>
   </li>
   <li id="calendar">
+  	{$locale->tr("calendar")}
 	{$calendar}
   </li>
 
     <li id="meta">
-    Meta
+    {$locale->tr("syndicate")}
     <ul>
      <li><a title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}">RSS 0.90</a></li>
      <li><a title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}">RSS 1.0</a></li>
      <li><a title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}">RSS 2.0</a></li>
      <li><a title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}">Atom 0.3</a></li>
-     <li><a href="http://validator.w3.org/check/referer" title="Aquesta pàgina està escrita en XHTML 1.0 Transitional">Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr></a></li>
+     <li><a href="http://validator.w3.org/check/referer" title="Aquesta pgina est escrita en XHTML 1.0 Transitional">Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr></a></li>
      <li><a href="http://www.lamevaweb.info/" title="Un bloc de lamevaweb.info">lamevaweb.info</a></li>
     </ul> 
     </li>

Modified: templates/trunk/base/post.template
===================================================================
--- templates/trunk/base/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/base/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -3,10 +3,15 @@
 
 <h3 class="storytitle"><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h3>
 
-{assign var=postCategory value=$post->getCategory()}
+
 {assign var=postText value=$post->getText()}
 <div class="meta">
-<ul class="post-categories"><li><a href="{$url->categoryLink($postCategory)}" title="{$postCategory->getName()}">{$postCategory->getName()}</a></li></ul>
+  <ul class="post-categories"><li>
+  {foreach name=categories from=$post->getCategories() item=postCategory}
+    <a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>
+  {if !$smarty.foreach.categories.last}, {/if}
+  {/foreach}
+  </li></ul>
  &#8212; {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
 </div>
 <div class="storycontent">

Modified: templates/trunk/base/postandcomments.template
===================================================================
--- templates/trunk/base/postandcomments.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/base/postandcomments.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="base/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="base/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="base/commentform.template"}
+          {include file="$blogtemplate/commentform.template"}
         {/if}
     </div>
 </div>
 
-{include file="base/panel.template"}
-{include file="base/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/base/posttrackbacks.template
===================================================================
--- templates/trunk/base/posttrackbacks.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/base/posttrackbacks.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="base/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="base/panel.template"}
-{include file="base/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/base/resource.template
===================================================================
--- templates/trunk/base/resource.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/base/resource.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="base/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="base/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/blufill/album.template
===================================================================
--- templates/trunk/blufill/album.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/blufill/album.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="blufill/header.template"}
+{include file="$blogtemplate/header.template"}
 <tr> 
 <td>
 <div id="container">
@@ -99,4 +99,4 @@
 </div>
 </td> 
 </tr>
-{include file="blufill/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/blufill/albums.template
===================================================================
--- templates/trunk/blufill/albums.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/blufill/albums.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="blufill/header.template"}
+{include file="$blogtemplate/header.template"}
 <tr> 
 <td>
 <div id="container">
@@ -20,4 +20,4 @@
 </div>
 </td> 
 </tr>
-{include file="blufill/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/blufill/commentarticle.template
===================================================================
--- templates/trunk/blufill/commentarticle.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/blufill/commentarticle.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,11 +1,11 @@
-{include file="blufill/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="blufill/commentform.template"}
+  {include file="$blogtemplate/commentform.template"}
  {/if}
  </td> 
 </tr>
-{include file="blufill/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/blufill/commentform.template
===================================================================
--- templates/trunk/blufill/commentform.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/blufill/commentform.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -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/blufill/bold.gif")}" width="16" height="16" align="middle" alt="Bold" />
+        src="{$url->getUrl("/templates/$blogtemplate/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/blufill/italic.gif")}" 
+        onMouseUp="mouseup(this);" onclick="wrapSelection(document.comments_form.commentText, 'i');" src="{$url->getUrl("/templates/$blogtemplate/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/blufill/link.gif")}"
+        onmouseup="mouseup(this);" onclick="insertLink(document.comments_form.commentText);" src="{$url->getUrl("/templates/$blogtemplate/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/blufill/error.template
===================================================================
--- templates/trunk/blufill/error.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/blufill/error.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="blufill/header.template"}
+{include file="$blogtemplate/header.template"}
    <tr> 
       <td> 
 <div id="container">
@@ -23,4 +23,4 @@
 </div>
    </td> 
 </tr>
-{include file="blufill/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/blufill/header.template
===================================================================
--- templates/trunk/blufill/header.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/blufill/header.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -13,7 +13,7 @@
  <meta name="template-author" content="M. Padiernos" />
  <meta name="template-copyright" content="Copyright (c) 2003-2004 M. Padiernos, Gaby's Family Page" />
  <meta name="distribution" content="Global" />
- <link rel="stylesheet" title="Default" href="{$url->getTemplateFile("blufill.css")}" type="text/css" />
+ <link rel="stylesheet" title="Default" href="{$url->getTemplateFile("style.css")}" type="text/css" />
  <link rel="alternate" type="text/xml" title="RSS 2.0" href="{$url->rssLink("rss20")}" />
  <link rel="alternate" type="text/xml" title="RSS 1.0" href="{$url->rssLink("rss10")}" />
  <link rel="alternate" type="text/xml" title="RSS 0.90" href="{$url->rssLink("rss090")}" />
@@ -32,12 +32,12 @@
          {$blog->getBlog()}
         </div>
         <div id="navbar" style="text-align:center">
-		      <span><a href="{$url->blogLink()}">Home </a> |
+		      <span><a href="{$url->blogLink()}">{$locale->tr("main")} </a> |
 		      </span> 
 					<span><a href="{$url->albumLink()}">
-		         Albums</a> |
+		         {$locale->tr("albums")}</a> |
 		      </span>
-		      <span><a href="admin.php" target="blank"> Admin</a>
+		      <span><a href="{$url->getAdminUrl()}" target="blank">{$locale->tr("admin")}</a>
 		      </span>
 				</div>
 		  </td>

Modified: templates/trunk/blufill/main.template
===================================================================
--- templates/trunk/blufill/main.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/blufill/main.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,15 +1,15 @@
-{include file="blufill/header.template"}
+{include file="$blogtemplate/header.template"}
     <tr> 
       <td valign="top" style="width: 350px; border-left:1px solid #EAEAEA;">
 			  <div id="content"> 
           <div id="blog">
 					  {foreach from=$posts item=post} 
-						  {include file="blufill/post.template"} 
+						  {include file="$blogtemplate/post.template"} 
             {/foreach} 
 					</div>
         </div></td>
       <td valign="top" style="border-right:1px solid #EAEAEA;">
-			 {include file="blufill/panel.template"}
+			 {include file="$blogtemplate/panel.template"}
 			</td>
     </tr>
-{include file="blufill/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/blufill/panel.template
===================================================================
--- templates/trunk/blufill/panel.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/blufill/panel.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -9,7 +9,19 @@
   {/foreach}
   </ul>
  </div>
-
+ 	  
+<div class="sidetitle">
+   {$locale->tr("search")}
+</div>
+<div class="side" style="margin-left: 5px">
+   <form name="search_form" method="post" action="{$url->getIndexUrl()}">
+    <input type="text" name="searchTerms" value="" size="14" /><br/>
+    <input type="hidden" name="op" value="Search" />
+    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
+    <input type="submit" name="Search" value="{$locale->tr("search")|capitalize}" />
+   </form>
+</div>
+  	   
  <div class="sidetitle" >
   {$locale->tr("categories")|capitalize}
  </div>
@@ -34,7 +46,7 @@
  </div>
 
  <div class="sidetitle">
-  Syndication
+  {$locale->tr("syndicate")}
  </div>
  <div class="side" style="text-align:center">
   <ul>

Modified: templates/trunk/blufill/post.template
===================================================================
--- templates/trunk/blufill/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/blufill/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-<!-- {$utils->postTrackbackLink($post)} -->
+<!-- {$url->postTrackbackLink($post)} -->
 {assign var="postDate" value=$post->getDateObject()}
 {assign var="postOwner" value=$post->getUserInfo()}
 <div class="blog">
@@ -12,8 +12,11 @@
      <a href="{$url->postPermalink($post)}"><img alt="{$locale->tr("permalink")}" src="{$url->getTemplateFile("post.gif")}" width="10" height="11" style="border: 0px; vertical-align: middle" /></a> | 
      <a href="{$url->postTrackbackStatsLink($post)}"><img alt="{$locale->tr("trackbacks")} [{$post->getNumTrackbacks()}]" src="{$url->getTemplateFile("trackback.gif")}" width="16" height="11" style="border: 0px; vertical-align: middle" /></a> |
 		 <a href="{$url->postPermalink($post)}" style=" font-size: 10px; font-family:georgia, verdana, arial, sans-serif;"><img alt="{$locale->tr("comments")}  [{$post->getTotalComments()}]" src="{$url->getTemplateFile("bubble.gif")}" width="11" height="11" style="border: 0px; vertical-align: middle;" /> {$locale->tr("comments")}  [{$post->getTotalComments()}]</a> | 
-		 {assign var=postCategory value=$post->getCategory()}
-   <a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>
+
+		  {foreach name=categories from=$post->getCategories() item=postCategory}
+		    <a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>
+		  {if !$smarty.foreach.categories.last}, {/if}
+		  {/foreach}
 		 </div>
 	</div>
  </div>

Modified: templates/trunk/blufill/postandcomments.template
===================================================================
--- templates/trunk/blufill/postandcomments.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/blufill/postandcomments.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,10 +1,10 @@
-{include file="blufill/header.template"}
+{include file="$blogtemplate/header.template"}
    <tr> 
       <td> 
 {assign var="postDate" value=$post->getDateObject()}
 {assign var="postOwner" value=$post->getUserInfo()}
 <div id="container">
- {include file="blufill/post.template"}
+ {include file="$blogtemplate/post.template"}
  <div class="blog">
  <div class="comments-head">
   <a name="comments"></a>Comments
@@ -28,11 +28,11 @@
  {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
   <div class="blog">
    <div class="comments-head">{$locale->tr("add_comment")}</div>
-   {include file="blufill/commentform.template"}
+   {include file="$blogtemplate/commentform.template"}
   </div>
  {/if}
 </div>
    </td> 
 </tr>
-{include file="blufill/footer.template"}
+{include file="$blogtemplate/footer.template"}
 

Modified: templates/trunk/blufill/posttrackbacks.template
===================================================================
--- templates/trunk/blufill/posttrackbacks.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/blufill/posttrackbacks.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="blufill/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="blufill/panel.template"}
-{include file="blufill/footer.template"}
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/blufill/resource.template
===================================================================
--- templates/trunk/blufill/resource.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/blufill/resource.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="blufill/header.template"}
+{include file="$blogtemplate/header.template"}
 <tr> 
       <td>
 {assign var=metadata value=$resource->getMetadataReader()}
@@ -55,4 +55,4 @@
 </div>
 </td> 
 </tr>
-{include file="blufill/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/bubble-blue/album.template
===================================================================
--- templates/trunk/bubble-blue/album.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/bubble-blue/album.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="bubble-blue/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="bubble-blue/footer.template"}
+ {include file="$blogtemplate/footer.template"}

Modified: templates/trunk/bubble-blue/albums.template
===================================================================
--- templates/trunk/bubble-blue/albums.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/bubble-blue/albums.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="bubble-blue/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="bubble-blue/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/bubble-blue/commentarticle.template
===================================================================
--- templates/trunk/bubble-blue/commentarticle.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/bubble-blue/commentarticle.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="bubble-blue/header.template"}
+{include file="$blogtemplate/header.template"}
 <h3>{$locale->tr("add_comment")}</h3>
- {include file="bubble-blue/commentform.template"}
-{include file="bubble-blue/footer.template"}
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/bubble-blue/error.template
===================================================================
--- templates/trunk/bubble-blue/error.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/bubble-blue/error.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="bubble-blue/header.template"}
+{include file="$blogtemplate/header.template"}
  <h1>{$locale->tr("error")}</h1>
  {$locale->tr($message)}
-{include file="bubble-blue/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/bubble-blue/header.template
===================================================================
--- templates/trunk/bubble-blue/header.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/bubble-blue/header.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -6,7 +6,7 @@
  <meta http-equiv="Content-Type" content="text/html;charset={$locale->getCharset()}" />
  <meta name="generator" content="{$version}" />
  <meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
- <link rel="stylesheet" title="Default" href="{$url->getTemplateFile("bubble-blue.css")}" type="text/css" />
+ <link rel="stylesheet" title="Default" href="{$url->getTemplateFile("style.css")}" type="text/css" />
  <link rel="alternate" type="text/xml" title="RSS 2.0" href="{$url->rssLink("rss20")}" />
  <link rel="alternate" type="text/xml" title="RSS 1.0" href="{$url->rssLink("rss10")}" />
  <link rel="alternate" type="text/xml" title="RSS 0.90" href="{$url->rssLink("rss090")}" />
@@ -18,12 +18,23 @@
   <div id="Top"><h1>{$blog->getBlog()}</a></h1></div>
   <div id="Topmenu">
 &nbsp;<a href="{$url->blogLink()}" class="navigation">{$locale->tr("main")}</a>&nbsp;<a href="{$url->albumLink()}" class=text-link-yellow >{$locale->tr("albums")}</a> 
-            {foreach from=$articlecategories item=articleCategory}<a href="{$url->categoryLink($articleCategory)}" class=text-link-yellow >{$articleCategory->getName()}[{$articleCategory->getNumArticles()}]</a> 
-            {/foreach} 
   </div>
   <div id="Main">
   <div id="Sidebar-l">
+
    <div class="Sidetitle">
+    <h4>{$locale->tr("search")}</h4>
+   </div>
+   <p>
+	   <form name="search_form" method="post" action="{$url->getIndexUrl()}">
+	    <input type="text" name="searchTerms" value="" size="14" /><br/>
+	    <input type="hidden" name="op" value="Search" />
+	    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
+	    <input type="submit" name="Search" value="{$locale->tr("search")|capitalize}" />
+	   </form>
+   </p>
+
+   <div class="Sidetitle">
     <h4>{$locale->tr("calendar")}</h4>
    </div>
    <p>

Modified: templates/trunk/bubble-blue/main.template
===================================================================
--- templates/trunk/bubble-blue/main.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/bubble-blue/main.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,5 +1,5 @@
-{include file="bubble-blue/header.template"}
+{include file="$blogtemplate/header.template"}
  {foreach from=$posts item=post}
-  {include file="bubble-blue/post.template"}
+  {include file="$blogtemplate/post.template"}
  {/foreach}
-{include file="bubble-blue/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/trunk/bubble-blue/post.template
===================================================================
--- templates/trunk/bubble-blue/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/bubble-blue/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-<!-- {$utils->postTrackbackLink($post)} -->
+<!-- {$url->postTrackbackLink($post)} -->
 <h3>{$post->getTopic()}</h3>
 {assign var="postDate" value=$post->getDateObject()}
 {assign var="postOwner" value=$post->getUserInfo()}
@@ -7,6 +7,9 @@
  {$post->getText()}
 </p>
 <div class="footer">
-{assign var="postCategory" value=$post->getCategory()}
-<a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a> :: <a href="{$url->postPermalink($post)}">{$locale->tr("comment on this")} ({$post->getTotalComments()})</a> :: <a title="{$locale->tr("permalink_title")}" href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> :: <a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a> 
+{foreach name=categories from=$post->getCategories() item=postCategory}
+	<a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>
+{if !$smarty.foreach.categories.last}, {/if}
+{/foreach}
+ :: <a href="{$url->postPermalink($post)}">{$locale->tr("comments")} ({$post->getTotalComments()})</a> :: <a title="{$locale->tr("permalink_title")}" href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> :: <a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a> 
 </div>

Modified: templates/trunk/bubble-blue/postandcomments.template
===================================================================
--- templates/trunk/bubble-blue/postandcomments.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/bubble-blue/postandcomments.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,15 +1,17 @@
-{include file="bubble-blue/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... *}
+   {assign var=nextpost value=$post->getNextArticle()}
    {if $nextpost == true}
      <a href="{$url->postPermalink($nextpost)}" title="Next post: {$nextpost->getTopic()}">&laquo;</a> |
    {/if}
+   {assign var=prevpost value=$post->getPrevArticle()}
    {if $prevpost == true}
      <a href="{$url->postPermalink($prevpost)}" title="Previous post: {$prevpost->getTopic()}">&raquo;</a>
    {/if}
    </p>
    {assign var="poster" value=$post->getUserInfo()}
-   {include file="bubble-blue/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>
@@ -24,6 +26,6 @@
   {/foreach}
  {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
  <h3>{$locale->tr("add_comment")}</h3>
- {include file="bubble-blue/commentform.template"}
+ {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="bubble-blue/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/bubble-blue/posttrackbacks.template
===================================================================
--- templates/trunk/bubble-blue/posttrackbacks.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/bubble-blue/posttrackbacks.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="bubble-blue/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="bubble-blue/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/bubble-blue/resource.template
===================================================================
--- templates/trunk/bubble-blue/resource.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/bubble-blue/resource.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -3,7 +3,7 @@
  <head>
   <meta http-equiv="content-type" content="text/html; charset={$locale->getCharset()}" />
   <title>{$blog->getBlog()}</title>
-  <style type="text/css" media="screen">@import "{$url->getTemplateFile("bubble-blue.css")}";</style>
+  <style type="text/css" media="screen">@import "{$url->getTemplateFile("style.css")}";</style>
  </head>
  <body> 
   <p class="Upgrade">This page looks plain and unstyled because you're using a non-standard compliant browser. To see it in its best form, please <a href="http://www.webstandards.org/upgrade/" title="The Web Standards Project's Browser Upgrade initiative">upgrade</a> to a browser that supports web standards. It's free and painless.</p>

Modified: templates/trunk/bubble-blue/samplerss.template
===================================================================
--- templates/trunk/bubble-blue/samplerss.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/bubble-blue/samplerss.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="bubble-blue/header.template"}
+{include file="$blogtemplate/header.template"}
 <h1>Sample template</h1>
 <p>
  {$message}
@@ -14,4 +14,4 @@
 <p>This is a sample of the plugin that gets the sinfest strip:
 </p>
 <a href="http://sinfest.net"><img src="{$sfstrip->SinfestStripUrl()}" alt="Sinfest strip" width="385"/></a>
-{include file="bubble-blue/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/lemons/header.template
===================================================================
--- templates/trunk/lemons/header.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/lemons/header.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -64,6 +64,16 @@
 <div class="side">
 <ul>
  <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
+ <li><a href="{$url->blogLink()}">{$locale->tr("main")}</a></li>
+ <li><a href="{$url->getAdminUrl()}">{$locale->tr("admin")}</a></li>
+</ul>
+</div>
+	
+<div class="sidetitle">
+{$locale->tr("syndicate")}
+</div>
+<div class="side">
+<ul>
  <li><a title="RSS 0.90" href="{$url->rssLink("rss090")}">RSS 0.90</a></li>
  <li><a title="RSS 1.0" href="{$url->rssLink("rss10")}">RSS 1.0</a></li>
  <li><a title="RSS 2.0" href="{$url->rssLink("rss20")}">RSS 2.0</a></li>
@@ -74,5 +84,5 @@
 </div>
 <div id="content">
 <a name="top"></a>
-<div class="top">:: <a class="header" href="{$url->blogLink()}">{$blog->getBlog()}</a> ::</div>
+<div class="top">:: <a class="header" href="{$url->blogLink()}">{$blog->getBlog()}</a> ::</div>	
 <div class="blog">

Modified: templates/trunk/lemons/lemons.css
===================================================================
--- templates/trunk/lemons/lemons.css	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/lemons/lemons.css	2005-02-24 01:53:46 UTC (rev 1186)
@@ -54,13 +54,12 @@
 	border-top: 1px solid #000;
 	border-right: 1px solid #000;
 	border-bottom: 1px solid #000;
-	margin: 0px 442px 0px 0px;
+	margin: 226px 442px 0px 0px;
 	background: #fff;
 	font: 11px/21px verdana, arial, sans-serif;
 	text-align: left
 	voice-family: "\"}\"";
 	voice-family: inherit;
-	margin: 0px 441px 0px 0px;
 		}		
 html>body #centercontent {
 	margin: 0px 441px 0px 0px;
@@ -72,18 +71,16 @@
 	position: absolute;
 	z-index: 1;
 	top: 0px;
-	right: 216px;
+	left:0px;
         background:#fff url(./topbanner.jpg);
-	width: 226px;
+	width: 1024px;
 	height:216px;
 	padding:0px; 
 	border-right: 1px solid #000;
 	border-bottom: 1px solid #000;
 	voice-family: "\"}\"";
 	voice-family: inherit;
-	width: 224px;
-	height:216px;
-		}
+}
 html>body #banner {
 	width: 224px;
 	height:216px;
@@ -134,12 +131,15 @@
 	}
 
 .bottom {
+	position: relative;
 	font:1em/1.25 monospace;
 	text-indent:0 !important;
 	padding:.3em;
 	text-align: center;
 	padding:5px;
 	margin-bottom: 20px;
+	margin-top: 20px;
+	width:1024px;
 	letter-spacing: .1em;
 	border-top:1px solid #000;
 	border-bottom:1px solid #000;

Modified: templates/trunk/lemons/post.template
===================================================================
--- templates/trunk/lemons/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/lemons/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -19,6 +19,6 @@
     {else}
      <a href="{$url->postCommentLink($post)}">{$locale->tr("comment on this")}</a>
     {/if}
-    | <a href="{$url->postTrackbackStatsLink($post)}">Trackback ({$post->getNumTrackbacks()})</a>
-    | <a href="{$url->postPermalink($post)}" title="{$locale->tr("permalink_title")}">(#)</a>
+    | <a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a>
+    | <a href="{$url->postPermalink($post)}" title="{$locale->tr("permalink_title")}">{$locale->tr("permalink")}(#)</a>
    </div>

Modified: templates/trunk/lemons/searchresults.template
===================================================================
--- templates/trunk/lemons/searchresults.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/lemons/searchresults.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-{include file="grey/header.template"}
+{include file="$blogtemplate/header.template"}
    <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
    <p>
     {foreach from=$searchresults item=result}
@@ -20,4 +20,4 @@
      <br/>
     {/foreach}
    </p> 
-{include file="grey/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/minitemplate/post.template
===================================================================
--- templates/trunk/minitemplate/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/minitemplate/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,5 +1,5 @@
 {* ------
-{$utils->postTrackbackLink($post)}
+{$url->postTrackbackLink($post)}
 ------ *}	
 
 {if $nextpost == true}

Modified: templates/trunk/pastel-blocks/post.template
===================================================================
--- templates/trunk/pastel-blocks/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/pastel-blocks/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -2,7 +2,7 @@
      <div class="block-main">
       <div class="{cycle values="box-teal,box-purple,box-red,box-green,box-blue"}">
 
-       <!-- {$utils->postTrackbackLink($post)} -->
+       <!-- {$url->postTrackbackLink($post)} -->
        <div class="entry-headpad">
         <div class="entry-headboard">
          <div class="entry-header">

Modified: templates/trunk/reic/post.template
===================================================================
--- templates/trunk/reic/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/reic/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-<!--{$utils->postTrackbackLink($post)}-->
+<!--{$url->postTrackbackLink($post)}-->
 {assign var="postDate" value=$post->getDateObject()}
 {assign var="postOwner" value=$post->getUserInfo()}
 

Modified: templates/trunk/standard_green/post.template
===================================================================
--- templates/trunk/standard_green/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/standard_green/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,5 +1,5 @@
 <h2>{$post->getTopic()}</h2>
-		<!-- {$utils->postTrackbackLink($post)} -->
+		<!-- {$url->postTrackbackLink($post)} -->
 		{assign var="postDate" value=$post->getDateObject()}
 		{assign var="postOwner" value=$post->getUserInfo()}
 <p class="date">{$postOwner->getUsername()} | {$locale->formatDate($postDate,"%d %B, %Y %H:%M")}</p>

Modified: templates/trunk/standard_happy/post.template
===================================================================
--- templates/trunk/standard_happy/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/standard_happy/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,5 +1,5 @@
 <h2>{$post->getTopic()}</h2>
-		<!-- {$utils->postTrackbackLink($post)} -->
+		<!-- {$url->postTrackbackLink($post)} -->
 		{assign var="postDate" value=$post->getDateObject()}
 		{assign var="postOwner" value=$post->getUserInfo()}
 <p class="date">{$postOwner->getUsername()} | {$locale->formatDate($postDate,"%d %B, %Y %H:%M")}</p>

Modified: templates/trunk/standard_red/post.template
===================================================================
--- templates/trunk/standard_red/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/standard_red/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,5 +1,5 @@
 <h2>{$post->getTopic()}</h2>
-		<!-- {$utils->postTrackbackLink($post)} -->
+		<!-- {$url->postTrackbackLink($post)} -->
 		{assign var="postDate" value=$post->getDateObject()}
 		{assign var="postOwner" value=$post->getUserInfo()}
 <p class="date">{$postOwner->getUsername()} | {$locale->formatDate($postDate,"%d %B, %Y %H:%M")}</p>

Modified: templates/trunk/toto/post.template
===================================================================
--- templates/trunk/toto/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/toto/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,4 +1,4 @@
-<!-- {$utils->postTrackbackLink($post)} -->
+<!-- {$url->postTrackbackLink($post)} -->
 {assign var="postDate" value=$post->getDateObject()}
 {assign var="postOwner" value=$post->getUserInfo()}
       <table width="100%"  border="0" cellspacing="2" cellpadding="2">

Modified: templates/trunk/tribal/post.template
===================================================================
--- templates/trunk/tribal/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/tribal/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,8 +1,8 @@
-      <!-- {$utils->postTrackbackLink($post)} -->
+      <!-- {$url->postTrackbackLink($post)} -->
       <h1>{$post->getTopic()}</h1>
       <p>{$post->getText()}</p>
       {assign var="postDate" value=$post->getDateObject()}
       {assign var="postOwner" value=$post->getUserInfo()}
       {assign var="postCategory" value=$post->getCategory()}
       <div class="footerpost">Por <strong>{$postOwner->getUsername()}</strong>, {$locale->formatDate($postDate,"%d %B %Y %H:%M")} | <a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a> | <a href="{$url->postLink($post)}">{$locale->tr("comment on this")}</a> ({$post->getTotalComments()}) | <a title="{$locale->tr("permalink_title")}" href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> | <a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a></div>
-      <br />
\ No newline at end of file
+      <br />

Modified: templates/trunk/wordplog/post.template
===================================================================
--- templates/trunk/wordplog/post.template	2005-02-24 01:51:42 UTC (rev 1185)
+++ templates/trunk/wordplog/post.template	2005-02-24 01:53:46 UTC (rev 1186)
@@ -1,7 +1,7 @@
 {assign var="postDate" value=$post->getDateObject()}
 {assign var="postOwner" value=$post->getUserInfo()}
 			<h2>{$locale->formatDate($postDate,"%Y/%m/%d")}</h2>
-			<!-- {$utils->postTrackbackLink($post)} -->
+			<!-- {$url->postTrackbackLink($post)} -->
 			<div class="post">
 				<h3 class="storytitle"><a href="{$url->postPermalink($post)}" rel="bookmark" title="{$locale->tr("permalink")}: {$post->getTopic()}">{$post->getTopic()}</a></h3>
 				<div class="meta">{$locale->tr("categories")}: 
@@ -37,4 +37,4 @@
 			</div>
 {if #searchhighlight# == 1}
 {$searchhighlight->end()}
-{/if}
\ No newline at end of file
+{/if}




More information about the pLog-svn mailing list