[pLog-svn] r6374 - in templates/branches/lifetype-1.2: . LiteWinter Mac-Stripe Matrix-Code unported

jondaley at devel.lifetype.net jondaley at devel.lifetype.net
Mon Apr 28 16:18:41 EDT 2008


Author: jondaley
Date: 2008-04-28 16:18:40 -0400 (Mon, 28 Apr 2008)
New Revision: 6374

Added:
   templates/branches/lifetype-1.2/LiteWinter/
   templates/branches/lifetype-1.2/LiteWinter/album.template
   templates/branches/lifetype-1.2/LiteWinter/albums.template
   templates/branches/lifetype-1.2/LiteWinter/commentarticle.template
   templates/branches/lifetype-1.2/LiteWinter/error.template
   templates/branches/lifetype-1.2/LiteWinter/favicon.ico
   templates/branches/lifetype-1.2/LiteWinter/footer.template
   templates/branches/lifetype-1.2/LiteWinter/header.template
   templates/branches/lifetype-1.2/LiteWinter/images/
   templates/branches/lifetype-1.2/LiteWinter/main.template
   templates/branches/lifetype-1.2/LiteWinter/panel.template
   templates/branches/lifetype-1.2/LiteWinter/post.template
   templates/branches/lifetype-1.2/LiteWinter/postandcomments.template
   templates/branches/lifetype-1.2/LiteWinter/posttrackbacks.template
   templates/branches/lifetype-1.2/LiteWinter/resource.template
   templates/branches/lifetype-1.2/LiteWinter/screenshot.jpg
   templates/branches/lifetype-1.2/LiteWinter/searchresults.template
   templates/branches/lifetype-1.2/LiteWinter/style.css
   templates/branches/lifetype-1.2/Mac-Stripe/
   templates/branches/lifetype-1.2/Mac-Stripe/album.template
   templates/branches/lifetype-1.2/Mac-Stripe/albums.template
   templates/branches/lifetype-1.2/Mac-Stripe/commentarticle.template
   templates/branches/lifetype-1.2/Mac-Stripe/error.template
   templates/branches/lifetype-1.2/Mac-Stripe/favicon.ico
   templates/branches/lifetype-1.2/Mac-Stripe/footer.template
   templates/branches/lifetype-1.2/Mac-Stripe/header.template
   templates/branches/lifetype-1.2/Mac-Stripe/main.template
   templates/branches/lifetype-1.2/Mac-Stripe/post.template
   templates/branches/lifetype-1.2/Mac-Stripe/postandcomments.template
   templates/branches/lifetype-1.2/Mac-Stripe/posttrackbacks.template
   templates/branches/lifetype-1.2/Mac-Stripe/resource.template
   templates/branches/lifetype-1.2/Mac-Stripe/screenshot.jpg
   templates/branches/lifetype-1.2/Mac-Stripe/searchresults.template
   templates/branches/lifetype-1.2/Mac-Stripe/stripes.png
   templates/branches/lifetype-1.2/Mac-Stripe/style.css
   templates/branches/lifetype-1.2/Matrix-Code/
   templates/branches/lifetype-1.2/Matrix-Code/album.template
   templates/branches/lifetype-1.2/Matrix-Code/albums.template
   templates/branches/lifetype-1.2/Matrix-Code/commentarticle.template
   templates/branches/lifetype-1.2/Matrix-Code/error.template
   templates/branches/lifetype-1.2/Matrix-Code/favicon.ico
   templates/branches/lifetype-1.2/Matrix-Code/footer.template
   templates/branches/lifetype-1.2/Matrix-Code/header.template
   templates/branches/lifetype-1.2/Matrix-Code/main.template
   templates/branches/lifetype-1.2/Matrix-Code/matrix-bannerbg.jpg
   templates/branches/lifetype-1.2/Matrix-Code/matrix-bodybg.jpg
   templates/branches/lifetype-1.2/Matrix-Code/matrix-contentbg.jpg
   templates/branches/lifetype-1.2/Matrix-Code/matrix-shadebg.png
   templates/branches/lifetype-1.2/Matrix-Code/post.template
   templates/branches/lifetype-1.2/Matrix-Code/postandcomments.template
   templates/branches/lifetype-1.2/Matrix-Code/posttrackbacks.template
   templates/branches/lifetype-1.2/Matrix-Code/resource.template
   templates/branches/lifetype-1.2/Matrix-Code/screenshot.jpg
   templates/branches/lifetype-1.2/Matrix-Code/searchresults.template
   templates/branches/lifetype-1.2/Matrix-Code/style.css
   templates/branches/lifetype-1.2/Modish/
Removed:
   templates/branches/lifetype-1.2/LiteWinter/album.template
   templates/branches/lifetype-1.2/LiteWinter/albums.template
   templates/branches/lifetype-1.2/LiteWinter/commentarticle.template
   templates/branches/lifetype-1.2/LiteWinter/error.template
   templates/branches/lifetype-1.2/LiteWinter/favicon.ico
   templates/branches/lifetype-1.2/LiteWinter/footer.template
   templates/branches/lifetype-1.2/LiteWinter/header.template
   templates/branches/lifetype-1.2/LiteWinter/images/
   templates/branches/lifetype-1.2/LiteWinter/main.template
   templates/branches/lifetype-1.2/LiteWinter/panel.template
   templates/branches/lifetype-1.2/LiteWinter/post.template
   templates/branches/lifetype-1.2/LiteWinter/postandcomments.template
   templates/branches/lifetype-1.2/LiteWinter/posttrackbacks.template
   templates/branches/lifetype-1.2/LiteWinter/resource.template
   templates/branches/lifetype-1.2/LiteWinter/screenshot.jpg
   templates/branches/lifetype-1.2/LiteWinter/searchresults.template
   templates/branches/lifetype-1.2/LiteWinter/style.css
   templates/branches/lifetype-1.2/Mac-Stripe/album.template
   templates/branches/lifetype-1.2/Mac-Stripe/albums.template
   templates/branches/lifetype-1.2/Mac-Stripe/commentarticle.template
   templates/branches/lifetype-1.2/Mac-Stripe/error.template
   templates/branches/lifetype-1.2/Mac-Stripe/favicon.ico
   templates/branches/lifetype-1.2/Mac-Stripe/footer.template
   templates/branches/lifetype-1.2/Mac-Stripe/header.template
   templates/branches/lifetype-1.2/Mac-Stripe/main.template
   templates/branches/lifetype-1.2/Mac-Stripe/post.template
   templates/branches/lifetype-1.2/Mac-Stripe/postandcomments.template
   templates/branches/lifetype-1.2/Mac-Stripe/posttrackbacks.template
   templates/branches/lifetype-1.2/Mac-Stripe/resource.template
   templates/branches/lifetype-1.2/Mac-Stripe/screenshot.jpg
   templates/branches/lifetype-1.2/Mac-Stripe/searchresults.template
   templates/branches/lifetype-1.2/Mac-Stripe/stripes.png
   templates/branches/lifetype-1.2/Mac-Stripe/style.css
   templates/branches/lifetype-1.2/Matrix-Code/album.template
   templates/branches/lifetype-1.2/Matrix-Code/albums.template
   templates/branches/lifetype-1.2/Matrix-Code/commentarticle.template
   templates/branches/lifetype-1.2/Matrix-Code/error.template
   templates/branches/lifetype-1.2/Matrix-Code/favicon.ico
   templates/branches/lifetype-1.2/Matrix-Code/footer.template
   templates/branches/lifetype-1.2/Matrix-Code/header.template
   templates/branches/lifetype-1.2/Matrix-Code/main.template
   templates/branches/lifetype-1.2/Matrix-Code/matrix-bannerbg.jpg
   templates/branches/lifetype-1.2/Matrix-Code/matrix-bodybg.jpg
   templates/branches/lifetype-1.2/Matrix-Code/matrix-contentbg.jpg
   templates/branches/lifetype-1.2/Matrix-Code/matrix-shadebg.png
   templates/branches/lifetype-1.2/Matrix-Code/post.template
   templates/branches/lifetype-1.2/Matrix-Code/postandcomments.template
   templates/branches/lifetype-1.2/Matrix-Code/posttrackbacks.template
   templates/branches/lifetype-1.2/Matrix-Code/resource.template
   templates/branches/lifetype-1.2/Matrix-Code/screenshot.jpg
   templates/branches/lifetype-1.2/Matrix-Code/searchresults.template
   templates/branches/lifetype-1.2/Matrix-Code/style.css
   templates/branches/lifetype-1.2/unported/LiteWinter/
   templates/branches/lifetype-1.2/unported/Mac-Stripe/
   templates/branches/lifetype-1.2/unported/Matrix-Code/
   templates/branches/lifetype-1.2/unported/Modish/
Log:
ported to 1.2

Copied: templates/branches/lifetype-1.2/LiteWinter (from rev 6368, templates/branches/lifetype-1.2/unported/LiteWinter)

Deleted: templates/branches/lifetype-1.2/LiteWinter/album.template
===================================================================
--- templates/branches/lifetype-1.2/unported/LiteWinter/album.template	2008-04-28 20:05:11 UTC (rev 6368)
+++ templates/branches/lifetype-1.2/LiteWinter/album.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,86 +0,0 @@
-{include file="$blogtemplate/header.template"}
-{include file="$blogtemplate/panel.template"}
-			<div id="Article_body">
-				<h1>{$album->getName()}</h1>
-				<p>
-					{$album->getDescription()}
-				</p>
-				<!-- album contents go here -->
-				<div id="album">
-					<table style="border:0px;width:93%" summary="Album Resources">
-					<tr>
-					<td style="width:30%;" align="center" >
-					<a class="nodecoration" href="{$url->parentAlbumLink($album)}">
-					<img style="border:0px" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
-					..
-					</a>
-					</td>
-					{assign var="counter" value=1}
-					{assign var=children value=$album->getChildren()}
-					{foreach from=$children item=childalbum}
-					<td style="width:30%;" align="center" >
-					<a class="nodecoration" href="{$url->albumLink($childalbum)}">
-					<img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
-					{$childalbum->getName()} ({$childalbum->getNumResources()})
-					</a>
-					<br/><br/>
-					{assign var="counter" value="`$counter+1`"}
-					</td>
-					{if $counter%3 == 0}
-					</tr>
-					<tr>
-					{/if}
-					{/foreach}
-					<!--- show the resources here -->
-
-					
-					{foreach from=$resources item=resource}
-					<td style="width:30%;" align="center" >
-					{if $resource->hasPreview()}
-					{*<a class="nodecoration" target="_blank" href="resserver.php?blogId={$blog->getId()}&amp;resource={$resource->getFileName()}">*}
-					<a class="nodecoration" href="{$url->resourceLink($resource)}">
-					<img alt="{$resource->getDescription()}" style="border:0px;" src="{$url->resourcePreviewLink($resource)}" />
-					<br/>{$resource->getFileName()}
-					</a>
-					{else}
-					<a class="nodecoration" href="{$url->resourceLink($resource)}">
-					{if $resource->isSound()}
-						<img alt="Sound" src="{$url->getUrl("/imgs/sound.gif")}" height="64" width="64" style="border:0px;" />
-					{elseif $resource->isVideo()}
-						<img alt="Video" src="{$url->getUrl("/imgs/video.gif")}" height="64" width="64" style="border:0px;" />
-					{elseif $resource->isZip()}
-						<img alt="Zip" src="{$url->getUrl("/imgs/compressed.gif")}" height="64" width="64" style="border:0px;" />   
-					{else}
-						<img alt="File" src="{$url->getUrl("/imgs/file.gif")}" height="64" width="64" style="border:0px;" />    
-					{/if}
-					<br/>{$resource->getFileName()}
-					</a>
-					{/if}
-					<br/>
-					{assign var=metadata value=$resource->getMetadataReader()}
-					{$metadata->getRoundedSize()}<br/>
-					{if $resource->isImage()}
-					{$metadata->getWidth()} x {$metadata->getHeight()}<br/>
-					{elseif $resource->isSound()}
-					{$metadata->getFormat()|upper} {$metadata->getSampleRate()} bps<br/>
-					{elseif $resource->isVideo()}
-					{$metadata->getFormat()|upper}
-					{$metadata->getWidth()} x {$metadata->getHeight()}, 
-					{$metadata->getLengthString()}<br/>
-					{elseif $resource->isZip()}
-					{$metadata->getTotalFiles()} {$locale->tr("files")}<br/>
-					{/if}
-					{assign var="counter" value="`$counter+1`"}
-					</td>
-					{if $counter%3 == 0}
-					</tr>
-					<tr>
-					{/if}
-					{/foreach}
-					<td></td></tr>
-					</table>
-					{pager style="links"}
-				</div>
-				<!-- end of album contents -->
-</div>
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/LiteWinter/album.template (from rev 6373, templates/branches/lifetype-1.2/unported/LiteWinter/album.template)
===================================================================
--- templates/branches/lifetype-1.2/LiteWinter/album.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/LiteWinter/album.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,86 @@
+{include file="$blogtemplate/header.template"}
+{include file="$blogtemplate/panel.template"}
+			<div id="Article_body">
+				<h1>{$album->getName()}</h1>
+				<p>
+					{$album->getDescription()}
+				</p>
+				<!-- album contents go here -->
+				<div id="album">
+					<table style="border:0px;width:93%" summary="Album Resources">
+					<tr>
+					<td style="width:30%;" align="center" >
+					<a class="nodecoration" href="{$url->parentAlbumLink($album)}">
+					<img style="border:0px" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
+					..
+					</a>
+					</td>
+					{assign var="counter" value=1}
+					{assign var=children value=$album->getChildren()}
+					{foreach from=$children item=childalbum}
+					<td style="width:30%;" align="center" >
+					<a class="nodecoration" href="{$url->albumLink($childalbum)}">
+					<img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
+					{$childalbum->getName()} ({$childalbum->getNumResources()})
+					</a>
+					<br/><br/>
+					{assign var="counter" value="`$counter+1`"}
+					</td>
+					{if $counter%3 == 0}
+					</tr>
+					<tr>
+					{/if}
+					{/foreach}
+					<!--- show the resources here -->
+
+					
+					{foreach from=$resources item=resource}
+					<td style="width:30%;" align="center" >
+					{if $resource->hasPreview()}
+					{*<a class="nodecoration" target="_blank" href="resserver.php?blogId={$blog->getId()}&amp;resource={$resource->getFileName()}">*}
+					<a class="nodecoration" href="{$url->resourceLink($resource)}">
+					<img alt="{$resource->getDescription()}" style="border:0px;" src="{$url->resourcePreviewLink($resource)}" />
+					<br/>{$resource->getFileName()}
+					</a>
+					{else}
+					<a class="nodecoration" href="{$url->resourceLink($resource)}">
+					{if $resource->isSound()}
+						<img alt="Sound" src="{$url->getUrl("/imgs/sound.gif")}" height="64" width="64" style="border:0px;" />
+					{elseif $resource->isVideo()}
+						<img alt="Video" src="{$url->getUrl("/imgs/video.gif")}" height="64" width="64" style="border:0px;" />
+					{elseif $resource->isZip()}
+						<img alt="Zip" src="{$url->getUrl("/imgs/compressed.gif")}" height="64" width="64" style="border:0px;" />   
+					{else}
+						<img alt="File" src="{$url->getUrl("/imgs/file.gif")}" height="64" width="64" style="border:0px;" />    
+					{/if}
+					<br/>{$resource->getFileName()}
+					</a>
+					{/if}
+					<br/>
+					{assign var=metadata value=$resource->getMetadataReader()}
+					{$metadata->getRoundedSize()}<br/>
+					{if $resource->isImage()}
+					{$metadata->getWidth()} x {$metadata->getHeight()}<br/>
+					{elseif $resource->isSound()}
+					{$metadata->getFormat()|upper} {$metadata->getSampleRate()} bps<br/>
+					{elseif $resource->isVideo()}
+					{$metadata->getFormat()|upper}
+					{$metadata->getWidth()} x {$metadata->getHeight()}, 
+					{$metadata->getLengthString()}<br/>
+					{elseif $resource->isZip()}
+					{$metadata->getTotalFiles()} {$locale->tr("files")}<br/>
+					{/if}
+					{assign var="counter" value="`$counter+1`"}
+					</td>
+					{if $counter%3 == 0}
+					</tr>
+					<tr>
+					{/if}
+					{/foreach}
+					<td></td></tr>
+					</table>
+					{pager style="links"}
+				</div>
+				<!-- end of album contents -->
+</div>
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/LiteWinter/albums.template
===================================================================
--- templates/branches/lifetype-1.2/unported/LiteWinter/albums.template	2008-04-28 20:05:11 UTC (rev 6368)
+++ templates/branches/lifetype-1.2/LiteWinter/albums.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,28 +0,0 @@
-{include file="$blogtemplate/header.template"}
-{include file="$blogtemplate/panel.template"}
-<div id="Article_body">
-<h1>{$locale->tr("albums")}</h1>
- <!-- album contents go here -->
-<div id="album">
-<table style="border:0px;width:93%;" summary="Albums">
-<tr>
-  {assign var="counter" value=0}
-  {foreach from=$albums item=album}
-  <td style="width:30%;" align="center">
-   <a class="nodecoration" href="{$url->albumLink($album)}">
-   <img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
-   {$album->getName()} ({$album->getNumResources()})
-  </a>
-  {assign var="counter" value="`$counter+1`"}
-  </td>
-  {if $counter%3 == 0}
-   </tr>
-   <tr>
-  {/if}
- {/foreach}
- <td></td></tr>
- </table>
- </div>
- <!-- end of the albums -->
-</div>
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/LiteWinter/albums.template (from rev 6373, templates/branches/lifetype-1.2/unported/LiteWinter/albums.template)
===================================================================
--- templates/branches/lifetype-1.2/LiteWinter/albums.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/LiteWinter/albums.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,28 @@
+{include file="$blogtemplate/header.template"}
+{include file="$blogtemplate/panel.template"}
+<div id="Article_body">
+<h1>{$locale->tr("albums")}</h1>
+ <!-- album contents go here -->
+<div id="album">
+<table style="border:0px;width:93%;" summary="Albums">
+<tr>
+  {assign var="counter" value=0}
+  {foreach from=$albums item=album}
+  <td style="width:30%;" align="center">
+   <a class="nodecoration" href="{$url->albumLink($album)}">
+   <img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
+   {$album->getName()} ({$album->getNumResources()})
+  </a>
+  {assign var="counter" value="`$counter+1`"}
+  </td>
+  {if $counter%3 == 0}
+   </tr>
+   <tr>
+  {/if}
+ {/foreach}
+ <td></td></tr>
+ </table>
+ </div>
+ <!-- end of the albums -->
+</div>
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/LiteWinter/commentarticle.template
===================================================================

Copied: templates/branches/lifetype-1.2/LiteWinter/commentarticle.template (from rev 6373, templates/branches/lifetype-1.2/unported/LiteWinter/commentarticle.template)
===================================================================

Deleted: templates/branches/lifetype-1.2/LiteWinter/error.template
===================================================================
--- templates/branches/lifetype-1.2/unported/LiteWinter/error.template	2008-04-28 20:05:11 UTC (rev 6368)
+++ templates/branches/lifetype-1.2/LiteWinter/error.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,12 +0,0 @@
-{include file="$blogtemplate/header.template"}
-                                <tr>
-                                    <td background="{$url->getTemplateFile("images/tb_r2_c1.jpg")}">&nbsp;</td>
-                                    <td colspan="2" align="left" valign="top" bgcolor="#FFFFFF">
-										 <h1>{$locale->tr("error")}</h1>
-										 <p>{$locale->tr($message)}</p>
-										 <p><a href="javascript:history.go(-1)">{$locale->tr("back")}</a></p>
-									</td>
-                                    <td background="{$url->getTemplateFile("images/tb_r2_c4.jpg")}"></td>
-                                    <td></td>
-                                </tr>
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/LiteWinter/error.template (from rev 6373, templates/branches/lifetype-1.2/unported/LiteWinter/error.template)
===================================================================
--- templates/branches/lifetype-1.2/LiteWinter/error.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/LiteWinter/error.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,12 @@
+{include file="$blogtemplate/header.template"}
+                                <tr>
+                                    <td background="{$url->getTemplateFile("images/tb_r2_c1.jpg")}">&nbsp;</td>
+                                    <td colspan="2" align="left" valign="top" bgcolor="#FFFFFF">
+										 <h1>{$locale->tr("error")}</h1>
+										 <p>{$locale->tr($message)}</p>
+										 <p><a href="javascript:history.go(-1)">{$locale->tr("back")}</a></p>
+									</td>
+                                    <td background="{$url->getTemplateFile("images/tb_r2_c4.jpg")}"></td>
+                                    <td></td>
+                                </tr>
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/LiteWinter/favicon.ico
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/LiteWinter/favicon.ico (from rev 6373, templates/branches/lifetype-1.2/unported/LiteWinter/favicon.ico)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/LiteWinter/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/LiteWinter/footer.template	2008-04-28 20:05:11 UTC (rev 6368)
+++ templates/branches/lifetype-1.2/LiteWinter/footer.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,6 +0,0 @@
-		</div>
-		<div id="BlogFooter">Power by <a href="http://www.lifetype.net" target="_blank">LifeType</a>. Template design by JamesHuang. Valid <a href="http://validator.w3.org/check/referer">XHTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></div>
-	</div>
-</div>
-</body>
-</html>

Copied: templates/branches/lifetype-1.2/LiteWinter/footer.template (from rev 6373, templates/branches/lifetype-1.2/unported/LiteWinter/footer.template)
===================================================================
--- templates/branches/lifetype-1.2/LiteWinter/footer.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/LiteWinter/footer.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,6 @@
+		</div>
+		<div id="BlogFooter">Power by <a href="http://www.lifetype.net" target="_blank">LifeType</a>. Template design by JamesHuang. Valid <a href="http://validator.w3.org/check/referer">XHTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></div>
+	</div>
+</div>
+</body>
+</html>

Deleted: templates/branches/lifetype-1.2/LiteWinter/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/LiteWinter/header.template	2008-04-28 20:05:11 UTC (rev 6368)
+++ templates/branches/lifetype-1.2/LiteWinter/header.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,28 +0,0 @@
-<!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" xml:lang="{$locale->getLanguageId()}" lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset={$locale->getCharset()}" />
-	<meta name="generator" content="{$version}" />
-	<meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
-	<title>{$pageTitle|escape:"html"}</title>
-	<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")}" />
-	<link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="{$url->rssLink("atom")}" />
- <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
-{if $badbehavior}
-   {$badbehavior->showBB2JavaScript()}
-{/if}
-</head>
-<body>
-<div align="center">
-	<div id="container">
-		<div id="BlogHeader">
-			<div id="TITLE"><a href="{$url->blogLink()}" accesskey="1"> {$blog->getBlog()}</a><div class="description">{$blog->getAbout()}</div></div>
-		</div>
-		<div id="nav_bar">
-			<a href="{$url->blogLink()}"> {$locale->tr("main")} </a> | 
-			<a href="{$url->getAdminUrl()}" accesskey="2">{$locale->tr("dashboard")} </a> | 
-			<a href="{$url->albumLink()}">{$locale->tr("albums")} </a> |
-		</div> 

Copied: templates/branches/lifetype-1.2/LiteWinter/header.template (from rev 6373, templates/branches/lifetype-1.2/unported/LiteWinter/header.template)
===================================================================
--- templates/branches/lifetype-1.2/LiteWinter/header.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/LiteWinter/header.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,28 @@
+<!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" xml:lang="{$locale->getLanguageId()}" lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
+<head>
+	<meta http-equiv="Content-Type" content="text/html;charset={$locale->getCharset()}" />
+	<meta name="generator" content="{$version}" />
+	<meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
+	<title>{$pageTitle|escape:"html"}</title>
+	<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")}" />
+	<link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="{$url->rssLink("atom")}" />
+ <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
+{if $badbehavior}
+   {$badbehavior->showBB2JavaScript()}
+{/if}
+</head>
+<body>
+<div align="center">
+	<div id="container">
+		<div id="BlogHeader">
+			<div id="TITLE"><a href="{$url->blogLink()}" accesskey="1"> {$blog->getBlog()}</a><div class="description">{$blog->getAbout()}</div></div>
+		</div>
+		<div id="nav_bar">
+			<a href="{$url->blogLink()}"> {$locale->tr("main")} </a> | 
+			<a href="{$url->getAdminUrl()}" accesskey="2">{$locale->tr("dashboard")} </a> | 
+			<a href="{$url->albumLink()}">{$locale->tr("albums")} </a> |
+		</div> 

Copied: templates/branches/lifetype-1.2/LiteWinter/images (from rev 6373, templates/branches/lifetype-1.2/unported/LiteWinter/images)

Deleted: templates/branches/lifetype-1.2/LiteWinter/main.template
===================================================================
--- templates/branches/lifetype-1.2/unported/LiteWinter/main.template	2008-04-28 20:05:11 UTC (rev 6368)
+++ templates/branches/lifetype-1.2/LiteWinter/main.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,9 +0,0 @@
-{include file="$blogtemplate/header.template"}
-{include file="$blogtemplate/panel.template"}
-	{foreach from=$posts item=post}
-			<div id="Article_body">
-  		{include file="$blogtemplate/post.template"}
-  			</div>
-	{/foreach}
- {pager style="links"}
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/LiteWinter/main.template (from rev 6373, templates/branches/lifetype-1.2/unported/LiteWinter/main.template)
===================================================================
--- templates/branches/lifetype-1.2/LiteWinter/main.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/LiteWinter/main.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,9 @@
+{include file="$blogtemplate/header.template"}
+{include file="$blogtemplate/panel.template"}
+	{foreach from=$posts item=post}
+			<div id="Article_body">
+  		{include file="$blogtemplate/post.template"}
+  			</div>
+	{/foreach}
+ {pager style="links"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/LiteWinter/panel.template
===================================================================
--- templates/branches/lifetype-1.2/unported/LiteWinter/panel.template	2008-04-28 20:05:11 UTC (rev 6368)
+++ templates/branches/lifetype-1.2/LiteWinter/panel.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,91 +0,0 @@
-		<div id="sidebar">
-		<!--Calendar-->
-			<div class="blockTitle"> {$locale->tr("calendar")} </div>
-			<div class="blockContent"> {$calendar} </div>
-			<div class="blockFooter">&nbsp;</div>
-
-		<!--Search-->
-				<form name="search_form" method="post" action="{$url->getIndexUrl()}">
-			<div class="blockTitle"> {$locale->tr("search")} </div>
-			<div class="blockContent">
-				<div align="center">
-					<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")}" />
-				</div>
-			</div>
-			<div class="blockFooter">&nbsp;</div>
-				</form>
-					
-{assign var=blogOwner value=$blog->getOwnerInfo()}
-{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
-{if $blogOwner->hasPicture() && $AboutMyself}  
-  	<div class="blockTitle">{$locale->tr("about_myself")}</div>
-  	<div class="blockContent">
-	  	<div align="center">
-		  	{assign var=picture value=$blogOwner->getPicture()}
-		  	<img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /><br/>
-		  	{$AboutMyself}
-	  	</div>
-  	</div>
-	<div class="blockFooter">&nbsp;</div>
-{/if}
-
-		<!--Recent Articles-->
-			<div class="blockTitle"> {$locale->tr("recently")} </div>
-			<div class="blockContent">
-				<div align="center">
-					{foreach from=$recentposts item=recentpost}
-						<div class="Item"><a title="{$recentpost->getText()|truncate:150:"..."|strip_tags|escape}" href="{$url->postLink($recentpost)}">{$recentpost->getTopic()}</a></div>
-					{/foreach}
-				</div>
-			</div>
-			<div class="blockFooter">&nbsp;</div>
-
-		<!--archives-->
-			<div class="blockTitle"> {$locale->tr("archives")} </div>
-			<div class="blockContent">
-				<div align="center">
-					{foreach from=$archives item=month}
-						<div class="Item"><a href="{$month->getUrl()}">{$month->getName()}</a></div>
-					{/foreach}
-				</div>
-			</div>
-			<div class="blockFooter">&nbsp;</div>
-
-		<!--categories-->
-			<div class="blockTitle"> {$locale->tr("categories")} </div>
-			<div class="blockContent">
-					{foreach from=$articlecategories item=articleCategory}
-						<div class="Item"><a href="{$url->categoryRssLink($articleCategory)}"><img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" style="border:0px;" alt="RSS 0.90" align="middle" /></a>
-						<a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a> [{$articleCategory->getNumArticles()}]</div>
-					{/foreach}
-			</div>
-			<div class="blockFooter">&nbsp;</div>
-
-		<!--Mylink-->
-			<div class="blockTitle"> {$locale->tr("my_links")} </div>
-			<div class="blockContent">
-					{foreach from=$mylinkscategories item=linkcategory}
-						<div class="MainItem">{$linkcategory->getName()}</div>
-						{foreach from=$linkcategory->getLinks() item=link}
-							<div class="SubItem"><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a></div>
-						{/foreach}
-					{/foreach}
-			</div>
-			<div class="blockFooter">&nbsp;</div>
-
-		<!--Syndicate-->
-			<div class="blockTitle"> {$locale->tr("syndicate")} </div>
-			<div class="blockContent">
-				<div align="center">
-					<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><br />
-					<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><br />
-					<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><br />
-					<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><br />
-				</div>
-			</div>
-			<div class="blockFooter">&nbsp;</div>
-		</div>
-		<div id="content">
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/LiteWinter/panel.template (from rev 6373, templates/branches/lifetype-1.2/unported/LiteWinter/panel.template)
===================================================================
--- templates/branches/lifetype-1.2/LiteWinter/panel.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/LiteWinter/panel.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,91 @@
+		<div id="sidebar">
+		<!--Calendar-->
+			<div class="blockTitle"> {$locale->tr("calendar")} </div>
+			<div class="blockContent"> {$calendar} </div>
+			<div class="blockFooter">&nbsp;</div>
+
+		<!--Search-->
+				<form name="search_form" method="post" action="{$url->getIndexUrl()}">
+			<div class="blockTitle"> {$locale->tr("search")} </div>
+			<div class="blockContent">
+				<div align="center">
+					<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")}" />
+				</div>
+			</div>
+			<div class="blockFooter">&nbsp;</div>
+				</form>
+					
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}  
+  	<div class="blockTitle">{$locale->tr("about_myself")}</div>
+  	<div class="blockContent">
+	  	<div align="center">
+		  	{assign var=picture value=$blogOwner->getPicture()}
+		  	<img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /><br/>
+		  	{$AboutMyself}
+	  	</div>
+  	</div>
+	<div class="blockFooter">&nbsp;</div>
+{/if}
+
+		<!--Recent Articles-->
+			<div class="blockTitle"> {$locale->tr("recently")} </div>
+			<div class="blockContent">
+				<div align="center">
+					{foreach from=$recentposts item=recentpost}
+						<div class="Item"><a title="{$recentpost->getText()|truncate:150:"..."|strip_tags|escape}" href="{$url->postLink($recentpost)}">{$recentpost->getTopic()}</a></div>
+					{/foreach}
+				</div>
+			</div>
+			<div class="blockFooter">&nbsp;</div>
+
+		<!--archives-->
+			<div class="blockTitle"> {$locale->tr("archives")} </div>
+			<div class="blockContent">
+				<div align="center">
+					{foreach from=$archives item=month}
+						<div class="Item"><a href="{$month->getUrl()}">{$month->getName()}</a></div>
+					{/foreach}
+				</div>
+			</div>
+			<div class="blockFooter">&nbsp;</div>
+
+		<!--categories-->
+			<div class="blockTitle"> {$locale->tr("categories")} </div>
+			<div class="blockContent">
+					{foreach from=$articlecategories item=articleCategory}
+						<div class="Item"><a href="{$url->categoryRssLink($articleCategory)}"><img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" style="border:0px;" alt="RSS 0.90" align="middle" /></a>
+						<a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a> [{$articleCategory->getNumArticles()}]</div>
+					{/foreach}
+			</div>
+			<div class="blockFooter">&nbsp;</div>
+
+		<!--Mylink-->
+			<div class="blockTitle"> {$locale->tr("my_links")} </div>
+			<div class="blockContent">
+					{foreach from=$mylinkscategories item=linkcategory}
+						<div class="MainItem">{$linkcategory->getName()}</div>
+						{foreach from=$linkcategory->getLinks() item=link}
+							<div class="SubItem"><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a></div>
+						{/foreach}
+					{/foreach}
+			</div>
+			<div class="blockFooter">&nbsp;</div>
+
+		<!--Syndicate-->
+			<div class="blockTitle"> {$locale->tr("syndicate")} </div>
+			<div class="blockContent">
+				<div align="center">
+					<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><br />
+					<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><br />
+					<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><br />
+					<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><br />
+				</div>
+			</div>
+			<div class="blockFooter">&nbsp;</div>
+		</div>
+		<div id="content">
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/LiteWinter/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/LiteWinter/post.template	2008-04-28 20:05:11 UTC (rev 6368)
+++ templates/branches/lifetype-1.2/LiteWinter/post.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,16 +0,0 @@
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-		<!-- post start -->
-
-				<div class="Article_title"><a href="{$url->postPermalink($post)}"> {$post->getTopic()} </a></div>
-				<div class="Article_posted">post by <strong> {$postOwner->getUsername()} </strong> @ {$locale->formatDate($postDate,"%d %B, %Y %H:%M")} </div>
-				<div class="Article_contest"> {$post->getText()} </div>
-				<div class="Article_footer">
-					[{foreach name=categories from=$post->getCategories() item=postcategory}
-					<a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
-					{if !$smarty.foreach.categories.last}, {/if}
-					{/foreach}]
-					|[<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>]
-					|[<a href="{$url->postPermalink($post)}"> {$locale->tr("comment on this")} ({$post->getNumComments()}) </a>]
-				</div>

Copied: templates/branches/lifetype-1.2/LiteWinter/post.template (from rev 6373, templates/branches/lifetype-1.2/unported/LiteWinter/post.template)
===================================================================
--- templates/branches/lifetype-1.2/LiteWinter/post.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/LiteWinter/post.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,16 @@
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+		<!-- post start -->
+
+				<div class="Article_title"><a href="{$url->postPermalink($post)}"> {$post->getTopic()} </a></div>
+				<div class="Article_posted">post by <strong> {$postOwner->getUsername()} </strong> @ {$locale->formatDate($postDate,"%d %B, %Y %H:%M")} </div>
+				<div class="Article_contest"> {$post->getText()} </div>
+				<div class="Article_footer">
+					[{foreach name=categories from=$post->getCategories() item=postcategory}
+					<a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
+					{if !$smarty.foreach.categories.last}, {/if}
+					{/foreach}]
+					|[<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>]
+					|[<a href="{$url->postPermalink($post)}"> {$locale->tr("comment on this")} ({$post->getNumComments()}) </a>]
+				</div>

Deleted: templates/branches/lifetype-1.2/LiteWinter/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/LiteWinter/postandcomments.template	2008-04-28 20:05:11 UTC (rev 6368)
+++ templates/branches/lifetype-1.2/LiteWinter/postandcomments.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,52 +0,0 @@
-{assign var="postPageTitle" value=$post->getTopic()}
-{assign var="postPageTitle" value=" - $postPageTitle"}
-{include file="$blogtemplate/header.template"}
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-{include file="$blogtemplate/panel.template"}
-		{assign var=nextpost value=$post->getNextArticle()}
-		{assign var=prevpost value=$post->getPrevArticle()}
-			<div id="Article_body">
-				<p align="center">
-				{if $prevpost == true}
-					 <a href="{$url->postPermalink($prevpost)}" title="{$locale->tr("previous_post")}: {$prevpost->getTopic()}">&laquo; {$locale->tr("previous_post")}</a> |
-				{/if}
-				{if $nextpost == true}
-					 <a href="{$url->postPermalink($nextpost)}" title="{$locale->tr("next_post")}: {$nextpost->getTopic()}">{$locale->tr("next_post")}&raquo;</a>
-				{/if}
-				</p>
-<!-- {$url->postTrackbackLink($post)} -->
-{include file="$blogtemplate/post.template"}
-        {pager style="links"}    
-
-{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
-			  <div id="commons"><a name="Add_commons"></a>{$locale->tr("add_comment")}</div>
-{include file="$blogtemplate/commentform.template"}
-{/if}
-
-{* show comments *}
-{foreach name=comment from=$comments item=comment}
-				<div id="common_head"><img src="{$url->getTemplateFile("images/comment_icon1.gif")}" alt="commons icon" /><a name="{$comment->getId()}"></a>
-					[{$smarty.foreach.comment.total-$smarty.foreach.comment.iteration+1}]
-					{$comment->getTopic()} [<a href="{$url->postPermalink($post)}#NewComment"> {$locale->tr("reply")} </a>]</div>
-				<div id="common_main">{if $comment->IsPosterAuthenticated()}
-	{assign var=poster value=$comment->getUser()}
-	{if $poster->hasPicture()}
-		{assign var=posterimg value=$poster->getPicture()}
-		<img src="{$posterimg->getPreviewLink()}" alt="{$poster->getUserName()}" align="right" class="poster_avatar"/>
-	{/if}
-{/if}
-{$comment->gettext()}</div>
-				<div id="common_footer">
-					{$locale->tr("posted_by")}
-					{if $comment->getUserUrl() != ""}
-						<a href="{$comment->getUserUrl()}"}>{$comment->getUsername()}</a>
-					{else}
-						{$comment->getUsername()}
-					{/if}
-					|{assign var=commentDate value=$comment->getDateObject()}
-					{$locale->formatDate($commentDate, "%d/%m/%Y, %H:%M")}
-				</div>
-{/foreach}
-			</div>
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/LiteWinter/postandcomments.template (from rev 6373, templates/branches/lifetype-1.2/unported/LiteWinter/postandcomments.template)
===================================================================
--- templates/branches/lifetype-1.2/LiteWinter/postandcomments.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/LiteWinter/postandcomments.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,52 @@
+{assign var="postPageTitle" value=$post->getTopic()}
+{assign var="postPageTitle" value=" - $postPageTitle"}
+{include file="$blogtemplate/header.template"}
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+{include file="$blogtemplate/panel.template"}
+		{assign var=nextpost value=$post->getNextArticle()}
+		{assign var=prevpost value=$post->getPrevArticle()}
+			<div id="Article_body">
+				<p align="center">
+				{if $prevpost == true}
+					 <a href="{$url->postPermalink($prevpost)}" title="{$locale->tr("previous_post")}: {$prevpost->getTopic()}">&laquo; {$locale->tr("previous_post")}</a> |
+				{/if}
+				{if $nextpost == true}
+					 <a href="{$url->postPermalink($nextpost)}" title="{$locale->tr("next_post")}: {$nextpost->getTopic()}">{$locale->tr("next_post")}&raquo;</a>
+				{/if}
+				</p>
+<!-- {$url->postTrackbackLink($post)} -->
+{include file="$blogtemplate/post.template"}
+
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
+			  <div id="commons"><a name="Add_commons"></a>{$locale->tr("add_comment")}</div>
+{include file="$blogtemplate/commentform.template"}
+{/if}
+
+{* show comments *}
+{foreach name=comment from=$comments item=comment}
+				<div id="common_head"><img src="{$url->getTemplateFile("images/comment_icon1.gif")}" alt="commons icon" /><a name="{$comment->getId()}"></a>
+					[{$smarty.foreach.comment.total-$smarty.foreach.comment.iteration+1}]
+					{$comment->getTopic()} [<a href="{$url->postPermalink($post)}#NewComment"> {$locale->tr("reply")} </a>]</div>
+				<div id="common_main">{if $comment->IsPosterAuthenticated()}
+	{assign var=poster value=$comment->getUser()}
+	{if $poster->hasPicture()}
+		{assign var=posterimg value=$poster->getPicture()}
+		<img src="{$posterimg->getPreviewLink()}" alt="{$poster->getUserName()}" align="right" class="poster_avatar"/>
+	{/if}
+{/if}
+{$comment->gettext()}</div>
+				<div id="common_footer">
+					{$locale->tr("posted_by")}
+					{if $comment->getUserUrl() != ""}
+						<a href="{$comment->getUserUrl()}"}>{$comment->getUsername()}</a>
+					{else}
+						{$comment->getUsername()}
+					{/if}
+					|{assign var=commentDate value=$comment->getDateObject()}
+					{$locale->formatDate($commentDate, "%d/%m/%Y, %H:%M")}
+				</div>
+{/foreach}
+        {pager style="links"}    
+			</div>
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/LiteWinter/posttrackbacks.template
===================================================================
--- templates/branches/lifetype-1.2/unported/LiteWinter/posttrackbacks.template	2008-04-28 20:05:11 UTC (rev 6368)
+++ templates/branches/lifetype-1.2/LiteWinter/posttrackbacks.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,17 +0,0 @@
-{include file="$blogtemplate/header.template"}
-{include file="$blogtemplate/panel.template"}
-			<div id="Article_body">
-				<p>
-					{$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>":
-				</p>
-				<p>
-					{foreach from=$trackbacks item=trackback}
-						<a href="{$trackback->getUrl()}">{$trackback->getTitle()}</a><br/>
-						<b>{$locale->tr("trackback_excerpt")}:</b> {$trackback->getExcerpt()}<br/>
-						<b>{$locale->tr("trackback_weblog")}:</b> {$trackback->getBlogName()}<br/>
-						{assign var="trackbackDate" value=$trackback->getDateObject()}
-							<b>{$locale->tr("date")}:</b> {$locale->formatDate($trackbackDate, "%d/%m/%Y %H:%M")}<br/><br/>
-					{/foreach}
-				</p>
-			</div>
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/LiteWinter/posttrackbacks.template (from rev 6373, templates/branches/lifetype-1.2/unported/LiteWinter/posttrackbacks.template)
===================================================================
--- templates/branches/lifetype-1.2/LiteWinter/posttrackbacks.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/LiteWinter/posttrackbacks.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,17 @@
+{include file="$blogtemplate/header.template"}
+{include file="$blogtemplate/panel.template"}
+			<div id="Article_body">
+				<p>
+					{$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>":
+				</p>
+				<p>
+					{foreach from=$trackbacks item=trackback}
+						<a href="{$trackback->getUrl()}">{$trackback->getTitle()}</a><br/>
+						<b>{$locale->tr("trackback_excerpt")}:</b> {$trackback->getExcerpt()}<br/>
+						<b>{$locale->tr("trackback_weblog")}:</b> {$trackback->getBlogName()}<br/>
+						{assign var="trackbackDate" value=$trackback->getDateObject()}
+							<b>{$locale->tr("date")}:</b> {$locale->formatDate($trackbackDate, "%d/%m/%Y %H:%M")}<br/><br/>
+					{/foreach}
+				</p>
+			</div>
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/LiteWinter/resource.template
===================================================================
--- templates/branches/lifetype-1.2/unported/LiteWinter/resource.template	2008-04-28 20:05:11 UTC (rev 6368)
+++ templates/branches/lifetype-1.2/LiteWinter/resource.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,57 +0,0 @@
-{include file="$blogtemplate/header.template"}
-{include file="$blogtemplate/panel.template"}
-{assign var=metadata value=$resource->getMetadataReader()}
-{assign var=updated value=$resource->getTimestamp()}
-<div id="Article_body">                                    	
-<h2>{$resource->getFileName()}</h2>
-<br/>
- <div id="Resource-Desc">
-    <a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a> 
-    ({$metadata->getRoundedSize()}) | {$locale->tr("created")} {$locale->formatDate($updated,"%d %B, %Y")}
- <div id="album">    
-  <p>{$resource->getDescription()}</p>
-  {if $resource->isImage()}
-   <img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
-  {else}
-   <a href="{$url->resourceDownloadLink($resource)}">
-   {* show some information about the file *}
-   {if $resource->isSound()}
-     <img alt="Sound" src="{$url->getUrl("/imgs/sound.gif")}" height="64" width="64" style="border:0px;" /><br/>
-     {$resource->getFileName()}
-     </a><br/>     
-     {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
-     {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
-     {$locale->tr("sample_rate")}: {$metadata->getSampleRate()} Khz
-   {elseif $resource->isVideo()}
-     <img alt="Sound" src="{$url->getUrl("/imgs/video.gif")}" height="64" width="64" style="border:0px;" /><br/>
-     {$resource->getFileName()}
-    </a><br/>
-    {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
-    {$locale->tr("size")}: {$metadata->getHeight()} x {$metadata->getWidth()}<br/>
-    {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
-    {$locale->tr("video_codec")}: {$metadata->getVideoCodec()}<br/>
-    {$locale->tr("audio_codec")}: {$metadata->getAudioCodec()}
-   {elseif $resource->isZip()}
-     <img alt="Sound" src="{$url->getUrl("/imgs/compressed.gif")}" height="64" width="64" style="border:0px;" /><br/>
-     {$resource->getFileName()}
-    </a><br/>
-    {$metadata->getTotalFiles()} {$locale->tr("files")}<br/>
-    {$locale->tr("uncompressed_size")}: {$metadata->getRoundedUncompressedSize()}
-   {else}
-     <img alt="Sound" src="{$url->getUrl("/imgs/file.gif")}" height="64" width="64" style="border:0px;" /><br/>
-     {$resource->getFileName()}
-     </a>    
-   {/if}   
-  {/if}
-  <br/>
-  </div>
-  <p>
-   {assign var=album value=$resource->getAlbum()}
-   {if $prevresource}<a href="{$url->resourceLink($prevresource)}">&laquo;</a> | {/if}
-   <a href="{$url->albumLink($album)}">{$locale->tr("back")}</a>
-   {if $nextresource}| <a href="{$url->resourceLink($nextresource)}">&raquo;</a>{/if}   
-  </p>
-
-</div>
-{include file="$blogtemplate/footer.template"}
-                                    	
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/LiteWinter/resource.template (from rev 6373, templates/branches/lifetype-1.2/unported/LiteWinter/resource.template)
===================================================================
--- templates/branches/lifetype-1.2/LiteWinter/resource.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/LiteWinter/resource.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,57 @@
+{include file="$blogtemplate/header.template"}
+{include file="$blogtemplate/panel.template"}
+{assign var=metadata value=$resource->getMetadataReader()}
+{assign var=updated value=$resource->getTimestamp()}
+<div id="Article_body">                                    	
+<h2>{$resource->getFileName()}</h2>
+<br/>
+ <div id="Resource-Desc">
+    <a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a> 
+    ({$metadata->getRoundedSize()}) | {$locale->tr("created")} {$locale->formatDate($updated,"%d %B, %Y")}
+ <div id="album">    
+  <p>{$resource->getDescription()}</p>
+  {if $resource->isImage()}
+   <img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
+  {else}
+   <a href="{$url->resourceDownloadLink($resource)}">
+   {* show some information about the file *}
+   {if $resource->isSound()}
+     <img alt="Sound" src="{$url->getUrl("/imgs/sound.gif")}" height="64" width="64" style="border:0px;" /><br/>
+     {$resource->getFileName()}
+     </a><br/>     
+     {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
+     {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
+     {$locale->tr("sample_rate")}: {$metadata->getSampleRate()} Khz
+   {elseif $resource->isVideo()}
+     <img alt="Sound" src="{$url->getUrl("/imgs/video.gif")}" height="64" width="64" style="border:0px;" /><br/>
+     {$resource->getFileName()}
+    </a><br/>
+    {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
+    {$locale->tr("size")}: {$metadata->getHeight()} x {$metadata->getWidth()}<br/>
+    {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
+    {$locale->tr("video_codec")}: {$metadata->getVideoCodec()}<br/>
+    {$locale->tr("audio_codec")}: {$metadata->getAudioCodec()}
+   {elseif $resource->isZip()}
+     <img alt="Sound" src="{$url->getUrl("/imgs/compressed.gif")}" height="64" width="64" style="border:0px;" /><br/>
+     {$resource->getFileName()}
+    </a><br/>
+    {$metadata->getTotalFiles()} {$locale->tr("files")}<br/>
+    {$locale->tr("uncompressed_size")}: {$metadata->getRoundedUncompressedSize()}
+   {else}
+     <img alt="Sound" src="{$url->getUrl("/imgs/file.gif")}" height="64" width="64" style="border:0px;" /><br/>
+     {$resource->getFileName()}
+     </a>    
+   {/if}   
+  {/if}
+  <br/>
+  </div>
+  <p>
+   {assign var=album value=$resource->getAlbum()}
+   {if $prevresource}<a href="{$url->resourceLink($prevresource)}">&laquo;</a> | {/if}
+   <a href="{$url->albumLink($album)}">{$locale->tr("back")}</a>
+   {if $nextresource}| <a href="{$url->resourceLink($nextresource)}">&raquo;</a>{/if}   
+  </p>
+
+</div>
+{include file="$blogtemplate/footer.template"}
+                                    	
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/LiteWinter/screenshot.jpg
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/LiteWinter/screenshot.jpg (from rev 6373, templates/branches/lifetype-1.2/unported/LiteWinter/screenshot.jpg)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/LiteWinter/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/LiteWinter/searchresults.template	2008-04-28 20:05:11 UTC (rev 6368)
+++ templates/branches/lifetype-1.2/LiteWinter/searchresults.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,15 +0,0 @@
-{include file="$blogtemplate/header.template"}
-{include file="$blogtemplate/panel.template"}
-			<div id="Article_body">
-				<h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
-				{foreach from=$searchresults item=result}
-					{assign var=article value=$result->getArticle()}
-					<h3 class="title"><a href="{$url->postPermalink($article)}">{$article->getTopic()}</a></h3>
-					<div class="SearchResult_posted">{$locale->tr("categories")}:
-					{foreach name=categories from=$article->getCategories() item=articleCategory}
-						 <a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
-					{/foreach}</div>
-					<div class="Article_contest">{$article->getText()|strip_tags|truncate:300:"...":false}</div>
-				{/foreach}
-			</div>
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/LiteWinter/searchresults.template (from rev 6373, templates/branches/lifetype-1.2/unported/LiteWinter/searchresults.template)
===================================================================
--- templates/branches/lifetype-1.2/LiteWinter/searchresults.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/LiteWinter/searchresults.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,15 @@
+{include file="$blogtemplate/header.template"}
+{include file="$blogtemplate/panel.template"}
+			<div id="Article_body">
+				<h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+				{foreach from=$searchresults item=result}
+					{assign var=article value=$result->getArticle()}
+					<h3 class="title"><a href="{$url->postPermalink($article)}">{$article->getTopic()}</a></h3>
+					<div class="SearchResult_posted">{$locale->tr("categories")}:
+					{foreach name=categories from=$article->getCategories() item=articleCategory}
+						 <a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+					{/foreach}</div>
+					<div class="Article_contest">{$article->getText()|strip_tags|truncate:300:"...":false}</div>
+				{/foreach}
+			</div>
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/LiteWinter/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/LiteWinter/style.css	2008-04-28 20:05:11 UTC (rev 6368)
+++ templates/branches/lifetype-1.2/LiteWinter/style.css	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,315 +0,0 @@
-html {
-	/* IE Horizontal scrollbar fix */
-	overflow-y: scroll;
-	/* force scrollbars in moz */
-	height: 100%;
-}
-body {
-	margin: 0px;
-}
-/*Layout style*/
-#container {
-	width:80%;
-	background-image:url(images/rightshadow.gif);
-	background-repeat:repeat-y;
-	background-position:right;
-	padding:0 6px 0 0;
-	border-left: 1px solid;
-	border-left-color: #999999;
-}
-
-#BlogHeader{
-	margin:0px;
-	width:100%;
-	background-image:url(images/logo.gif);
-	background-repeat:no-repeat;
-	background-position:left;
-	height:80px;
-}
-
-/*Spereate Head and Main block*/
-#nav_bar {
-	background-image:url(images/hbar.gif);
-	background-repeat:repeat-x;
-	border-bottom: 1px solid #dddddd;
-	font:12px/1.4em Arial;
-}
-
-/*Left Block:: Menu Block*/
-#sidebar {
-	font:12px Times, Arial;
-	float:left;
-	width:180px;
-	margin:10px 10px 10px 10px;
-	padding:3px;
-	text-align:left;
-}
-
-/*Right Block :: Article Block*/
-#content {
-	margin:10px 10px 0 200px;
-	position:relative;
-	padding:3px;
-	text-align:left;
-}
-
-/*Bottom Block :: footer block*/
-#BlogFooter {
-	clear:both;
-	font: 12px Times, Arial;
-	background-image:url(images/hbar.gif);
-	background-repeat:repeat-x;
-	border-left: 1px solid #dddddd;
-	border-bottom:1px solid #dddddd;
-	width:100%;
-	text-align:center;
-}
-
-/*The three classes below are use to castale menu blocks*/
-div.blockTitle {
-	background-image: url(images/leftcolumnTitle_bg.gif); 
-	padding: 3px; 
-	background-color: #dddddd; 
-	color: #639ACE; 
-	font-weight: bold;
-	text-align:center;
-}
-
-div.blockContent {
-	background-image:url(images/leftcolumnContent_bg.gif); 
-	padding: 3px; 
-	line-height: 120%; 
-}
-
-div.blockFooter {
-	height:18px; 
-	background-image:url(images/leftcolumnFooter_bg.gif);
-	background-repeat:no-repeat; 
-	padding: 3px; 
-	margin-bottom: 10px;
-}
-
-/*Blog Title style*/
-#TITLE {
-	font:20px Times New Roman, Times, serif;
-	text-align:left;
-	padding:30px 0 0 20px;
-	font-weight:bold;
-}
-
-div.description {
-	width:400px;
-	margin:10px 0 0 0;
-	font:12px Times New Roman, Times, serif;
-	
-}
-
-/*Article style*/
-#Article_body {
-	margin: 0 0 5px 15px;
-	line-height: 140%;
-	border:1px solid #dddddd;
-	padding:5px;
-}
-
-.Article_title {
-	width:99%;
-	float:left;
-	font-size: 11pt;
-	text-transform: capitalize;
-	border-bottom:1px dotted #666666;
-}
-
-.Article_posted {
-	text-align: right;
-    font: 10px verdana, arial, helvetica, sans-serif;
-    letter-spacing: 0.07em;
-}
-
-.Article_contest {
-	margin: 10px 0 10px 10px;
-	text-align:left;
-	font:12px/1.6em Arial, Helvetica, sans-serif;
-    
-}
-
-.Article_footer {
-	margin: 0px;
-	padding: 0px 5px 10px 5px;
-	text-align: right;
-	font:12px/1.4em Arial, Helvetica, sans-serif;
-    	letter-spacing: 0.08em;
-}
-
-/*Commons style*/
-#commons {
-	margin:10px;
-	border-bottom:1px solid #dddddd;
-	font:12px Arial, Helvetica, sans-serif;
-	text-transform: capitalize;
-}
-#common_form {
-	margin:10px;
-	text-align:left;
-	font:12px/1.4em Arial, Helvetica, sans-serif;
-	line-height:180%;
-}
-#commons input {
-	border-bottom:1px solid #666666;
-	border-left: 0px;
-	border-top: 0px;
-	border-right: 0px;
-	width:60%;
-}
-#commons textarea {
-	width:100%;
-}
-
-.text_form {
-	line-height:140%;
-}
-
-#common_head {
-	margin:20px 10px 10px 10px;
-	border-top:1px dotted #dddddd;
-	font:12px Arial, Helvetica, sans-serif;
-	letter-spacing:0.1em;
-}
-
-#common_main {
-	margin:10px;
-	padding: 0 0 0 10px;
-	font:12px Arial, Helvetica, sans-serif;
-	letter-spacing:0.1em;
-}
-
-#common_footer {
-	text-align:right;
-	margin:10px;
-	font:12px Arial, Helvetica, sans-serif;
-	letter-spacing:0.09em;
-}
-
-/* Calander style*/
-table.calMonth{
-	margin: 0px auto;
-}
-.calMonthHeader
-{
-	font-weight: bold;
-	text-align:center;
-}
-.calMonthToday{
-	border:1px dotted #669933;
-	background-color:#eeeeee;
-}
-
-/*Item style*/
-div.Item {
-	font: 12px Times,Arial;
-	Text-align:left;
-	margin:0 0 0 5px;
-}
-
-div.MainItem {
-	font: 12px Times,Arial;
-	font-weight:bold;
-	Text-align:left;
-	margin:0 0 0 5px;
-}
-
-div.SubItem {
-	font: 12px Times,Arial;
-	Text-align:left;
-	margin:0 0 0 10px;
-}
-
-/* hyperlinks setting */
-a:link { text-decoration: none; color: #3366CC;}
-a:visited {	text-decoration: none;	color: #3366CC;}
-a:hover { text-decoration: none; color:#FFFFFF; background-color:#00CC00;}
-a:active { text-decoration: none;}
-
-#nav_bar a	{ background: transparent; text-decoration: none; color:#333333;}
-#nav_bar a:link	{ background: transparent; }
-#nav_bar a:visited	{ background: transparent; }
-#nav_bar a:active	{ background: transparent; }
-#nav_bar a:hover	{ color:#0099FF; background: transparent;text-decoration: underline; }
-
-#TITLE a{
-	display: block;
-	color:#3697E7;
-	font-style:oblique;
-}
-#TITLE a:hover{
-	display: block; text-decoration: none; background: transparent;
-}
-
-/*  albums style */
-
-#album {
-	text-align: center;
-}
-
-#album p {
-	text-align: center;
-	padding:0;
-	margin:0;
-	width:150px;
-}
-
-#album a a.linked a.hover a.active {
-	color:#3697E7;
-	text-decoration: none; 
-	background: transparent;
-}
-
-#album.nodecoration {
-	text-decoration: none; 
-	background: transparent;
-}
-#Resource-Desc {
-    padding: 10px;
-    text-decoration: none;
-}
-
-/* SearchResult style*/
-div.SearchResult_posted {
-	font:12px/1.4em Times, Arial;
-	text-align:left;
-	border-top:1px solid #666666;
-}
-.pager {
-	clear:all;
-	text-align: center;
-	margin-bottom: 20px;
-	margin-top: 20px;
-	font-size: 12px;
-	padding-top: 10px;
-	padding-bottom: 10px;
-}
-.pager a, .pager a:link, .pager a:href, .pager a:hover {
- text-decoration: none;
- border: 0px;
-}
-
-.pager .pagerLinkPrevPage, .pagerLink, .pagerLinkNextPage{
-	padding: 2px 6px;
-}
-
-.pager .pagerLinkPrevPage{
-	margin-right:20px;
-}
-.pager .pagerLinkNextPage {
-	margin-left:20px;
-}
-
-.pager .pagerCurrent {
-	padding: 2px 6px; 
-	border-color: #999; 
-	font-weight: bold; 
-	font-size: 13px; 
-	vertical-align: top; 
-	background: #fff; 
-	color: #FF0084;	
-}

Copied: templates/branches/lifetype-1.2/LiteWinter/style.css (from rev 6373, templates/branches/lifetype-1.2/unported/LiteWinter/style.css)
===================================================================
--- templates/branches/lifetype-1.2/LiteWinter/style.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/LiteWinter/style.css	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,315 @@
+html {
+	/* IE Horizontal scrollbar fix */
+	overflow-y: scroll;
+	/* force scrollbars in moz */
+	height: 100%;
+}
+body {
+	margin: 0px;
+}
+/*Layout style*/
+#container {
+	width:80%;
+	background-image:url(images/rightshadow.gif);
+	background-repeat:repeat-y;
+	background-position:right;
+	padding:0 6px 0 0;
+	border-left: 1px solid;
+	border-left-color: #999999;
+}
+
+#BlogHeader{
+	margin:0px;
+	width:100%;
+	background-image:url(images/logo.gif);
+	background-repeat:no-repeat;
+	background-position:left;
+	height:80px;
+}
+
+/*Spereate Head and Main block*/
+#nav_bar {
+	background-image:url(images/hbar.gif);
+	background-repeat:repeat-x;
+	border-bottom: 1px solid #dddddd;
+	font:12px/1.4em Arial;
+}
+
+/*Left Block:: Menu Block*/
+#sidebar {
+	font:12px Times, Arial;
+	float:left;
+	width:180px;
+	margin:10px 10px 10px 10px;
+	padding:3px;
+	text-align:left;
+}
+
+/*Right Block :: Article Block*/
+#content {
+	margin:10px 10px 0 200px;
+	position:relative;
+	padding:3px;
+	text-align:left;
+}
+
+/*Bottom Block :: footer block*/
+#BlogFooter {
+	clear:both;
+	font: 12px Times, Arial;
+	background-image:url(images/hbar.gif);
+	background-repeat:repeat-x;
+	border-left: 1px solid #dddddd;
+	border-bottom:1px solid #dddddd;
+	width:100%;
+	text-align:center;
+}
+
+/*The three classes below are use to castale menu blocks*/
+div.blockTitle {
+	background-image: url(images/leftcolumnTitle_bg.gif); 
+	padding: 3px; 
+	background-color: #dddddd; 
+	color: #639ACE; 
+	font-weight: bold;
+	text-align:center;
+}
+
+div.blockContent {
+	background-image:url(images/leftcolumnContent_bg.gif); 
+	padding: 3px; 
+	line-height: 120%; 
+}
+
+div.blockFooter {
+	height:18px; 
+	background-image:url(images/leftcolumnFooter_bg.gif);
+	background-repeat:no-repeat; 
+	padding: 3px; 
+	margin-bottom: 10px;
+}
+
+/*Blog Title style*/
+#TITLE {
+	font:20px Times New Roman, Times, serif;
+	text-align:left;
+	padding:30px 0 0 20px;
+	font-weight:bold;
+}
+
+div.description {
+	width:400px;
+	margin:10px 0 0 0;
+	font:12px Times New Roman, Times, serif;
+	
+}
+
+/*Article style*/
+#Article_body {
+	margin: 0 0 5px 15px;
+	line-height: 140%;
+	border:1px solid #dddddd;
+	padding:5px;
+}
+
+.Article_title {
+	width:99%;
+	float:left;
+	font-size: 11pt;
+	text-transform: capitalize;
+	border-bottom:1px dotted #666666;
+}
+
+.Article_posted {
+	text-align: right;
+    font: 10px verdana, arial, helvetica, sans-serif;
+    letter-spacing: 0.07em;
+}
+
+.Article_contest {
+	margin: 10px 0 10px 10px;
+	text-align:left;
+	font:12px/1.6em Arial, Helvetica, sans-serif;
+    
+}
+
+.Article_footer {
+	margin: 0px;
+	padding: 0px 5px 10px 5px;
+	text-align: right;
+	font:12px/1.4em Arial, Helvetica, sans-serif;
+    	letter-spacing: 0.08em;
+}
+
+/*Commons style*/
+#commons {
+	margin:10px;
+	border-bottom:1px solid #dddddd;
+	font:12px Arial, Helvetica, sans-serif;
+	text-transform: capitalize;
+}
+#common_form {
+	margin:10px;
+	text-align:left;
+	font:12px/1.4em Arial, Helvetica, sans-serif;
+	line-height:180%;
+}
+#commons input {
+	border-bottom:1px solid #666666;
+	border-left: 0px;
+	border-top: 0px;
+	border-right: 0px;
+	width:60%;
+}
+#commons textarea {
+	width:100%;
+}
+
+.text_form {
+	line-height:140%;
+}
+
+#common_head {
+	margin:20px 10px 10px 10px;
+	border-top:1px dotted #dddddd;
+	font:12px Arial, Helvetica, sans-serif;
+	letter-spacing:0.1em;
+}
+
+#common_main {
+	margin:10px;
+	padding: 0 0 0 10px;
+	font:12px Arial, Helvetica, sans-serif;
+	letter-spacing:0.1em;
+}
+
+#common_footer {
+	text-align:right;
+	margin:10px;
+	font:12px Arial, Helvetica, sans-serif;
+	letter-spacing:0.09em;
+}
+
+/* Calander style*/
+table.calMonth{
+	margin: 0px auto;
+}
+.calMonthHeader
+{
+	font-weight: bold;
+	text-align:center;
+}
+.calMonthToday{
+	border:1px dotted #669933;
+	background-color:#eeeeee;
+}
+
+/*Item style*/
+div.Item {
+	font: 12px Times,Arial;
+	Text-align:left;
+	margin:0 0 0 5px;
+}
+
+div.MainItem {
+	font: 12px Times,Arial;
+	font-weight:bold;
+	Text-align:left;
+	margin:0 0 0 5px;
+}
+
+div.SubItem {
+	font: 12px Times,Arial;
+	Text-align:left;
+	margin:0 0 0 10px;
+}
+
+/* hyperlinks setting */
+a:link { text-decoration: none; color: #3366CC;}
+a:visited {	text-decoration: none;	color: #3366CC;}
+a:hover { text-decoration: none; color:#FFFFFF; background-color:#00CC00;}
+a:active { text-decoration: none;}
+
+#nav_bar a	{ background: transparent; text-decoration: none; color:#333333;}
+#nav_bar a:link	{ background: transparent; }
+#nav_bar a:visited	{ background: transparent; }
+#nav_bar a:active	{ background: transparent; }
+#nav_bar a:hover	{ color:#0099FF; background: transparent;text-decoration: underline; }
+
+#TITLE a{
+	display: block;
+	color:#3697E7;
+	font-style:oblique;
+}
+#TITLE a:hover{
+	display: block; text-decoration: none; background: transparent;
+}
+
+/*  albums style */
+
+#album {
+	text-align: center;
+}
+
+#album p {
+	text-align: center;
+	padding:0;
+	margin:0;
+	width:150px;
+}
+
+#album a a.linked a.hover a.active {
+	color:#3697E7;
+	text-decoration: none; 
+	background: transparent;
+}
+
+#album.nodecoration {
+	text-decoration: none; 
+	background: transparent;
+}
+#Resource-Desc {
+    padding: 10px;
+    text-decoration: none;
+}
+
+/* SearchResult style*/
+div.SearchResult_posted {
+	font:12px/1.4em Times, Arial;
+	text-align:left;
+	border-top:1px solid #666666;
+}
+.pager {
+	clear:all;
+	text-align: center;
+	margin-bottom: 20px;
+	margin-top: 20px;
+	font-size: 12px;
+	padding-top: 10px;
+	padding-bottom: 10px;
+}
+.pager a, .pager a:link, .pager a:href, .pager a:hover {
+ text-decoration: none;
+ border: 0px;
+}
+
+.pager .pagerLinkPrevPage, .pagerLink, .pagerLinkNextPage{
+	padding: 2px 6px;
+}
+
+.pager .pagerLinkPrevPage{
+	margin-right:20px;
+}
+.pager .pagerLinkNextPage {
+	margin-left:20px;
+}
+
+.pager .pagerCurrent {
+	padding: 2px 6px; 
+	border-color: #999; 
+	font-weight: bold; 
+	font-size: 13px; 
+	vertical-align: top; 
+	background: #fff; 
+	color: #FF0084;	
+}

Copied: templates/branches/lifetype-1.2/Mac-Stripe (from rev 6372, templates/branches/lifetype-1.2/unported/Mac-Stripe)

Deleted: templates/branches/lifetype-1.2/Mac-Stripe/album.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Mac-Stripe/album.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Mac-Stripe/album.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,87 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="container">
-<p>
- {$album->getDescription()}
-</p>
-
- <!-- album contents go here -->
-<div id="album">
-<table style="border:0px;width:100%;" summary="Album Resources">
- <tr>
-  <td style="width:50%;" align="center" >
-   <a class="nodecoration" href="{$url->parentAlbumLink($album)}">
-    <img style="border:0px" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
-    ..
-   </a>
-  </td>
-  {assign var="counter" value=1}
-  {assign var=children value=$album->getChildren()}
-  {foreach from=$children item=childalbum}
-  <td style="width:50%;" align="center" >
-   <a class="nodecoration" href="{$url->albumLink($childalbum)}">
-   <img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
-   {$childalbum->getName()} ({$childalbum->getNumResources()})
-  </a>
-  <br/><br/>
-  {assign var="counter" value="`$counter+1`"}
-  </td>
-  {if $counter%2 == 0}
-   </tr>
-   <tr>
-  {/if}
- {/foreach}
-
- <!--- show the resources here -->
-
- 
- {foreach from=$resources item=resource}
-  <td style="width:25%;" align="center" >
-  {if $resource->hasPreview()}
-   {*<a target="_blank" href="resserver.php?blogId={$blog->getId()}&amp;resource={$resource->getFileName()}">*}
-   <a href="{$url->resourceLink($resource)}">
-    <img alt="{$resource->getDescription()}" style="border:0px;" src="{$url->resourcePreviewLink($resource)}" />
-    <br/>{$resource->getFileName()}
-   </a>
-  {else}
-   <a class="nodecoration" href="{$url->resourceLink($resource)}">
-   {if $resource->isSound()}
-    <img alt="Sound" src="{$url->getUrl("/imgs/sound.gif")}" height="64" width="64" style="border:0px;" />
-   {elseif $resource->isVideo()}
-    <img alt="Video" src="{$url->getUrl("/imgs/video.gif")}" height="64" width="64" style="border:0px;" />
-   {elseif $resource->isZip()}
-    <img alt="Zip" src="{$url->getUrl("/imgs/compressed.gif")}" height="64" width="64" style="border:0px;" />   
-   {else}
-    <img alt="File" src="{$url->getUrl("/imgs/file.gif")}" height="64" width="64" style="border:0px;" />    
-   {/if}
-   <br/>{$resource->getFileName()}
-   </a>
-  {/if}
-  <br/>
-  {assign var=metadata value=$resource->getMetadataReader()}
-  {$metadata->getRoundedSize()}<br/>
-  {if $resource->isImage()}
-   {$metadata->getWidth()} x {$metadata->getHeight()}<br/>
-  {elseif $resource->isSound()}
-   {$metadata->getFormat()|upper} {$metadata->getSampleRate()} bps<br/>
-  {elseif $resource->isVideo()}
-   {$metadata->getFormat()|upper}
-   {$metadata->getWidth()} x {$metadata->getHeight()}, 
-   {$metadata->getLengthString()}<br/>
-  {elseif $resource->isZip()}
-   {$metadata->getTotalFiles()} {$locale->tr("files")}<br/>
-  {/if}
-  {assign var="counter" value="`$counter+1`"}
-  </td>
-  {if $counter%2 == 0}
-   </tr>
-   <tr>
-  {/if}
- {/foreach}
- <td></td></tr>
-</table>
-{pager style="links"}
- <!-- end of album contents -->
- 
- </div>
-</div>
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/Mac-Stripe/album.template (from rev 6373, templates/branches/lifetype-1.2/unported/Mac-Stripe/album.template)
===================================================================
--- templates/branches/lifetype-1.2/Mac-Stripe/album.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Mac-Stripe/album.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,87 @@
+{include file="$blogtemplate/header.template"}
+<div id="container">
+<p>
+ {$album->getDescription()}
+</p>
+
+ <!-- album contents go here -->
+<div id="album">
+<table style="border:0px;width:100%;" summary="Album Resources">
+ <tr>
+  <td style="width:50%;" align="center" >
+   <a class="nodecoration" href="{$url->parentAlbumLink($album)}">
+    <img style="border:0px" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
+    ..
+   </a>
+  </td>
+  {assign var="counter" value=1}
+  {assign var=children value=$album->getChildren()}
+  {foreach from=$children item=childalbum}
+  <td style="width:50%;" align="center" >
+   <a class="nodecoration" href="{$url->albumLink($childalbum)}">
+   <img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
+   {$childalbum->getName()} ({$childalbum->getNumResources()})
+  </a>
+  <br/><br/>
+  {assign var="counter" value="`$counter+1`"}
+  </td>
+  {if $counter%2 == 0}
+   </tr>
+   <tr>
+  {/if}
+ {/foreach}
+
+ <!--- show the resources here -->
+
+ 
+ {foreach from=$resources item=resource}
+  <td style="width:25%;" align="center" >
+  {if $resource->hasPreview()}
+   {*<a target="_blank" href="resserver.php?blogId={$blog->getId()}&amp;resource={$resource->getFileName()}">*}
+   <a href="{$url->resourceLink($resource)}">
+    <img alt="{$resource->getDescription()}" style="border:0px;" src="{$url->resourcePreviewLink($resource)}" />
+    <br/>{$resource->getFileName()}
+   </a>
+  {else}
+   <a class="nodecoration" href="{$url->resourceLink($resource)}">
+   {if $resource->isSound()}
+    <img alt="Sound" src="{$url->getUrl("/imgs/sound.gif")}" height="64" width="64" style="border:0px;" />
+   {elseif $resource->isVideo()}
+    <img alt="Video" src="{$url->getUrl("/imgs/video.gif")}" height="64" width="64" style="border:0px;" />
+   {elseif $resource->isZip()}
+    <img alt="Zip" src="{$url->getUrl("/imgs/compressed.gif")}" height="64" width="64" style="border:0px;" />   
+   {else}
+    <img alt="File" src="{$url->getUrl("/imgs/file.gif")}" height="64" width="64" style="border:0px;" />    
+   {/if}
+   <br/>{$resource->getFileName()}
+   </a>
+  {/if}
+  <br/>
+  {assign var=metadata value=$resource->getMetadataReader()}
+  {$metadata->getRoundedSize()}<br/>
+  {if $resource->isImage()}
+   {$metadata->getWidth()} x {$metadata->getHeight()}<br/>
+  {elseif $resource->isSound()}
+   {$metadata->getFormat()|upper} {$metadata->getSampleRate()} bps<br/>
+  {elseif $resource->isVideo()}
+   {$metadata->getFormat()|upper}
+   {$metadata->getWidth()} x {$metadata->getHeight()}, 
+   {$metadata->getLengthString()}<br/>
+  {elseif $resource->isZip()}
+   {$metadata->getTotalFiles()} {$locale->tr("files")}<br/>
+  {/if}
+  {assign var="counter" value="`$counter+1`"}
+  </td>
+  {if $counter%2 == 0}
+   </tr>
+   <tr>
+  {/if}
+ {/foreach}
+ <td></td></tr>
+</table>
+{pager style="links"}
+ <!-- end of album contents -->
+ 
+ </div>
+</div>
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/Mac-Stripe/albums.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Mac-Stripe/albums.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Mac-Stripe/albums.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,25 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="container">
-<!-- album contents go here -->
-<br/>
-<table style="border:0px;width:100%;" summary="Albums">
-<tr>
-  {assign var="counter" value=0}
-  {foreach from=$albums item=album}
-  <td style="width:33%;" align="center">
-   <a class="nodecoration" href="{$url->albumLink($album)}">
-   <img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
-   {$album->getName()} ({$album->getNumResources()})
-  </a>
-  {assign var="counter" value="`$counter+1`"}
-  </td>
-  {if $counter%2 == 0}
-   </tr>
-   <tr>
-  {/if}
- {/foreach}
- <td></td></tr>
- </table>
- <!-- end of the albums -->
-</div>
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/Mac-Stripe/albums.template (from rev 6373, templates/branches/lifetype-1.2/unported/Mac-Stripe/albums.template)
===================================================================
--- templates/branches/lifetype-1.2/Mac-Stripe/albums.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Mac-Stripe/albums.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,25 @@
+{include file="$blogtemplate/header.template"}
+<div id="container">
+<!-- album contents go here -->
+<br/>
+<table style="border:0px;width:100%;" summary="Albums">
+<tr>
+  {assign var="counter" value=0}
+  {foreach from=$albums item=album}
+  <td style="width:33%;" align="center">
+   <a class="nodecoration" href="{$url->albumLink($album)}">
+   <img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
+   {$album->getName()} ({$album->getNumResources()})
+  </a>
+  {assign var="counter" value="`$counter+1`"}
+  </td>
+  {if $counter%2 == 0}
+   </tr>
+   <tr>
+  {/if}
+ {/foreach}
+ <td></td></tr>
+ </table>
+ <!-- end of the albums -->
+</div>
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/Mac-Stripe/commentarticle.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Mac-Stripe/commentarticle.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Mac-Stripe/commentarticle.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,4 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<h3>{$locale->tr("add_comment")}</h3>
- {include file="$blogtemplate/commentform.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/Mac-Stripe/commentarticle.template (from rev 6373, templates/branches/lifetype-1.2/unported/Mac-Stripe/commentarticle.template)
===================================================================
--- templates/branches/lifetype-1.2/Mac-Stripe/commentarticle.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Mac-Stripe/commentarticle.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,4 @@
+{include file="$blogtemplate/header.template"}
+<h3>{$locale->tr("add_comment")}</h3>
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/Mac-Stripe/error.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Mac-Stripe/error.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Mac-Stripe/error.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,4 +0,0 @@
-{include file="$blogtemplate/header.template"}
- <h3>{$locale->tr("error")}</h3>
- {$locale->tr($message)}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/Mac-Stripe/error.template (from rev 6373, templates/branches/lifetype-1.2/unported/Mac-Stripe/error.template)
===================================================================
--- templates/branches/lifetype-1.2/Mac-Stripe/error.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Mac-Stripe/error.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,4 @@
+{include file="$blogtemplate/header.template"}
+ <h3>{$locale->tr("error")}</h3>
+ {$locale->tr($message)}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/Mac-Stripe/favicon.ico
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/Mac-Stripe/favicon.ico (from rev 6373, templates/branches/lifetype-1.2/unported/Mac-Stripe/favicon.ico)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/Mac-Stripe/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Mac-Stripe/footer.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Mac-Stripe/footer.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,93 +0,0 @@
-</div>
-</div>
-
-<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" />
-    <input type="hidden" name="op" value="Search" />
-    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
-    <input type="submit" name="Search" value="{$locale->tr("search")}" />
-   </form>
-</div>
-
-{assign var=blogOwner value=$blog->getOwnerInfo()}
-{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
-{if $blogOwner->hasPicture() && $AboutMyself}  
-  	<div class="sidetitle">{$locale->tr("about_myself")}</div>
-  	<div class="side">
-  	<div align="center">
-  	{assign var=picture value=$blogOwner->getPicture()}
-  	<img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /><br/>
-  	<p>{$AboutMyself}</p>
-  	</div>
-  	</div>
-{/if}
-
-<div class="sidetitle">{$locale->tr("calendar")}</div>
-<div class="side">
-<div align="center">
-{$calendar}
-</div>
-</div>
-
-<div class="sidetitle">{$locale->tr("archives")}</div>
-<div class="side">
-<p>
- <ul>
- {foreach from=$archives item=archive}
-  <li><a href="{$archive->getUrl()}">{$archive->getName()}</a></li>
- {/foreach}
- </ul>
-</p>
-</div>
-
-<div class="sidetitle">{$locale->tr("categories")}</div>
-<div class="side">
-<p>
- <ul>
- {foreach from=$articlecategories item=category}
-  <li><a href="{$url->categoryLink($category)}">{$category->getName()}</a></li>
- {/foreach}
- </ul>
-</p>
-</div>
-
-<div class="sidetitle">{$locale->tr("links")}</div>
-<div class="side">
-<p>
-  <ul>
-   {foreach from=$mylinkscategories item=linkcategory}
-     <li><b>{$linkcategory->getName()}</b>
-     <ul>
-      {foreach from=$linkcategory->getLinks() item=link}
-       <li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a></li>
-      {/foreach}
-     </ul>
-    </li>
-   {/foreach}  
-   </ul>
-</p>
-</div>
-
-<div class="sidetitle">{$locale->tr("menu")}</div>
-<div class="side">
-<ul>
-<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="powered">
-Powered by <a href="http://www.lifetype.net">LifeType</a><br />    
-</div>
-
-</div>
-</body>
-</html>

Copied: templates/branches/lifetype-1.2/Mac-Stripe/footer.template (from rev 6373, templates/branches/lifetype-1.2/unported/Mac-Stripe/footer.template)
===================================================================
--- templates/branches/lifetype-1.2/Mac-Stripe/footer.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Mac-Stripe/footer.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,93 @@
+</div>
+</div>
+
+<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" />
+    <input type="hidden" name="op" value="Search" />
+    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
+    <input type="submit" name="Search" value="{$locale->tr("search")}" />
+   </form>
+</div>
+
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}  
+  	<div class="sidetitle">{$locale->tr("about_myself")}</div>
+  	<div class="side">
+  	<div align="center">
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	<img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /><br/>
+  	<p>{$AboutMyself}</p>
+  	</div>
+  	</div>
+{/if}
+
+<div class="sidetitle">{$locale->tr("calendar")}</div>
+<div class="side">
+<div align="center">
+{$calendar}
+</div>
+</div>
+
+<div class="sidetitle">{$locale->tr("archives")}</div>
+<div class="side">
+<p>
+ <ul>
+ {foreach from=$archives item=archive}
+  <li><a href="{$archive->getUrl()}">{$archive->getName()}</a></li>
+ {/foreach}
+ </ul>
+</p>
+</div>
+
+<div class="sidetitle">{$locale->tr("categories")}</div>
+<div class="side">
+<p>
+ <ul>
+ {foreach from=$articlecategories item=category}
+  <li><a href="{$url->categoryLink($category)}">{$category->getName()}</a></li>
+ {/foreach}
+ </ul>
+</p>
+</div>
+
+<div class="sidetitle">{$locale->tr("links")}</div>
+<div class="side">
+<p>
+  <ul>
+   {foreach from=$mylinkscategories item=linkcategory}
+     <li><b>{$linkcategory->getName()}</b>
+     <ul>
+      {foreach from=$linkcategory->getLinks() item=link}
+       <li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a></li>
+      {/foreach}
+     </ul>
+    </li>
+   {/foreach}  
+   </ul>
+</p>
+</div>
+
+<div class="sidetitle">{$locale->tr("menu")}</div>
+<div class="side">
+<ul>
+<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="powered">
+Powered by <a href="http://www.lifetype.net">LifeType</a><br />    
+</div>
+
+</div>
+</body>
+</html>

Deleted: templates/branches/lifetype-1.2/Mac-Stripe/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Mac-Stripe/header.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Mac-Stripe/header.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,27 +0,0 @@
-<!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">
-
-<head>
-<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>
-<title>{$pageTitle|escape:"html"}</title>
- <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")}" />
- <link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="{$url->rssLink("atom")}" />
- <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
-{if $badbehavior}
-   {$badbehavior->showBB2JavaScript()}
-{/if}
-</head>
-
-<body>
-<div id="banner">
-<h1><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1>
-{if $blog->getAbout()}<span class="description">{$blog->getAbout()}</span>{/if}
-</div>
-
-<div id="content">
-<div class="blog">
-

Copied: templates/branches/lifetype-1.2/Mac-Stripe/header.template (from rev 6373, templates/branches/lifetype-1.2/unported/Mac-Stripe/header.template)
===================================================================
--- templates/branches/lifetype-1.2/Mac-Stripe/header.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Mac-Stripe/header.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,27 @@
+<!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">
+
+<head>
+<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>
+<title>{$pageTitle|escape:"html"}</title>
+ <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")}" />
+ <link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="{$url->rssLink("atom")}" />
+ <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
+{if $badbehavior}
+   {$badbehavior->showBB2JavaScript()}
+{/if}
+</head>
+
+<body>
+<div id="banner">
+<h1><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1>
+{if $blog->getAbout()}<span class="description">{$blog->getAbout()}</span>{/if}
+</div>
+
+<div id="content">
+<div class="blog">
+

Deleted: templates/branches/lifetype-1.2/Mac-Stripe/main.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Mac-Stripe/main.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Mac-Stripe/main.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,9 +0,0 @@
-{include file="$blogtemplate/header.template"}
- {foreach from=$posts item=post}
-   {assign var="postDate" value=$post->getDateObject()}
-   <div class="blogbody">
-   {include file="$blogtemplate/post.template"}
-   </div>
- {/foreach}
-  {pager style="links"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/Mac-Stripe/main.template (from rev 6373, templates/branches/lifetype-1.2/unported/Mac-Stripe/main.template)
===================================================================
--- templates/branches/lifetype-1.2/Mac-Stripe/main.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Mac-Stripe/main.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,9 @@
+{include file="$blogtemplate/header.template"}
+ {foreach from=$posts item=post}
+   {assign var="postDate" value=$post->getDateObject()}
+   <div class="blogbody">
+   {include file="$blogtemplate/post.template"}
+   </div>
+ {/foreach}
+  {pager style="links"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/Mac-Stripe/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Mac-Stripe/post.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Mac-Stripe/post.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,22 +0,0 @@
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-
-<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>
-
- ({foreach name=categories from=$post->getCategories() item=postCategory}
-    <a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
-  {/foreach})
-  
- :: 
-{if $post->getCommentsEnabled()}
-<a href="{$url->postPermalink($post)}">{$locale->tr("comments")}
-({$post->getNumComments()})</a>
-::
-{/if}
-<a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a>
-
-</div>

Copied: templates/branches/lifetype-1.2/Mac-Stripe/post.template (from rev 6373, templates/branches/lifetype-1.2/unported/Mac-Stripe/post.template)
===================================================================
--- templates/branches/lifetype-1.2/Mac-Stripe/post.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Mac-Stripe/post.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,22 @@
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+
+<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>
+
+ ({foreach name=categories from=$post->getCategories() item=postCategory}
+    <a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+  {/foreach})
+  
+ :: 
+{if $post->getCommentsEnabled()}
+<a href="{$url->postPermalink($post)}">{$locale->tr("comments")}
+({$post->getNumComments()})</a>
+::
+{/if}
+<a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a>
+
+</div>

Deleted: templates/branches/lifetype-1.2/Mac-Stripe/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Mac-Stripe/postandcomments.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Mac-Stripe/postandcomments.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,39 +0,0 @@
-{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">
-   <!-- {$url->postTrackbackLink($post)} -->
-   <p>{include file="$blogtemplate/post.template"}</p>
-        {pager style="links"}    
-   </div>
-   {foreach from=$comments item=comment}
-   <div class="blogbody">
-    <p class="title">
-     <img src="{$url->getUrl("/imgs/comment_icon1.gif")}"/> {$comment->getTopic()} <span class="categoryinfo">[<a href="{$url->replyCommentLink($post,$comment)}">{$locale->tr("reply")}</a>]</span>
-    </p>
-    {if $comment->IsPosterAuthenticated()}
-	{assign var=poster value=$comment->getUser()}
-	{if $poster->hasPicture()}
-		{assign var=posterimg value=$poster->getPicture()}
-		<img src="{$posterimg->getPreviewLink()}" alt="{$poster->getUserName()}" align="right" class="poster_avatar"/>
-	{/if}
-{/if}
-{$comment->gettext()}
-    <div class="posted">
-    {assign var="commentDate" value=$comment->getTimestamp()}
-    Comment by 
-    {if $comment->getUserUrl() != "" }
-    <a href="{$comment->getUserUrl()}">{$comment->getUsername()}</a>
-    {else}
-    {$comment->getUsername()}
-    {/if}
-    ({$locale->formatDate($commentDate, "%m/%d/%Y %H:%M")})</div></div>
-  {/foreach}
-{if $post->getCommentsEnabled()}
-<p>
-<h3>{$locale->tr("add_comment")}</h3>
-{include file="$blogtemplate/commentform.template"}
-</p>
-{/if}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/Mac-Stripe/postandcomments.template (from rev 6373, templates/branches/lifetype-1.2/unported/Mac-Stripe/postandcomments.template)
===================================================================
--- templates/branches/lifetype-1.2/Mac-Stripe/postandcomments.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Mac-Stripe/postandcomments.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,39 @@
+{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">
+   <!-- {$url->postTrackbackLink($post)} -->
+   <p>{include file="$blogtemplate/post.template"}</p>
+        {pager style="links"}    
+   </div>
+   {foreach from=$comments item=comment}
+   <div class="blogbody">
+    <p class="title">
+     <img src="{$url->getUrl("/imgs/comment_icon1.gif")}"/> {$comment->getTopic()} <span class="categoryinfo">[<a href="{$url->replyCommentLink($post,$comment)}">{$locale->tr("reply")}</a>]</span>
+    </p>
+    {if $comment->IsPosterAuthenticated()}
+	{assign var=poster value=$comment->getUser()}
+	{if $poster->hasPicture()}
+		{assign var=posterimg value=$poster->getPicture()}
+		<img src="{$posterimg->getPreviewLink()}" alt="{$poster->getUserName()}" align="right" class="poster_avatar"/>
+	{/if}
+{/if}
+{$comment->gettext()}
+    <div class="posted">
+    {assign var="commentDate" value=$comment->getTimestamp()}
+    Comment by 
+    {if $comment->getUserUrl() != "" }
+    <a href="{$comment->getUserUrl()}">{$comment->getUsername()}</a>
+    {else}
+    {$comment->getUsername()}
+    {/if}
+    ({$locale->formatDate($commentDate, "%m/%d/%Y %H:%M")})</div></div>
+  {/foreach}
+{if $post->getCommentsEnabled()}
+<p>
+<h3>{$locale->tr("add_comment")}</h3>
+{include file="$blogtemplate/commentform.template"}
+</p>
+{/if}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/Mac-Stripe/posttrackbacks.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Mac-Stripe/posttrackbacks.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Mac-Stripe/posttrackbacks.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,14 +0,0 @@
-{include file="$blogtemplate/header.template"}
-  <p>
-    {$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>":
-  </p>
-  <p>
-  {foreach from=$trackbacks item=trackback}
-   <a href="{$trackback->getUrl()}">{$trackback->getTitle()}</a><br/>
-   <b>{$locale->tr("trackback_excerpt")}:</b> {$trackback->getExcerpt()}<br/>
-   <b>{$locale->tr("trackback_weblog")}:</b> {$trackback->getBlogName()}<br/>
-   {assign var="trackbackDate" value=$trackback->getDateObject()}
-   <b>{$locale->tr("date")}:</b> {$locale->formatDate($trackbackDate, "%d/%m/%Y %H:%M")}<br/><br/>
-  {/foreach}
-  </p>
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/Mac-Stripe/posttrackbacks.template (from rev 6373, templates/branches/lifetype-1.2/unported/Mac-Stripe/posttrackbacks.template)
===================================================================
--- templates/branches/lifetype-1.2/Mac-Stripe/posttrackbacks.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Mac-Stripe/posttrackbacks.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,14 @@
+{include file="$blogtemplate/header.template"}
+  <p>
+    {$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>":
+  </p>
+  <p>
+  {foreach from=$trackbacks item=trackback}
+   <a href="{$trackback->getUrl()}">{$trackback->getTitle()}</a><br/>
+   <b>{$locale->tr("trackback_excerpt")}:</b> {$trackback->getExcerpt()}<br/>
+   <b>{$locale->tr("trackback_weblog")}:</b> {$trackback->getBlogName()}<br/>
+   {assign var="trackbackDate" value=$trackback->getDateObject()}
+   <b>{$locale->tr("date")}:</b> {$locale->formatDate($trackbackDate, "%d/%m/%Y %H:%M")}<br/><br/>
+  {/foreach}
+  </p>
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/Mac-Stripe/resource.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Mac-Stripe/resource.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Mac-Stripe/resource.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,55 +0,0 @@
-{include file="$blogtemplate/header.template"}
-
-{assign var=metadata value=$resource->getMetadataReader()}
-{assign var=updated value=$resource->getTimestamp()}
-<div id="container">
- <div class="blog">
-  <h2 class="date">{$resource->getFileName()}</h2>
-  <div class="blogbody">
-   <div class="posted">
-    <a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a> 
-    ({$metadata->getRoundedSize()}) | {$locale->tr("created")} {$locale->formatDate($updated,"%d %b, %Y")}
-   </div>
-  </div>
-  <p>{$resource->getDescription()}</p>
-  {if $resource->isImage()}
-   <img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
-  {else}
-   <a href="{$url->resourceDownloadLink($resource)}">
-   {* show some information about the file *}
-   {if $resource->isSound()}
-     <img alt="Sound" src="{$url->getUrl("/imgs/sound.gif")}" height="64" width="64" style="border:0px;" /><br/>
-     {$resource->getFileName()}
-     </a><br/>     
-     {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
-     {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
-     {$locale->tr("sample_rate")}: {$metadata->getSampleRate()} Khz
-   {elseif $resource->isVideo()}
-     <img alt="Sound" src="{$url->getUrl("/imgs/video.gif")}" height="64" width="64" style="border:0px;" /><br/>
-     {$resource->getFileName()}
-    </a><br/>
-    {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
-    {$locale->tr("size")}: {$metadata->getHeight()} x {$metadata->getWidth()}<br/>
-    {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
-    {$locale->tr("video_codec")}: {$metadata->getVideoCodec()}<br/>
-    {$locale->tr("audio_codec")}: {$metadata->getAudioCodec()}
-   {elseif $resource->isZip()}
-     <img alt="Sound" src="{$url->getUrl("/imgs/compressed.gif")}" height="64" width="64" style="border:0px;" /><br/>
-     {$resource->getFileName()}
-    </a><br/>
-    {$metadata->getTotalFiles()} {$locale->tr("files")}<br/>
-    {$locale->tr("uncompressed_size")}: {$metadata->getRoundedUncompressedSize()}
-   {else}
-     <img alt="Sound" src="{$url->getUrl("/imgs/file.gif")}" height="64" width="64" style="border:0px;" /><br/>
-     {$resource->getFileName()}
-     </a>    
-   {/if}   
-  {/if}
-  <br/>
-  <p>
-   {assign var=album value=$resource->getAlbum()}
-   <a href="{$url->albumLink($album)}">{$locale->tr("back")}</a>
-  </p>
- </div>
-</div>
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/Mac-Stripe/resource.template (from rev 6373, templates/branches/lifetype-1.2/unported/Mac-Stripe/resource.template)
===================================================================
--- templates/branches/lifetype-1.2/Mac-Stripe/resource.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Mac-Stripe/resource.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,55 @@
+{include file="$blogtemplate/header.template"}
+
+{assign var=metadata value=$resource->getMetadataReader()}
+{assign var=updated value=$resource->getTimestamp()}
+<div id="container">
+ <div class="blog">
+  <h2 class="date">{$resource->getFileName()}</h2>
+  <div class="blogbody">
+   <div class="posted">
+    <a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a> 
+    ({$metadata->getRoundedSize()}) | {$locale->tr("created")} {$locale->formatDate($updated,"%d %b, %Y")}
+   </div>
+  </div>
+  <p>{$resource->getDescription()}</p>
+  {if $resource->isImage()}
+   <img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
+  {else}
+   <a href="{$url->resourceDownloadLink($resource)}">
+   {* show some information about the file *}
+   {if $resource->isSound()}
+     <img alt="Sound" src="{$url->getUrl("/imgs/sound.gif")}" height="64" width="64" style="border:0px;" /><br/>
+     {$resource->getFileName()}
+     </a><br/>     
+     {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
+     {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
+     {$locale->tr("sample_rate")}: {$metadata->getSampleRate()} Khz
+   {elseif $resource->isVideo()}
+     <img alt="Sound" src="{$url->getUrl("/imgs/video.gif")}" height="64" width="64" style="border:0px;" /><br/>
+     {$resource->getFileName()}
+    </a><br/>
+    {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
+    {$locale->tr("size")}: {$metadata->getHeight()} x {$metadata->getWidth()}<br/>
+    {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
+    {$locale->tr("video_codec")}: {$metadata->getVideoCodec()}<br/>
+    {$locale->tr("audio_codec")}: {$metadata->getAudioCodec()}
+   {elseif $resource->isZip()}
+     <img alt="Sound" src="{$url->getUrl("/imgs/compressed.gif")}" height="64" width="64" style="border:0px;" /><br/>
+     {$resource->getFileName()}
+    </a><br/>
+    {$metadata->getTotalFiles()} {$locale->tr("files")}<br/>
+    {$locale->tr("uncompressed_size")}: {$metadata->getRoundedUncompressedSize()}
+   {else}
+     <img alt="Sound" src="{$url->getUrl("/imgs/file.gif")}" height="64" width="64" style="border:0px;" /><br/>
+     {$resource->getFileName()}
+     </a>    
+   {/if}   
+  {/if}
+  <br/>
+  <p>
+   {assign var=album value=$resource->getAlbum()}
+   <a href="{$url->albumLink($album)}">{$locale->tr("back")}</a>
+  </p>
+ </div>
+</div>
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/Mac-Stripe/screenshot.jpg
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/Mac-Stripe/screenshot.jpg (from rev 6373, templates/branches/lifetype-1.2/unported/Mac-Stripe/screenshot.jpg)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/Mac-Stripe/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Mac-Stripe/searchresults.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Mac-Stripe/searchresults.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,22 +0,0 @@
-{include file="$blogtemplate/header.template"} 
-   <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
-   <div id="SearchResults">
-    {foreach from=$searchresults item=result}
-    
-    
-      {assign var=article value=$result->getArticle()}
-      <h3><a href="{$url->postPermalink($article)}">{$article->getTopic()}</a></h3>
-      <p class="searchArticle">
-      {$article->getText()|strip_tags|truncate:300:"...":false}
-      </p>
-      <p class="footer">
-		{foreach name=categories from=$article->getCategories() 
-				 item=postCategory}
-          <a href="{$url->categoryLink($postCategory)}">
-			 {$postCategory->getName()}</a>{if 
-				!$smarty.foreach.categories.last}, {/if}
-        {/foreach}
-      </p>
-    {/foreach}
-   </div> 
-{include file="$blogtemplate/footer.template"} 

Copied: templates/branches/lifetype-1.2/Mac-Stripe/searchresults.template (from rev 6373, templates/branches/lifetype-1.2/unported/Mac-Stripe/searchresults.template)
===================================================================
--- templates/branches/lifetype-1.2/Mac-Stripe/searchresults.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Mac-Stripe/searchresults.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,22 @@
+{include file="$blogtemplate/header.template"} 
+   <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+   <div id="SearchResults">
+    {foreach from=$searchresults item=result}
+    
+    
+      {assign var=article value=$result->getArticle()}
+      <h3><a href="{$url->postPermalink($article)}">{$article->getTopic()}</a></h3>
+      <p class="searchArticle">
+      {$article->getText()|strip_tags|truncate:300:"...":false}
+      </p>
+      <p class="footer">
+		{foreach name=categories from=$article->getCategories() 
+				 item=postCategory}
+          <a href="{$url->categoryLink($postCategory)}">
+			 {$postCategory->getName()}</a>{if 
+				!$smarty.foreach.categories.last}, {/if}
+        {/foreach}
+      </p>
+    {/foreach}
+   </div> 
+{include file="$blogtemplate/footer.template"} 

Deleted: templates/branches/lifetype-1.2/Mac-Stripe/stripes.png
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/Mac-Stripe/stripes.png (from rev 6373, templates/branches/lifetype-1.2/unported/Mac-Stripe/stripes.png)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/Mac-Stripe/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/Mac-Stripe/style.css	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Mac-Stripe/style.css	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,281 +0,0 @@
-/* "Mac Stripe" was written by Scott Yang of www.movablestyles.org
-   and released under the Creative Commons attribution license
-   (http://creativecommons.org/licenses/by/2.0/).
-*/
-
-body {
-    background: #fff;
-    font-family: "Trebuchet MS", arial, helvetica, sans-serif;
-    margin: 0px 0px 20px 0px;
-}
-
-a, a:link, a:visited	{ 
-    border-bottom: #88a dotted 1px;
-    color: #88a;
-    text-decoration: none; 
-}
-
-a:active, a:hover {
-    border-bottom: #445 solid 1px;
-    color: #445;  
-}
-
-h1, h2, h3 {
-    margin: 0px;
-    padding: 0px;
-}
-
-#banner, #banner-commentspop {
-    background-image: url(stripes.png);
-    border-bottom: 3px solid #888;
-    color: #000;
-    font-size: x-large;
-    font-weight: normal;	
-    padding: 10px 0 10px 15px;
-}
-
-#banner a,
-#banner a:link,
-#banner a:visited,
-#banner a:active,
-#banner a:hover {
-    border: none;
-    color: #000;
-    font-size: 40px;
-    text-decoration: none;
-}
-
-.description {
-    color: #333;
-    font-size: small;
-    text-transform: none;	
-}
-
-#content {
-    position: absolute;
-    left: 275px;
-    right: 65px;
-}
-
-#container {
-    border: 1px solid #fff;		
-    margin: 0 50px 0 50px;
-}
-
-#links {	
-    margin-left: 50px;
-    padding: 0px 15px 15px 15px;				
-    width: 200px;			
-}
-
-.blog {
-    padding:30px 15px 15px 15px;
-}
-
-.blogbody {
-    color: #333;
-    line-height: 140%;
-    text-align: justify;
-}
-
-.title	{
-    font-size: large;
-}			
-
-#menu {
-    text-align: center;
-}		
-
-.date	{ 
-    background-image: url(stripes.png);
-    border-bottom: 2px solid #888;
-    color: #333; 
-    font-size: medium; 
-    font-weight:bold;
-    margin-bottom: 10px;
-    padding: 2px;
-    text-align: center;
-}			
-
-.posted	{ 
-    color: #000; 
-    display: block;
-    font-size: small; 
-    margin-bottom: 25px;
-    padding-top: 2px;
-    text-align: center;
-}
-
-.calendar a {
-    border: #888 solid 1px;
-    font-weight: bold;
-    padding: 0 2px 0 2px;
-}
-
-.calendar table {
-    width: 100%;
-}
-
-.calendar td, .calendar th {
-    color:#666;
-    font-size: small;
-    font-weight: normal;
-    line-height: 140%;
-    padding: 2px;
-    text-align: center;
-}
-
-.calendarhead {	
-    background-image: url(stripes.png);
-    border-bottom: 2px solid #888;
-    color: #000;
-    font-size: normal;
-    font-weight: bold;
-    padding: 2px;
-    text-align: center;			
-}	
-
-.side {
-    color: #333;
-    font-size: small;
-    font-weight: normal;
-    line-height: 140%;
-    padding: 2px;				
-}
-
-.side form {
-    margin: 0;
-}
-
-.sidetitle {
-    background-image: url(stripes.png);
-    border-bottom: 2px solid #888;
-    color: #000;
-    font-weight: bold;
-    margin-top: 30px;
-    padding: 2px;
-    text-align: center;
-}		
-
-.syndicate {
-    background-image: url(stripes.png);
-    border-bottom: 2px solid #888;
-    font-weight: bold;
-    padding: 2px;
-    margin-top: 15px;
-    text-align: center;
-}
-
-.syndicate a, .syndicate a:hover {
-    border: none;
-}
-
-.powered {
-    color: #666;
-    font-size: small;
-    line-height: 140%;
-    padding: 2px;
-    text-align: center;
-}	
-
-.comments-body {
-    border-bottom: #aaa dotted 1px;
-    color: #666;
-    line-height: 140%;
-    margin: 10px 30px;
-    padding-bottom: 10px;
-    text-align: justify;
-}		
-
-.comments-post {
-    color: #666;
-    display: block;
-    font-size: small;
-    text-align: center;
-}	
-
-.trackback-url {
-    color:#666;
-    font-size:small;
-    font-weight:normal;
-    line-height:140%;
-    padding:5px;		
-    border:1px dotted #999; 					
-}
-
-
-.trackback-body {
-    color:#666;
-    font-size:small;
-    font-weight:normal;
-    line-height:140%;
-    padding-bottom:10px;
-    padding-top:10px;		
-    border-bottom:1px dotted #999; 					
-}		
-
-.trackback-post {
-    color:#666;
-    font-size:x-small;
-    font-weight:normal;
-}	
-
-
-.comments-head	{ 
-    background-image: url(stripes.png);
-    border-bottom: 2px solid #888;
-    color: #333; 
-    font-size: medium; 
-    font-weight:bold;
-    margin-bottom: 10px;
-    padding: 2px;
-    text-align: center;
-}		
-
-#author, #email, #search, #text, #url {
-    border: #aaa solid 1px;
-}
-
-#text {
-    width: 350px;
-}
-
-DIV.side UL {
-    position: relative;
-    left: -20px;
-}
-
-.pager {
-	clear:all;
-	text-align: center;
-	margin-bottom: 20px;
-	margin-top: 20px;
-	font-size: 12px;
-	padding-top: 10px;
-	padding-bottom: 10px;
-}
-.pager a, .pager a:link, .pager a:href, .pager a:hover {
- text-decoration: none;
- border: 0px;
-}
-
-.pager .pagerLinkPrevPage, .pagerLink, .pagerLinkNextPage{
-	padding: 2px 6px;
-}
-
-.pager .pagerLinkPrevPage{
-	margin-right:20px;
-}
-.pager .pagerLinkNextPage {
-	margin-left:20px;
-}
-
-.pager .pagerCurrent {
-	padding: 2px 6px; 
-	border-color: #999; 
-	font-weight: bold; 
-	font-size: 13px; 
-	vertical-align: top; 
-	background: #fff; 
-	color: #FF0084;	
-}

Copied: templates/branches/lifetype-1.2/Mac-Stripe/style.css (from rev 6373, templates/branches/lifetype-1.2/unported/Mac-Stripe/style.css)
===================================================================
--- templates/branches/lifetype-1.2/Mac-Stripe/style.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/Mac-Stripe/style.css	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,281 @@
+/* "Mac Stripe" was written by Scott Yang of www.movablestyles.org
+   and released under the Creative Commons attribution license
+   (http://creativecommons.org/licenses/by/2.0/).
+*/
+
+body {
+    background: #fff;
+    font-family: "Trebuchet MS", arial, helvetica, sans-serif;
+    margin: 0px 0px 20px 0px;
+}
+
+a, a:link, a:visited	{ 
+    border-bottom: #88a dotted 1px;
+    color: #88a;
+    text-decoration: none; 
+}
+
+a:active, a:hover {
+    border-bottom: #445 solid 1px;
+    color: #445;  
+}
+
+h1, h2, h3 {
+    margin: 0px;
+    padding: 0px;
+}
+
+#banner, #banner-commentspop {
+    background-image: url(stripes.png);
+    border-bottom: 3px solid #888;
+    color: #000;
+    font-size: x-large;
+    font-weight: normal;	
+    padding: 10px 0 10px 15px;
+}
+
+#banner a,
+#banner a:link,
+#banner a:visited,
+#banner a:active,
+#banner a:hover {
+    border: none;
+    color: #000;
+    font-size: 40px;
+    text-decoration: none;
+}
+
+.description {
+    color: #333;
+    font-size: small;
+    text-transform: none;	
+}
+
+#content {
+    position: absolute;
+    left: 275px;
+    right: 65px;
+}
+
+#container {
+    border: 1px solid #fff;		
+    margin: 0 50px 0 50px;
+}
+
+#links {	
+    margin-left: 50px;
+    padding: 0px 15px 15px 15px;				
+    width: 200px;			
+}
+
+.blog {
+    padding:30px 15px 15px 15px;
+}
+
+.blogbody {
+    color: #333;
+    line-height: 140%;
+    text-align: justify;
+}
+
+.title	{
+    font-size: large;
+}			
+
+#menu {
+    text-align: center;
+}		
+
+.date	{ 
+    background-image: url(stripes.png);
+    border-bottom: 2px solid #888;
+    color: #333; 
+    font-size: medium; 
+    font-weight:bold;
+    margin-bottom: 10px;
+    padding: 2px;
+    text-align: center;
+}			
+
+.posted	{ 
+    color: #000; 
+    display: block;
+    font-size: small; 
+    margin-bottom: 25px;
+    padding-top: 2px;
+    text-align: center;
+}
+
+.calendar a {
+    border: #888 solid 1px;
+    font-weight: bold;
+    padding: 0 2px 0 2px;
+}
+
+.calendar table {
+    width: 100%;
+}
+
+.calendar td, .calendar th {
+    color:#666;
+    font-size: small;
+    font-weight: normal;
+    line-height: 140%;
+    padding: 2px;
+    text-align: center;
+}
+
+.calendarhead {	
+    background-image: url(stripes.png);
+    border-bottom: 2px solid #888;
+    color: #000;
+    font-size: normal;
+    font-weight: bold;
+    padding: 2px;
+    text-align: center;			
+}	
+
+.side {
+    color: #333;
+    font-size: small;
+    font-weight: normal;
+    line-height: 140%;
+    padding: 2px;				
+}
+
+.side form {
+    margin: 0;
+}
+
+.sidetitle {
+    background-image: url(stripes.png);
+    border-bottom: 2px solid #888;
+    color: #000;
+    font-weight: bold;
+    margin-top: 30px;
+    padding: 2px;
+    text-align: center;
+}		
+
+.syndicate {
+    background-image: url(stripes.png);
+    border-bottom: 2px solid #888;
+    font-weight: bold;
+    padding: 2px;
+    margin-top: 15px;
+    text-align: center;
+}
+
+.syndicate a, .syndicate a:hover {
+    border: none;
+}
+
+.powered {
+    color: #666;
+    font-size: small;
+    line-height: 140%;
+    padding: 2px;
+    text-align: center;
+}	
+
+.comments-body {
+    border-bottom: #aaa dotted 1px;
+    color: #666;
+    line-height: 140%;
+    margin: 10px 30px;
+    padding-bottom: 10px;
+    text-align: justify;
+}		
+
+.comments-post {
+    color: #666;
+    display: block;
+    font-size: small;
+    text-align: center;
+}	
+
+.trackback-url {
+    color:#666;
+    font-size:small;
+    font-weight:normal;
+    line-height:140%;
+    padding:5px;		
+    border:1px dotted #999; 					
+}
+
+
+.trackback-body {
+    color:#666;
+    font-size:small;
+    font-weight:normal;
+    line-height:140%;
+    padding-bottom:10px;
+    padding-top:10px;		
+    border-bottom:1px dotted #999; 					
+}		
+
+.trackback-post {
+    color:#666;
+    font-size:x-small;
+    font-weight:normal;
+}	
+
+
+.comments-head	{ 
+    background-image: url(stripes.png);
+    border-bottom: 2px solid #888;
+    color: #333; 
+    font-size: medium; 
+    font-weight:bold;
+    margin-bottom: 10px;
+    padding: 2px;
+    text-align: center;
+}		
+
+#author, #email, #search, #text, #url {
+    border: #aaa solid 1px;
+}
+
+#text {
+    width: 350px;
+}
+
+DIV.side UL {
+    position: relative;
+    left: -20px;
+}
+
+.pager {
+	clear:all;
+	text-align: center;
+	margin-bottom: 20px;
+	margin-top: 20px;
+	font-size: 12px;
+	padding-top: 10px;
+	padding-bottom: 10px;
+}
+.pager a, .pager a:link, .pager a:href, .pager a:hover {
+ text-decoration: none;
+ border: 0px;
+}
+
+.pager .pagerLinkPrevPage, .pagerLink, .pagerLinkNextPage{
+	padding: 2px 6px;
+}
+
+.pager .pagerLinkPrevPage{
+	margin-right:20px;
+}
+.pager .pagerLinkNextPage {
+	margin-left:20px;
+}
+
+.pager .pagerCurrent {
+	padding: 2px 6px; 
+	border-color: #999; 
+	font-weight: bold; 
+	font-size: 13px; 
+	vertical-align: top; 
+	background: #fff; 
+	color: #FF0084;	
+}

Copied: templates/branches/lifetype-1.2/Matrix-Code (from rev 6372, templates/branches/lifetype-1.2/unported/Matrix-Code)

Deleted: templates/branches/lifetype-1.2/Matrix-Code/album.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Matrix-Code/album.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Matrix-Code/album.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,88 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="container">
-<p>
- {$album->getDescription()}
-</p>
-
- <!-- album contents go here -->
-<div id="album">
-<table style="border:0px;width:100%;" summary="Album Resources">
- <tr>
-  <td style="width:50%;" align="center" >
-   <a class="nodecoration" href="{$url->parentAlbumLink($album)}">
-    <img style="border:0px" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
-    ..
-   </a>
-  </td>
-  {assign var="counter" value=1}
-  {assign var=children value=$album->getChildren()}
-  {foreach from=$children item=childalbum}
-  <td style="width:50%;" align="center" >
-   <a class="nodecoration" href="{$url->albumLink($childalbum)}">
-   <img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
-   {$childalbum->getName()} ({$childalbum->getNumResources()})
-  </a>
-  <br/><br/>
-  {assign var="counter" value="`$counter+1`"}
-  </td>
-  {if $counter%2 == 0}
-   </tr>
-   <tr>
-  {/if}
- {/foreach}
-
- <!--- show the resources here -->
-
- 
- {foreach from=$resources item=resource}
-  <td style="width:25%;" align="center" >
-  {if $resource->hasPreview()}
-   {*<a target="_blank" href="resserver.php?blogId={$blog->getId()}&amp;resource={$resource->getFileName()}">*}
-   <a href="{$url->resourceLink($resource)}">
-    <img alt="{$resource->getDescription()}" style="border:0px;" src="{$url->resourcePreviewLink($resource)}" />
-    <br/>{$resource->getFileName()}
-   </a>
-  {else}
-   <a class="nodecoration" href="{$url->resourceLink($resource)}">
-   {if $resource->isSound()}
-    <img alt="Sound" src="{$url->getUrl("/imgs/sound.gif")}" height="64" width="64" style="border:0px;" />
-   {elseif $resource->isVideo()}
-    <img alt="Video" src="{$url->getUrl("/imgs/video.gif")}" height="64" width="64" style="border:0px;" />
-   {elseif $resource->isZip()}
-    <img alt="Zip" src="{$url->getUrl("/imgs/compressed.gif")}" height="64" width="64" style="border:0px;" />   
-   {else}
-    <img alt="File" src="{$url->getUrl("/imgs/file.gif")}" height="64" width="64" style="border:0px;" />    
-   {/if}
-   <br/>{$resource->getFileName()}
-   </a>
-  {/if}
-  <br/>
-  {assign var=metadata value=$resource->getMetadataReader()}
-  {$metadata->getRoundedSize()}<br/>
-  {if $resource->isImage()}
-   {$metadata->getWidth()} x {$metadata->getHeight()}<br/>
-  {elseif $resource->isSound()}
-   {$metadata->getFormat()|upper} {$metadata->getSampleRate()} bps<br/>
-  {elseif $resource->isVideo()}
-   {$metadata->getFormat()|upper}
-   {$metadata->getWidth()} x {$metadata->getHeight()}, 
-   {$metadata->getLengthString()}<br/>
-  {elseif $resource->isZip()}
-   {$metadata->getTotalFiles()} {$locale->tr("files")}<br/>
-  {/if}
-  {assign var="counter" value="`$counter+1`"}
-  </td>
-  {if $counter%2 == 0}
-   </tr>
-   <tr>
-  {/if}
- {/foreach}
- <td></td></tr>
-</table>
-{pager style="links"}
-
- <!-- end of album contents -->
- 
- </div>
-</div>
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/Matrix-Code/album.template (from rev 6373, templates/branches/lifetype-1.2/unported/Matrix-Code/album.template)
===================================================================
--- templates/branches/lifetype-1.2/Matrix-Code/album.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Matrix-Code/album.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,88 @@
+{include file="$blogtemplate/header.template"}
+<div id="container">
+<p>
+ {$album->getDescription()}
+</p>
+
+ <!-- album contents go here -->
+<div id="album">
+<table style="border:0px;width:100%;" summary="Album Resources">
+ <tr>
+  <td style="width:50%;" align="center" >
+   <a class="nodecoration" href="{$url->parentAlbumLink($album)}">
+    <img style="border:0px" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
+    ..
+   </a>
+  </td>
+  {assign var="counter" value=1}
+  {assign var=children value=$album->getChildren()}
+  {foreach from=$children item=childalbum}
+  <td style="width:50%;" align="center" >
+   <a class="nodecoration" href="{$url->albumLink($childalbum)}">
+   <img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
+   {$childalbum->getName()} ({$childalbum->getNumResources()})
+  </a>
+  <br/><br/>
+  {assign var="counter" value="`$counter+1`"}
+  </td>
+  {if $counter%2 == 0}
+   </tr>
+   <tr>
+  {/if}
+ {/foreach}
+
+ <!--- show the resources here -->
+
+ 
+ {foreach from=$resources item=resource}
+  <td style="width:25%;" align="center" >
+  {if $resource->hasPreview()}
+   {*<a target="_blank" href="resserver.php?blogId={$blog->getId()}&amp;resource={$resource->getFileName()}">*}
+   <a href="{$url->resourceLink($resource)}">
+    <img alt="{$resource->getDescription()}" style="border:0px;" src="{$url->resourcePreviewLink($resource)}" />
+    <br/>{$resource->getFileName()}
+   </a>
+  {else}
+   <a class="nodecoration" href="{$url->resourceLink($resource)}">
+   {if $resource->isSound()}
+    <img alt="Sound" src="{$url->getUrl("/imgs/sound.gif")}" height="64" width="64" style="border:0px;" />
+   {elseif $resource->isVideo()}
+    <img alt="Video" src="{$url->getUrl("/imgs/video.gif")}" height="64" width="64" style="border:0px;" />
+   {elseif $resource->isZip()}
+    <img alt="Zip" src="{$url->getUrl("/imgs/compressed.gif")}" height="64" width="64" style="border:0px;" />   
+   {else}
+    <img alt="File" src="{$url->getUrl("/imgs/file.gif")}" height="64" width="64" style="border:0px;" />    
+   {/if}
+   <br/>{$resource->getFileName()}
+   </a>
+  {/if}
+  <br/>
+  {assign var=metadata value=$resource->getMetadataReader()}
+  {$metadata->getRoundedSize()}<br/>
+  {if $resource->isImage()}
+   {$metadata->getWidth()} x {$metadata->getHeight()}<br/>
+  {elseif $resource->isSound()}
+   {$metadata->getFormat()|upper} {$metadata->getSampleRate()} bps<br/>
+  {elseif $resource->isVideo()}
+   {$metadata->getFormat()|upper}
+   {$metadata->getWidth()} x {$metadata->getHeight()}, 
+   {$metadata->getLengthString()}<br/>
+  {elseif $resource->isZip()}
+   {$metadata->getTotalFiles()} {$locale->tr("files")}<br/>
+  {/if}
+  {assign var="counter" value="`$counter+1`"}
+  </td>
+  {if $counter%2 == 0}
+   </tr>
+   <tr>
+  {/if}
+ {/foreach}
+ <td></td></tr>
+</table>
+{pager style="links"}
+
+ <!-- end of album contents -->
+ 
+ </div>
+</div>
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/Matrix-Code/albums.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Matrix-Code/albums.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Matrix-Code/albums.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,25 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="container">
-<!-- album contents go here -->
-<br/>
-<table style="border:0px;width:100%;" summary="Albums">
-<tr>
-  {assign var="counter" value=0}
-  {foreach from=$albums item=album}
-  <td style="width:33%;" align="center">
-   <a class="nodecoration" href="{$url->albumLink($album)}">
-   <img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
-   {$album->getName()} ({$album->getNumResources()})
-  </a>
-  {assign var="counter" value="`$counter+1`"}
-  </td>
-  {if $counter%2 == 0}
-   </tr>
-   <tr>
-  {/if}
- {/foreach}
- <td></td></tr>
- </table>
- <!-- end of the albums -->
-</div>
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/Matrix-Code/albums.template (from rev 6373, templates/branches/lifetype-1.2/unported/Matrix-Code/albums.template)
===================================================================
--- templates/branches/lifetype-1.2/Matrix-Code/albums.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Matrix-Code/albums.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,25 @@
+{include file="$blogtemplate/header.template"}
+<div id="container">
+<!-- album contents go here -->
+<br/>
+<table style="border:0px;width:100%;" summary="Albums">
+<tr>
+  {assign var="counter" value=0}
+  {foreach from=$albums item=album}
+  <td style="width:33%;" align="center">
+   <a class="nodecoration" href="{$url->albumLink($album)}">
+   <img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
+   {$album->getName()} ({$album->getNumResources()})
+  </a>
+  {assign var="counter" value="`$counter+1`"}
+  </td>
+  {if $counter%2 == 0}
+   </tr>
+   <tr>
+  {/if}
+ {/foreach}
+ <td></td></tr>
+ </table>
+ <!-- end of the albums -->
+</div>
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/Matrix-Code/commentarticle.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Matrix-Code/commentarticle.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Matrix-Code/commentarticle.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,4 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<h3>{$locale->tr("add_comment")}</h3>
- {include file="$blogtemplate/commentform.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/Matrix-Code/commentarticle.template (from rev 6373, templates/branches/lifetype-1.2/unported/Matrix-Code/commentarticle.template)
===================================================================
--- templates/branches/lifetype-1.2/Matrix-Code/commentarticle.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Matrix-Code/commentarticle.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,4 @@
+{include file="$blogtemplate/header.template"}
+<h3>{$locale->tr("add_comment")}</h3>
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/Matrix-Code/error.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Matrix-Code/error.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Matrix-Code/error.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,4 +0,0 @@
-{include file="$blogtemplate/header.template"}
- <h3>{$locale->tr("error")}</h3>
- {$locale->tr($message)}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/Matrix-Code/error.template (from rev 6373, templates/branches/lifetype-1.2/unported/Matrix-Code/error.template)
===================================================================
--- templates/branches/lifetype-1.2/Matrix-Code/error.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Matrix-Code/error.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,4 @@
+{include file="$blogtemplate/header.template"}
+ <h3>{$locale->tr("error")}</h3>
+ {$locale->tr($message)}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/Matrix-Code/favicon.ico
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/Matrix-Code/favicon.ico (from rev 6373, templates/branches/lifetype-1.2/unported/Matrix-Code/favicon.ico)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/Matrix-Code/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Matrix-Code/footer.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Matrix-Code/footer.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,94 +0,0 @@
-</div>
-</div>
-
-<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")}" />
-   </form>
-</div>
-
-{assign var=blogOwner value=$blog->getOwnerInfo()}
-{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
-{if $blogOwner->hasPicture() && $AboutMyself}  
-  	<div class="sidetitle">{$locale->tr("about_myself")}</div>
-  	<div class="side">
-  	<div align="center">
-  	{assign var=picture value=$blogOwner->getPicture()}
-  	<img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /><br/>
-  	<p>{$AboutMyself}</p>
-  	</div>
-  	</div>
-{/if}
-
-
-<div class="sidetitle">{$locale->tr("calendar")}</div>
-<div class="side">
-<div align="center">
-{$calendar}
-</div>
-</div>
-
-<div class="sidetitle">{$locale->tr("archives")}</div>
-<div class="side">
-<p>
- <ul>
- {foreach from=$archives item=archive}
-  <li><a href="{$archive->getUrl()}">{$archive->getName()}</a></li>
- {/foreach}
- </ul>
-</p>
-</div>
-
-<div class="sidetitle">{$locale->tr("categories")}</div>
-<div class="side">
-<p>
- <ul>
- {foreach from=$articlecategories item=category}
-  <li><a href="{$url->categoryLink($category)}">{$category->getName()}</a></li>
- {/foreach}
- </ul>
-</p>
-</div>
-
-<div class="sidetitle">{$locale->tr("links")}</div>
-<div class="side">
-<p>
-  <ul>
-   {foreach from=$mylinkscategories item=linkcategory}
-     <li><b>{$linkcategory->getName()}</b>
-     <ul>
-      {foreach from=$linkcategory->getLinks() item=link}
-       <li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a></li>
-      {/foreach}
-     </ul>
-    </li>
-   {/foreach}  
-   </ul>
-</p>
-</div>
-
-<div class="sidetitle">{$locale->tr("menu")}</div>
-<div class="side">
-<ul>
-<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="powered">
-Powered by <a href="http://www.lifetype.net">LifeType</a><br />    
-</div>
-
-</div>
-</body>
-</html>

Copied: templates/branches/lifetype-1.2/Matrix-Code/footer.template (from rev 6373, templates/branches/lifetype-1.2/unported/Matrix-Code/footer.template)
===================================================================
--- templates/branches/lifetype-1.2/Matrix-Code/footer.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Matrix-Code/footer.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,94 @@
+</div>
+</div>
+
+<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" />
+    <input type="hidden" name="op" value="Search" />
+    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
+    <input type="submit" name="Search" value="{$locale->tr("search")}" />
+   </form>
+</div>
+
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}  
+  	<div class="sidetitle">{$locale->tr("about_myself")}</div>
+  	<div class="side">
+  	<div align="center">
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	<img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /><br/>
+  	<p>{$AboutMyself}</p>
+  	</div>
+  	</div>
+{/if}
+
+
+<div class="sidetitle">{$locale->tr("calendar")}</div>
+<div class="side">
+<div align="center">
+{$calendar}
+</div>
+</div>
+
+<div class="sidetitle">{$locale->tr("archives")}</div>
+<div class="side">
+<p>
+ <ul>
+ {foreach from=$archives item=archive}
+  <li><a href="{$archive->getUrl()}">{$archive->getName()}</a></li>
+ {/foreach}
+ </ul>
+</p>
+</div>
+
+<div class="sidetitle">{$locale->tr("categories")}</div>
+<div class="side">
+<p>
+ <ul>
+ {foreach from=$articlecategories item=category}
+  <li><a href="{$url->categoryLink($category)}">{$category->getName()}</a></li>
+ {/foreach}
+ </ul>
+</p>
+</div>
+
+<div class="sidetitle">{$locale->tr("links")}</div>
+<div class="side">
+<p>
+  <ul>
+   {foreach from=$mylinkscategories item=linkcategory}
+     <li><b>{$linkcategory->getName()}</b>
+     <ul>
+      {foreach from=$linkcategory->getLinks() item=link}
+       <li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a></li>
+      {/foreach}
+     </ul>
+    </li>
+   {/foreach}  
+   </ul>
+</p>
+</div>
+
+<div class="sidetitle">{$locale->tr("menu")}</div>
+<div class="side">
+<ul>
+<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="powered">
+Powered by <a href="http://www.lifetype.net">LifeType</a><br />    
+</div>
+
+</div>
+</body>
+</html>

Deleted: templates/branches/lifetype-1.2/Matrix-Code/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Matrix-Code/header.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Matrix-Code/header.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,27 +0,0 @@
-<!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">
-
-<head>
-<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>
-<title>{$pageTitle|escape:"html"}</title>
- <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")}" />
- <link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="{$url->rssLink("atom")}" />
- <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
-{if $badbehavior}
-   {$badbehavior->showBB2JavaScript()}
-{/if}
-</head>
-
-<body>
-<div id="banner">
-<h1><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1>
-{if $blog->getAbout()}<span class="description">{$blog->getAbout()}</span>{/if}
-</div>
-
-<div id="content">
-<div class="blog">
-

Copied: templates/branches/lifetype-1.2/Matrix-Code/header.template (from rev 6373, templates/branches/lifetype-1.2/unported/Matrix-Code/header.template)
===================================================================
--- templates/branches/lifetype-1.2/Matrix-Code/header.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Matrix-Code/header.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,27 @@
+<!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">
+
+<head>
+<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>
+<title>{$pageTitle|escape:"html"}</title>
+ <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")}" />
+ <link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="{$url->rssLink("atom")}" />
+ <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
+{if $badbehavior}
+   {$badbehavior->showBB2JavaScript()}
+{/if}
+</head>
+
+<body>
+<div id="banner">
+<h1><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1>
+{if $blog->getAbout()}<span class="description">{$blog->getAbout()}</span>{/if}
+</div>
+
+<div id="content">
+<div class="blog">
+

Deleted: templates/branches/lifetype-1.2/Matrix-Code/main.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Matrix-Code/main.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Matrix-Code/main.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,9 +0,0 @@
-{include file="$blogtemplate/header.template"}
- {foreach from=$posts item=post}
-   {assign var="postDate" value=$post->getDateObject()}
-    <div class="blogbody">
-   {include file="$blogtemplate/post.template"}
-   </div>
- {/foreach}
- {pager style="links"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/Matrix-Code/main.template (from rev 6373, templates/branches/lifetype-1.2/unported/Matrix-Code/main.template)
===================================================================
--- templates/branches/lifetype-1.2/Matrix-Code/main.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Matrix-Code/main.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,9 @@
+{include file="$blogtemplate/header.template"}
+ {foreach from=$posts item=post}
+   {assign var="postDate" value=$post->getDateObject()}
+    <div class="blogbody">
+   {include file="$blogtemplate/post.template"}
+   </div>
+ {/foreach}
+ {pager style="links"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/Matrix-Code/matrix-bannerbg.jpg
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/Matrix-Code/matrix-bannerbg.jpg (from rev 6373, templates/branches/lifetype-1.2/unported/Matrix-Code/matrix-bannerbg.jpg)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/Matrix-Code/matrix-bodybg.jpg
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/Matrix-Code/matrix-bodybg.jpg (from rev 6373, templates/branches/lifetype-1.2/unported/Matrix-Code/matrix-bodybg.jpg)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/Matrix-Code/matrix-contentbg.jpg
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/Matrix-Code/matrix-contentbg.jpg (from rev 6373, templates/branches/lifetype-1.2/unported/Matrix-Code/matrix-contentbg.jpg)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/Matrix-Code/matrix-shadebg.png
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/Matrix-Code/matrix-shadebg.png (from rev 6373, templates/branches/lifetype-1.2/unported/Matrix-Code/matrix-shadebg.png)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/Matrix-Code/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Matrix-Code/post.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Matrix-Code/post.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,24 +0,0 @@
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-
-<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>
-
- ({foreach name=categories from=$post->getCategories() item=postCategory}
-    <a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
-  {/foreach})
-  
- :: 
-{if $post->getCommentsEnabled()}
-<a href="{$url->postPermalink($post)}">{$locale->tr("comments")}
-({$post->getNumComments()})</a> ::
-{/if}
-<a href="{$url->postPermalink($post)}">
-   {$locale->tr("permalink")}</a> ::
-<a href="{$url->postTrackbackStatsLink($post)}">
-   {$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a>
-
-</div>

Copied: templates/branches/lifetype-1.2/Matrix-Code/post.template (from rev 6373, templates/branches/lifetype-1.2/unported/Matrix-Code/post.template)
===================================================================
--- templates/branches/lifetype-1.2/Matrix-Code/post.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Matrix-Code/post.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,24 @@
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+
+<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>
+
+ ({foreach name=categories from=$post->getCategories() item=postCategory}
+    <a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+  {/foreach})
+  
+ :: 
+{if $post->getCommentsEnabled()}
+<a href="{$url->postPermalink($post)}">{$locale->tr("comments")}
+({$post->getNumComments()})</a> ::
+{/if}
+<a href="{$url->postPermalink($post)}">
+   {$locale->tr("permalink")}</a> ::
+<a href="{$url->postTrackbackStatsLink($post)}">
+   {$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a>
+
+</div>

Deleted: templates/branches/lifetype-1.2/Matrix-Code/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Matrix-Code/postandcomments.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Matrix-Code/postandcomments.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,40 +0,0 @@
-{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">
-   <!-- {$url->postTrackbackLink($post)} -->
-   <p>{include file="$blogtemplate/post.template"}</p>
-        {pager style="links"}    
-   </div>
-   {foreach from=$comments item=comment}
-   <div class="blogbody">
-    <p class="title">
-     <img src="{$url->getUrl("/imgs/comment_icon1.gif")}"/> {$comment->getTopic()} <span class="categoryinfo">[<a href="{$url->replyCommentLink($post,$comment)}">{$locale->tr("reply")}</a>]</span>
-    </p>
-    {if $comment->IsPosterAuthenticated()}
-	{assign var=poster value=$comment->getUser()}
-	{if $poster->hasPicture()}
-		{assign var=posterimg value=$poster->getPicture()}
-		<img src="{$posterimg->getPreviewLink()}" alt="{$poster->getUserName()}" align="right" class="poster_avatar"/>
-	{/if}
-{/if}
-{$comment->gettext()}
-    <div class="posted">
-    {assign var="commentDate" value=$comment->getTimestamp()}
-    Comment by 
-    {if $comment->getUserUrl() != "" }
-    <a href="{$comment->getUserUrl()}">{$comment->getUsername()}</a>
-    {else}
-    {$comment->getUsername()}
-    {/if}
-    ({$locale->formatDate($commentDate, "%m/%d/%Y %H:%M")})</div></div>
-  {/foreach}
-{if $post->getCommentsEnabled()}
-<p><div style="padding-left: 20px">
-<h3>{$locale->tr("add_comment")}</h3>
-{include file="$blogtemplate/commentform.template"}
-</div>
-</p>
-{/if}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/Matrix-Code/postandcomments.template (from rev 6373, templates/branches/lifetype-1.2/unported/Matrix-Code/postandcomments.template)
===================================================================
--- templates/branches/lifetype-1.2/Matrix-Code/postandcomments.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Matrix-Code/postandcomments.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,40 @@
+{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">
+   <!-- {$url->postTrackbackLink($post)} -->
+   <p>{include file="$blogtemplate/post.template"}</p>
+        {pager style="links"}    
+   </div>
+   {foreach from=$comments item=comment}
+   <div class="blogbody">
+    <p class="title">
+     <img src="{$url->getUrl("/imgs/comment_icon1.gif")}"/> {$comment->getTopic()} <span class="categoryinfo">[<a href="{$url->replyCommentLink($post,$comment)}">{$locale->tr("reply")}</a>]</span>
+    </p>
+    {if $comment->IsPosterAuthenticated()}
+	{assign var=poster value=$comment->getUser()}
+	{if $poster->hasPicture()}
+		{assign var=posterimg value=$poster->getPicture()}
+		<img src="{$posterimg->getPreviewLink()}" alt="{$poster->getUserName()}" align="right" class="poster_avatar"/>
+	{/if}
+{/if}
+{$comment->gettext()}
+    <div class="posted">
+    {assign var="commentDate" value=$comment->getTimestamp()}
+    Comment by 
+    {if $comment->getUserUrl() != "" }
+    <a href="{$comment->getUserUrl()}">{$comment->getUsername()}</a>
+    {else}
+    {$comment->getUsername()}
+    {/if}
+    ({$locale->formatDate($commentDate, "%m/%d/%Y %H:%M")})</div></div>
+  {/foreach}
+{if $post->getCommentsEnabled()}
+<p><div style="padding-left: 20px">
+<h3>{$locale->tr("add_comment")}</h3>
+{include file="$blogtemplate/commentform.template"}
+</div>
+</p>
+{/if}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/Matrix-Code/posttrackbacks.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Matrix-Code/posttrackbacks.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Matrix-Code/posttrackbacks.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,14 +0,0 @@
-{include file="$blogtemplate/header.template"}
-  <p>
-    {$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>":
-  </p>
-  <p>
-  {foreach from=$trackbacks item=trackback}
-   <a href="{$trackback->getUrl()}">{$trackback->getTitle()}</a><br/>
-   <b>{$locale->tr("trackback_excerpt")}:</b> {$trackback->getExcerpt()}<br/>
-   <b>{$locale->tr("trackback_weblog")}:</b> {$trackback->getBlogName()}<br/>
-   {assign var="trackbackDate" value=$trackback->getDateObject()}
-   <b>{$locale->tr("date")}:</b> {$locale->formatDate($trackbackDate, "%d/%m/%Y %H:%M")}<br/><br/>
-  {/foreach}
-  </p>
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/Matrix-Code/posttrackbacks.template (from rev 6373, templates/branches/lifetype-1.2/unported/Matrix-Code/posttrackbacks.template)
===================================================================
--- templates/branches/lifetype-1.2/Matrix-Code/posttrackbacks.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Matrix-Code/posttrackbacks.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,14 @@
+{include file="$blogtemplate/header.template"}
+  <p>
+    {$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>":
+  </p>
+  <p>
+  {foreach from=$trackbacks item=trackback}
+   <a href="{$trackback->getUrl()}">{$trackback->getTitle()}</a><br/>
+   <b>{$locale->tr("trackback_excerpt")}:</b> {$trackback->getExcerpt()}<br/>
+   <b>{$locale->tr("trackback_weblog")}:</b> {$trackback->getBlogName()}<br/>
+   {assign var="trackbackDate" value=$trackback->getDateObject()}
+   <b>{$locale->tr("date")}:</b> {$locale->formatDate($trackbackDate, "%d/%m/%Y %H:%M")}<br/><br/>
+  {/foreach}
+  </p>
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/Matrix-Code/resource.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Matrix-Code/resource.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Matrix-Code/resource.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,55 +0,0 @@
-{include file="$blogtemplate/header.template"}
-
-{assign var=metadata value=$resource->getMetadataReader()}
-{assign var=updated value=$resource->getTimestamp()}
-<div id="container">
- <div class="blog">
-  <h2 class="date">{$resource->getFileName()}</h2>
-  <div class="blogbody">
-   <div class="posted">
-    <a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a> 
-    ({$metadata->getRoundedSize()}) | {$locale->tr("created")} {$locale->formatDate($updated,"%d %b, %Y")}
-   </div>
-  </div>
-  <p>{$resource->getDescription()}</p>
-  {if $resource->isImage()}
-   <img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
-  {else}
-   <a href="{$url->resourceDownloadLink($resource)}">
-   {* show some information about the file *}
-   {if $resource->isSound()}
-     <img alt="Sound" src="{$url->getUrl("/imgs/sound.gif")}" height="64" width="64" style="border:0px;" /><br/>
-     {$resource->getFileName()}
-     </a><br/>     
-     {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
-     {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
-     {$locale->tr("sample_rate")}: {$metadata->getSampleRate()} Khz
-   {elseif $resource->isVideo()}
-     <img alt="Sound" src="{$url->getUrl("/imgs/video.gif")}" height="64" width="64" style="border:0px;" /><br/>
-     {$resource->getFileName()}
-    </a><br/>
-    {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
-    {$locale->tr("size")}: {$metadata->getHeight()} x {$metadata->getWidth()}<br/>
-    {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
-    {$locale->tr("video_codec")}: {$metadata->getVideoCodec()}<br/>
-    {$locale->tr("audio_codec")}: {$metadata->getAudioCodec()}
-   {elseif $resource->isZip()}
-     <img alt="Sound" src="{$url->getUrl("/imgs/compressed.gif")}" height="64" width="64" style="border:0px;" /><br/>
-     {$resource->getFileName()}
-    </a><br/>
-    {$metadata->getTotalFiles()} {$locale->tr("files")}<br/>
-    {$locale->tr("uncompressed_size")}: {$metadata->getRoundedUncompressedSize()}
-   {else}
-     <img alt="Sound" src="{$url->getUrl("/imgs/file.gif")}" height="64" width="64" style="border:0px;" /><br/>
-     {$resource->getFileName()}
-     </a>    
-   {/if}   
-  {/if}
-  <br/>
-  <p>
-   {assign var=album value=$resource->getAlbum()}
-   <a href="{$url->albumLink($album)}">{$locale->tr("back")}</a>
-  </p>
- </div>
-</div>
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/Matrix-Code/resource.template (from rev 6373, templates/branches/lifetype-1.2/unported/Matrix-Code/resource.template)
===================================================================
--- templates/branches/lifetype-1.2/Matrix-Code/resource.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Matrix-Code/resource.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,55 @@
+{include file="$blogtemplate/header.template"}
+
+{assign var=metadata value=$resource->getMetadataReader()}
+{assign var=updated value=$resource->getTimestamp()}
+<div id="container">
+ <div class="blog">
+  <h2 class="date">{$resource->getFileName()}</h2>
+  <div class="blogbody">
+   <div class="posted">
+    <a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a> 
+    ({$metadata->getRoundedSize()}) | {$locale->tr("created")} {$locale->formatDate($updated,"%d %b, %Y")}
+   </div>
+  </div>
+  <p>{$resource->getDescription()}</p>
+  {if $resource->isImage()}
+   <img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
+  {else}
+   <a href="{$url->resourceDownloadLink($resource)}">
+   {* show some information about the file *}
+   {if $resource->isSound()}
+     <img alt="Sound" src="{$url->getUrl("/imgs/sound.gif")}" height="64" width="64" style="border:0px;" /><br/>
+     {$resource->getFileName()}
+     </a><br/>     
+     {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
+     {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
+     {$locale->tr("sample_rate")}: {$metadata->getSampleRate()} Khz
+   {elseif $resource->isVideo()}
+     <img alt="Sound" src="{$url->getUrl("/imgs/video.gif")}" height="64" width="64" style="border:0px;" /><br/>
+     {$resource->getFileName()}
+    </a><br/>
+    {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
+    {$locale->tr("size")}: {$metadata->getHeight()} x {$metadata->getWidth()}<br/>
+    {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
+    {$locale->tr("video_codec")}: {$metadata->getVideoCodec()}<br/>
+    {$locale->tr("audio_codec")}: {$metadata->getAudioCodec()}
+   {elseif $resource->isZip()}
+     <img alt="Sound" src="{$url->getUrl("/imgs/compressed.gif")}" height="64" width="64" style="border:0px;" /><br/>
+     {$resource->getFileName()}
+    </a><br/>
+    {$metadata->getTotalFiles()} {$locale->tr("files")}<br/>
+    {$locale->tr("uncompressed_size")}: {$metadata->getRoundedUncompressedSize()}
+   {else}
+     <img alt="Sound" src="{$url->getUrl("/imgs/file.gif")}" height="64" width="64" style="border:0px;" /><br/>
+     {$resource->getFileName()}
+     </a>    
+   {/if}   
+  {/if}
+  <br/>
+  <p>
+   {assign var=album value=$resource->getAlbum()}
+   <a href="{$url->albumLink($album)}">{$locale->tr("back")}</a>
+  </p>
+ </div>
+</div>
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/Matrix-Code/screenshot.jpg
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/Matrix-Code/screenshot.jpg (from rev 6373, templates/branches/lifetype-1.2/unported/Matrix-Code/screenshot.jpg)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/Matrix-Code/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Matrix-Code/searchresults.template	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Matrix-Code/searchresults.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,15 +0,0 @@
-{include file="$blogtemplate/header.template"}
-   <h2>{$locale->tr("search_results")}</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>
-      <p>
-      {$article->getText()|strip_tags|truncate:300:"...":false}
-      </p>
-     </div>
-     <br/>
-    {/foreach}
-   </p> 
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/Matrix-Code/searchresults.template (from rev 6373, templates/branches/lifetype-1.2/unported/Matrix-Code/searchresults.template)
===================================================================
--- templates/branches/lifetype-1.2/Matrix-Code/searchresults.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Matrix-Code/searchresults.template	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,15 @@
+{include file="$blogtemplate/header.template"}
+   <h2>{$locale->tr("search_results")}</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>
+      <p>
+      {$article->getText()|strip_tags|truncate:300:"...":false}
+      </p>
+     </div>
+     <br/>
+    {/foreach}
+   </p> 
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/Matrix-Code/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/Matrix-Code/style.css	2008-04-28 20:15:50 UTC (rev 6372)
+++ templates/branches/lifetype-1.2/Matrix-Code/style.css	2008-04-28 20:18:40 UTC (rev 6374)
@@ -1,342 +0,0 @@
-/* "Matrix Code" written by Scott Yang of www.movablestyles.org
-   and released under the Creative Commons attribution license
-   (http://creativecommons.org/licenses/by/2.0/)
-*/
-
-body {
-    color: #cfc;
-    margin: 0;
-    background-color: #000;
-    background-image: url(matrix-bodybg.jpg);
-    background-repeat: repeat-x;
-}
-
-a, a:link, a:visited { 
-    color: #dd8; 
-    text-decoration: none; 
-}
-a:active, a:hover { 
-    color: #ffb; 
-    text-decoration: underline; 
-}
-
-h1, h2, h3 {
-    margin: 0px;
-    padding: 0px;
-}
-
-#banner {
-    background-image: url(matrix-shadebg.png);
-    border: #565 1px solid;
-    color: #8f8;
-    font-family: monospace;
-    font-weight: bold;
-    margin: 5px;
-    padding: 5px 20px;
-}
-
-#banner a,
-#banner a:link,
-#banner a:visited,
-#banner a:active,
-#banner a:hover {
-    color: #cfc;
-    font-family: monospace;
-    font-size: 32pt;
-    letter-spacing: .5ex;
-    text-decoration: none;
-}
-
-ul {
- list-style: none;
-}
-
-.description {
-    color: #ada;
-    display: block;
-    font-family: monospace;
-    font-size: large;
-    font-weight:bold;
-    letter-spacing: none; 
-    text-transform:none;
-}
-
-#content, #container {
-    background-image: url(matrix-contentbg.jpg);
-    background-repeat: repeat-x;
-    background-position: bottom left;
-    position: absolute;
-    left: 0;
-}
-
-#content .blog {
-    margin-bottom: 100px;
-    margin-right: 290px;
-}
-
-#links {
-    position: absolute;
-    right: 10px;
-    width: 280px;
-    text-align: right;
-}
-
-.blogbody {
-    font-family: sans-serif;
-    font-size: small;
-    font-weight: normal;
-    line-height:140%;
-    margin: 10px 20px;
-    text-align: justify;
-    width: 450px;
-}
-
-.searchresult {
-    font-family: sans-serif;
-    font-size: small;
-    font-weight: normal;
-    line-height:140%;
-    margin: 10px 20px;
-    text-align: justify;
-    width: 450px;
-}
-
-.title { 
-    background-image: url(matrix-shadebg.png);
-    border: #565 1px solid;
-    font-family: monospace;
-    font-size: large; 
-    font-weight: bold;
-    letter-spacing: .5ex;
-    margin: 0 -10px;
-    padding: 3px 10px;
-    text-align: center;
-    text-transform: uppercase;
-}
-
-#menu {
-    background-image: url(matrix-shadebg.png);
-    border: 1px solid #565;
-    font-family: sans-serif;
-    font-size: small;
-    font-weight: bold;  
-    margin: 10px 20%;
-    padding: 5px;
-    text-align: center;
-}
-
-.date   { 
-    font-family:sans-serif; 
-    font-size: small; 
-    color: #eea; 
-    font-weight:bold;
-    text-transform:uppercase;
-    margin: 10px 10px 0 0px;
-    text-align: right;
-}
-
-.posted { 
-    color: #dd8; 
-    display: block;
-    font-family: sans-serif; 
-    font-size: x-small; 
-}
-
-
-.calendar {
-    font-family: monospace;
-    font-size: small;
-    font-weight: normal;
-    padding: 5px;
-}
-
-.calendarToday {
-	font-weight: bold;
-	padding: 5px;
-    font-family: monospace;
-    font-size: small;
-}
-
-div.calendar {
-    margin-left: auto;
-    text-align: right;
-    width: 250px;
-}
-
-.calendarhead {
-    font-family: monospace;
-    font-size: medium;
-    font-weight: bold;
-    letter-spacing: .5ex;
-    margin-top: 15px;
-    padding: 2px 10px;
-    text-transform: uppercase;
-    width: 250px;
-}
-
-.side {
-    font-family: sans-serif;
-    font-size: small;
-    font-weight: small;
-    line-height: 125%;
-    margin: 5px 10px 5px auto;
-    width: 250px;
-}
-
-.sidecal {
-    font-family: sans-serif;
-    font-size: small;
-    font-weight: small;
-    line-height: 125%;
-    margin: 5px 10px 5px auto;
-    width: 250px;
-    position: relative;
-    left: 40px;
-    padding: 3px 7px;
-    text-align: center;
-}
-
-
-.sidetitle {
-    border: 1px solid #565;
-    font-family: monospace;
-    font-size: medium;
-    font-weight: bold;
-    letter-spacing: .5ex;
-    margin-top: 15px;
-    margin-left: auto;
-    padding: 2px 10px;
-    text-transform: uppercase;
-    width: 250px;
-}
-
-.syndicate {
-    font-family: sans-serif;
-    font-size: x-small;
-    font-weight: normal;
-    margin-left: auto;
-    margin-top: 10px;
-    padding: 2px;
-    text-align: center;
-    width: 250px;
-}
-
-.powered {
-    border-bottom: 1px solid #565;
-    border-top: 1px solid #565;
-    font-family: sans-serif;
-    font-size: x-small;
-    font-weight: bold;
-    letter-spacing: .2em;
-    margin: 10px 0 0 auto;
-    padding: 2px;
-    text-align: center;
-    text-transform: uppercase; 
-    width: 250px;
-}
-
-
-.comments-body {
-    font-family: sans-serif;
-    font-size: small;
-    font-weight: normal;
-    line-height: 140%;
-    margin: 10px 20px;
-}
-
-.comments-post {
-    color: #dd8; 
-    display: block;
-    font-family: sans-serif; 
-    font-size: x-small; 
-    margin: 5px 0;
-}
-
-.comments-head  { 
-    background-image: url(matrix-shadebg.png);
-    border: 1px solid #565;
-    font-family: monospace;
-    font-size: medium; 
-    font-weight: bold;
-    letter-spacing: .5ex;
-    margin: 10px 10px;
-    padding: 3px 10px;
-    text-align: center;
-    text-transform: uppercase;
-}
-
-.trackback-body {
-    font-family: sans-serif;
-    font-size: small;
-    font-weight: normal;
-    line-height: 125%;
-    margin: 5px;
-    padding: 5px;
-}
-
-.trackback-url {
-    border: 1px solid #565; 
-    font-family: sans-serif;
-    font-size: small;
-    font-weight: normal;
-    line-height: 125%;
-    margin: 5px;
-    padding: 5px;
-}
-
-.trackback-post {
-    font-family:sans-serif;
-    font-size:x-small;
-    font-weight:normal;
-    margin-bottom:20px;
-}
-
-#banner-commentspop {
-    background-image: url(matrix-shadebg.png);
-    border: #565 1px solid;
-    color: #8f8;
-    font-family: monospace;
-    font-size: 24pt;
-    font-weight: bold;
-    margin: 5px;
-    padding: 5px 20px;
-}
-
-#author, #email, #url, #text {
-    border: 1px solid #565;
-}
-.pager {
-	clear:all;
-	text-align: center;
-	margin-bottom: 20px;
-	margin-top: 20px;
-	font-size: 12px;
-	padding-top: 10px;
-	padding-bottom: 10px;
-}
-.pager a, .pager a:link, .pager a:href, .pager a:hover {
- text-decoration: none;
- border: 0px;
-}
-
-.pager .pagerLinkPrevPage, .pagerLink, .pagerLinkNextPage{
-	padding: 2px 6px;
-}
-
-.pager .pagerLinkPrevPage{
-	margin-right:20px;
-}
-.pager .pagerLinkNextPage {
-	margin-left:20px;
-}
-
-.pager .pagerCurrent {
-	padding: 2px 6px; 
-	border-color: #999; 
-	font-weight: bold; 
-	font-size: 13px; 
-	vertical-align: top; 
-	background: #fff; 
-	color: #FF0084;	
-}
-

Copied: templates/branches/lifetype-1.2/Matrix-Code/style.css (from rev 6373, templates/branches/lifetype-1.2/unported/Matrix-Code/style.css)
===================================================================
--- templates/branches/lifetype-1.2/Matrix-Code/style.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/Matrix-Code/style.css	2008-04-28 20:18:40 UTC (rev 6374)
@@ -0,0 +1,342 @@
+/* "Matrix Code" written by Scott Yang of www.movablestyles.org
+   and released under the Creative Commons attribution license
+   (http://creativecommons.org/licenses/by/2.0/)
+*/
+
+body {
+    color: #cfc;
+    margin: 0;
+    background-color: #000;
+    background-image: url(matrix-bodybg.jpg);
+    background-repeat: repeat-x;
+}
+
+a, a:link, a:visited { 
+    color: #dd8; 
+    text-decoration: none; 
+}
+a:active, a:hover { 
+    color: #ffb; 
+    text-decoration: underline; 
+}
+
+h1, h2, h3 {
+    margin: 0px;
+    padding: 0px;
+}
+
+#banner {
+    background-image: url(matrix-shadebg.png);
+    border: #565 1px solid;
+    color: #8f8;
+    font-family: monospace;
+    font-weight: bold;
+    margin: 5px;
+    padding: 5px 20px;
+}
+
+#banner a,
+#banner a:link,
+#banner a:visited,
+#banner a:active,
+#banner a:hover {
+    color: #cfc;
+    font-family: monospace;
+    font-size: 32pt;
+    letter-spacing: .5ex;
+    text-decoration: none;
+}
+
+ul {
+ list-style: none;
+}
+
+.description {
+    color: #ada;
+    display: block;
+    font-family: monospace;
+    font-size: large;
+    font-weight:bold;
+    letter-spacing: none; 
+    text-transform:none;
+}
+
+#content, #container {
+    background-image: url(matrix-contentbg.jpg);
+    background-repeat: repeat-x;
+    background-position: bottom left;
+    position: absolute;
+    left: 0;
+}
+
+#content .blog {
+    margin-bottom: 100px;
+    margin-right: 290px;
+}
+
+#links {
+    position: absolute;
+    right: 10px;
+    width: 280px;
+    text-align: right;
+}
+
+.blogbody {
+    font-family: sans-serif;
+    font-size: small;
+    font-weight: normal;
+    line-height:140%;
+    margin: 10px 20px;
+    text-align: justify;
+    width: 450px;
+}
+
+.searchresult {
+    font-family: sans-serif;
+    font-size: small;
+    font-weight: normal;
+    line-height:140%;
+    margin: 10px 20px;
+    text-align: justify;
+    width: 450px;
+}
+
+.title { 
+    background-image: url(matrix-shadebg.png);
+    border: #565 1px solid;
+    font-family: monospace;
+    font-size: large; 
+    font-weight: bold;
+    letter-spacing: .5ex;
+    margin: 0 -10px;
+    padding: 3px 10px;
+    text-align: center;
+    text-transform: uppercase;
+}
+
+#menu {
+    background-image: url(matrix-shadebg.png);
+    border: 1px solid #565;
+    font-family: sans-serif;
+    font-size: small;
+    font-weight: bold;  
+    margin: 10px 20%;
+    padding: 5px;
+    text-align: center;
+}
+
+.date   { 
+    font-family:sans-serif; 
+    font-size: small; 
+    color: #eea; 
+    font-weight:bold;
+    text-transform:uppercase;
+    margin: 10px 10px 0 0px;
+    text-align: right;
+}
+
+.posted { 
+    color: #dd8; 
+    display: block;
+    font-family: sans-serif; 
+    font-size: x-small; 
+}
+
+
+.calendar {
+    font-family: monospace;
+    font-size: small;
+    font-weight: normal;
+    padding: 5px;
+}
+
+.calendarToday {
+	font-weight: bold;
+	padding: 5px;
+    font-family: monospace;
+    font-size: small;
+}
+
+div.calendar {
+    margin-left: auto;
+    text-align: right;
+    width: 250px;
+}
+
+.calendarhead {
+    font-family: monospace;
+    font-size: medium;
+    font-weight: bold;
+    letter-spacing: .5ex;
+    margin-top: 15px;
+    padding: 2px 10px;
+    text-transform: uppercase;
+    width: 250px;
+}
+
+.side {
+    font-family: sans-serif;
+    font-size: small;
+    font-weight: small;
+    line-height: 125%;
+    margin: 5px 10px 5px auto;
+    width: 250px;
+}
+
+.sidecal {
+    font-family: sans-serif;
+    font-size: small;
+    font-weight: small;
+    line-height: 125%;
+    margin: 5px 10px 5px auto;
+    width: 250px;
+    position: relative;
+    left: 40px;
+    padding: 3px 7px;
+    text-align: center;
+}
+
+
+.sidetitle {
+    border: 1px solid #565;
+    font-family: monospace;
+    font-size: medium;
+    font-weight: bold;
+    letter-spacing: .5ex;
+    margin-top: 15px;
+    margin-left: auto;
+    padding: 2px 10px;
+    text-transform: uppercase;
+    width: 250px;
+}
+
+.syndicate {
+    font-family: sans-serif;
+    font-size: x-small;
+    font-weight: normal;
+    margin-left: auto;
+    margin-top: 10px;
+    padding: 2px;
+    text-align: center;
+    width: 250px;
+}
+
+.powered {
+    border-bottom: 1px solid #565;
+    border-top: 1px solid #565;
+    font-family: sans-serif;
+    font-size: x-small;
+    font-weight: bold;
+    letter-spacing: .2em;
+    margin: 10px 0 0 auto;
+    padding: 2px;
+    text-align: center;
+    text-transform: uppercase; 
+    width: 250px;
+}
+
+
+.comments-body {
+    font-family: sans-serif;
+    font-size: small;
+    font-weight: normal;
+    line-height: 140%;
+    margin: 10px 20px;
+}
+
+.comments-post {
+    color: #dd8; 
+    display: block;
+    font-family: sans-serif; 
+    font-size: x-small; 
+    margin: 5px 0;
+}
+
+.comments-head  { 
+    background-image: url(matrix-shadebg.png);
+    border: 1px solid #565;
+    font-family: monospace;
+    font-size: medium; 
+    font-weight: bold;
+    letter-spacing: .5ex;
+    margin: 10px 10px;
+    padding: 3px 10px;
+    text-align: center;
+    text-transform: uppercase;
+}
+
+.trackback-body {
+    font-family: sans-serif;
+    font-size: small;
+    font-weight: normal;
+    line-height: 125%;
+    margin: 5px;
+    padding: 5px;
+}
+
+.trackback-url {
+    border: 1px solid #565; 
+    font-family: sans-serif;
+    font-size: small;
+    font-weight: normal;
+    line-height: 125%;
+    margin: 5px;
+    padding: 5px;
+}
+
+.trackback-post {
+    font-family:sans-serif;
+    font-size:x-small;
+    font-weight:normal;
+    margin-bottom:20px;
+}
+
+#banner-commentspop {
+    background-image: url(matrix-shadebg.png);
+    border: #565 1px solid;
+    color: #8f8;
+    font-family: monospace;
+    font-size: 24pt;
+    font-weight: bold;
+    margin: 5px;
+    padding: 5px 20px;
+}
+
+#author, #email, #url, #text {
+    border: 1px solid #565;
+}
+.pager {
+	clear:all;
+	text-align: center;
+	margin-bottom: 20px;
+	margin-top: 20px;
+	font-size: 12px;
+	padding-top: 10px;
+	padding-bottom: 10px;
+}
+.pager a, .pager a:link, .pager a:href, .pager a:hover {
+ text-decoration: none;
+ border: 0px;
+}
+
+.pager .pagerLinkPrevPage, .pagerLink, .pagerLinkNextPage{
+	padding: 2px 6px;
+}
+
+.pager .pagerLinkPrevPage{
+	margin-right:20px;
+}
+.pager .pagerLinkNextPage {
+	margin-left:20px;
+}
+
+.pager .pagerCurrent {
+	padding: 2px 6px; 
+	border-color: #999; 
+	font-weight: bold; 
+	font-size: 13px; 
+	vertical-align: top; 
+	background: #fff; 
+	color: #FF0084;	
+}
+

Copied: templates/branches/lifetype-1.2/Modish (from rev 6373, templates/branches/lifetype-1.2/unported/Modish)



More information about the pLog-svn mailing list