[pLog-svn] r6376 - in templates/branches/lifetype-1.2: . Soft-Blue Soft-Green Soft-Red unported

jondaley at devel.lifetype.net jondaley at devel.lifetype.net
Mon Apr 28 16:21:01 EDT 2008


Author: jondaley
Date: 2008-04-28 16:21:01 -0400 (Mon, 28 Apr 2008)
New Revision: 6376

Added:
   templates/branches/lifetype-1.2/Soft-Blue/
   templates/branches/lifetype-1.2/Soft-Blue/album.template
   templates/branches/lifetype-1.2/Soft-Blue/albums.template
   templates/branches/lifetype-1.2/Soft-Blue/commentarticle.template
   templates/branches/lifetype-1.2/Soft-Blue/error.template
   templates/branches/lifetype-1.2/Soft-Blue/favicon.ico
   templates/branches/lifetype-1.2/Soft-Blue/footer.template
   templates/branches/lifetype-1.2/Soft-Blue/header.template
   templates/branches/lifetype-1.2/Soft-Blue/main.template
   templates/branches/lifetype-1.2/Soft-Blue/post.template
   templates/branches/lifetype-1.2/Soft-Blue/postandcomments.template
   templates/branches/lifetype-1.2/Soft-Blue/posttrackbacks.template
   templates/branches/lifetype-1.2/Soft-Blue/resource.template
   templates/branches/lifetype-1.2/Soft-Blue/screenshot.jpg
   templates/branches/lifetype-1.2/Soft-Blue/searchresults.template
   templates/branches/lifetype-1.2/Soft-Blue/style.css
   templates/branches/lifetype-1.2/Soft-Green/
   templates/branches/lifetype-1.2/Soft-Green/album.template
   templates/branches/lifetype-1.2/Soft-Green/albums.template
   templates/branches/lifetype-1.2/Soft-Green/commentarticle.template
   templates/branches/lifetype-1.2/Soft-Green/error.template
   templates/branches/lifetype-1.2/Soft-Green/favicon.ico
   templates/branches/lifetype-1.2/Soft-Green/footer.template
   templates/branches/lifetype-1.2/Soft-Green/header.template
   templates/branches/lifetype-1.2/Soft-Green/main.template
   templates/branches/lifetype-1.2/Soft-Green/post.template
   templates/branches/lifetype-1.2/Soft-Green/postandcomments.template
   templates/branches/lifetype-1.2/Soft-Green/posttrackbacks.template
   templates/branches/lifetype-1.2/Soft-Green/resource.template
   templates/branches/lifetype-1.2/Soft-Green/screenshot.jpg
   templates/branches/lifetype-1.2/Soft-Green/searchresults.template
   templates/branches/lifetype-1.2/Soft-Green/style.css
   templates/branches/lifetype-1.2/Soft-Red/
   templates/branches/lifetype-1.2/Soft-Red/album.template
   templates/branches/lifetype-1.2/Soft-Red/albums.template
   templates/branches/lifetype-1.2/Soft-Red/commentarticle.template
   templates/branches/lifetype-1.2/Soft-Red/error.template
   templates/branches/lifetype-1.2/Soft-Red/favicon.ico
   templates/branches/lifetype-1.2/Soft-Red/footer.template
   templates/branches/lifetype-1.2/Soft-Red/header.template
   templates/branches/lifetype-1.2/Soft-Red/main.template
   templates/branches/lifetype-1.2/Soft-Red/post.template
   templates/branches/lifetype-1.2/Soft-Red/postandcomments.template
   templates/branches/lifetype-1.2/Soft-Red/posttrackbacks.template
   templates/branches/lifetype-1.2/Soft-Red/resource.template
   templates/branches/lifetype-1.2/Soft-Red/screenshot.jpg
   templates/branches/lifetype-1.2/Soft-Red/searchresults.template
   templates/branches/lifetype-1.2/Soft-Red/style.css
Removed:
   templates/branches/lifetype-1.2/Soft-Blue/album.template
   templates/branches/lifetype-1.2/Soft-Blue/albums.template
   templates/branches/lifetype-1.2/Soft-Blue/commentarticle.template
   templates/branches/lifetype-1.2/Soft-Blue/error.template
   templates/branches/lifetype-1.2/Soft-Blue/favicon.ico
   templates/branches/lifetype-1.2/Soft-Blue/footer.template
   templates/branches/lifetype-1.2/Soft-Blue/header.template
   templates/branches/lifetype-1.2/Soft-Blue/main.template
   templates/branches/lifetype-1.2/Soft-Blue/post.template
   templates/branches/lifetype-1.2/Soft-Blue/postandcomments.template
   templates/branches/lifetype-1.2/Soft-Blue/posttrackbacks.template
   templates/branches/lifetype-1.2/Soft-Blue/resource.template
   templates/branches/lifetype-1.2/Soft-Blue/screenshot.jpg
   templates/branches/lifetype-1.2/Soft-Blue/searchresults.template
   templates/branches/lifetype-1.2/Soft-Blue/style.css
   templates/branches/lifetype-1.2/Soft-Green/album.template
   templates/branches/lifetype-1.2/Soft-Green/albums.template
   templates/branches/lifetype-1.2/Soft-Green/commentarticle.template
   templates/branches/lifetype-1.2/Soft-Green/error.template
   templates/branches/lifetype-1.2/Soft-Green/favicon.ico
   templates/branches/lifetype-1.2/Soft-Green/footer.template
   templates/branches/lifetype-1.2/Soft-Green/header.template
   templates/branches/lifetype-1.2/Soft-Green/main.template
   templates/branches/lifetype-1.2/Soft-Green/post.template
   templates/branches/lifetype-1.2/Soft-Green/postandcomments.template
   templates/branches/lifetype-1.2/Soft-Green/posttrackbacks.template
   templates/branches/lifetype-1.2/Soft-Green/resource.template
   templates/branches/lifetype-1.2/Soft-Green/screenshot.jpg
   templates/branches/lifetype-1.2/Soft-Green/searchresults.template
   templates/branches/lifetype-1.2/Soft-Green/style.css
   templates/branches/lifetype-1.2/Soft-Red/album.template
   templates/branches/lifetype-1.2/Soft-Red/albums.template
   templates/branches/lifetype-1.2/Soft-Red/commentarticle.template
   templates/branches/lifetype-1.2/Soft-Red/error.template
   templates/branches/lifetype-1.2/Soft-Red/favicon.ico
   templates/branches/lifetype-1.2/Soft-Red/footer.template
   templates/branches/lifetype-1.2/Soft-Red/header.template
   templates/branches/lifetype-1.2/Soft-Red/main.template
   templates/branches/lifetype-1.2/Soft-Red/post.template
   templates/branches/lifetype-1.2/Soft-Red/postandcomments.template
   templates/branches/lifetype-1.2/Soft-Red/posttrackbacks.template
   templates/branches/lifetype-1.2/Soft-Red/resource.template
   templates/branches/lifetype-1.2/Soft-Red/screenshot.jpg
   templates/branches/lifetype-1.2/Soft-Red/searchresults.template
   templates/branches/lifetype-1.2/Soft-Red/style.css
   templates/branches/lifetype-1.2/unported/Soft-Blue/
   templates/branches/lifetype-1.2/unported/Soft-Green/
   templates/branches/lifetype-1.2/unported/Soft-Red/
Log:
ported to 1.2

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

Deleted: templates/branches/lifetype-1.2/Soft-Blue/album.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Blue/album.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Blue/album.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Blue/album.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Blue/album.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Blue/album.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Blue/album.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Blue/albums.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Blue/albums.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Blue/albums.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Blue/albums.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Blue/albums.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Blue/albums.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Blue/albums.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Blue/commentarticle.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Blue/commentarticle.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Blue/commentarticle.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Blue/commentarticle.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Blue/commentarticle.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Blue/commentarticle.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Blue/commentarticle.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Blue/error.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Blue/error.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Blue/error.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Blue/error.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Blue/error.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Blue/error.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Blue/error.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Blue/favicon.ico
===================================================================
(Binary files differ)

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

Deleted: templates/branches/lifetype-1.2/Soft-Blue/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Blue/footer.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Blue/footer.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -1,95 +0,0 @@
-</div>
-</div>
-
-<div id="links">
-
-<div class="sidetitle">{$locale->tr("search")}</div>
-<div class="sidecal">
-   <form name="search_form" method="post" action="{$url->getIndexUrl()}">
-    <input type="text" name="searchTerms" value="" size="14" /><br/>
-    <input type="hidden" name="op" value="Search" />
-    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
-    <input type="submit" name="Search" value="{$locale->tr("search")}" />
-   </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">
-  	 <ul>
-  	{assign var=picture value=$blogOwner->getPicture()}
-  	<li><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /></li>
-  	<li>{$AboutMyself}</li>
-  	</ul>
-  	</div>
-{/if}
-<div class="sidetitle">{$locale->tr("calendar")}</div>
-<div class="sidecal">{$calendar}</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>
-  </ul>
-</p> 
-</div>
-
-<div class="sidetitle">{$locale->tr("syndicate")}</div>
-<div class="side">
-<ul>
-<p>
-    <li><a class="nodecoration" title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img src="{$url->getUrl("/imgs/rss090_logo.gif")}" style="border:0px;" alt="RSS 0.90" /></a></li>
-    <li><a class="nodecoration" title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img src="{$url->getUrl("/imgs/rss10_logo.gif")}" style="border:0px;" alt="RSS 1.0" /></a></li>
-    <li><a class="nodecoration" title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img src="{$url->getUrl("/imgs/rss20_logo.gif")}" style="border:0px;" alt="RSS 2.0" /></a></li>
-    <li><a class="nodecoration" title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img src="{$url->getUrl("/imgs/atom_logo.png")}" style="border:0px;" alt="Atom 0.3" /></a></li>	
-</p>
-</div>
-<div class="powered">
-Powered by <a href="http://www.lifetype.net">LifeType</a><br />    
-</div>
-
-</div>
-</body>
-</html>

Copied: templates/branches/lifetype-1.2/Soft-Blue/footer.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Blue/footer.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Blue/footer.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Blue/footer.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -0,0 +1,95 @@
+</div>
+</div>
+
+<div id="links">
+
+<div class="sidetitle">{$locale->tr("search")}</div>
+<div class="sidecal">
+   <form name="search_form" method="post" action="{$url->getIndexUrl()}">
+    <input type="text" name="searchTerms" value="" size="14" /><br/>
+    <input type="hidden" name="op" value="Search" />
+    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
+    <input type="submit" name="Search" value="{$locale->tr("search")}" />
+   </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">
+  	 <ul>
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	<li><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /></li>
+  	<li>{$AboutMyself}</li>
+  	</ul>
+  	</div>
+{/if}
+<div class="sidetitle">{$locale->tr("calendar")}</div>
+<div class="sidecal">{$calendar}</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>
+  </ul>
+</p> 
+</div>
+
+<div class="sidetitle">{$locale->tr("syndicate")}</div>
+<div class="side">
+<ul>
+<p>
+    <li><a class="nodecoration" title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img src="{$url->getUrl("/imgs/rss090_logo.gif")}" style="border:0px;" alt="RSS 0.90" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img src="{$url->getUrl("/imgs/rss10_logo.gif")}" style="border:0px;" alt="RSS 1.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img src="{$url->getUrl("/imgs/rss20_logo.gif")}" style="border:0px;" alt="RSS 2.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img src="{$url->getUrl("/imgs/atom_logo.png")}" style="border:0px;" alt="Atom 0.3" /></a></li>	
+</p>
+</div>
+<div class="powered">
+Powered by <a href="http://www.lifetype.net">LifeType</a><br />    
+</div>
+
+</div>
+</body>
+</html>

Deleted: templates/branches/lifetype-1.2/Soft-Blue/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Blue/header.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Blue/header.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Blue/header.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Blue/header.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Blue/header.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Blue/header.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Blue/main.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Blue/main.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Blue/main.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Blue/main.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Blue/main.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Blue/main.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Blue/main.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Blue/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Blue/post.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Blue/post.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Blue/post.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Blue/post.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Blue/post.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Blue/post.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Blue/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Blue/postandcomments.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Blue/postandcomments.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -1,41 +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/Soft-Blue/postandcomments.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Blue/postandcomments.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Blue/postandcomments.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Blue/postandcomments.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -0,0 +1,41 @@
+{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/Soft-Blue/posttrackbacks.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Blue/posttrackbacks.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Blue/posttrackbacks.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Blue/posttrackbacks.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Blue/posttrackbacks.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Blue/posttrackbacks.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Blue/posttrackbacks.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Blue/resource.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Blue/resource.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Blue/resource.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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="$blogtemplatee/footer.template"}

Copied: templates/branches/lifetype-1.2/Soft-Blue/resource.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Blue/resource.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Blue/resource.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Blue/resource.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Blue/screenshot.jpg
===================================================================
(Binary files differ)

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

Deleted: templates/branches/lifetype-1.2/Soft-Blue/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Blue/searchresults.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Blue/searchresults.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Blue/searchresults.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Blue/searchresults.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Blue/searchresults.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Blue/searchresults.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Blue/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Blue/style.css	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Blue/style.css	2008-04-28 20:21:01 UTC (rev 6376)
@@ -1,264 +0,0 @@
-/* 
-    "Soft Blue" was based on "Plain Blue," which was written by Scott Yang 
-    of www.movablestyle.com and released by him under the Creative Commons
-    attribution license (http://creativecommons.org/licenses/by/2.0/).
-*/
-
-body, table {
-    font-family: verdana, helvetica;
-}
-
-body {
-    background-color: #fff;
-    margin: 0px;
-    padding: 0px;
-}
-
-a 		{ color: #668; text-decoration: none; font-weight:normal; } 
-a:link		{ color: #668; } 
-a:visited	{ color: #668; } 
-a:active	{ color: #334; } 
-a:hover		{ color: #334; }
-
-h1, h2, h3 {
-    margin: 0px;
-    padding: 0px;
-}
-
-#banner, #banner-commentspop {
-    background-color: #ddf;
-    border-bottom: 1px dotted #668;
-}
-
-#banner {
-    height: 65px;
-    padding: 10px 0 0 15px;
-}
-
-#banner-commentspop {
-    font-size: x-large;
-    font-weight: bold;
-    padding: 5px 0 5px 5px;
-    margin-bottom: 10px;
-}
-
-#banner a,
-#banner a:link,
-#banner a:visited,
-#banner a:active,
-#banner a:hover {
-    color: #000;
-    font-size: xx-large;
-    font-weight: bold;
-    text-decoration: none;
-}
-
-#banner .description {
-    color: #668;
-    font-family: times, serif;
-    font-size: large;
-    font-style: italic;
-    font-weight: bold;
-    margin-left: 10px;
-}	
-
-#content {
-    margin-right: 230px;
-    border-right: #668 dotted 1px;
-}
-
-#container {
-    margin: 10px;
-}
-
-#links {
-    background-color: #fff;
-    border-left: 1px dotted #668;
-    padding: 10px;				
-    position: absolute;
-    top: 0px;
-    right: 0px;
-    width: 209px;
-}
-
-body > #links {
-    width: 210px;
-}
-
-.blog {
-    padding: 10px;
-    margin-bottom: 10px;
-}	
-
-
-.blogbody {
-    color: #666;
-    font-size: small;
-    font-weight: normal;
-    background: #fff;
-    line-height: 140%;			
-    margin-left: 15px;
-    margin-bottom: 10px;
-    padding: 5px;
-}
-
-.blogbody a,
-.blogbody a:link,
-.blogbody a:visited {
-    border-bottom: 1px dotted #334;
-}
-.blogbody a:active,
-.blogbody a:hover {
-    border-bottom: 1px solid #668;
-}
-
-.title	{ 
-    color: #668; 	
-    font-family: verdana, helvetica, sans-serif;
-    font-size: normal; 
-}			
-
-#menu {
-    background: #fff;
-    font-size: small;
-    text-align: left;  							
-}		
-
-.date	{ 
-    color: #444; 
-    font-size: small; 
-    font-weight: bold;
-    margin-bottom: 5px;
-}			
-
-.posted	{ 
-    color: #666; 
-    font-size: x-small; 
-    font-style: italic;
-    margin-top: 8px;
-}
-
-
-.calendar {
-    font-size: x-small;
-    font-weight: normal;
-    line-height: 140%;
-    padding: 2px;
-    text-align: center;	
-}
-
-.calendarToday {
-    font-size: x-small;
-    font-weight: bold;
-    text-decoration: underline;
-    line-height: 140%;
-    padding: 2px; 
-    text-align: center;  
-}
-
-div.calendar {
-    padding: 3px;
-}
-
-div.calendar table {
-    width: 100%;
-}
-
-.calendarhead {	
-    background: #ddf;
-    border: #9c9 dotted 1px;
-    color: #668;
-    font-size: x-small;
-    font-weight: bold;
-    line-height: 140%;
-    padding: 2px;					
-    width: 100%;
-}	
-
-.side {
-    color: #333;
-    font-size: x-small;
-    font-weight: normal;
-    line-height: 140%;
-    padding: 3px 7px;				
-}	
-
-DIV.side UL {
-    position: relative;
-    left: -20px;
-}
-
-.sidecal {
-    position: relative;
-    left: 26px;
-    color: #333;
-    font-size: x-small;
-    font-weight: normal;
-    line-height: 140%;
-    padding: 3px 7px;
-    text-align: center;
-}
-
-.sidetitle {
-    background-color: #ddf;
-    border: 1px dotted #9c9;
-    color: #668;
-    font-size: x-small;
-    font-weight: bold;
-    padding: 2px;
-    margin-top: 10px;
-    letter-spacing: .3em;
-    text-align:center;		  					
-}		
-
-.syndicate {
-    font-size: x-small;
-    font-weight: bold;		
-    padding: 2px;
-    margin-top: 10px;
-    text-align: center;
-}	
-
-.powered {
-    font-size: x-small;
-    font-weight: bold;
-    line-height:140%;
-    margin-top: 10px;
-    padding:2px;
-    text-align:center;
-}	
-.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/Soft-Blue/style.css (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Blue/style.css)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Blue/style.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Blue/style.css	2008-04-28 20:21:01 UTC (rev 6376)
@@ -0,0 +1,264 @@
+/* 
+    "Soft Blue" was based on "Plain Blue," which was written by Scott Yang 
+    of www.movablestyle.com and released by him under the Creative Commons
+    attribution license (http://creativecommons.org/licenses/by/2.0/).
+*/
+
+body, table {
+    font-family: verdana, helvetica;
+}
+
+body {
+    background-color: #fff;
+    margin: 0px;
+    padding: 0px;
+}
+
+a 		{ color: #668; text-decoration: none; font-weight:normal; } 
+a:link		{ color: #668; } 
+a:visited	{ color: #668; } 
+a:active	{ color: #334; } 
+a:hover		{ color: #334; }
+
+h1, h2, h3 {
+    margin: 0px;
+    padding: 0px;
+}
+
+#banner, #banner-commentspop {
+    background-color: #ddf;
+    border-bottom: 1px dotted #668;
+}
+
+#banner {
+    height: 65px;
+    padding: 10px 0 0 15px;
+}
+
+#banner-commentspop {
+    font-size: x-large;
+    font-weight: bold;
+    padding: 5px 0 5px 5px;
+    margin-bottom: 10px;
+}
+
+#banner a,
+#banner a:link,
+#banner a:visited,
+#banner a:active,
+#banner a:hover {
+    color: #000;
+    font-size: xx-large;
+    font-weight: bold;
+    text-decoration: none;
+}
+
+#banner .description {
+    color: #668;
+    font-family: times, serif;
+    font-size: large;
+    font-style: italic;
+    font-weight: bold;
+    margin-left: 10px;
+}	
+
+#content {
+    margin-right: 230px;
+    border-right: #668 dotted 1px;
+}
+
+#container {
+    margin: 10px;
+}
+
+#links {
+    background-color: #fff;
+    border-left: 1px dotted #668;
+    padding: 10px;				
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    width: 209px;
+}
+
+body > #links {
+    width: 210px;
+}
+
+.blog {
+    padding: 10px;
+    margin-bottom: 10px;
+}	
+
+
+.blogbody {
+    color: #666;
+    font-size: small;
+    font-weight: normal;
+    background: #fff;
+    line-height: 140%;			
+    margin-left: 15px;
+    margin-bottom: 10px;
+    padding: 5px;
+}
+
+.blogbody a,
+.blogbody a:link,
+.blogbody a:visited {
+    border-bottom: 1px dotted #334;
+}
+.blogbody a:active,
+.blogbody a:hover {
+    border-bottom: 1px solid #668;
+}
+
+.title	{ 
+    color: #668; 	
+    font-family: verdana, helvetica, sans-serif;
+    font-size: normal; 
+}			
+
+#menu {
+    background: #fff;
+    font-size: small;
+    text-align: left;  							
+}		
+
+.date	{ 
+    color: #444; 
+    font-size: small; 
+    font-weight: bold;
+    margin-bottom: 5px;
+}			
+
+.posted	{ 
+    color: #666; 
+    font-size: x-small; 
+    font-style: italic;
+    margin-top: 8px;
+}
+
+
+.calendar {
+    font-size: x-small;
+    font-weight: normal;
+    line-height: 140%;
+    padding: 2px;
+    text-align: center;	
+}
+
+.calendarToday {
+    font-size: x-small;
+    font-weight: bold;
+    text-decoration: underline;
+    line-height: 140%;
+    padding: 2px; 
+    text-align: center;  
+}
+
+div.calendar {
+    padding: 3px;
+}
+
+div.calendar table {
+    width: 100%;
+}
+
+.calendarhead {	
+    background: #ddf;
+    border: #9c9 dotted 1px;
+    color: #668;
+    font-size: x-small;
+    font-weight: bold;
+    line-height: 140%;
+    padding: 2px;					
+    width: 100%;
+}	
+
+.side {
+    color: #333;
+    font-size: x-small;
+    font-weight: normal;
+    line-height: 140%;
+    padding: 3px 7px;				
+}	
+
+DIV.side UL {
+    position: relative;
+    left: -20px;
+}
+
+.sidecal {
+    position: relative;
+    left: 26px;
+    color: #333;
+    font-size: x-small;
+    font-weight: normal;
+    line-height: 140%;
+    padding: 3px 7px;
+    text-align: center;
+}
+
+.sidetitle {
+    background-color: #ddf;
+    border: 1px dotted #9c9;
+    color: #668;
+    font-size: x-small;
+    font-weight: bold;
+    padding: 2px;
+    margin-top: 10px;
+    letter-spacing: .3em;
+    text-align:center;		  					
+}		
+
+.syndicate {
+    font-size: x-small;
+    font-weight: bold;		
+    padding: 2px;
+    margin-top: 10px;
+    text-align: center;
+}	
+
+.powered {
+    font-size: x-small;
+    font-weight: bold;
+    line-height:140%;
+    margin-top: 10px;
+    padding:2px;
+    text-align:center;
+}	
+.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/Soft-Green (from rev 6373, templates/branches/lifetype-1.2/unported/Soft-Green)

Deleted: templates/branches/lifetype-1.2/Soft-Green/album.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Green/album.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Green/album.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/album.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Green/album.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Green/album.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Green/album.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/albums.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Green/albums.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Green/albums.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/albums.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Green/albums.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Green/albums.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Green/albums.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/commentarticle.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Green/commentarticle.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Green/commentarticle.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/commentarticle.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Green/commentarticle.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Green/commentarticle.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Green/commentarticle.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/error.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Green/error.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Green/error.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/error.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Green/error.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Green/error.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Green/error.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/favicon.ico
===================================================================
(Binary files differ)

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

Deleted: templates/branches/lifetype-1.2/Soft-Green/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Green/footer.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Green/footer.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -1,95 +0,0 @@
-</div>
-</div>
-
-<div id="links">
-
-<div class="sidetitle">{$locale->tr("search")}</div>
-<div class="sidecal">
-   <form name="search_form" method="post" action="{$url->getIndexUrl()}">
-    <input type="text" name="searchTerms" value="" size="14" /><br/>
-    <input type="hidden" name="op" value="Search" />
-    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
-    <input type="submit" name="Search" value="{$locale->tr("search")}" />
-   </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">
-  	 <ul>
-  	{assign var=picture value=$blogOwner->getPicture()}
-  	<li><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /></li>
-  	<li>{$AboutMyself}</li>
-  	</ul>
-  	</div>
-{/if}
-<div class="sidetitle">{$locale->tr("calendar")}</div>
-<div class="sidecal">{$calendar}</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>
-  </ul>
-</p> 
-</div>
-
-<div class="sidetitle">{$locale->tr("syndicate")}</div>
-<div class="side">
-<ul>
-<p>
-    <li><a class="nodecoration" title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img src="{$url->getUrl("/imgs/rss090_logo.gif")}" style="border:0px;" alt="RSS 0.90" /></a></li>
-    <li><a class="nodecoration" title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img src="{$url->getUrl("/imgs/rss10_logo.gif")}" style="border:0px;" alt="RSS 1.0" /></a></li>
-    <li><a class="nodecoration" title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img src="{$url->getUrl("/imgs/rss20_logo.gif")}" style="border:0px;" alt="RSS 2.0" /></a></li>
-    <li><a class="nodecoration" title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img src="{$url->getUrl("/imgs/atom_logo.png")}" style="border:0px;" alt="Atom 0.3" /></a></li>	
-</p>
-</div>
-<div class="powered">
-Powered by <a href="http://www.lifetype.net">LifeType</a><br />    
-</div>
-
-</div>
-</body>
-</html>

Copied: templates/branches/lifetype-1.2/Soft-Green/footer.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Green/footer.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Green/footer.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Green/footer.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -0,0 +1,95 @@
+</div>
+</div>
+
+<div id="links">
+
+<div class="sidetitle">{$locale->tr("search")}</div>
+<div class="sidecal">
+   <form name="search_form" method="post" action="{$url->getIndexUrl()}">
+    <input type="text" name="searchTerms" value="" size="14" /><br/>
+    <input type="hidden" name="op" value="Search" />
+    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
+    <input type="submit" name="Search" value="{$locale->tr("search")}" />
+   </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">
+  	 <ul>
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	<li><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /></li>
+  	<li>{$AboutMyself}</li>
+  	</ul>
+  	</div>
+{/if}
+<div class="sidetitle">{$locale->tr("calendar")}</div>
+<div class="sidecal">{$calendar}</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>
+  </ul>
+</p> 
+</div>
+
+<div class="sidetitle">{$locale->tr("syndicate")}</div>
+<div class="side">
+<ul>
+<p>
+    <li><a class="nodecoration" title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img src="{$url->getUrl("/imgs/rss090_logo.gif")}" style="border:0px;" alt="RSS 0.90" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img src="{$url->getUrl("/imgs/rss10_logo.gif")}" style="border:0px;" alt="RSS 1.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img src="{$url->getUrl("/imgs/rss20_logo.gif")}" style="border:0px;" alt="RSS 2.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img src="{$url->getUrl("/imgs/atom_logo.png")}" style="border:0px;" alt="Atom 0.3" /></a></li>	
+</p>
+</div>
+<div class="powered">
+Powered by <a href="http://www.lifetype.net">LifeType</a><br />    
+</div>
+
+</div>
+</body>
+</html>

Deleted: templates/branches/lifetype-1.2/Soft-Green/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Green/header.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Green/header.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/header.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Green/header.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Green/header.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Green/header.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/main.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Green/main.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Green/main.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/main.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Green/main.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Green/main.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Green/main.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Green/post.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Green/post.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/post.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Green/post.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Green/post.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Green/post.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Green/postandcomments.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Green/postandcomments.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -1,41 +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/Soft-Green/postandcomments.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Green/postandcomments.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Green/postandcomments.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Green/postandcomments.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -0,0 +1,41 @@
+{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/Soft-Green/posttrackbacks.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Green/posttrackbacks.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Green/posttrackbacks.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/posttrackbacks.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Green/posttrackbacks.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Green/posttrackbacks.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Green/posttrackbacks.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/resource.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Green/resource.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Green/resource.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/resource.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Green/resource.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Green/resource.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Green/resource.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/screenshot.jpg
===================================================================
(Binary files differ)

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

Deleted: templates/branches/lifetype-1.2/Soft-Green/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Green/searchresults.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Green/searchresults.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/searchresults.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Green/searchresults.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Green/searchresults.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Green/searchresults.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Green/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Green/style.css	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Green/style.css	2008-04-28 20:21:01 UTC (rev 6376)
@@ -1,256 +0,0 @@
-/* 
-    "Soft Green" was based on "Plain Blue," which was written by Scott Yang 
-    of www.movablestyle.com and released by him under the Creative Commons
-    attribution license (http://creativecommons.org/licenses/by/2.0/).
-*/
-
-body, table {
-    font-family: verdana, helvetica;
-}
-
-body {
-    background-color: #fff;
-    margin: 0px;
-    padding: 0px;
-}
-
-a 		{ color: #337C66; text-decoration: none; font-weight:normal; } 
-a:link		{ color: #337C66; } 
-a:visited	{ color: #337C66; } 
-a:active	{ color: #004933; } 
-a:hover		{ color: #004933; }
-
-h1, h2, h3 {
-    margin: 0px;
-    padding: 0px;
-}
-
-#banner, #banner-commentspop {
-    background-color: #DCFFCB;
-    border-bottom: 1px dotted #337C66;
-}
-
-#banner {
-    height: 65px;
-    padding: 10px 0 0 15px;
-}
-
-#banner-commentspop {
-    font-size: x-large;
-    font-weight: bold;
-    padding: 5px 0 5px 5px;
-    margin-bottom: 10px;
-}
-
-#banner a,
-#banner a:link,
-#banner a:visited,
-#banner a:active,
-#banner a:hover {
-    color: #000;
-    font-size: xx-large;
-    font-weight: bold;
-    text-decoration: none;
-}
-
-#banner .description {
-    color: #337C66;
-    font-family: times, serif;
-    font-size: large;
-    font-style: italic;
-    font-weight: bold;
-    margin-left: 10px;
-}	
-
-#content {
-    margin-right: 230px;
-    border-right: #337C66 dotted 1px;
-}
-
-#container {
-    margin: 10px;
-}
-
-#links {
-    background-color: #fff;
-    border-left: 1px dotted #337C66;
-    padding: 10px;				
-    position: absolute;
-    top: 0px;
-    right: 0px;
-    width: 209px;
-}
-
-body > #links {
-    width: 210px;
-}
-
-.blog {
-    padding: 10px;
-    margin-bottom: 10px;
-}	
-
-
-.blogbody {
-    color: #666;
-    font-size: small;
-    font-weight: normal;
-    background: #fff;
-    line-height: 140%;			
-    margin-left: 15px;
-    margin-bottom: 10px;
-    padding: 5px;
-}
-
-.blogbody a,
-.blogbody a:link,
-.blogbody a:visited {
-    border-bottom: 1px dotted #004933;
-}
-.blogbody a:active,
-.blogbody a:hover {
-    border-bottom: 1px solid #337C66;
-}
-
-.title	{ 
-    color: #337C66;
-    font-family: verdana, helvetica, sans-serif;
-    font-size: normal; 
-}			
-
-#menu {
-    background: #fff;
-    font-size: small;
-    text-align: left;  							
-}		
-
-.date	{ 
-    color: #444; 
-    font-size: small; 
-    font-weight: bold;
-    margin-bottom: 5px;
-}			
-
-.posted	{ 
-    color: #666; 
-    font-size: x-small; 
-    font-style: italic;
-    margin-top: 8px;
-}
-
-
-.calendar {
-    font-size: x-small;
-    font-weight: normal;
-    line-height: 140%;
-    padding: 2px;
-    text-align: center;	
-}
-
-.calendarToday {
-    font-size: x-small;
-    font-weight: bold;
-    text-decoration: underline;
-    line-height: 140%;
-    padding: 2px;
-    text-align: center;
-}
-
-div.calendar {
-    padding: 3px;
-}
-
-div.calendar table {
-    width: 100%;
-}
-
-.calendarhead {	
-    background: #DCFFCB;
-    border: #9c9 dotted 1px;
-    color: #337C66;
-    font-size: x-small;
-    font-weight: bold;
-    line-height: 140%;
-    padding: 2px;					
-    width: 100%;
-}	
-
-.side {
-    color: #333;
-    font-size: x-small;
-    font-weight: normal;
-    line-height: 140%;
-    padding: 3px 7px;				
-}	
-
-.sidecal {
-    position: relative;
-    left: 26px;
-    color: #333;
-    font-size: x-small;
-    font-weight: normal;
-    line-height: 140%;
-    padding: 3px 7px;
-    text-align: center;
-}
-
-.sidetitle {
-    background-color: #DCFFCB;
-    border: 1px dotted #9c9;
-    color: #337C66;
-    font-size: x-small;
-    font-weight: bold;
-    padding: 2px;
-    margin-top: 10px;
-    letter-spacing: .3em;
-    text-align:center;		  					
-}		
-
-.powered {
-    font-size: x-small;
-    font-weight: bold;
-    line-height:140%;
-    margin-top: 10px;
-    padding:2px;
-    text-align:center;
-}	
-
-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/Soft-Green/style.css (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Green/style.css)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Green/style.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Green/style.css	2008-04-28 20:21:01 UTC (rev 6376)
@@ -0,0 +1,256 @@
+/* 
+    "Soft Green" was based on "Plain Blue," which was written by Scott Yang 
+    of www.movablestyle.com and released by him under the Creative Commons
+    attribution license (http://creativecommons.org/licenses/by/2.0/).
+*/
+
+body, table {
+    font-family: verdana, helvetica;
+}
+
+body {
+    background-color: #fff;
+    margin: 0px;
+    padding: 0px;
+}
+
+a 		{ color: #337C66; text-decoration: none; font-weight:normal; } 
+a:link		{ color: #337C66; } 
+a:visited	{ color: #337C66; } 
+a:active	{ color: #004933; } 
+a:hover		{ color: #004933; }
+
+h1, h2, h3 {
+    margin: 0px;
+    padding: 0px;
+}
+
+#banner, #banner-commentspop {
+    background-color: #DCFFCB;
+    border-bottom: 1px dotted #337C66;
+}
+
+#banner {
+    height: 65px;
+    padding: 10px 0 0 15px;
+}
+
+#banner-commentspop {
+    font-size: x-large;
+    font-weight: bold;
+    padding: 5px 0 5px 5px;
+    margin-bottom: 10px;
+}
+
+#banner a,
+#banner a:link,
+#banner a:visited,
+#banner a:active,
+#banner a:hover {
+    color: #000;
+    font-size: xx-large;
+    font-weight: bold;
+    text-decoration: none;
+}
+
+#banner .description {
+    color: #337C66;
+    font-family: times, serif;
+    font-size: large;
+    font-style: italic;
+    font-weight: bold;
+    margin-left: 10px;
+}	
+
+#content {
+    margin-right: 230px;
+    border-right: #337C66 dotted 1px;
+}
+
+#container {
+    margin: 10px;
+}
+
+#links {
+    background-color: #fff;
+    border-left: 1px dotted #337C66;
+    padding: 10px;				
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    width: 209px;
+}
+
+body > #links {
+    width: 210px;
+}
+
+.blog {
+    padding: 10px;
+    margin-bottom: 10px;
+}	
+
+
+.blogbody {
+    color: #666;
+    font-size: small;
+    font-weight: normal;
+    background: #fff;
+    line-height: 140%;			
+    margin-left: 15px;
+    margin-bottom: 10px;
+    padding: 5px;
+}
+
+.blogbody a,
+.blogbody a:link,
+.blogbody a:visited {
+    border-bottom: 1px dotted #004933;
+}
+.blogbody a:active,
+.blogbody a:hover {
+    border-bottom: 1px solid #337C66;
+}
+
+.title	{ 
+    color: #337C66;
+    font-family: verdana, helvetica, sans-serif;
+    font-size: normal; 
+}			
+
+#menu {
+    background: #fff;
+    font-size: small;
+    text-align: left;  							
+}		
+
+.date	{ 
+    color: #444; 
+    font-size: small; 
+    font-weight: bold;
+    margin-bottom: 5px;
+}			
+
+.posted	{ 
+    color: #666; 
+    font-size: x-small; 
+    font-style: italic;
+    margin-top: 8px;
+}
+
+
+.calendar {
+    font-size: x-small;
+    font-weight: normal;
+    line-height: 140%;
+    padding: 2px;
+    text-align: center;	
+}
+
+.calendarToday {
+    font-size: x-small;
+    font-weight: bold;
+    text-decoration: underline;
+    line-height: 140%;
+    padding: 2px;
+    text-align: center;
+}
+
+div.calendar {
+    padding: 3px;
+}
+
+div.calendar table {
+    width: 100%;
+}
+
+.calendarhead {	
+    background: #DCFFCB;
+    border: #9c9 dotted 1px;
+    color: #337C66;
+    font-size: x-small;
+    font-weight: bold;
+    line-height: 140%;
+    padding: 2px;					
+    width: 100%;
+}	
+
+.side {
+    color: #333;
+    font-size: x-small;
+    font-weight: normal;
+    line-height: 140%;
+    padding: 3px 7px;				
+}	
+
+.sidecal {
+    position: relative;
+    left: 26px;
+    color: #333;
+    font-size: x-small;
+    font-weight: normal;
+    line-height: 140%;
+    padding: 3px 7px;
+    text-align: center;
+}
+
+.sidetitle {
+    background-color: #DCFFCB;
+    border: 1px dotted #9c9;
+    color: #337C66;
+    font-size: x-small;
+    font-weight: bold;
+    padding: 2px;
+    margin-top: 10px;
+    letter-spacing: .3em;
+    text-align:center;		  					
+}		
+
+.powered {
+    font-size: x-small;
+    font-weight: bold;
+    line-height:140%;
+    margin-top: 10px;
+    padding:2px;
+    text-align:center;
+}	
+
+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/Soft-Red (from rev 6373, templates/branches/lifetype-1.2/unported/Soft-Red)

Deleted: templates/branches/lifetype-1.2/Soft-Red/album.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Red/album.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Red/album.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/album.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Red/album.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Red/album.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Red/album.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/albums.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Red/albums.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Red/albums.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/albums.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Red/albums.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Red/albums.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Red/albums.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/commentarticle.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Red/commentarticle.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Red/commentarticle.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/commentarticle.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Red/commentarticle.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Red/commentarticle.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Red/commentarticle.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/error.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Red/error.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Red/error.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/error.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Red/error.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Red/error.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Red/error.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/favicon.ico
===================================================================
(Binary files differ)

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

Deleted: templates/branches/lifetype-1.2/Soft-Red/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Red/footer.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Red/footer.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -1,95 +0,0 @@
-</div>
-</div>
-
-<div id="links">
-
-<div class="sidetitle">{$locale->tr("search")}</div>
-<div class="sidecal">
-   <form name="search_form" method="post" action="{$url->getIndexUrl()}">
-    <input type="text" name="searchTerms" value="" size="14" /><br/>
-    <input type="hidden" name="op" value="Search" />
-    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
-    <input type="submit" name="Search" value="{$locale->tr("search")}" />
-   </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">
-  	 <ul>
-  	{assign var=picture value=$blogOwner->getPicture()}
-  	<li><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /></li>
-  	<li>{$AboutMyself}</li>
-  	</ul>
-  	</div>
-{/if}
-<div class="sidetitle">{$locale->tr("calendar")}</div>
-<div class="sidecal">{$calendar}</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>
-  </ul>
-</p> 
-</div>
-
-<div class="sidetitle">{$locale->tr("syndicate")}</div>
-<div class="side">
-<ul>
-<p>
-    <li><a class="nodecoration" title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img src="{$url->getUrl("/imgs/rss090_logo.gif")}" style="border:0px;" alt="RSS 0.90" /></a></li>
-    <li><a class="nodecoration" title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img src="{$url->getUrl("/imgs/rss10_logo.gif")}" style="border:0px;" alt="RSS 1.0" /></a></li>
-    <li><a class="nodecoration" title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img src="{$url->getUrl("/imgs/rss20_logo.gif")}" style="border:0px;" alt="RSS 2.0" /></a></li>
-    <li><a class="nodecoration" title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img src="{$url->getUrl("/imgs/atom_logo.png")}" style="border:0px;" alt="Atom 0.3" /></a></li>	
-</p>
-</div>
-<div class="powered">
-Powered by <a href="http://www.lifetype.net">LifeType</a><br />    
-</div>
-
-</div>
-</body>
-</html>

Copied: templates/branches/lifetype-1.2/Soft-Red/footer.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Red/footer.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Red/footer.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Red/footer.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -0,0 +1,95 @@
+</div>
+</div>
+
+<div id="links">
+
+<div class="sidetitle">{$locale->tr("search")}</div>
+<div class="sidecal">
+   <form name="search_form" method="post" action="{$url->getIndexUrl()}">
+    <input type="text" name="searchTerms" value="" size="14" /><br/>
+    <input type="hidden" name="op" value="Search" />
+    <input type="hidden" name="blogId" value="{$blog->getId()}"/>   
+    <input type="submit" name="Search" value="{$locale->tr("search")}" />
+   </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">
+  	 <ul>
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	<li><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /></li>
+  	<li>{$AboutMyself}</li>
+  	</ul>
+  	</div>
+{/if}
+<div class="sidetitle">{$locale->tr("calendar")}</div>
+<div class="sidecal">{$calendar}</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>
+  </ul>
+</p> 
+</div>
+
+<div class="sidetitle">{$locale->tr("syndicate")}</div>
+<div class="side">
+<ul>
+<p>
+    <li><a class="nodecoration" title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img src="{$url->getUrl("/imgs/rss090_logo.gif")}" style="border:0px;" alt="RSS 0.90" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img src="{$url->getUrl("/imgs/rss10_logo.gif")}" style="border:0px;" alt="RSS 1.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img src="{$url->getUrl("/imgs/rss20_logo.gif")}" style="border:0px;" alt="RSS 2.0" /></a></li>
+    <li><a class="nodecoration" title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img src="{$url->getUrl("/imgs/atom_logo.png")}" style="border:0px;" alt="Atom 0.3" /></a></li>	
+</p>
+</div>
+<div class="powered">
+Powered by <a href="http://www.lifetype.net">LifeType</a><br />    
+</div>
+
+</div>
+</body>
+</html>

Deleted: templates/branches/lifetype-1.2/Soft-Red/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Red/header.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Red/header.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/header.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Red/header.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Red/header.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Red/header.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/main.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Red/main.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Red/main.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/main.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Red/main.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Red/main.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Red/main.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Red/post.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Red/post.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/post.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Red/post.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Red/post.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Red/post.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Red/postandcomments.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Red/postandcomments.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -1,41 +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/Soft-Red/postandcomments.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Red/postandcomments.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Red/postandcomments.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Red/postandcomments.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -0,0 +1,41 @@
+{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/Soft-Red/posttrackbacks.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Red/posttrackbacks.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Red/posttrackbacks.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/posttrackbacks.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Red/posttrackbacks.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Red/posttrackbacks.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Red/posttrackbacks.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/resource.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Red/resource.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Red/resource.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/resource.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Red/resource.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Red/resource.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Red/resource.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/screenshot.jpg
===================================================================
(Binary files differ)

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

Deleted: templates/branches/lifetype-1.2/Soft-Red/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Red/searchresults.template	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Red/searchresults.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/searchresults.template (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Red/searchresults.template)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Red/searchresults.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Red/searchresults.template	2008-04-28 20:21:01 UTC (rev 6376)
@@ -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/Soft-Red/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/Soft-Red/style.css	2008-04-28 20:17:26 UTC (rev 6373)
+++ templates/branches/lifetype-1.2/Soft-Red/style.css	2008-04-28 20:21:01 UTC (rev 6376)
@@ -1,252 +0,0 @@
-/* 
-    "Soft Red" was based on "Plain Blue," which was written by Scott Yang 
-    of www.movablestyle.com and released by him under the Creative Commons 
-    attribution license (http://creativecommons.org/licenses/by/2.0/).
-*/
-
-body, table {
-    font-family: verdana, helvetica;
-}
-
-body {
-    background-color: #fff;
-    margin: 0px;
-    padding: 0px;
-}
-
-a 		{ color: #553E3E; text-decoration: none; font-weight:normal; } 
-a:link		{ color: #553E3E; } 
-a:visited	{ color: #553E3E; } 
-a:active	{ color: #AA7C7C; } 
-a:hover		{ color: #AA7C7C; }
-
-h1, h2, h3 {
-    margin: 0px;
-    padding: 0px;
-}
-
-#banner {
-    background-color: #FF9696;
-    border-bottom: 1px dotted #553E3E;
-}
-
-#banner {
-    height: 65px;
-    padding: 10px 0 0 15px;
-}
-
-#banner-commentspop {
-    font-size: x-large;
-    font-weight: bold;
-    padding: 5px 0 5px 5px;
-    margin-bottom: 10px;
-}
-
-#banner a,
-#banner a:link,
-#banner a:visited,
-#banner a:active,
-#banner a:hover {
-    color: #000;
-    font-size: xx-large;
-    font-weight: bold;
-    text-decoration: none;
-}
-
-#banner .description {
-    color: #553E3E;
-    font-family: times, serif;
-    font-size: large;
-    font-style: italic;
-    font-weight: bold;
-    margin-left: 10px;
-}	
-
-#content {
-    margin-right: 230px;
-    border-right: #553E3E dotted 1px;
-}
-
-#container {
-    margin: 10px;
-}
-
-#links {
-    background-color: #fff;
-    border-left: 1px dotted #553E3E;
-    padding: 10px;				
-    position: absolute;
-    top: 0px;
-    right: 0px;
-    width: 209px;
-}
-
-body > #links {
-    width: 210px;
-}
-
-.blog {
-    padding: 10px;
-    margin-bottom: 10px;
-}	
-
-
-.blogbody {
-    color: #666;
-    font-size: small;
-    font-weight: normal;
-    background: #fff;
-    line-height: 140%;			
-    margin-left: 15px;
-    margin-bottom: 10px;
-    padding: 5px;
-}
-
-.blogbody a,
-.blogbody a:link,
-.blogbody a:visited {
-    border-bottom: 1px dotted #AA7C7C;
-}
-
-.title	{ 
-    color: #553E3E; 	
-    font-family: verdana, helvetica, sans-serif;
-    font-size: normal; 
-}			
-
-#menu {
-    background: #fff;
-    font-size: small;
-    text-align: left;  							
-}		
-
-.date	{ 
-    color: #FC6D6D; 
-    font-size: small; 
-    font-weight: bold;
-    margin-bottom: 5px;
-}			
-
-.posted	{ 
-    color: #666; 
-    font-size: x-small; 
-    font-style: italic;
-    margin-top: 8px;
-}
-
-
-.calendar {
-    font-size: x-small;
-    font-weight: normal;
-    line-height: 140%;
-    padding: 2px;
-    text-align: center;	
-}
-
-.calendarToday {
-    font-size: x-small;
-    font-weight: bold;
-    text-decoration: underline;
-    line-height: 140%;
-    padding: 2px; 
-    text-align: center;  
-}
-
-div.calendar {
-    padding: 3px;
-}
-
-div.calendar table {
-    width: 100%;
-}
-
-.calendarhead {	
-    background: #FF9696;
-    border: #999 dotted 1px;
-    color: #553E3E;
-    font-size: x-small;
-    font-weight: bold;
-    line-height: 140%;
-    padding: 2px;					
-    width: 100%;
-}	
-
-.side {
-    color: #333;
-    font-size: x-small;
-    font-weight: normal;
-    line-height: 140%;
-    padding: 3px 7px;				
-}	
-
-DIV.side UL {
-    position: relative;
-    left: -20px;
-}
-
-.sidecal {
-    position: relative;
-    left: 26px;
-    color: #333;
-    font-size: x-small;
-    font-weight: normal;
-    line-height: 140%;
-    padding: 3px 7px;
-    text-align: center;
-}
-
-.sidetitle {
-    background-color: #FF9696;
-    border: 1px dotted #999;
-    color: #553E3E;
-    font-size: x-small;
-    font-weight: bold;
-    padding: 2px;
-    margin-top: 10px;
-    letter-spacing: .3em;
-    text-align:center;		  					
-}		
-
-.powered {
-    font-size: x-small;
-    font-weight: bold;
-    line-height:140%;
-    margin-top: 10px;
-    padding:2px;
-    text-align:center;
-}	
-
-.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/Soft-Red/style.css (from rev 6375, templates/branches/lifetype-1.2/unported/Soft-Red/style.css)
===================================================================
--- templates/branches/lifetype-1.2/Soft-Red/style.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/Soft-Red/style.css	2008-04-28 20:21:01 UTC (rev 6376)
@@ -0,0 +1,252 @@
+/* 
+    "Soft Red" was based on "Plain Blue," which was written by Scott Yang 
+    of www.movablestyle.com and released by him under the Creative Commons 
+    attribution license (http://creativecommons.org/licenses/by/2.0/).
+*/
+
+body, table {
+    font-family: verdana, helvetica;
+}
+
+body {
+    background-color: #fff;
+    margin: 0px;
+    padding: 0px;
+}
+
+a 		{ color: #553E3E; text-decoration: none; font-weight:normal; } 
+a:link		{ color: #553E3E; } 
+a:visited	{ color: #553E3E; } 
+a:active	{ color: #AA7C7C; } 
+a:hover		{ color: #AA7C7C; }
+
+h1, h2, h3 {
+    margin: 0px;
+    padding: 0px;
+}
+
+#banner {
+    background-color: #FF9696;
+    border-bottom: 1px dotted #553E3E;
+}
+
+#banner {
+    height: 65px;
+    padding: 10px 0 0 15px;
+}
+
+#banner-commentspop {
+    font-size: x-large;
+    font-weight: bold;
+    padding: 5px 0 5px 5px;
+    margin-bottom: 10px;
+}
+
+#banner a,
+#banner a:link,
+#banner a:visited,
+#banner a:active,
+#banner a:hover {
+    color: #000;
+    font-size: xx-large;
+    font-weight: bold;
+    text-decoration: none;
+}
+
+#banner .description {
+    color: #553E3E;
+    font-family: times, serif;
+    font-size: large;
+    font-style: italic;
+    font-weight: bold;
+    margin-left: 10px;
+}	
+
+#content {
+    margin-right: 230px;
+    border-right: #553E3E dotted 1px;
+}
+
+#container {
+    margin: 10px;
+}
+
+#links {
+    background-color: #fff;
+    border-left: 1px dotted #553E3E;
+    padding: 10px;				
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    width: 209px;
+}
+
+body > #links {
+    width: 210px;
+}
+
+.blog {
+    padding: 10px;
+    margin-bottom: 10px;
+}	
+
+
+.blogbody {
+    color: #666;
+    font-size: small;
+    font-weight: normal;
+    background: #fff;
+    line-height: 140%;			
+    margin-left: 15px;
+    margin-bottom: 10px;
+    padding: 5px;
+}
+
+.blogbody a,
+.blogbody a:link,
+.blogbody a:visited {
+    border-bottom: 1px dotted #AA7C7C;
+}
+
+.title	{ 
+    color: #553E3E; 	
+    font-family: verdana, helvetica, sans-serif;
+    font-size: normal; 
+}			
+
+#menu {
+    background: #fff;
+    font-size: small;
+    text-align: left;  							
+}		
+
+.date	{ 
+    color: #FC6D6D; 
+    font-size: small; 
+    font-weight: bold;
+    margin-bottom: 5px;
+}			
+
+.posted	{ 
+    color: #666; 
+    font-size: x-small; 
+    font-style: italic;
+    margin-top: 8px;
+}
+
+
+.calendar {
+    font-size: x-small;
+    font-weight: normal;
+    line-height: 140%;
+    padding: 2px;
+    text-align: center;	
+}
+
+.calendarToday {
+    font-size: x-small;
+    font-weight: bold;
+    text-decoration: underline;
+    line-height: 140%;
+    padding: 2px; 
+    text-align: center;  
+}
+
+div.calendar {
+    padding: 3px;
+}
+
+div.calendar table {
+    width: 100%;
+}
+
+.calendarhead {	
+    background: #FF9696;
+    border: #999 dotted 1px;
+    color: #553E3E;
+    font-size: x-small;
+    font-weight: bold;
+    line-height: 140%;
+    padding: 2px;					
+    width: 100%;
+}	
+
+.side {
+    color: #333;
+    font-size: x-small;
+    font-weight: normal;
+    line-height: 140%;
+    padding: 3px 7px;				
+}	
+
+DIV.side UL {
+    position: relative;
+    left: -20px;
+}
+
+.sidecal {
+    position: relative;
+    left: 26px;
+    color: #333;
+    font-size: x-small;
+    font-weight: normal;
+    line-height: 140%;
+    padding: 3px 7px;
+    text-align: center;
+}
+
+.sidetitle {
+    background-color: #FF9696;
+    border: 1px dotted #999;
+    color: #553E3E;
+    font-size: x-small;
+    font-weight: bold;
+    padding: 2px;
+    margin-top: 10px;
+    letter-spacing: .3em;
+    text-align:center;		  					
+}		
+
+.powered {
+    font-size: x-small;
+    font-weight: bold;
+    line-height:140%;
+    margin-top: 10px;
+    padding:2px;
+    text-align:center;
+}	
+
+.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;	
+}



More information about the pLog-svn mailing list