[pLog-svn] r1445 - in templates/trunk: buddha cab darkfire dots drove-all-night flower gutenberg mars-spirit pink_lilies rubric silver simple_sky toni water_play

jondaley at devel.plogworld.net jondaley at devel.plogworld.net
Sun Mar 13 01:00:03 GMT 2005 

Author: jondaley
Date: 2005-03-13 01:00:03 +0000 (Sun, 13 Mar 2005)
New Revision: 1445

Added:
   templates/trunk/buddha/error.gif
   templates/trunk/buddha/searchresults.template
   templates/trunk/cab/error.gif
   templates/trunk/cab/searchresults.template
   templates/trunk/darkfire/error.gif
   templates/trunk/darkfire/searchresults.template
   templates/trunk/dots/error.gif
   templates/trunk/dots/searchresults.template
   templates/trunk/drove-all-night/error.gif
   templates/trunk/drove-all-night/searchresults.template
   templates/trunk/flower/error.gif
   templates/trunk/flower/searchresults.template
   templates/trunk/gutenberg/error.gif
   templates/trunk/gutenberg/searchresults.template
   templates/trunk/mars-spirit/error.gif
   templates/trunk/mars-spirit/searchresults.template
   templates/trunk/rubric/error.gif
   templates/trunk/rubric/searchresults.template
   templates/trunk/silver/error.gif
   templates/trunk/silver/searchresults.template
   templates/trunk/simple_sky/error.gif
   templates/trunk/simple_sky/searchresults.template
   templates/trunk/toni/error.gif
   templates/trunk/toni/searchresults.template
   templates/trunk/water_play/error.gif
   templates/trunk/water_play/searchresults.template
Modified:
   templates/trunk/buddha/album.template
   templates/trunk/buddha/albums.template
   templates/trunk/buddha/error.template
   templates/trunk/buddha/panel.template
   templates/trunk/buddha/post.template
   templates/trunk/buddha/resource.template
   templates/trunk/cab/album.template
   templates/trunk/cab/albums.template
   templates/trunk/cab/error.template
   templates/trunk/cab/panel.template
   templates/trunk/cab/post.template
   templates/trunk/cab/resource.template
   templates/trunk/darkfire/album.template
   templates/trunk/darkfire/albums.template
   templates/trunk/darkfire/error.template
   templates/trunk/darkfire/panel.template
   templates/trunk/darkfire/post.template
   templates/trunk/darkfire/resource.template
   templates/trunk/dots/album.template
   templates/trunk/dots/albums.template
   templates/trunk/dots/error.template
   templates/trunk/dots/panel.template
   templates/trunk/dots/post.template
   templates/trunk/dots/resource.template
   templates/trunk/drove-all-night/album.template
   templates/trunk/drove-all-night/albums.template
   templates/trunk/drove-all-night/error.template
   templates/trunk/drove-all-night/panel.template
   templates/trunk/drove-all-night/post.template
   templates/trunk/drove-all-night/resource.template
   templates/trunk/flower/album.template
   templates/trunk/flower/albums.template
   templates/trunk/flower/error.template
   templates/trunk/flower/panel.template
   templates/trunk/flower/post.template
   templates/trunk/flower/resource.template
   templates/trunk/gutenberg/album.template
   templates/trunk/gutenberg/albums.template
   templates/trunk/gutenberg/error.template
   templates/trunk/gutenberg/panel.template
   templates/trunk/gutenberg/post.template
   templates/trunk/gutenberg/resource.template
   templates/trunk/mars-spirit/album.template
   templates/trunk/mars-spirit/albums.template
   templates/trunk/mars-spirit/error.template
   templates/trunk/mars-spirit/panel.template
   templates/trunk/mars-spirit/post.template
   templates/trunk/mars-spirit/resource.template
   templates/trunk/pink_lilies/style.css
   templates/trunk/rubric/album.template
   templates/trunk/rubric/albums.template
   templates/trunk/rubric/error.template
   templates/trunk/rubric/panel.template
   templates/trunk/rubric/post.template
   templates/trunk/rubric/resource.template
   templates/trunk/silver/album.template
   templates/trunk/silver/albums.template
   templates/trunk/silver/error.template
   templates/trunk/silver/panel.template
   templates/trunk/silver/post.template
   templates/trunk/silver/resource.template
   templates/trunk/simple_sky/album.template
   templates/trunk/simple_sky/albums.template
   templates/trunk/simple_sky/error.template
   templates/trunk/simple_sky/panel.template
   templates/trunk/simple_sky/post.template
   templates/trunk/simple_sky/resource.template
   templates/trunk/toni/album.template
   templates/trunk/toni/albums.template
   templates/trunk/toni/error.template
   templates/trunk/toni/panel.template
   templates/trunk/toni/post.template
   templates/trunk/toni/resource.template
   templates/trunk/water_play/album.template
   templates/trunk/water_play/albums.template
   templates/trunk/water_play/error.template
   templates/trunk/water_play/panel.template
   templates/trunk/water_play/post.template
   templates/trunk/water_play/resource.template
Log:
panel on all pages.  calendar is better.  error typo fixed. search added. etc.

Modified: templates/trunk/buddha/album.template
===================================================================
--- templates/trunk/buddha/album.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/buddha/album.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -93,11 +93,8 @@
 </table>  
  <!-- end of album contents -->
  
-
-
  </div>
- 
-
 </div>
 
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Modified: templates/trunk/buddha/albums.template
===================================================================
--- templates/trunk/buddha/albums.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/buddha/albums.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -22,4 +22,5 @@
  </div>
 {/foreach}
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/buddha/error.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/buddha/error.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: templates/trunk/buddha/error.template
===================================================================
--- templates/trunk/buddha/error.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/buddha/error.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -10,7 +10,7 @@
         </div>
         
         <div class="storycontent">
-            <img src="{$url->getUrl("/imgs/error.gif")}" height="32" width="32" alt="Error"/>
+            <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
             {$locale->tr($message)}
         </div>    
     </div>

Modified: templates/trunk/buddha/panel.template
===================================================================
--- templates/trunk/buddha/panel.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/buddha/panel.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -1,8 +1,16 @@
 
 <div id="menu">
 <ul>
-    <li id="wordpress">
-    {$locale->tr("menu")}
+    <li id="search">{$locale->tr("search")}
+	   <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()}"/>
+   </form>
+    </li>
+
+    <li id="wordpress">{$locale->tr("menu")}
     <ul>
      <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
     </ul> 

Modified: templates/trunk/buddha/post.template
===================================================================
--- templates/trunk/buddha/post.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/buddha/post.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -6,7 +6,13 @@
 {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} 
+    <a href="{$url->categoryLink($postCategory)}"
+		   title="{$postCategory->getName()}">
+		   {$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+  {/foreach}
+
  &#8212; {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
 </div>
 <div class="storycontent">

Modified: templates/trunk/buddha/resource.template
===================================================================
--- templates/trunk/buddha/resource.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/buddha/resource.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -54,4 +54,5 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/buddha/searchresults.template
===================================================================
--- templates/trunk/buddha/searchresults.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/buddha/searchresults.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -0,0 +1,21 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+   <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+   <p>
+    {foreach from=$searchresults item=result}
+     <div class="searchresult">
+      {assign var=article value=$result->getArticle()}
+      <a href="{$url->postPermalink($article)}"><h3><b>{$article->getTopic()}</b></h3></a>
+     <div align="right">{foreach name=categories from=$article->getCategories() item=postcategory}
+       <a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+     {/foreach}</div>
+      <p>
+      {$article->getText()|strip_tags|truncate:300:"...":false}
+      </p>
+     </div>
+     <br/>
+    {/foreach}
+   </p> 
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/cab/album.template
===================================================================
--- templates/trunk/cab/album.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/cab/album.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -93,11 +93,8 @@
 </table>  
  <!-- end of album contents -->
  
-
-
  </div>
- 
-
 </div>
 
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Modified: templates/trunk/cab/albums.template
===================================================================
--- templates/trunk/cab/albums.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/cab/albums.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -22,4 +22,5 @@
  </div>
 {/foreach}
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/cab/error.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/cab/error.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: templates/trunk/cab/error.template
===================================================================
--- templates/trunk/cab/error.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/cab/error.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -10,7 +10,7 @@
         </div>
         
         <div class="storycontent">
-            <img src="{$url->getUrl("/imgs/error.gif")}" height="32" width="32" alt="Error"/>
+            <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
             {$locale->tr($message)}
         </div>    
     </div>

Modified: templates/trunk/cab/panel.template
===================================================================
--- templates/trunk/cab/panel.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/cab/panel.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -1,8 +1,16 @@
 
 <div id="menu">
 <ul>
-    <li id="wordpress">
-    {$locale->tr("menu")}
+    <li id="search">{$locale->tr("search")}
+	   <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()}"/>
+   </form>
+    </li>
+
+    <li id="wordpress">{$locale->tr("menu")}
     <ul>
      <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
     </ul> 

Modified: templates/trunk/cab/post.template
===================================================================
--- templates/trunk/cab/post.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/cab/post.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -6,7 +6,13 @@
 {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} 
+    <a href="{$url->categoryLink($postCategory)}"
+		   title="{$postCategory->getName()}">
+		   {$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+  {/foreach}
+
  &#8212; {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
 </div>
 <div class="storycontent">

Modified: templates/trunk/cab/resource.template
===================================================================
--- templates/trunk/cab/resource.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/cab/resource.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -54,4 +54,5 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/cab/searchresults.template
===================================================================
--- templates/trunk/cab/searchresults.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/cab/searchresults.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -0,0 +1,21 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+   <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+   <p>
+    {foreach from=$searchresults item=result}
+     <div class="searchresult">
+      {assign var=article value=$result->getArticle()}
+      <a href="{$url->postPermalink($article)}"><h3><b>{$article->getTopic()}</b></h3></a>
+     <div align="right">{foreach name=categories from=$article->getCategories() item=postcategory}
+       <a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+     {/foreach}</div>
+      <p>
+      {$article->getText()|strip_tags|truncate:300:"...":false}
+      </p>
+     </div>
+     <br/>
+    {/foreach}
+   </p> 
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/darkfire/album.template
===================================================================
--- templates/trunk/darkfire/album.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/darkfire/album.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -93,11 +93,8 @@
 </table>  
  <!-- end of album contents -->
  
-
-
  </div>
- 
-
 </div>
 
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Modified: templates/trunk/darkfire/albums.template
===================================================================
--- templates/trunk/darkfire/albums.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/darkfire/albums.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -22,4 +22,5 @@
  </div>
 {/foreach}
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/darkfire/error.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/darkfire/error.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: templates/trunk/darkfire/error.template
===================================================================
--- templates/trunk/darkfire/error.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/darkfire/error.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -10,7 +10,7 @@
         </div>
         
         <div class="storycontent">
-            <img src="{$url->getUrl("/imgs/error.gif")}" height="32" width="32" alt="Error"/>
+            <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
             {$locale->tr($message)}
         </div>    
     </div>

Modified: templates/trunk/darkfire/panel.template
===================================================================
--- templates/trunk/darkfire/panel.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/darkfire/panel.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -1,8 +1,16 @@
 
 <div id="menu">
 <ul>
-    <li id="wordpress">
-    {$locale->tr("menu")}
+    <li id="search">{$locale->tr("search")}
+	   <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()}"/>
+   </form>
+    </li>
+
+    <li id="wordpress">{$locale->tr("menu")}
     <ul>
      <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
     </ul> 

Modified: templates/trunk/darkfire/post.template
===================================================================
--- templates/trunk/darkfire/post.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/darkfire/post.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -6,7 +6,13 @@
 {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} 
+    <a href="{$url->categoryLink($postCategory)}"
+		   title="{$postCategory->getName()}">
+		   {$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+  {/foreach}
+
  &#8212; {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
 </div>
 <div class="storycontent">

Modified: templates/trunk/darkfire/resource.template
===================================================================
--- templates/trunk/darkfire/resource.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/darkfire/resource.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -54,4 +54,5 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/darkfire/searchresults.template
===================================================================
--- templates/trunk/darkfire/searchresults.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/darkfire/searchresults.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -0,0 +1,21 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+   <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+   <p>
+    {foreach from=$searchresults item=result}
+     <div class="searchresult">
+      {assign var=article value=$result->getArticle()}
+      <a href="{$url->postPermalink($article)}"><h3><b>{$article->getTopic()}</b></h3></a>
+     <div align="right">{foreach name=categories from=$article->getCategories() item=postcategory}
+       <a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+     {/foreach}</div>
+      <p>
+      {$article->getText()|strip_tags|truncate:300:"...":false}
+      </p>
+     </div>
+     <br/>
+    {/foreach}
+   </p> 
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/dots/album.template
===================================================================
--- templates/trunk/dots/album.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/dots/album.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -93,11 +93,8 @@
 </table>  
  <!-- end of album contents -->
  
-
-
  </div>
- 
-
 </div>
 
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Modified: templates/trunk/dots/albums.template
===================================================================
--- templates/trunk/dots/albums.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/dots/albums.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -22,4 +22,5 @@
  </div>
 {/foreach}
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/dots/error.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/dots/error.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: templates/trunk/dots/error.template
===================================================================
--- templates/trunk/dots/error.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/dots/error.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -10,7 +10,7 @@
         </div>
         
         <div class="storycontent">
-            <img src="{$url->getUrl("/imgs/error.gif")}" height="32" width="32" alt="Error"/>
+            <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
             {$locale->tr($message)}
         </div>    
     </div>

Modified: templates/trunk/dots/panel.template
===================================================================
--- templates/trunk/dots/panel.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/dots/panel.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -1,8 +1,16 @@
 
 <div id="menu">
 <ul>
-    <li id="wordpress">
-    {$locale->tr("menu")}
+    <li id="search">{$locale->tr("search")}
+	   <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()}"/>
+   </form>
+    </li>
+
+    <li id="wordpress">{$locale->tr("menu")}
     <ul>
      <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
     </ul> 

Modified: templates/trunk/dots/post.template
===================================================================
--- templates/trunk/dots/post.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/dots/post.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -6,7 +6,13 @@
 {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} 
+    <a href="{$url->categoryLink($postCategory)}"
+		   title="{$postCategory->getName()}">
+		   {$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+  {/foreach}
+
  &#8212; {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
 </div>
 <div class="storycontent">

Modified: templates/trunk/dots/resource.template
===================================================================
--- templates/trunk/dots/resource.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/dots/resource.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -54,4 +54,5 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/dots/searchresults.template
===================================================================
--- templates/trunk/dots/searchresults.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/dots/searchresults.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -0,0 +1,21 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+   <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+   <p>
+    {foreach from=$searchresults item=result}
+     <div class="searchresult">
+      {assign var=article value=$result->getArticle()}
+      <a href="{$url->postPermalink($article)}"><h3><b>{$article->getTopic()}</b></h3></a>
+     <div align="right">{foreach name=categories from=$article->getCategories() item=postcategory}
+       <a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+     {/foreach}</div>
+      <p>
+      {$article->getText()|strip_tags|truncate:300:"...":false}
+      </p>
+     </div>
+     <br/>
+    {/foreach}
+   </p> 
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/drove-all-night/album.template
===================================================================
--- templates/trunk/drove-all-night/album.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/drove-all-night/album.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -93,11 +93,8 @@
 </table>  
  <!-- end of album contents -->
  
-
-
  </div>
- 
-
 </div>
 
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Modified: templates/trunk/drove-all-night/albums.template
===================================================================
--- templates/trunk/drove-all-night/albums.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/drove-all-night/albums.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -22,4 +22,5 @@
  </div>
 {/foreach}
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/drove-all-night/error.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/drove-all-night/error.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: templates/trunk/drove-all-night/error.template
===================================================================
--- templates/trunk/drove-all-night/error.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/drove-all-night/error.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -10,7 +10,7 @@
         </div>
         
         <div class="storycontent">
-            <img src="{$url->getUrl("/imgs/error.gif")}" height="32" width="32" alt="Error"/>
+            <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
             {$locale->tr($message)}
         </div>    
     </div>

Modified: templates/trunk/drove-all-night/panel.template
===================================================================
--- templates/trunk/drove-all-night/panel.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/drove-all-night/panel.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -1,8 +1,16 @@
 
 <div id="menu">
 <ul>
-    <li id="wordpress">
-    {$locale->tr("menu")}
+    <li id="search">{$locale->tr("search")}
+	   <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()}"/>
+   </form>
+    </li>
+
+    <li id="wordpress">{$locale->tr("menu")}
     <ul>
      <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
     </ul> 

Modified: templates/trunk/drove-all-night/post.template
===================================================================
--- templates/trunk/drove-all-night/post.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/drove-all-night/post.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -6,7 +6,13 @@
 {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} 
+    <a href="{$url->categoryLink($postCategory)}"
+		   title="{$postCategory->getName()}">
+		   {$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+  {/foreach}
+
  &#8212; {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
 </div>
 <div class="storycontent">

Modified: templates/trunk/drove-all-night/resource.template
===================================================================
--- templates/trunk/drove-all-night/resource.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/drove-all-night/resource.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -54,4 +54,5 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/drove-all-night/searchresults.template
===================================================================
--- templates/trunk/drove-all-night/searchresults.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/drove-all-night/searchresults.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -0,0 +1,21 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+   <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+   <p>
+    {foreach from=$searchresults item=result}
+     <div class="searchresult">
+      {assign var=article value=$result->getArticle()}
+      <a href="{$url->postPermalink($article)}"><h3><b>{$article->getTopic()}</b></h3></a>
+     <div align="right">{foreach name=categories from=$article->getCategories() item=postcategory}
+       <a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+     {/foreach}</div>
+      <p>
+      {$article->getText()|strip_tags|truncate:300:"...":false}
+      </p>
+     </div>
+     <br/>
+    {/foreach}
+   </p> 
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/flower/album.template
===================================================================
--- templates/trunk/flower/album.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/flower/album.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -93,11 +93,8 @@
 </table>  
  <!-- end of album contents -->
  
-
-
  </div>
- 
-
 </div>
 
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Modified: templates/trunk/flower/albums.template
===================================================================
--- templates/trunk/flower/albums.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/flower/albums.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -22,4 +22,5 @@
  </div>
 {/foreach}
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/flower/error.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/flower/error.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: templates/trunk/flower/error.template
===================================================================
--- templates/trunk/flower/error.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/flower/error.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -10,7 +10,7 @@
         </div>
         
         <div class="storycontent">
-            <img src="{$url->getUrl("/imgs/error.gif")}" height="32" width="32" alt="Error"/>
+            <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
             {$locale->tr($message)}
         </div>    
     </div>

Modified: templates/trunk/flower/panel.template
===================================================================
--- templates/trunk/flower/panel.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/flower/panel.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -1,8 +1,16 @@
 
 <div id="menu">
 <ul>
-    <li id="wordpress">
-    {$locale->tr("menu")}
+    <li id="search">{$locale->tr("search")}
+	   <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()}"/>
+   </form>
+    </li>
+
+    <li id="wordpress">{$locale->tr("menu")}
     <ul>
      <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
     </ul> 

Modified: templates/trunk/flower/post.template
===================================================================
--- templates/trunk/flower/post.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/flower/post.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -6,7 +6,13 @@
 {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} 
+    <a href="{$url->categoryLink($postCategory)}"
+		   title="{$postCategory->getName()}">
+		   {$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+  {/foreach}
+
  &#8212; {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
 </div>
 <div class="storycontent">

Modified: templates/trunk/flower/resource.template
===================================================================
--- templates/trunk/flower/resource.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/flower/resource.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -54,4 +54,5 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/flower/searchresults.template
===================================================================
--- templates/trunk/flower/searchresults.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/flower/searchresults.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -0,0 +1,21 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+   <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+   <p>
+    {foreach from=$searchresults item=result}
+     <div class="searchresult">
+      {assign var=article value=$result->getArticle()}
+      <a href="{$url->postPermalink($article)}"><h3><b>{$article->getTopic()}</b></h3></a>
+     <div align="right">{foreach name=categories from=$article->getCategories() item=postcategory}
+       <a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+     {/foreach}</div>
+      <p>
+      {$article->getText()|strip_tags|truncate:300:"...":false}
+      </p>
+     </div>
+     <br/>
+    {/foreach}
+   </p> 
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/gutenberg/album.template
===================================================================
--- templates/trunk/gutenberg/album.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/gutenberg/album.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -93,11 +93,8 @@
 </table>  
  <!-- end of album contents -->
  
-
-
  </div>
- 
-
 </div>
 
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Modified: templates/trunk/gutenberg/albums.template
===================================================================
--- templates/trunk/gutenberg/albums.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/gutenberg/albums.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -22,4 +22,5 @@
  </div>
 {/foreach}
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/gutenberg/error.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/gutenberg/error.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: templates/trunk/gutenberg/error.template
===================================================================
--- templates/trunk/gutenberg/error.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/gutenberg/error.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -10,7 +10,7 @@
         </div>
         
         <div class="storycontent">
-            <img src="{$url->getUrl("/imgs/error.gif")}" height="32" width="32" alt="Error"/>
+            <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
             {$locale->tr($message)}
         </div>    
     </div>

Modified: templates/trunk/gutenberg/panel.template
===================================================================
--- templates/trunk/gutenberg/panel.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/gutenberg/panel.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -1,8 +1,16 @@
 
 <div id="menu">
 <ul>
-    <li id="wordpress">
-    {$locale->tr("menu")}
+    <li id="search">{$locale->tr("search")}
+	   <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()}"/>
+   </form>
+    </li>
+
+    <li id="wordpress">{$locale->tr("menu")}
     <ul>
      <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
     </ul> 

Modified: templates/trunk/gutenberg/post.template
===================================================================
--- templates/trunk/gutenberg/post.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/gutenberg/post.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -6,7 +6,13 @@
 {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} 
+    <a href="{$url->categoryLink($postCategory)}"
+		   title="{$postCategory->getName()}">
+		   {$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+  {/foreach}
+
  &#8212; {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
 </div>
 <div class="storycontent">

Modified: templates/trunk/gutenberg/resource.template
===================================================================
--- templates/trunk/gutenberg/resource.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/gutenberg/resource.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -54,4 +54,5 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/gutenberg/searchresults.template
===================================================================
--- templates/trunk/gutenberg/searchresults.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/gutenberg/searchresults.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -0,0 +1,21 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+   <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+   <p>
+    {foreach from=$searchresults item=result}
+     <div class="searchresult">
+      {assign var=article value=$result->getArticle()}
+      <a href="{$url->postPermalink($article)}"><h3><b>{$article->getTopic()}</b></h3></a>
+     <div align="right">{foreach name=categories from=$article->getCategories() item=postcategory}
+       <a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+     {/foreach}</div>
+      <p>
+      {$article->getText()|strip_tags|truncate:300:"...":false}
+      </p>
+     </div>
+     <br/>
+    {/foreach}
+   </p> 
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/mars-spirit/album.template
===================================================================
--- templates/trunk/mars-spirit/album.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/mars-spirit/album.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -93,11 +93,8 @@
 </table>  
  <!-- end of album contents -->
  
-
-
  </div>
- 
-
 </div>
 
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Modified: templates/trunk/mars-spirit/albums.template
===================================================================
--- templates/trunk/mars-spirit/albums.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/mars-spirit/albums.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -22,4 +22,5 @@
  </div>
 {/foreach}
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/mars-spirit/error.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/mars-spirit/error.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: templates/trunk/mars-spirit/error.template
===================================================================
--- templates/trunk/mars-spirit/error.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/mars-spirit/error.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -10,7 +10,7 @@
         </div>
         
         <div class="storycontent">
-            <img src="{$url->getUrl("/imgs/error.gif")}" height="32" width="32" alt="Error"/>
+            <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
             {$locale->tr($message)}
         </div>    
     </div>

Modified: templates/trunk/mars-spirit/panel.template
===================================================================
--- templates/trunk/mars-spirit/panel.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/mars-spirit/panel.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -1,8 +1,16 @@
 
 <div id="menu">
 <ul>
-    <li id="wordpress">
-    {$locale->tr("menu")}
+    <li id="search">{$locale->tr("search")}
+	   <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()}"/>
+   </form>
+    </li>
+
+    <li id="wordpress">{$locale->tr("menu")}
     <ul>
      <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
     </ul> 

Modified: templates/trunk/mars-spirit/post.template
===================================================================
--- templates/trunk/mars-spirit/post.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/mars-spirit/post.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -6,7 +6,13 @@
 {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} 
+    <a href="{$url->categoryLink($postCategory)}"
+		   title="{$postCategory->getName()}">
+		   {$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+  {/foreach}
+
  &#8212; {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
 </div>
 <div class="storycontent">

Modified: templates/trunk/mars-spirit/resource.template
===================================================================
--- templates/trunk/mars-spirit/resource.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/mars-spirit/resource.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -54,4 +54,5 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/mars-spirit/searchresults.template
===================================================================
--- templates/trunk/mars-spirit/searchresults.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/mars-spirit/searchresults.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -0,0 +1,21 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+   <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+   <p>
+    {foreach from=$searchresults item=result}
+     <div class="searchresult">
+      {assign var=article value=$result->getArticle()}
+      <a href="{$url->postPermalink($article)}"><h3><b>{$article->getTopic()}</b></h3></a>
+     <div align="right">{foreach name=categories from=$article->getCategories() item=postcategory}
+       <a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+     {/foreach}</div>
+      <p>
+      {$article->getText()|strip_tags|truncate:300:"...":false}
+      </p>
+     </div>
+     <br/>
+    {/foreach}
+   </p> 
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/pink_lilies/style.css
===================================================================
--- templates/trunk/pink_lilies/style.css	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/pink_lilies/style.css	2005-03-13 01:00:03 UTC (rev 1445)
@@ -299,11 +299,6 @@
 	color: #FFF;
 	}
 
-#calendarHeader {
-	text-align: left;
-	padding-bottom: 2px;
-	padding-left: 2px;
-	}
 
 #calendar td, #calendar th {
 	color: #666;
@@ -321,13 +316,6 @@
 	background: #6E2224;
 	color: #FFF;
 	}
-
-#calendarHeader {
-	color: #6E2224;
-	font-style: normal;
-	text-transform: lowercase;
-	text-align:center;
-	}
 	
 /* MENU ends here */	
 	

Modified: templates/trunk/rubric/album.template
===================================================================
--- templates/trunk/rubric/album.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/rubric/album.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -93,11 +93,8 @@
 </table>  
  <!-- end of album contents -->
  
-
-
  </div>
- 
-
 </div>
 
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Modified: templates/trunk/rubric/albums.template
===================================================================
--- templates/trunk/rubric/albums.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/rubric/albums.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -22,4 +22,5 @@
  </div>
 {/foreach}
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/rubric/error.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/rubric/error.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: templates/trunk/rubric/error.template
===================================================================
--- templates/trunk/rubric/error.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/rubric/error.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -10,7 +10,7 @@
         </div>
         
         <div class="storycontent">
-            <img src="{$url->getUrl("/imgs/error.gif")}" height="32" width="32" alt="Error"/>
+            <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
             {$locale->tr($message)}
         </div>    
     </div>

Modified: templates/trunk/rubric/panel.template
===================================================================
--- templates/trunk/rubric/panel.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/rubric/panel.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -1,8 +1,16 @@
 
 <div id="menu">
 <ul>
-    <li id="wordpress">
-    {$locale->tr("menu")}
+    <li id="search">{$locale->tr("search")}
+	   <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()}"/>
+   </form>
+    </li>
+
+    <li id="wordpress">{$locale->tr("menu")}
     <ul>
      <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
     </ul> 

Modified: templates/trunk/rubric/post.template
===================================================================
--- templates/trunk/rubric/post.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/rubric/post.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -6,7 +6,13 @@
 {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} 
+    <a href="{$url->categoryLink($postCategory)}"
+		   title="{$postCategory->getName()}">
+		   {$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+  {/foreach}
+
  &#8212; {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
 </div>
 <div class="storycontent">

Modified: templates/trunk/rubric/resource.template
===================================================================
--- templates/trunk/rubric/resource.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/rubric/resource.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -54,4 +54,5 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/rubric/searchresults.template
===================================================================
--- templates/trunk/rubric/searchresults.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/rubric/searchresults.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -0,0 +1,21 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+   <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+   <p>
+    {foreach from=$searchresults item=result}
+     <div class="searchresult">
+      {assign var=article value=$result->getArticle()}
+      <a href="{$url->postPermalink($article)}"><h3><b>{$article->getTopic()}</b></h3></a>
+     <div align="right">{foreach name=categories from=$article->getCategories() item=postcategory}
+       <a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+     {/foreach}</div>
+      <p>
+      {$article->getText()|strip_tags|truncate:300:"...":false}
+      </p>
+     </div>
+     <br/>
+    {/foreach}
+   </p> 
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/silver/album.template
===================================================================
--- templates/trunk/silver/album.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/silver/album.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -93,11 +93,8 @@
 </table>  
  <!-- end of album contents -->
  
-
-
  </div>
- 
-
 </div>
 
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Modified: templates/trunk/silver/albums.template
===================================================================
--- templates/trunk/silver/albums.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/silver/albums.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -22,4 +22,5 @@
  </div>
 {/foreach}
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/silver/error.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/silver/error.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: templates/trunk/silver/error.template
===================================================================
--- templates/trunk/silver/error.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/silver/error.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -10,7 +10,7 @@
         </div>
         
         <div class="storycontent">
-            <img src="{$url->getUrl("/imgs/error.gif")}" height="32" width="32" alt="Error"/>
+            <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
             {$locale->tr($message)}
         </div>    
     </div>

Modified: templates/trunk/silver/panel.template
===================================================================
--- templates/trunk/silver/panel.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/silver/panel.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -1,8 +1,16 @@
 
 <div id="menu">
 <ul>
-    <li id="wordpress">
-    {$locale->tr("menu")}
+    <li id="search">{$locale->tr("search")}
+	   <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()}"/>
+   </form>
+    </li>
+
+    <li id="wordpress">{$locale->tr("menu")}
     <ul>
      <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
     </ul> 

Modified: templates/trunk/silver/post.template
===================================================================
--- templates/trunk/silver/post.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/silver/post.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -6,7 +6,13 @@
 {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} 
+    <a href="{$url->categoryLink($postCategory)}"
+		   title="{$postCategory->getName()}">
+		   {$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+  {/foreach}
+
  &#8212; {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
 </div>
 <div class="storycontent">

Modified: templates/trunk/silver/resource.template
===================================================================
--- templates/trunk/silver/resource.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/silver/resource.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -54,4 +54,5 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/silver/searchresults.template
===================================================================
--- templates/trunk/silver/searchresults.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/silver/searchresults.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -0,0 +1,21 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+   <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+   <p>
+    {foreach from=$searchresults item=result}
+     <div class="searchresult">
+      {assign var=article value=$result->getArticle()}
+      <a href="{$url->postPermalink($article)}"><h3><b>{$article->getTopic()}</b></h3></a>
+     <div align="right">{foreach name=categories from=$article->getCategories() item=postcategory}
+       <a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+     {/foreach}</div>
+      <p>
+      {$article->getText()|strip_tags|truncate:300:"...":false}
+      </p>
+     </div>
+     <br/>
+    {/foreach}
+   </p> 
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/simple_sky/album.template
===================================================================
--- templates/trunk/simple_sky/album.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/simple_sky/album.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -93,11 +93,8 @@
 </table>  
  <!-- end of album contents -->
  
-
-
  </div>
- 
-
 </div>
 
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Modified: templates/trunk/simple_sky/albums.template
===================================================================
--- templates/trunk/simple_sky/albums.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/simple_sky/albums.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -22,4 +22,5 @@
  </div>
 {/foreach}
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/simple_sky/error.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/simple_sky/error.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: templates/trunk/simple_sky/error.template
===================================================================
--- templates/trunk/simple_sky/error.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/simple_sky/error.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -10,7 +10,7 @@
         </div>
         
         <div class="storycontent">
-            <img src="{$url->getUrl("/imgs/error.gif")}" height="32" width="32" alt="Error"/>
+            <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
             {$locale->tr($message)}
         </div>    
     </div>

Modified: templates/trunk/simple_sky/panel.template
===================================================================
--- templates/trunk/simple_sky/panel.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/simple_sky/panel.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -1,8 +1,16 @@
 
 <div id="menu">
 <ul>
-    <li id="wordpress">
-    {$locale->tr("menu")}
+    <li id="search">{$locale->tr("search")}
+	   <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()}"/>
+   </form>
+    </li>
+
+    <li id="wordpress">{$locale->tr("menu")}
     <ul>
      <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
     </ul> 

Modified: templates/trunk/simple_sky/post.template
===================================================================
--- templates/trunk/simple_sky/post.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/simple_sky/post.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -6,7 +6,13 @@
 {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} 
+    <a href="{$url->categoryLink($postCategory)}"
+		   title="{$postCategory->getName()}">
+		   {$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+  {/foreach}
+
  &#8212; {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
 </div>
 <div class="storycontent">

Modified: templates/trunk/simple_sky/resource.template
===================================================================
--- templates/trunk/simple_sky/resource.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/simple_sky/resource.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -54,4 +54,5 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/simple_sky/searchresults.template
===================================================================
--- templates/trunk/simple_sky/searchresults.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/simple_sky/searchresults.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -0,0 +1,21 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+   <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+   <p>
+    {foreach from=$searchresults item=result}
+     <div class="searchresult">
+      {assign var=article value=$result->getArticle()}
+      <a href="{$url->postPermalink($article)}"><h3><b>{$article->getTopic()}</b></h3></a>
+     <div align="right">{foreach name=categories from=$article->getCategories() item=postcategory}
+       <a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+     {/foreach}</div>
+      <p>
+      {$article->getText()|strip_tags|truncate:300:"...":false}
+      </p>
+     </div>
+     <br/>
+    {/foreach}
+   </p> 
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/toni/album.template
===================================================================
--- templates/trunk/toni/album.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/toni/album.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -93,11 +93,8 @@
 </table>  
  <!-- end of album contents -->
  
-
-
  </div>
- 
-
 </div>
 
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Modified: templates/trunk/toni/albums.template
===================================================================
--- templates/trunk/toni/albums.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/toni/albums.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -22,4 +22,5 @@
  </div>
 {/foreach}
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/toni/error.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/toni/error.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: templates/trunk/toni/error.template
===================================================================
--- templates/trunk/toni/error.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/toni/error.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -10,7 +10,7 @@
         </div>
         
         <div class="storycontent">
-            <img src="{$url->getUrl("/imgs/error.gif")}" height="32" width="32" alt="Error"/>
+            <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
             {$locale->tr($message)}
         </div>    
     </div>

Modified: templates/trunk/toni/panel.template
===================================================================
--- templates/trunk/toni/panel.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/toni/panel.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -1,8 +1,16 @@
 
 <div id="menu">
 <ul>
-    <li id="wordpress">
-    {$locale->tr("menu")}
+    <li id="search">{$locale->tr("search")}
+	   <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()}"/>
+   </form>
+    </li>
+
+    <li id="wordpress">{$locale->tr("menu")}
     <ul>
      <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
     </ul> 

Modified: templates/trunk/toni/post.template
===================================================================
--- templates/trunk/toni/post.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/toni/post.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -6,7 +6,13 @@
 {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} 
+    <a href="{$url->categoryLink($postCategory)}"
+		   title="{$postCategory->getName()}">
+		   {$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+  {/foreach}
+
  &#8212; {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
 </div>
 <div class="storycontent">

Modified: templates/trunk/toni/resource.template
===================================================================
--- templates/trunk/toni/resource.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/toni/resource.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -54,4 +54,5 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/toni/searchresults.template
===================================================================
--- templates/trunk/toni/searchresults.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/toni/searchresults.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -0,0 +1,21 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+   <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+   <p>
+    {foreach from=$searchresults item=result}
+     <div class="searchresult">
+      {assign var=article value=$result->getArticle()}
+      <a href="{$url->postPermalink($article)}"><h3><b>{$article->getTopic()}</b></h3></a>
+     <div align="right">{foreach name=categories from=$article->getCategories() item=postcategory}
+       <a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+     {/foreach}</div>
+      <p>
+      {$article->getText()|strip_tags|truncate:300:"...":false}
+      </p>
+     </div>
+     <br/>
+    {/foreach}
+   </p> 
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/trunk/water_play/album.template
===================================================================
--- templates/trunk/water_play/album.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/water_play/album.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -93,11 +93,8 @@
 </table>  
  <!-- end of album contents -->
  
-
-
  </div>
- 
-
 </div>
 
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Modified: templates/trunk/water_play/albums.template
===================================================================
--- templates/trunk/water_play/albums.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/water_play/albums.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -22,4 +22,5 @@
  </div>
 {/foreach}
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/water_play/error.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/water_play/error.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: templates/trunk/water_play/error.template
===================================================================
--- templates/trunk/water_play/error.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/water_play/error.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -10,7 +10,7 @@
         </div>
         
         <div class="storycontent">
-            <img src="{$url->getUrl("/imgs/error.gif")}" height="32" width="32" alt="Error"/>
+            <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
             {$locale->tr($message)}
         </div>    
     </div>

Modified: templates/trunk/water_play/panel.template
===================================================================
--- templates/trunk/water_play/panel.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/water_play/panel.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -1,8 +1,16 @@
 
 <div id="menu">
 <ul>
-    <li id="wordpress">
-    {$locale->tr("menu")}
+    <li id="search">{$locale->tr("search")}
+	   <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()}"/>
+   </form>
+    </li>
+
+    <li id="wordpress">{$locale->tr("menu")}
     <ul>
      <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
     </ul> 

Modified: templates/trunk/water_play/post.template
===================================================================
--- templates/trunk/water_play/post.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/water_play/post.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -6,7 +6,13 @@
 {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} 
+    <a href="{$url->categoryLink($postCategory)}"
+		   title="{$postCategory->getName()}">
+		   {$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+  {/foreach}
+
  &#8212; {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
 </div>
 <div class="storycontent">

Modified: templates/trunk/water_play/resource.template
===================================================================
--- templates/trunk/water_play/resource.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/water_play/resource.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -54,4 +54,5 @@
    <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
   </p>
 </div>
+{include file="$blogtemplate/panel.template"}
 {include file="$blogtemplate/footer.template"}

Added: templates/trunk/water_play/searchresults.template
===================================================================
--- templates/trunk/water_play/searchresults.template	2005-03-13 00:21:19 UTC (rev 1444)
+++ templates/trunk/water_play/searchresults.template	2005-03-13 01:00:03 UTC (rev 1445)
@@ -0,0 +1,21 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+   <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+   <p>
+    {foreach from=$searchresults item=result}
+     <div class="searchresult">
+      {assign var=article value=$result->getArticle()}
+      <a href="{$url->postPermalink($article)}"><h3><b>{$article->getTopic()}</b></h3></a>
+     <div align="right">{foreach name=categories from=$article->getCategories() item=postcategory}
+       <a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+     {/foreach}</div>
+      <p>
+      {$article->getText()|strip_tags|truncate:300:"...":false}
+      </p>
+     </div>
+     <br/>
+    {/foreach}
+   </p> 
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

More information about the pLog-svn mailing list