[pLog-svn] r6391 - in templates/branches/lifetype-1.2: . fblueWithPlugins fdawn unported

jondaley at devel.lifetype.net jondaley at devel.lifetype.net
Mon Apr 28 17:44:01 EDT 2008


Author: jondaley
Date: 2008-04-28 17:44:00 -0400 (Mon, 28 Apr 2008)
New Revision: 6391

Added:
   templates/branches/lifetype-1.2/fblueWithPlugins/
   templates/branches/lifetype-1.2/fblueWithPlugins/album.template
   templates/branches/lifetype-1.2/fblueWithPlugins/albums.template
   templates/branches/lifetype-1.2/fblueWithPlugins/archives.template
   templates/branches/lifetype-1.2/fblueWithPlugins/bookmark.template
   templates/branches/lifetype-1.2/fblueWithPlugins/commentarticle.template
   templates/branches/lifetype-1.2/fblueWithPlugins/error.template
   templates/branches/lifetype-1.2/fblueWithPlugins/favicon.ico
   templates/branches/lifetype-1.2/fblueWithPlugins/features.template
   templates/branches/lifetype-1.2/fblueWithPlugins/footer.template
   templates/branches/lifetype-1.2/fblueWithPlugins/header.template
   templates/branches/lifetype-1.2/fblueWithPlugins/ie.css
   templates/branches/lifetype-1.2/fblueWithPlugins/images/
   templates/branches/lifetype-1.2/fblueWithPlugins/links.template
   templates/branches/lifetype-1.2/fblueWithPlugins/main.template
   templates/branches/lifetype-1.2/fblueWithPlugins/post.template
   templates/branches/lifetype-1.2/fblueWithPlugins/postandcomments.template
   templates/branches/lifetype-1.2/fblueWithPlugins/posttrackbacks.template
   templates/branches/lifetype-1.2/fblueWithPlugins/resource.template
   templates/branches/lifetype-1.2/fblueWithPlugins/samplerss.template
   templates/branches/lifetype-1.2/fblueWithPlugins/screenshot.jpg
   templates/branches/lifetype-1.2/fblueWithPlugins/searchresults.template
   templates/branches/lifetype-1.2/fblueWithPlugins/style.css
   templates/branches/lifetype-1.2/fdawn/
   templates/branches/lifetype-1.2/fdawn/album.template
   templates/branches/lifetype-1.2/fdawn/albums.template
   templates/branches/lifetype-1.2/fdawn/archives.template
   templates/branches/lifetype-1.2/fdawn/bookmark.template
   templates/branches/lifetype-1.2/fdawn/commentarticle.template
   templates/branches/lifetype-1.2/fdawn/error.template
   templates/branches/lifetype-1.2/fdawn/favicon.ico
   templates/branches/lifetype-1.2/fdawn/features.template
   templates/branches/lifetype-1.2/fdawn/footer.template
   templates/branches/lifetype-1.2/fdawn/header.template
   templates/branches/lifetype-1.2/fdawn/ie.css
   templates/branches/lifetype-1.2/fdawn/images/
   templates/branches/lifetype-1.2/fdawn/links.template
   templates/branches/lifetype-1.2/fdawn/main.template
   templates/branches/lifetype-1.2/fdawn/post.template
   templates/branches/lifetype-1.2/fdawn/postandcomments.template
   templates/branches/lifetype-1.2/fdawn/posttrackbacks.template
   templates/branches/lifetype-1.2/fdawn/resource.template
   templates/branches/lifetype-1.2/fdawn/samplerss.template
   templates/branches/lifetype-1.2/fdawn/screenshot.jpg
   templates/branches/lifetype-1.2/fdawn/searchresults.template
   templates/branches/lifetype-1.2/fdawn/style.css
   templates/branches/lifetype-1.2/fdawnWithPlugins/
Removed:
   templates/branches/lifetype-1.2/fblueWithPlugins/album.template
   templates/branches/lifetype-1.2/fblueWithPlugins/albums.template
   templates/branches/lifetype-1.2/fblueWithPlugins/archives.template
   templates/branches/lifetype-1.2/fblueWithPlugins/bookmark.template
   templates/branches/lifetype-1.2/fblueWithPlugins/commentarticle.template
   templates/branches/lifetype-1.2/fblueWithPlugins/error.template
   templates/branches/lifetype-1.2/fblueWithPlugins/favicon.ico
   templates/branches/lifetype-1.2/fblueWithPlugins/features.template
   templates/branches/lifetype-1.2/fblueWithPlugins/footer.template
   templates/branches/lifetype-1.2/fblueWithPlugins/header.template
   templates/branches/lifetype-1.2/fblueWithPlugins/ie.css
   templates/branches/lifetype-1.2/fblueWithPlugins/images/
   templates/branches/lifetype-1.2/fblueWithPlugins/links.template
   templates/branches/lifetype-1.2/fblueWithPlugins/main.template
   templates/branches/lifetype-1.2/fblueWithPlugins/post.template
   templates/branches/lifetype-1.2/fblueWithPlugins/postandcomments.template
   templates/branches/lifetype-1.2/fblueWithPlugins/posttrackbacks.template
   templates/branches/lifetype-1.2/fblueWithPlugins/resource.template
   templates/branches/lifetype-1.2/fblueWithPlugins/samplerss.template
   templates/branches/lifetype-1.2/fblueWithPlugins/screenshot.jpg
   templates/branches/lifetype-1.2/fblueWithPlugins/searchresults.template
   templates/branches/lifetype-1.2/fblueWithPlugins/style.css
   templates/branches/lifetype-1.2/fdawn/album.template
   templates/branches/lifetype-1.2/fdawn/albums.template
   templates/branches/lifetype-1.2/fdawn/archives.template
   templates/branches/lifetype-1.2/fdawn/bookmark.template
   templates/branches/lifetype-1.2/fdawn/commentarticle.template
   templates/branches/lifetype-1.2/fdawn/error.template
   templates/branches/lifetype-1.2/fdawn/favicon.ico
   templates/branches/lifetype-1.2/fdawn/features.template
   templates/branches/lifetype-1.2/fdawn/footer.template
   templates/branches/lifetype-1.2/fdawn/header.template
   templates/branches/lifetype-1.2/fdawn/ie.css
   templates/branches/lifetype-1.2/fdawn/images/
   templates/branches/lifetype-1.2/fdawn/links.template
   templates/branches/lifetype-1.2/fdawn/main.template
   templates/branches/lifetype-1.2/fdawn/post.template
   templates/branches/lifetype-1.2/fdawn/postandcomments.template
   templates/branches/lifetype-1.2/fdawn/posttrackbacks.template
   templates/branches/lifetype-1.2/fdawn/resource.template
   templates/branches/lifetype-1.2/fdawn/samplerss.template
   templates/branches/lifetype-1.2/fdawn/screenshot.jpg
   templates/branches/lifetype-1.2/fdawn/searchresults.template
   templates/branches/lifetype-1.2/fdawn/style.css
   templates/branches/lifetype-1.2/unported/fblueWithPlugins/
   templates/branches/lifetype-1.2/unported/fdawn/
   templates/branches/lifetype-1.2/unported/fdawnWithPlugins/
Log:
ported to 1.2

Copied: templates/branches/lifetype-1.2/fblueWithPlugins (from rev 6387, templates/branches/lifetype-1.2/unported/fblueWithPlugins)

Deleted: templates/branches/lifetype-1.2/fblueWithPlugins/album.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fblueWithPlugins/album.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/album.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,82 +0,0 @@
-{include file="$blogtemplate/header.template"}
-
-		<!-- Loop Start -->
-		<!-- album contents go here -->
-		<H2>{$album->getName()}</H2>
-			<H3>{$album->getDescription()}</h3>
-			<table style="border:0px;width:100%;" summary="Album Resources">
-				<tr>
-					<td style="width:25%;" align="center" >
-						<a class="nodecoration" href="{$url->parentAlbumLink($album)}">
-						<img style="border:0px" src="{$url->getUrl("/imgs/admin/icon_folder-72.png")}" alt="Folder" /><br/>
-						 ..
-						 </a>
-					</td>
-					{assign var="counter" value=1}
-					{assign var=children value=$album->getChildren()}
-					{foreach from=$children item=childalbum}
-					<td style="width:25%;" align="center" >
-						<a class="nodecoration" href="{$url->albumLink($childalbum)}">
-							<img style="border:0px;" src="{$url->getUrl("/imgs/admin/icon_folder-72.png")}" 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 -->
- {include file="$blogtemplate/links.template"}
- {include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/fblueWithPlugins/album.template (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/album.template)
===================================================================
--- templates/branches/lifetype-1.2/fblueWithPlugins/album.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/album.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,82 @@
+{include file="$blogtemplate/header.template"}
+
+		<!-- Loop Start -->
+		<!-- album contents go here -->
+		<H2>{$album->getName()}</H2>
+			<H3>{$album->getDescription()}</h3>
+			<table style="border:0px;width:100%;" summary="Album Resources">
+				<tr>
+					<td style="width:25%;" align="center" >
+						<a class="nodecoration" href="{$url->parentAlbumLink($album)}">
+						<img style="border:0px" src="{$url->getUrl("/imgs/admin/icon_folder-72.png")}" alt="Folder" /><br/>
+						 ..
+						 </a>
+					</td>
+					{assign var="counter" value=1}
+					{assign var=children value=$album->getChildren()}
+					{foreach from=$children item=childalbum}
+					<td style="width:25%;" align="center" >
+						<a class="nodecoration" href="{$url->albumLink($childalbum)}">
+							<img style="border:0px;" src="{$url->getUrl("/imgs/admin/icon_folder-72.png")}" 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 -->
+ {include file="$blogtemplate/links.template"}
+ {include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/fblueWithPlugins/albums.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fblueWithPlugins/albums.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/albums.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,27 +0,0 @@
-{include file="$blogtemplate/header.template"}
-
-		<!-- Loop Start -->
-		<!-- album contents go here -->
-			<H2>{$locale->tr("albums")}</H2>
-				<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/admin/icon_folder-72.png")}" alt="Folder" /><br/>
-								{$album->getName()} ({$album->getNumResources()})
-							</a>
-							{assign var="counter" value="`$counter+1`"}
-						</td>
-						{if $counter%3 == 0}
-					</tr>
-					<tr>
-						{/if}
-						{/foreach}
-						<td></td>
-					</tr>
-				</table>
-		<!-- end of the albums -->
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/fblueWithPlugins/albums.template (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/albums.template)
===================================================================
--- templates/branches/lifetype-1.2/fblueWithPlugins/albums.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/albums.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,27 @@
+{include file="$blogtemplate/header.template"}
+
+		<!-- Loop Start -->
+		<!-- album contents go here -->
+			<H2>{$locale->tr("albums")}</H2>
+				<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/admin/icon_folder-72.png")}" alt="Folder" /><br/>
+								{$album->getName()} ({$album->getNumResources()})
+							</a>
+							{assign var="counter" value="`$counter+1`"}
+						</td>
+						{if $counter%3 == 0}
+					</tr>
+					<tr>
+						{/if}
+						{/foreach}
+						<td></td>
+					</tr>
+				</table>
+		<!-- end of the albums -->
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/fblueWithPlugins/archives.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fblueWithPlugins/archives.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/archives.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,17 +0,0 @@
-{include file="$blogtemplate/header.template"} 
-		<DIV class=entry>		
-			<H3 class=entrytitle>{$locale->tr("archives")}</H3>
-			<DIV class=entrybody>
-				<ul>
-					{foreach from=$archives item=month}
-					<li>
-						<a href="{$month->getUrl()}">{$month->getName()}</a> [{$month->getNumArticles()}]
-					</li>
-					{/foreach}
-				</ul>
-
-			</div>
-		</div>
-
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"} 
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/fblueWithPlugins/archives.template (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/archives.template)
===================================================================
--- templates/branches/lifetype-1.2/fblueWithPlugins/archives.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/archives.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,17 @@
+{include file="$blogtemplate/header.template"} 
+		<DIV class=entry>		
+			<H3 class=entrytitle>{$locale->tr("archives")}</H3>
+			<DIV class=entrybody>
+				<ul>
+					{foreach from=$archives item=month}
+					<li>
+						<a href="{$month->getUrl()}">{$month->getName()}</a> [{$month->getNumArticles()}]
+					</li>
+					{/foreach}
+				</ul>
+
+			</div>
+		</div>
+
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"} 
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/fblueWithPlugins/bookmark.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fblueWithPlugins/bookmark.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/bookmark.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,15 +0,0 @@
-{include file="$blogtemplate/header.template"}
-		<!-- Loop Start -->
-			<H2>{$locale->tr("my_links")}</H2>
-				{foreach from=$mylinkscategories item=linkcategory}
-				<H3>{$linkcategory->getName()}</h3>
-				<ul>
-					{foreach from=$linkcategory->getLinks() item=link}
-					<li>
-						<a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a>: {$link->getDescription()}
-					</li>
-					{/foreach}
-				</ul>
-				{/foreach}
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"} 
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/fblueWithPlugins/bookmark.template (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/bookmark.template)
===================================================================
--- templates/branches/lifetype-1.2/fblueWithPlugins/bookmark.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/bookmark.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,15 @@
+{include file="$blogtemplate/header.template"}
+		<!-- Loop Start -->
+			<H2>{$locale->tr("my_links")}</H2>
+				{foreach from=$mylinkscategories item=linkcategory}
+				<H3>{$linkcategory->getName()}</h3>
+				<ul>
+					{foreach from=$linkcategory->getLinks() item=link}
+					<li>
+						<a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a>: {$link->getDescription()}
+					</li>
+					{/foreach}
+				</ul>
+				{/foreach}
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"} 
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/fblueWithPlugins/commentarticle.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fblueWithPlugins/commentarticle.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/commentarticle.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,7 +0,0 @@
-{include file="$blogtemplate/header.template"}
-{include file="$blogtemplate/links.template"}
-		<!-- Loop Start -->
-			<h3 id="respond">{$locale->tr("add_comment")}</h3>
-	
-{include file="$blogtemplate/commentform.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/fblueWithPlugins/commentarticle.template (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/commentarticle.template)
===================================================================
--- templates/branches/lifetype-1.2/fblueWithPlugins/commentarticle.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/commentarticle.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,7 @@
+{include file="$blogtemplate/header.template"}
+{include file="$blogtemplate/links.template"}
+		<!-- Loop Start -->
+			<h3 id="respond">{$locale->tr("add_comment")}</h3>
+	
+{include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/fblueWithPlugins/error.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fblueWithPlugins/error.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/error.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,7 +0,0 @@
-{include file="$blogtemplate/header.template"}
-		<!-- Loop Start -->
-				<h2>{$locale->tr("error")}</h2>
-				<p>{$locale->tr($message)}</p>
-				<p><a href="javascript:history.go(-1)">{$locale->tr("back")}</a></p>
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/fblueWithPlugins/error.template (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/error.template)
===================================================================
--- templates/branches/lifetype-1.2/fblueWithPlugins/error.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/error.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,7 @@
+{include file="$blogtemplate/header.template"}
+		<!-- Loop Start -->
+				<h2>{$locale->tr("error")}</h2>
+				<p>{$locale->tr($message)}</p>
+				<p><a href="javascript:history.go(-1)">{$locale->tr("back")}</a></p>
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"}

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

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

Deleted: templates/branches/lifetype-1.2/fblueWithPlugins/features.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fblueWithPlugins/features.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/features.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,6 +0,0 @@
-{include file="$blogtemplate/header.template"}
-		<!-- Loop Start -->
-				<h3>Features</h3>
-				{$blog->getAbout()}
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/fblueWithPlugins/features.template (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/features.template)
===================================================================
--- templates/branches/lifetype-1.2/fblueWithPlugins/features.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/features.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,6 @@
+{include file="$blogtemplate/header.template"}
+		<!-- Loop Start -->
+				<h3>Features</h3>
+				{$blog->getAbout()}
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/fblueWithPlugins/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fblueWithPlugins/footer.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/footer.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,9 +0,0 @@
-	<!-- begin footer -->
-	<DIV id=footer>
-		<P>Using the fBlue theme design by <A href="http://www.fahlstad.se/">Fredrik Fahlstad </A>
-		Proudly powered by <A href="http://www.lifetype.net/">LifeType</A>.
-		</P>
-	</DIV>
-</DIV>
-</BODY>
-</HTML>
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/fblueWithPlugins/footer.template (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/footer.template)
===================================================================
--- templates/branches/lifetype-1.2/fblueWithPlugins/footer.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/footer.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,9 @@
+	<!-- begin footer -->
+	<DIV id=footer>
+		<P>Using the fBlue theme design by <A href="http://www.fahlstad.se/">Fredrik Fahlstad </A>
+		Proudly powered by <A href="http://www.lifetype.net/">LifeType</A>.
+		</P>
+	</DIV>
+</DIV>
+</BODY>
+</HTML>
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/fblueWithPlugins/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fblueWithPlugins/header.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/header.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" 
-      lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
-<head>
- <meta http-equiv="Content-Type" content="text/html;charset={$locale->getCharset()}" />
- <meta name="generator" content="{$version}" />
- <meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
- <title>{$pageTitle|escape:"html"}</title>
- <link rel="stylesheet" title="Default" href="{$url->getTemplateFile("style.css")}" type="text/css" media=screen />
- <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")}" />
-
-<!--[if IE]><LINK href="{$url->getTemplateFile("ie.css")}" type=text/css rel=stylesheet><![endif]-->
-
- <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
-{if $badbehavior}
-   {$badbehavior->showBB2JavaScript()}
-{/if}
-</head>
-
-<BODY class=log id=home>
-<DIV id=wrap>
-	<DIV id=headtitle>
-		<H1 id=title><A href="{$url->blogLink()}">{$blog->getBlog()}</A></H1>
-	</DIV>
-	<DIV id=subheader>
-		<DIV id=description>{$blog->getAbout()}</DIV>
-	</DIV>
-	<DIV id=main>
-	<DIV id=content>
-

Copied: templates/branches/lifetype-1.2/fblueWithPlugins/header.template (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/header.template)
===================================================================
--- templates/branches/lifetype-1.2/fblueWithPlugins/header.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/header.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" 
+      lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
+<head>
+ <meta http-equiv="Content-Type" content="text/html;charset={$locale->getCharset()}" />
+ <meta name="generator" content="{$version}" />
+ <meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
+ <title>{$pageTitle|escape:"html"}</title>
+ <link rel="stylesheet" title="Default" href="{$url->getTemplateFile("style.css")}" type="text/css" media=screen />
+ <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")}" />
+
+<!--[if IE]><LINK href="{$url->getTemplateFile("ie.css")}" type=text/css rel=stylesheet><![endif]-->
+
+ <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
+{if $badbehavior}
+   {$badbehavior->showBB2JavaScript()}
+{/if}
+</head>
+
+<BODY class=log id=home>
+<DIV id=wrap>
+	<DIV id=headtitle>
+		<H1 id=title><A href="{$url->blogLink()}">{$blog->getBlog()}</A></H1>
+	</DIV>
+	<DIV id=subheader>
+		<DIV id=description>{$blog->getAbout()}</DIV>
+	</DIV>
+	<DIV id=main>
+	<DIV id=content>
+

Deleted: templates/branches/lifetype-1.2/fblueWithPlugins/ie.css
===================================================================
--- templates/branches/lifetype-1.2/unported/fblueWithPlugins/ie.css	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/ie.css	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,15 +0,0 @@
-#wrap {
-	height:1%;
-
-}
-#main {
-	height:1%;
-}
-#content {
-	display:inline;
-	overflow:hidden;
-}
-#sidebar {
-	display:inline;
-	word-wrap:break-word;
-}

Copied: templates/branches/lifetype-1.2/fblueWithPlugins/ie.css (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/ie.css)
===================================================================
--- templates/branches/lifetype-1.2/fblueWithPlugins/ie.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/ie.css	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,15 @@
+#wrap {
+	height:1%;
+
+}
+#main {
+	height:1%;
+}
+#content {
+	display:inline;
+	overflow:hidden;
+}
+#sidebar {
+	display:inline;
+	word-wrap:break-word;
+}

Copied: templates/branches/lifetype-1.2/fblueWithPlugins/images (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/images)

Deleted: templates/branches/lifetype-1.2/fblueWithPlugins/links.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fblueWithPlugins/links.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/links.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,96 +0,0 @@
-</DIV>
-<!-- begin sidebar -->
-<DIV id=sidebar>
-<DIV id=searchdiv>
-<form method="post" action="{$url->getIndexUrl()}"><LABEL for=s>Search this site:</LABEL>
-<input type="text" name="searchTerms" value="" size="20" />
-<input type="hidden" name="op" value="Search" />
-<input type="hidden" name="blogId" value="{$blog->getId()}"/>
-<input type="submit" name="Search" value="Go" />
-</form>
-</DIV>
-
-<UL>
-
-<li>
-{assign var=blogOwner value=$blog->getOwnerInfo()}
-{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
-{if $blogOwner->hasPicture() && $AboutMyself}  
-  	 <h2>{$locale->tr("about_myself")}</h2>
-  	 <ul>
-  	{assign var=picture value=$blogOwner->getPicture()}
-  	<li><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /></li>
-  	{$AboutMyself}
-  	</ul>
-{/if}
-</li>
-
-
-
-<LI>
-<H2>Around here</H2>
-<UL>
-{foreach from=$recentposts item=recentpost}
-<LI class=page_item><A title="{$recentpost->getText()|truncate:150:"..."|strip_tags|escape}" href="{$url->postLink($recentpost)}">{$recentpost->getTopic()}</a><br/></LI>
-{/foreach}
-</UL>
-
-<LI>
-{if !empty($recentcomments)}
-{if $recentcomments->isEnabled()}
-<H2>Recent Comments</H2>
-<UL>
-{assign var=comments value=$recentcomments->getRecentComments()}
-{foreach from=$post->getComments() item=comment}
-{assign var=commentpostid value=$comment->getArticleId()}
-{assign var=commentpost value=$recentcomments->getArticle($commentpostid)}
-<LI><b>{$comment->getUsername()}:</b><a title="View comments by {$comment->getUsername()}" href="{$url->postPermalink($commentpost)}#{$comment->getId()}">{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()|truncate:100:"..."|strip_tags}</a><br /></LI>
-{/foreach}
-</UL>
-{/if}
-{/if}
-</LI>
-
-
-<LI>
-<H2>Categories</H2>
-<UL>
-{foreach from=$articlecategories item=articleCategory}
-<LI><A href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</A> ({$articleCategory->getNumArticles()})</LI>
-{/foreach}
-</UL>
-
-<LI>
-<H2>Navigate</H2>
-<UL>
-<LI><a title="{$locale->tr("main")}" href="{$url->blogLink()}">{$locale->tr("main")}</a>
-<LI><a title="{$locale->tr("archives")}" href="{$url->templatePage("archives")}">{$locale->tr("archives")}</a>
-<LI><a title="{$locale->tr("links")}" href="{$url->templatePage("bookmark")}">{$locale->tr("links")}</a>
-<LI><a title="{$locale->tr("summary")}" href="{$url->getUrl("/summary.php")}">{$locale->tr("summary")}</a>
-</UL>
-</LI>
-
-
-<LI>
-<H2>Meta</H2>
-<UL>
-<LI><A title="{$locale->tr("admin")}" href="{$url->getAdminUrl()}">{$locale->tr("admin")}</a></LI>
-<LI><A title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a></LI>
-<LI><A title="This page validates as XHTML 1.0 Transitional" href="http://validator.w3.org/check/referer">Valid <ABBR title="eXtensible HyperText Markup Language">XHTML</ABBR></A> </LI>
-<LI><A href="http://gmpg.org/xfn/"><ABBR title="XHTML Friends Network">XFN</ABBR></A> </LI>
-<LI><A title="Powered by LifeType, state-of-the-art semantic personal publishing platform." href="http://www.lifetype.net/">LifeType</A> </LI>
-</UL>
-</LI>
-
-
-
-</UL>
-</DIV>
-<!-- The main column ends  -->	</DIV>
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/fblueWithPlugins/links.template (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/links.template)
===================================================================
--- templates/branches/lifetype-1.2/fblueWithPlugins/links.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/links.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,96 @@
+</DIV>
+<!-- begin sidebar -->
+<DIV id=sidebar>
+<DIV id=searchdiv>
+<form method="post" action="{$url->getIndexUrl()}"><LABEL for=s>Search this site:</LABEL>
+<input type="text" name="searchTerms" value="" size="20" />
+<input type="hidden" name="op" value="Search" />
+<input type="hidden" name="blogId" value="{$blog->getId()}"/>
+<input type="submit" name="Search" value="Go" />
+</form>
+</DIV>
+
+<UL>
+
+<li>
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}  
+  	 <h2>{$locale->tr("about_myself")}</h2>
+  	 <ul>
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	<li><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /></li>
+  	{$AboutMyself}
+  	</ul>
+{/if}
+</li>
+
+
+
+<LI>
+<H2>Around here</H2>
+<UL>
+{foreach from=$recentposts item=recentpost}
+<LI class=page_item><A title="{$recentpost->getText()|truncate:150:"..."|strip_tags|escape}" href="{$url->postLink($recentpost)}">{$recentpost->getTopic()}</a><br/></LI>
+{/foreach}
+</UL>
+
+<LI>
+{if !empty($recentcomments)}
+{if $recentcomments->isEnabled()}
+<H2>Recent Comments</H2>
+<UL>
+{assign var=comments value=$recentcomments->getRecentComments()}
+{foreach from=$post->getComments() item=comment}
+{assign var=commentpostid value=$comment->getArticleId()}
+{assign var=commentpost value=$recentcomments->getArticle($commentpostid)}
+<LI><b>{$comment->getUsername()}:</b><a title="View comments by {$comment->getUsername()}" href="{$url->postPermalink($commentpost)}#{$comment->getId()}">{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()|truncate:100:"..."|strip_tags}</a><br /></LI>
+{/foreach}
+</UL>
+{/if}
+{/if}
+</LI>
+
+
+<LI>
+<H2>Categories</H2>
+<UL>
+{foreach from=$articlecategories item=articleCategory}
+<LI><A href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</A> ({$articleCategory->getNumArticles()})</LI>
+{/foreach}
+</UL>
+
+<LI>
+<H2>Navigate</H2>
+<UL>
+<LI><a title="{$locale->tr("main")}" href="{$url->blogLink()}">{$locale->tr("main")}</a>
+<LI><a title="{$locale->tr("archives")}" href="{$url->templatePage("archives")}">{$locale->tr("archives")}</a>
+<LI><a title="{$locale->tr("links")}" href="{$url->templatePage("bookmark")}">{$locale->tr("links")}</a>
+<LI><a title="{$locale->tr("summary")}" href="{$url->getUrl("/summary.php")}">{$locale->tr("summary")}</a>
+</UL>
+</LI>
+
+
+<LI>
+<H2>Meta</H2>
+<UL>
+<LI><A title="{$locale->tr("admin")}" href="{$url->getAdminUrl()}">{$locale->tr("admin")}</a></LI>
+<LI><A title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a></LI>
+<LI><A title="This page validates as XHTML 1.0 Transitional" href="http://validator.w3.org/check/referer">Valid <ABBR title="eXtensible HyperText Markup Language">XHTML</ABBR></A> </LI>
+<LI><A href="http://gmpg.org/xfn/"><ABBR title="XHTML Friends Network">XFN</ABBR></A> </LI>
+<LI><A title="Powered by LifeType, state-of-the-art semantic personal publishing platform." href="http://www.lifetype.net/">LifeType</A> </LI>
+</UL>
+</LI>
+
+
+
+</UL>
+</DIV>
+<!-- The main column ends  -->	</DIV>
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/fblueWithPlugins/main.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fblueWithPlugins/main.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/main.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,19 +0,0 @@
-{include file="$blogtemplate/header.template"}
-	<!-- Loop Start -->
-	{if $showAll}
-		{if $showAll == 1 && $category}
-			<h2>{$locale->tr("posts")}: {$category->getName()}</h2>
-		{/if}
-		{foreach from=$posts item=post}
-			<!-- showing only the topic of the post, in case we have too many! -->
-			{assign var="postDate" value=$post->getDateObject()}
-			{$locale->formatDate($postDate,"%Y.%B%d")} <a href="{$url->postPermalink($post)}">{$post->getTopic()}</a><br/>
-		{/foreach}
-	{else}
-		{foreach from=$posts item=post}
-			{include file="$blogtemplate/post.template"}
-		{/foreach}
-	{/if}
- {pager style="links"}
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/fblueWithPlugins/main.template (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/main.template)
===================================================================
--- templates/branches/lifetype-1.2/fblueWithPlugins/main.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/main.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,19 @@
+{include file="$blogtemplate/header.template"}
+	<!-- Loop Start -->
+	{if $showAll}
+		{if $showAll == 1 && $category}
+			<h2>{$locale->tr("posts")}: {$category->getName()}</h2>
+		{/if}
+		{foreach from=$posts item=post}
+			<!-- showing only the topic of the post, in case we have too many! -->
+			{assign var="postDate" value=$post->getDateObject()}
+			{$locale->formatDate($postDate,"%Y.%B%d")} <a href="{$url->postPermalink($post)}">{$post->getTopic()}</a><br/>
+		{/foreach}
+	{else}
+		{foreach from=$posts item=post}
+			{include file="$blogtemplate/post.template"}
+		{/foreach}
+	{/if}
+ {pager style="links"}
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/fblueWithPlugins/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fblueWithPlugins/post.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/post.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,18 +0,0 @@
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-		<DIV class=entry>
-		
-		
-			<H3 class=entrytitle><A href="{$url->postPermalink($post)}">{$post->getTopic()}</A></H3>
-			<DIV class=entrybody>
-				<P>{$post->getText()}</P>
-				<DIV class=entrymeta>
-				{$locale->formatDate($postDate,"%m/%d,%Y")} Posted to 
-				{foreach name=categories from=$post->getCategories() item=postcategory}
-					<a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
-				{if !$smarty.foreach.categories.last}, {/if}
-				{/foreach} 
-				</DIV>
-			</DIV>
-			<P class=comments_link><A href="{$url->postPermalink($post)}#comments">Comments ({$post->getNumComments()})</A> </P>
-		</DIV><br>

Copied: templates/branches/lifetype-1.2/fblueWithPlugins/post.template (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/post.template)
===================================================================
--- templates/branches/lifetype-1.2/fblueWithPlugins/post.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/post.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,18 @@
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+		<DIV class=entry>
+		
+		
+			<H3 class=entrytitle><A href="{$url->postPermalink($post)}">{$post->getTopic()}</A></H3>
+			<DIV class=entrybody>
+				<P>{$post->getText()}</P>
+				<DIV class=entrymeta>
+				{$locale->formatDate($postDate,"%m/%d,%Y")} Posted to 
+				{foreach name=categories from=$post->getCategories() item=postcategory}
+					<a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
+				{if !$smarty.foreach.categories.last}, {/if}
+				{/foreach} 
+				</DIV>
+			</DIV>
+			<P class=comments_link><A href="{$url->postPermalink($post)}#comments">Comments ({$post->getNumComments()})</A> </P>
+		</DIV><br>

Deleted: templates/branches/lifetype-1.2/fblueWithPlugins/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fblueWithPlugins/postandcomments.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/postandcomments.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,106 +0,0 @@
-{assign var="postPageTitle" value=$post->getTopic()}
-{assign var="postPageTitle" value=" | $postPageTitle"}
-
-{include file="$blogtemplate/header.template"}
-
-	<DIV class=entry>
-		<!-- {$url->postTrackbackLink($post)} -->
-		{assign var="postDate" value=$post->getDateObject()}
-		{assign var="postOwner" value=$post->getUserInfo()}
-		<H3 class=entrytitle><A href="{$url->postPermalink($post)}">{$post->getTopic()}</A></H3>
-		<DIV class=date>Published on {$locale->formatDate($postDate,"%m/%d,%Y")}</DIV>
-		<DIV class=entrybody>
-			<P>{$post->getText()}</P>
-			<BR clear=all>
-			</DIV>
-	</DIV>
-	<DIV class=feedback>
-		<DIV class=meta>Posted by {$postOwner->getUsername()} at
-			{$locale->formatDate($postDate,"%H:%M")}
-			<A class=aposted href="{$url->postPermalink($post)}#comments">{$locale->tr("comment on this")} ({$post->getNumComments()})</A> │
-			<A class=aposted href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</A> │
-			{foreach name=categories from=$post->getCategories() item=postcategory}
-				<a class=aposted href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
-				{if !$smarty.foreach.categories.last}, {/if}
-			{/foreach}<br>
-			{* Prevpost and nextpost use *}
-			<a href="{$url->blogLink()}">回 Blog 首頁</a>
-			{assign var=nextpost value=$post->getNextArticle()}
-			{assign var=prevpost value=$post->getPrevArticle()}
-			{if $nextpost == true}
-				<a href="{$url->postPermalink($nextpost)}" title="Previous post: {$nextpost->getTopic()}">{$locale->tr("previous_post")}</a>
-			{/if}
-			{if $prevpost == true}
-				<a href="{$url->postPermalink($prevpost)}" title="Next post: {$prevpost->getTopic()}">{$locale->tr("next_post")}</a>
-			{/if}
-			{* End of article_index *}
-		</DIV>
-	</DIV>	
-        {pager style="links"}    
-
-	{if !empty($blogtimes)}
-		{if $blogtimes->isEnabled()}
-			{$blogtimes->show()}
-		{/if}
-	{/if}
-
-	<a name="comments"></a>
-
-	<h2 id="commentsformheader">Leave a Reply</h2>
-	{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
-		{include file="$misctemplatepath/commentform.template"}
-	{/if}
-	<h2 id="comments">Comments </h2>
-	<ol id="commentlist">
-	
-	{assign var="counter" value=1}
-	{foreach name=comment from=$comments item=comment}
-		<a name="{$comment->getId()}"></a>
-		{if $counter%2!=0}
-		<li class="alt" id="comment-{$comment->getId()}">
-		
-		{else}
-		<li class="standard" id="comment-{$comment->getId()}">
-		{/if}
-			<div class="commentname">
-				<span class="commentauthor"><a href="{$comment->getUserUrl()}">{$comment->getUsername()}</a></span>
-			</div>
-			<div class="commentinfo">
-				<span class="commentdate">
-					{assign var=commentDate value=$comment->getDateObject()} {$locale->formatDate($commentDate, "%m/%d,%Y")} | <a href="#comment-{$comment->getId()}" title="">{$locale->formatDate($commentDate, "%H:%M")}</a>
-				</span>
-			</div>
-			<div class='commenttext'>			{if !empty($gravatar)}
-			{if $gravatar->isEnabled()}
-				<img src="{$gravatar->gravatar($comment)}" width="{$gravatar->getSize()}" height="{$gravatar->getSize()}" align="left" hspace="10"/>
-			{/if}{/if}
-{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>
-		</LI>
-		{assign var="counter" value="`$counter+1`"}
-	{/foreach}
-	</ol>
-
-	{if !empty($articlereferers)}
-		{if $articlereferers->isEnabled()}
-			<h2 id="comments">Article Referers</h2>
-			{assign var=postid value=$post->getId()}
-			{assign var=referers value=$articlereferers->getArticleReferers($postid)}
-			<ol>
-				{foreach from=$referers item=referer}
-				<li>
-					<a href="{$referer->getUrl()}">{$referer->getUrl()|truncate:65:"..."}</a>  ({$referer->getCount()})
-				</li>
-				{/foreach}
-			</ol>
-		{/if}
-	{/if}
-
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/fblueWithPlugins/postandcomments.template (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/postandcomments.template)
===================================================================
--- templates/branches/lifetype-1.2/fblueWithPlugins/postandcomments.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/postandcomments.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,105 @@
+{assign var="postPageTitle" value=$post->getTopic()}
+{assign var="postPageTitle" value=" | $postPageTitle"}
+
+{include file="$blogtemplate/header.template"}
+
+	<DIV class=entry>
+		<!-- {$url->postTrackbackLink($post)} -->
+		{assign var="postDate" value=$post->getDateObject()}
+		{assign var="postOwner" value=$post->getUserInfo()}
+		<H3 class=entrytitle><A href="{$url->postPermalink($post)}">{$post->getTopic()}</A></H3>
+		<DIV class=date>Published on {$locale->formatDate($postDate,"%m/%d,%Y")}</DIV>
+		<DIV class=entrybody>
+			<P>{$post->getText()}</P>
+			<BR clear=all>
+			</DIV>
+	</DIV>
+	<DIV class=feedback>
+		<DIV class=meta>Posted by {$postOwner->getUsername()} at
+			{$locale->formatDate($postDate,"%H:%M")}
+			<A class=aposted href="{$url->postPermalink($post)}#comments">{$locale->tr("comment on this")} ({$post->getNumComments()})</A>
+			<A class=aposted href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</A>
+			<a href="{$url->blogLink()}">{$locale->tr("Main")}</a>
+			{foreach name=categories from=$post->getCategories() item=postcategory}
+				<a class=aposted href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+			{/foreach}<br>
+			{* Prevpost and nextpost use *}
+			{assign var=nextpost value=$post->getNextArticle()}
+			{assign var=prevpost value=$post->getPrevArticle()}
+			{if $nextpost == true}
+				<a href="{$url->postPermalink($nextpost)}" title="Previous post: {$nextpost->getTopic()}">{$locale->tr("previous_post")}</a>
+			{/if}
+			{if $prevpost == true}
+				<a href="{$url->postPermalink($prevpost)}" title="Next post: {$prevpost->getTopic()}">{$locale->tr("next_post")}</a>
+			{/if}
+			{* End of article_index *}
+		</DIV>
+	</DIV>	
+
+	{if !empty($blogtimes)}
+		{if $blogtimes->isEnabled()}
+			{$blogtimes->show()}
+		{/if}
+	{/if}
+
+	<a name="comments"></a>
+
+	<h2 id="commentsformheader">Leave a Reply</h2>
+	{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
+		{include file="$misctemplatepath/commentform.template"}
+	{/if}
+	<h2 id="comments">Comments </h2>
+        {pager style="links"}    
+	<ol id="commentlist">
+	
+	{assign var="counter" value=1}
+	{foreach name=comment from=$comments item=comment}
+		<a name="{$comment->getId()}"></a>
+		{if $counter%2!=0}
+		<li class="alt" id="comment-{$comment->getId()}">
+		
+		{else}
+		<li class="standard" id="comment-{$comment->getId()}">
+		{/if}
+			<div class="commentname">
+				<span class="commentauthor"><a href="{$comment->getUserUrl()}">{$comment->getUsername()}</a></span>
+			</div>
+			<div class="commentinfo">
+				<span class="commentdate">
+					{assign var=commentDate value=$comment->getDateObject()} {$locale->formatDate($commentDate, "%m/%d,%Y")} | <a href="#comment-{$comment->getId()}" title="">{$locale->formatDate($commentDate, "%H:%M")}</a>
+				</span>
+			</div>
+			<div class='commenttext'>			{if !empty($gravatar)}
+			{if $gravatar->isEnabled()}
+				<img src="{$gravatar->gravatar($comment)}" width="{$gravatar->getSize()}" height="{$gravatar->getSize()}" align="left" hspace="10"/>
+			{/if}{/if}
+{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>
+		</LI>
+		{assign var="counter" value="`$counter+1`"}
+	{/foreach}
+	</ol>
+
+	{if !empty($articlereferers)}
+		{if $articlereferers->isEnabled()}
+			<h2 id="comments">Article Referers</h2>
+			{assign var=postid value=$post->getId()}
+			{assign var=referers value=$articlereferers->getArticleReferers($postid)}
+			<ol>
+				{foreach from=$referers item=referer}
+				<li>
+					<a href="{$referer->getUrl()}">{$referer->getUrl()|truncate:65:"..."}</a>  ({$referer->getCount()})
+				</li>
+				{/foreach}
+			</ol>
+		{/if}
+	{/if}
+
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/fblueWithPlugins/posttrackbacks.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fblueWithPlugins/posttrackbacks.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/posttrackbacks.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,14 +0,0 @@
-{include file="$blogtemplate/header.template"}
-		<!-- Loop Start -->
-				<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/links.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/fblueWithPlugins/posttrackbacks.template (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/posttrackbacks.template)
===================================================================
--- templates/branches/lifetype-1.2/fblueWithPlugins/posttrackbacks.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/posttrackbacks.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,14 @@
+{include file="$blogtemplate/header.template"}
+		<!-- Loop Start -->
+				<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/links.template"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/fblueWithPlugins/resource.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fblueWithPlugins/resource.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/resource.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,89 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" 
-      lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
-<head>
- <meta http-equiv="Content-Type" content="text/html;charset={$locale->getCharset()}" />
- <meta name="generator" content="{$version}" />
- <meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
- <title>{$pageTitle|escape:"html"}</title>
- <link rel="stylesheet" title="Default" href="{$url->getTemplateFile("style.css")}" type="text/css" media=screen />
- <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")}" />
-
-<!--[if IE]><LINK href="{$url->getTemplateFile("ie.css")}" type=text/css rel=stylesheet><![endif]-->
-
-{if $badbehavior}
-   {$badbehavior->showBB2JavaScript()}
-{/if}
-</head>
-
-<BODY class=log id=home>
-<DIV id=wrap>
-	<DIV id=headtitle>
-		<H1 id=title><A href="{$url->blogLink()}">{$blog->getBlog()}</A></H1>
-	</DIV>
-	<DIV id=subheader>
-		<DIV id=description>{$blog->getAbout()}</DIV>
-	</DIV>
-	<DIV id=resource-main>
-	<div id=resource>
-	<!-- end header -->
-		{assign var=metadata value=$resource->getMetadataReader()}
-		{assign var=updated value=$resource->getTimestamp()}
-		
-		<H4>
-			Filename: {$resource->getFileName()} ({$metadata->getRoundedSize()}) | 
-			{$locale->tr("created")} {$locale->formatDate($updated,"%d %B, %Y")} | 
-			<a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a>
-		</H4>
-		<H3>{$resource->getFileName()}</H3>
-		<br/>
-		    
-		<p>{$resource->getDescription()}</p>
-		{if $resource->isImage()}
-		<center><img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" /></center>
-	{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()}
-   		{if $prevresource}<a href="{$url->resourceLink($prevresource)}">&laquo;</a> | {/if}
-   		<a href="{$url->albumLink($album)}">{$locale->tr("back")}</a>
-   		{if $nextresource}| <a href="{$url->resourceLink($nextresource)}">&raquo;</a>{/if}
-	</p>
-
-
-
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/fblueWithPlugins/resource.template (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/resource.template)
===================================================================
--- templates/branches/lifetype-1.2/fblueWithPlugins/resource.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/resource.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,89 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" 
+      lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
+<head>
+ <meta http-equiv="Content-Type" content="text/html;charset={$locale->getCharset()}" />
+ <meta name="generator" content="{$version}" />
+ <meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
+ <title>{$pageTitle|escape:"html"}</title>
+ <link rel="stylesheet" title="Default" href="{$url->getTemplateFile("style.css")}" type="text/css" media=screen />
+ <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")}" />
+
+<!--[if IE]><LINK href="{$url->getTemplateFile("ie.css")}" type=text/css rel=stylesheet><![endif]-->
+
+{if $badbehavior}
+   {$badbehavior->showBB2JavaScript()}
+{/if}
+</head>
+
+<BODY class=log id=home>
+<DIV id=wrap>
+	<DIV id=headtitle>
+		<H1 id=title><A href="{$url->blogLink()}">{$blog->getBlog()}</A></H1>
+	</DIV>
+	<DIV id=subheader>
+		<DIV id=description>{$blog->getAbout()}</DIV>
+	</DIV>
+	<DIV id=resource-main>
+	<div id=resource>
+	<!-- end header -->
+		{assign var=metadata value=$resource->getMetadataReader()}
+		{assign var=updated value=$resource->getTimestamp()}
+		
+		<H4>
+			Filename: {$resource->getFileName()} ({$metadata->getRoundedSize()}) | 
+			{$locale->tr("created")} {$locale->formatDate($updated,"%d %B, %Y")} | 
+			<a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a>
+		</H4>
+		<H3>{$resource->getFileName()}</H3>
+		<br/>
+		    
+		<p>{$resource->getDescription()}</p>
+		{if $resource->isImage()}
+		<center><img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" /></center>
+	{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()}
+   		{if $prevresource}<a href="{$url->resourceLink($prevresource)}">&laquo;</a> | {/if}
+   		<a href="{$url->albumLink($album)}">{$locale->tr("back")}</a>
+   		{if $nextresource}| <a href="{$url->resourceLink($nextresource)}">&raquo;</a>{/if}
+	</p>
+
+
+
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/fblueWithPlugins/samplerss.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fblueWithPlugins/samplerss.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/samplerss.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,18 +0,0 @@
-{include file="$blogtemplate/header.template"}
-		<!-- Loop Start -->
-				<h3 class="title">Sample template</h3>
-				<p>
-					{$message}
-				</p>
-				<p>
-					And now, some RSS feeds from Slashdot using the RSS parser included in this package:<br/>
-					{if $rss->parse("http://slashdot.org/slashdot.rdf")}
-					{foreach from=$rss->getItems() item=rssItem}
-					<a href="{$rssItem->getLink()}">{$rssItem->getTitle()}</a><br/>
-					{/foreach}
-					{/if}
-					<hr/>
-					<p>This is a sample of the plugin that gets the sinfest strip:</p>
-					<a href="http://sinfest.net"><img src="{$sfstrip->SinfestStripUrl()}" alt="Sinfest strip" width="385"/></a>
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/fblueWithPlugins/samplerss.template (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/samplerss.template)
===================================================================
--- templates/branches/lifetype-1.2/fblueWithPlugins/samplerss.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/samplerss.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,18 @@
+{include file="$blogtemplate/header.template"}
+		<!-- Loop Start -->
+				<h3 class="title">Sample template</h3>
+				<p>
+					{$message}
+				</p>
+				<p>
+					And now, some RSS feeds from Slashdot using the RSS parser included in this package:<br/>
+					{if $rss->parse("http://slashdot.org/slashdot.rdf")}
+					{foreach from=$rss->getItems() item=rssItem}
+					<a href="{$rssItem->getLink()}">{$rssItem->getTitle()}</a><br/>
+					{/foreach}
+					{/if}
+					<hr/>
+					<p>This is a sample of the plugin that gets the sinfest strip:</p>
+					<a href="http://sinfest.net"><img src="{$sfstrip->SinfestStripUrl()}" alt="Sinfest strip" width="385"/></a>
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"}

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

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

Deleted: templates/branches/lifetype-1.2/fblueWithPlugins/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fblueWithPlugins/searchresults.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/searchresults.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,13 +0,0 @@
-{include file="$blogtemplate/header.template"}
-		<!-- Loop Start -->
-				<H2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
-						{foreach from=$searchresults item=result}
-							{assign var=article value=$result->getArticle()}
-							{foreach name=categories from=$article->getCategories() item=postcategory}
-							<a class=aside href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
-							{if !$smarty.foreach.categories.last}, {/if}
-							{/foreach}							
-								<a href="{$url->postPermalink($article)}">{$article->getTopic()}</a><br/>	
-						{/foreach}
-{include file="$blogtemplate/links.template"}		
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/fblueWithPlugins/searchresults.template (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/searchresults.template)
===================================================================
--- templates/branches/lifetype-1.2/fblueWithPlugins/searchresults.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/searchresults.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,13 @@
+{include file="$blogtemplate/header.template"}
+		<!-- Loop Start -->
+				<H2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+						{foreach from=$searchresults item=result}
+							{assign var=article value=$result->getArticle()}
+							{foreach name=categories from=$article->getCategories() item=postcategory}
+							<a class=aside href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
+							{if !$smarty.foreach.categories.last}, {/if}
+							{/foreach}							
+								<a href="{$url->postPermalink($article)}">{$article->getTopic()}</a><br/>	
+						{/foreach}
+{include file="$blogtemplate/links.template"}		
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/fblueWithPlugins/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/fblueWithPlugins/style.css	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/style.css	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,467 +0,0 @@
-
-
-/*
-	Theme Name: fBlue
-	Theme URI: http://www.fahlstad.se
-	Description: Liquid theme with max width, easy to customize.
-	Version: 1.0
-	Author: Fredrik Fahlstad
-	Author URI: http://www.fahlstad.se
-*/
-#wrap {
-	margin: 0px auto;
-	padding: 0px;
-	width: 802px;
-	border: 1px solid #000000;
-	position:relative;
-}
-
-#resource {
-	background-color:white;
-}
-body {
-	background-color: #606060;
-	margin: 0px;
-	padding: 0px;
-	background-image: url(images/bg.gif);
-	background-repeat: repeat-x;
-	background-position: left top;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 76%;
-	line-height: 115%;
-	color: #333333;
-}
-#subheader {
-	background-color: #188CD7;
-	margin: 0px;
-	padding: 0px;
-	height: 110px;
-	border-top-width: 1px;
-	border-right-width: 1px;
-	border-bottom-width: 1px;
-	border-left-width: 1px;
-	border-right-style: solid;
-	border-bottom-style: solid;
-	border-left-style: solid;
-	border-top-color: #FFFFFF;
-	border-right-color: #FFFFFF;
-	border-bottom-color: #FFFFFF;
-	border-left-color: #FFFFFF;
-	background-image: url(images/top.jpg);
-	background-repeat: no-repeat;
-	border-top-style: none;
-}
-#main {
-	overflow: hidden;
-	border-bottom-width: 1px;
-	border-bottom-color: #FFFFFF;
-	background-color: #FFFFFF;
-	padding-top: 1em;
-	border-top: 1px #FFFFFF;
-	border-right: 1px solid #FFFFFF;
-	border-left: 1px solid #FFFFFF;
-	background-image: url(images/bg_main.jpg);
-	background-repeat: repeat-y;
-	background-position: right;
-}
-
-#resource-main {
-	overflow: hidden;
-	border-bottom-width: 1px;
-	border-bottom-color: #FFFFFF;
-	background-color: #FFFFFF;
-	padding-top: 1em;
-	border-top: 1px #FFFFFF;
-	border-right: 1px solid #FFFFFF;
-	border-left: 1px solid #FFFFFF;
-	background-repeat: repeat-y;
-	background-position: right;
-}
-
-#content {
-	float: left;
-	width: 520px;
-	background-color: #FFFFFF;
-	margin: 0px;
-	padding: 20px 20px 0px;
-	overflow: hidden;
-	line-height: 1.6em;
-	ovh1erflow:hidden;
-	font-size:10pt;
-	letter-spacing:1px;
-
-}
-#sidebar {
-	background-color: #24345C;
-	float: right;
-	clear:right;
-	width: 220px;
-	margin: 0px;
-	padding: 10px;
-	line-height:1.3em;
-	color: #FFFFFF;
-	font-family:Lucida Grande, Lucida Sans Unicode, Verdana, Helvetica, Arial, sans-serif;
-}
-#description {
-	margin: 0px;
-	font-size: 1em;
-	font-weight: bold;
-	color: #FFFFFF;
-	padding-top: 50px;
-	padding-right: 20px;
-	padding-bottom: 0px;
-	padding-left: 0px;
-	text-align: right;
-}
-#footer {
-	background-color: #333643;
-	clear: both;
-	border-top-width: 1px;
-	border-right-width: 1px;
-	border-bottom-width: 1px;
-	border-left-width: 1px;
-	border-bottom-style: solid;
-	border-top-color: #FFFFFF;
-	border-right-color: #FFFFFF;
-	border-bottom-color: #FFFFFF;
-	border-left-color: #FFFFFF;
-	height: 40px;
-}
-#footer p {
-	color: #FFFFFF;
-	text-align: center;
-	margin: 0px;
-	padding: 10px 0px 0px;
-	font-size: 10px;
-}
-#headtitle {
-	background-color: #2A2C38;
-	margin: 0px;
-	padding: 0px;
-	height: 100px;
-	border: 1px solid #FFFFFF;
-	background-image: url(images/title.jpg);
-	background-position: right;
-}
-
-h1#title {
-	font-size:2.4em;
-	font-family: "Century Gothic";
-	font-weight: normal;
-	float:left;
-	display:inline;
-	padding-top: 30px;
-	padding-right: 0px;
-	padding-bottom: 30px;
-	padding-left: 30px;
-	margin: 0px;
-}
-h1#title a {
-	color: #FFFFFF;
-}
-h1,h2,h3,h4 {
-	font-family:"Lucida Grande", "Lucida Sans Unicode", Verdana, Tahoma, Arial, sans-seriff;
-}
-h2 {
-	font-size: 1.8em;
-	margin: 0 0 0.5em 0;
-}
-h3 {
-	font-size: 1.6em;
-	margin: 0 0 10px 0;
-
-}
-h4 {
-	font-size: 1.4em;
-	margin: 0 0 10px 0;
-
-}
-
-
-/* Links
-================================================*/
-a:link,
-a:visited {
-	color:#1d79c9;
-	text-decoration:none;
-	padding:2px 2px 0;
-	margin:0 -2px;
-	
-	}
-a:focus {
-	color:#580801;
-	}
-a:hover {
-	color:#580801;
-	border-color:#580801;
-	text-decoration:underline;
-	}
-
-.current_page_item a {
-font-weight:bold;
-	}
-
-/************************************************
-*	Comments													*
-************************************************/
-h2#comments{
-	text-align:center;
-	border-top:1px solid #acb1ba;
-	background:#eeeeee;
-	padding:2px;
-	border-bottom:1px solid #acb1ba;
-	margin-bottom:10px;
-	margin-top:80px;
-	font-size: 110%;
-}
-
-ol#commentlist {
-	margin-top:0px;
-	padding: 5px;
-	margin-left: 0px;
-	color: #9b9b9b;
-	list-style-type: none;
-	font-size:0.9em;
-}
-
-#commentlist li  p{
-	margin-top: 8px;
-	margin-bottom: 16px;
-	line-height: 20px;
-}
-
-.commentname {
-	float: left;
-	margin: 0;
-	padding: 0  0 2px 0;
-	font-weight: bold;
-}
-
-.commentinfo{
-	width: 300px;
-	float: right;
-	text-align: right;
-}
-
-.commenttext {
-	clear: both;
-	margin-top: 0px;
-	margin-bottom: 30px;
-	border-top: 1px solid #ebebeb;
-	line-height:12px;
-	color: #5b5b5b;
-	background-color: #F8F8F8;
-	padding: 5px;
-}
-
-.commenttext-admin {
-	clear: both;
-	margin-top: 0px;
-	margin-bottom: 30px;
-	border-top: 1px solid #ebebeb;
-	line-height:12px;
-	color: #5b5b5b;
-	background-color: #CEE4F4;
-	padding: 5px;
-}
-
-#commentsformheader{
-	padding-left:18px;
-	font-size: 1.4em;
-}
-
-#commentsform{
-	margin-top:0;
-	text-align:center;
-	border:1px solid #ddd;
-	background:#ededed;
-	padding:0px 10px;
-}
-
-#commentsform form{
-	text-align:left;
-	margin:0px;
-}
-
-#commentsform p{
-	margin:5px;
-}
-
-#commentsform form textarea{
-	width:100%;
-}
-p.comments_link  img{
-	margin: 0px;
-	padding: 0px;
-	border-top-style: none;
-	border-right-style: none;
-	border-bottom-style: none;
-	border-left-style: none;
-}
-/************************************************
-*	Header																			*
-************************************************/
-
-h2.entrydate{
-	margin-bottom:1px;
-	font-weight:normal;
-	text-transform:uppercase;
-	border-bottom:solid 1px #ccc;
-	text-align:right;
-}
-
-.entrymeta{
-	font-size: 10pt;
-}
-
-h3.entrytitle {
-	margin-top:0px;
-	padding-bottom:10px;
-	font-weight:bold;
-	color:#000000
-}
-h3.entrytitle a, h3.entrytitle a:visited{
-color:#24345C;
-}
-
-.entry{
-	margin-top:8px;
-	border-bottom:dotted 1px #ccc;
-}
-
-.entrybody p a{
-	/*font-weight:bold;*/
-}
-blockquote {
-	border-left-width: 3px;
-	border-left-style: solid;
-	border-left-color: #CCCCCC;
-	padding-left: 10px;
-	font-style: italic;
-	color: #666666;
-}
-
-.entrybody p {
-	margin-top:8px;
-	margin-bottom:16px;
-	text-align: justify;
-	font-size: 10pt;
-	line-height:1.5;
-	letter-spacing:1px;
-}
-
-.entrybody li {
-	font-size: 10pt;
-	line-height:1.8;
-}
-
-
-code {
-	background-color: #eeeeee;
-	padding: 5px;
-	border: 1px solid #CCCCCC;
-}
-#sidebar ul {
-	list-style: none;
-	padding-left: 10px;
-	margin-left: 10px;
-}
-
-#sidebar h2 {
-	font-size: 90%;
-	font-weight:normal;
-	text-transform:uppercase;
-	color:#ffffff
-}
-
-#sidebar ul, #sidebar ul ol {
-	margin: 0px;
-	padding: 0px;
-}
-
-#sidebar ul li {
-	list-style-type: none;
-	margin-bottom: 15px;
-}
-
-#sidebar ul p, #sidebar ul select {
-	margin: 5px 0 8px;
-	font-size: 0.9em;
-}
-
-#sidebar ul ul, #sidebar ul ol { margin: 5px 0 0 7px; }
-
-#sidebar ul ul ul, #sidebar ul ol { margin: 0 0 0 0px; }
-
-#sidebar ul ul li, #sidebar ul ol li {
-	margin: 0px 0 0;
-	display: block;
-	width: 200px;
-	padding-bottom: 2px;
-	padding-top: 2px;
-	padding-left: 0px;
-	border-bottom: 1px solid #395293;
-}
-
-#sidebar ul ul ul li{
-	border:0px;
-	margin-left:5px;
-}
-
-#sidebar form { margin-top: 20px; }
-	
-#sidebar a {
-	color:#ABC7ED;
-}
-#searchdiv
-{
-	padding: 5px;
-	margin-bottom: 20px;
-	font-weight:bold;
-}
-
-#sidebar form {
-	margin: 0px;
-	padding: 0px;
-}
-label {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	font-weight: bold;
-	color: #ffffff;
-}
-.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/fblueWithPlugins/style.css (from rev 6390, templates/branches/lifetype-1.2/unported/fblueWithPlugins/style.css)
===================================================================
--- templates/branches/lifetype-1.2/fblueWithPlugins/style.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/fblueWithPlugins/style.css	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,461 @@
+
+
+/*
+	Theme Name: fBlue
+	Theme URI: http://www.fahlstad.se
+	Description: Liquid theme with max width, easy to customize.
+	Version: 1.0
+	Author: Fredrik Fahlstad
+	Author URI: http://www.fahlstad.se
+*/
+#wrap {
+	margin: 0px auto;
+	padding: 0px;
+	width: 802px;
+	border: 1px solid #000000;
+	position:relative;
+}
+
+#resource {
+	background-color:white;
+}
+body {
+	background-color: #606060;
+	margin: 0px;
+	padding: 0px;
+	background-image: url(images/bg.gif);
+	background-repeat: repeat-x;
+	background-position: left top;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 76%;
+	line-height: 115%;
+	color: #333333;
+}
+#subheader {
+	background-color: #188CD7;
+	margin: 0px;
+	padding: 0px;
+	height: 110px;
+	border-top-width: 1px;
+	border-right-width: 1px;
+	border-bottom-width: 1px;
+	border-left-width: 1px;
+	border-right-style: solid;
+	border-bottom-style: solid;
+	border-left-style: solid;
+	border-top-color: #FFFFFF;
+	border-right-color: #FFFFFF;
+	border-bottom-color: #FFFFFF;
+	border-left-color: #FFFFFF;
+	background-image: url(images/top.jpg);
+	background-repeat: no-repeat;
+	border-top-style: none;
+}
+#main {
+	overflow: hidden;
+	border-bottom-width: 1px;
+	border-bottom-color: #FFFFFF;
+	background-color: #FFFFFF;
+	padding-top: 1em;
+	border-top: 1px #FFFFFF;
+	border-right: 1px solid #FFFFFF;
+	border-left: 1px solid #FFFFFF;
+	background-image: url(images/bg_main.jpg);
+	background-repeat: repeat-y;
+	background-position: right;
+}
+
+#resource-main {
+	overflow: hidden;
+	border-bottom-width: 1px;
+	border-bottom-color: #FFFFFF;
+	background-color: #FFFFFF;
+	padding-top: 1em;
+	border-top: 1px #FFFFFF;
+	border-right: 1px solid #FFFFFF;
+	border-left: 1px solid #FFFFFF;
+	background-repeat: repeat-y;
+	background-position: right;
+}
+
+#content {
+	float: left;
+	width: 520px;
+	background-color: #FFFFFF;
+	margin: 0px;
+	padding: 20px 20px 0px;
+	overflow: hidden;
+	line-height: 1.6em;
+	ovh1erflow:hidden;
+	font-size:10pt;
+	letter-spacing:1px;
+
+}
+#sidebar {
+	background-color: #24345C;
+	float: right;
+	clear:right;
+	width: 220px;
+	margin: 0px;
+	padding: 10px;
+	line-height:1.3em;
+	color: #FFFFFF;
+	font-family:Lucida Grande, Lucida Sans Unicode, Verdana, Helvetica, Arial, sans-serif;
+}
+#description {
+	margin: 0px;
+	font-size: 1em;
+	font-weight: bold;
+	color: #FFFFFF;
+	padding-top: 50px;
+	padding-right: 20px;
+	padding-bottom: 0px;
+	padding-left: 0px;
+	text-align: right;
+}
+#footer {
+	background-color: #333643;
+	clear: both;
+	border-top-width: 1px;
+	border-right-width: 1px;
+	border-bottom-width: 1px;
+	border-left-width: 1px;
+	border-bottom-style: solid;
+	border-top-color: #FFFFFF;
+	border-right-color: #FFFFFF;
+	border-bottom-color: #FFFFFF;
+	border-left-color: #FFFFFF;
+	height: 40px;
+}
+#footer p {
+	color: #FFFFFF;
+	text-align: center;
+	margin: 0px;
+	padding: 10px 0px 0px;
+	font-size: 10px;
+}
+#headtitle {
+	background-color: #2A2C38;
+	margin: 0px;
+	padding: 0px;
+	height: 100px;
+	border: 1px solid #FFFFFF;
+	background-image: url(images/title.jpg);
+	background-position: right;
+}
+
+h1#title {
+	font-size:2.4em;
+	font-family: "Century Gothic";
+	font-weight: normal;
+	float:left;
+	display:inline;
+	padding-top: 30px;
+	padding-right: 0px;
+	padding-bottom: 30px;
+	padding-left: 30px;
+	margin: 0px;
+}
+h1#title a {
+	color: #FFFFFF;
+}
+h1,h2,h3,h4 {
+	font-family:"Lucida Grande", "Lucida Sans Unicode", Verdana, Tahoma, Arial, sans-seriff;
+}
+h2 {
+	font-size: 1.8em;
+	margin: 0 0 0.5em 0;
+}
+h3 {
+	font-size: 1.6em;
+	margin: 0 0 10px 0;
+
+}
+h4 {
+	font-size: 1.4em;
+	margin: 0 0 10px 0;
+
+}
+
+
+/* Links
+================================================*/
+a:link,
+a:visited {
+	color:#1d79c9;
+	text-decoration:none;
+	padding:2px 2px 0;
+	margin:0 -2px;
+	
+	}
+a:focus {
+	color:#580801;
+	}
+a:hover {
+	color:#580801;
+	border-color:#580801;
+	text-decoration:underline;
+	}
+
+.current_page_item a {
+font-weight:bold;
+	}
+
+/************************************************
+*	Comments													*
+************************************************/
+h2#comments{
+	text-align:center;
+	border-top:1px solid #acb1ba;
+	background:#eeeeee;
+	padding:2px;
+	border-bottom:1px solid #acb1ba;
+	margin-bottom:10px;
+	margin-top:80px;
+	font-size: 110%;
+}
+
+ol#commentlist {
+	margin-top:0px;
+	padding: 5px;
+	margin-left: 0px;
+	color: #9b9b9b;
+	list-style-type: none;
+	font-size:0.9em;
+}
+
+#commentlist li  p{
+	margin-top: 8px;
+	margin-bottom: 16px;
+	line-height: 20px;
+}
+
+.commentname {
+	float: left;
+	margin: 0;
+	padding: 0  0 2px 0;
+	font-weight: bold;
+}
+
+.commentinfo{
+	width: 300px;
+	float: right;
+	text-align: right;
+}
+
+.commenttext {
+	clear: both;
+	margin-top: 0px;
+	margin-bottom: 30px;
+	border-top: 1px solid #ebebeb;
+	line-height:12px;
+	color: #5b5b5b;
+	background-color: #F8F8F8;
+	padding: 5px;
+}
+
+.commenttext-admin {
+	clear: both;
+	margin-top: 0px;
+	margin-bottom: 30px;
+	border-top: 1px solid #ebebeb;
+	line-height:12px;
+	color: #5b5b5b;
+	background-color: #CEE4F4;
+	padding: 5px;
+}
+
+#commentsformheader{
+	padding-left:18px;
+	font-size: 1.4em;
+}
+
+#commentsform{
+	margin-top:0;
+	text-align:center;
+	border:1px solid #ddd;
+	background:#ededed;
+	padding:0px 10px;
+}
+
+#commentsform form{
+	text-align:left;
+	margin:0px;
+}
+
+#commentsform p{
+	margin:5px;
+}
+
+#commentsform form textarea{
+	width:100%;
+}
+p.comments_link  img{
+	margin: 0px;
+	padding: 0px;
+	border-top-style: none;
+	border-right-style: none;
+	border-bottom-style: none;
+	border-left-style: none;
+}
+/************************************************
+*	Header																			*
+************************************************/
+
+h2.entrydate{
+	margin-bottom:1px;
+	font-weight:normal;
+	text-transform:uppercase;
+	border-bottom:solid 1px #ccc;
+	text-align:right;
+}
+
+.entrymeta{
+	font-size: 10pt;
+}
+
+h3.entrytitle {
+	margin-top:0px;
+	padding-bottom:10px;
+	font-weight:bold;
+	color:#000000
+}
+h3.entrytitle a, h3.entrytitle a:visited{
+color:#24345C;
+}
+
+.entry{
+	margin-top:8px;
+	border-bottom:dotted 1px #ccc;
+}
+
+.entrybody p a{
+	/*font-weight:bold;*/
+}
+blockquote {
+	border-left-width: 3px;
+	border-left-style: solid;
+	border-left-color: #CCCCCC;
+	padding-left: 10px;
+	font-style: italic;
+	color: #666666;
+}
+
+.entrybody p {
+	margin-top:8px;
+	margin-bottom:16px;
+	text-align: justify;
+	font-size: 10pt;
+	line-height:1.5;
+	letter-spacing:1px;
+}
+
+.entrybody li {
+	font-size: 10pt;
+	line-height:1.8;
+}
+
+
+code {
+	background-color: #eeeeee;
+	padding: 5px;
+	border: 1px solid #CCCCCC;
+}
+#sidebar ul {
+	list-style: none;
+	padding-left: 10px;
+	margin-left: 10px;
+}
+
+#sidebar h2 {
+	font-size: 90%;
+	font-weight:normal;
+	text-transform:uppercase;
+	color:#ffffff
+}
+
+#sidebar ul, #sidebar ul ol {
+	margin: 0px;
+	padding: 0px;
+}
+
+#sidebar ul li {
+	list-style-type: none;
+	margin-bottom: 15px;
+}
+
+#sidebar ul p, #sidebar ul select {
+	margin: 5px 0 8px;
+	font-size: 0.9em;
+}
+
+#sidebar ul ul, #sidebar ul ol { margin: 5px 0 0 7px; }
+
+#sidebar ul ul ul, #sidebar ul ol { margin: 0 0 0 0px; }
+
+#sidebar ul ul li, #sidebar ul ol li {
+	margin: 0px 0 0;
+	display: block;
+	width: 200px;
+	padding-bottom: 2px;
+	padding-top: 2px;
+	padding-left: 0px;
+	border-bottom: 1px solid #395293;
+}
+
+#sidebar ul ul ul li{
+	border:0px;
+	margin-left:5px;
+}
+
+#sidebar form { margin-top: 20px; }
+	
+#sidebar a {
+	color:#ABC7ED;
+}
+#searchdiv
+{
+	padding: 5px;
+	margin-bottom: 20px;
+	font-weight:bold;
+}
+
+#sidebar form {
+	margin: 0px;
+	padding: 0px;
+}
+.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/fdawn (from rev 6387, templates/branches/lifetype-1.2/unported/fdawn)

Deleted: templates/branches/lifetype-1.2/fdawn/album.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fdawn/album.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fdawn/album.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,84 +0,0 @@
-{include file="$blogtemplate/header.template"}
-
-<div class="entry">
-		<!-- Loop Start -->
-		<!-- album contents go here -->
-		<H2>{$album->getName()}</H2>
-			<H3>{$album->getDescription()}</h3>
-			<table style="border:0px;width:100%;" summary="Album Resources">
-				<tr>
-					<td style="width:25%;" align="center" >
-						<a class="nodecoration" href="{$url->parentAlbumLink($album)}">
-						<img style="border:0px" src="{$url->getUrl("/imgs/admin/icon_folder-72.png")}" alt="Folder" /><br/>
-						 ..
-						 </a>
-					</td>
-					{assign var="counter" value=1}
-					{assign var=children value=$album->getChildren()}
-					{foreach from=$children item=childalbum}
-					<td style="width:25%;" align="center" >
-						<a class="nodecoration" href="{$url->albumLink($childalbum)}">
-							<img style="border:0px;" src="{$url->getUrl("/imgs/admin/icon_folder-72.png")}" 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>
- {include file="$blogtemplate/links.template"}
- {include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/fdawn/album.template (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/album.template)
===================================================================
--- templates/branches/lifetype-1.2/fdawn/album.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fdawn/album.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,84 @@
+{include file="$blogtemplate/header.template"}
+
+<div class="entry">
+		<!-- Loop Start -->
+		<!-- album contents go here -->
+		<H2>{$album->getName()}</H2>
+			<H3>{$album->getDescription()}</h3>
+			<table style="border:0px;width:100%;" summary="Album Resources">
+				<tr>
+					<td style="width:25%;" align="center" >
+						<a class="nodecoration" href="{$url->parentAlbumLink($album)}">
+						<img style="border:0px" src="{$url->getUrl("/imgs/admin/icon_folder-72.png")}" alt="Folder" /><br/>
+						 ..
+						 </a>
+					</td>
+					{assign var="counter" value=1}
+					{assign var=children value=$album->getChildren()}
+					{foreach from=$children item=childalbum}
+					<td style="width:25%;" align="center" >
+						<a class="nodecoration" href="{$url->albumLink($childalbum)}">
+							<img style="border:0px;" src="{$url->getUrl("/imgs/admin/icon_folder-72.png")}" 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>
+ {include file="$blogtemplate/links.template"}
+ {include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/fdawn/albums.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fdawn/albums.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fdawn/albums.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,29 +0,0 @@
-{include file="$blogtemplate/header.template"}
-
-<div class="entry">
-		<!-- Loop Start -->
-		<!-- album contents go here -->
-			<H2>{$locale->tr("albums")}</H2>
-				<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/admin/icon_folder-72.png")}" alt="Folder" /><br/>
-								{$album->getName()} ({$album->getNumResources()})
-							</a>
-							{assign var="counter" value="`$counter+1`"}
-						</td>
-						{if $counter%3 == 0}
-					</tr>
-					<tr>
-						{/if}
-						{/foreach}
-						<td></td>
-					</tr>
-				</table>
-		<!-- end of the albums -->
-		</div>
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/fdawn/albums.template (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/albums.template)
===================================================================
--- templates/branches/lifetype-1.2/fdawn/albums.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fdawn/albums.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,29 @@
+{include file="$blogtemplate/header.template"}
+
+<div class="entry">
+		<!-- Loop Start -->
+		<!-- album contents go here -->
+			<H2>{$locale->tr("albums")}</H2>
+				<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/admin/icon_folder-72.png")}" alt="Folder" /><br/>
+								{$album->getName()} ({$album->getNumResources()})
+							</a>
+							{assign var="counter" value="`$counter+1`"}
+						</td>
+						{if $counter%3 == 0}
+					</tr>
+					<tr>
+						{/if}
+						{/foreach}
+						<td></td>
+					</tr>
+				</table>
+		<!-- end of the albums -->
+		</div>
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/fdawn/archives.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fdawn/archives.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fdawn/archives.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,17 +0,0 @@
-{include file="$blogtemplate/header.template"} 
-		<DIV class=entry>		
-			<H3 class=entrytitle>{$locale->tr("archives")}</H3>
-			<DIV class=entrybody>
-				<ul>
-					{foreach from=$archives item=month}
-					<li>
-						<a href="{$month->getUrl()}">{$month->getName()}</a> [{$month->getNumArticles()}]
-					</li>
-					{/foreach}
-				</ul>
-
-			</div>
-		</div>
-
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"} 
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/fdawn/archives.template (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/archives.template)
===================================================================
--- templates/branches/lifetype-1.2/fdawn/archives.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fdawn/archives.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,17 @@
+{include file="$blogtemplate/header.template"} 
+		<DIV class=entry>		
+			<H3 class=entrytitle>{$locale->tr("archives")}</H3>
+			<DIV class=entrybody>
+				<ul>
+					{foreach from=$archives item=month}
+					<li>
+						<a href="{$month->getUrl()}">{$month->getName()}</a> [{$month->getNumArticles()}]
+					</li>
+					{/foreach}
+				</ul>
+
+			</div>
+		</div>
+
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"} 
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/fdawn/bookmark.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fdawn/bookmark.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fdawn/bookmark.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,18 +0,0 @@
-{include file="$blogtemplate/header.template"}
-
-		<div class=entry>
-		<!-- Loop Start -->
-			<H2>{$locale->tr("my_links")}</H2>
-				{foreach from=$mylinkscategories item=linkcategory}
-				<H3>{$linkcategory->getName()}</h3>
-				<ul>
-					{foreach from=$linkcategory->getLinks() item=link}
-					<li>
-						<a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a>: {$link->getDescription()}
-					</li>
-					{/foreach}
-				</ul>
-				{/foreach}
-		</div>
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"} 
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/fdawn/bookmark.template (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/bookmark.template)
===================================================================
--- templates/branches/lifetype-1.2/fdawn/bookmark.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fdawn/bookmark.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,18 @@
+{include file="$blogtemplate/header.template"}
+
+		<div class=entry>
+		<!-- Loop Start -->
+			<H2>{$locale->tr("my_links")}</H2>
+				{foreach from=$mylinkscategories item=linkcategory}
+				<H3>{$linkcategory->getName()}</h3>
+				<ul>
+					{foreach from=$linkcategory->getLinks() item=link}
+					<li>
+						<a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a>: {$link->getDescription()}
+					</li>
+					{/foreach}
+				</ul>
+				{/foreach}
+		</div>
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"} 
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/fdawn/commentarticle.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fdawn/commentarticle.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fdawn/commentarticle.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,8 +0,0 @@
-{include file="$blogtemplate/header.template"}
-{include file="$blogtemplate/links.template"}
-		<div class=entry>
-		<!-- Loop Start -->
-			<h3 id="respond">{$locale->tr("add_comment")}</h3>
-		</div>
-{include file="$blogtemplate/commentform.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/fdawn/commentarticle.template (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/commentarticle.template)
===================================================================
--- templates/branches/lifetype-1.2/fdawn/commentarticle.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fdawn/commentarticle.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,8 @@
+{include file="$blogtemplate/header.template"}
+{include file="$blogtemplate/links.template"}
+		<div class=entry>
+		<!-- Loop Start -->
+			<h3 id="respond">{$locale->tr("add_comment")}</h3>
+		</div>
+{include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/fdawn/error.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fdawn/error.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fdawn/error.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,9 +0,0 @@
-{include file="$blogtemplate/header.template"}
-		<div class=entry>
-		<!-- Loop Start -->
-				<h2>{$locale->tr("error")}</h2>
-				<p>{$locale->tr($message)}</p>
-				<p><a href="javascript:history.go(-1)">{$locale->tr("back")}</a></p>
-		</div>
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/fdawn/error.template (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/error.template)
===================================================================
--- templates/branches/lifetype-1.2/fdawn/error.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fdawn/error.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,9 @@
+{include file="$blogtemplate/header.template"}
+		<div class=entry>
+		<!-- Loop Start -->
+				<h2>{$locale->tr("error")}</h2>
+				<p>{$locale->tr($message)}</p>
+				<p><a href="javascript:history.go(-1)">{$locale->tr("back")}</a></p>
+		</div>
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"}

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

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

Deleted: templates/branches/lifetype-1.2/fdawn/features.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fdawn/features.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fdawn/features.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,8 +0,0 @@
-{include file="$blogtemplate/header.template"}
-		<div class=entry>
-		<!-- Loop Start -->
-				<h3>Features</h3>
-				{$blog->getAbout()}
-		</div>
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/fdawn/features.template (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/features.template)
===================================================================
--- templates/branches/lifetype-1.2/fdawn/features.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fdawn/features.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,8 @@
+{include file="$blogtemplate/header.template"}
+		<div class=entry>
+		<!-- Loop Start -->
+				<h3>Features</h3>
+				{$blog->getAbout()}
+		</div>
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/fdawn/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fdawn/footer.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fdawn/footer.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,9 +0,0 @@
-	<!-- begin footer -->
-	<DIV id=footer>
-		<P>Using the Dawn theme design by <A href="http://www.fahlstad.se/">Fredrik Fahlstad </A>
-		Proudly powered by <A href="http://www.lifetype.net/">LifeType</A>.
-		</P>
-	</DIV>
-</DIV>
-</BODY>
-</HTML>
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/fdawn/footer.template (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/footer.template)
===================================================================
--- templates/branches/lifetype-1.2/fdawn/footer.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fdawn/footer.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,9 @@
+	<!-- begin footer -->
+	<DIV id=footer>
+		<P>Using the Dawn theme design by <A href="http://www.fahlstad.se/">Fredrik Fahlstad </A>
+		Proudly powered by <A href="http://www.lifetype.net/">LifeType</A>.
+		</P>
+	</DIV>
+</DIV>
+</BODY>
+</HTML>
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/fdawn/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fdawn/header.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fdawn/header.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" 
-      lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
-<head>
- <meta http-equiv="Content-Type" content="text/html;charset={$locale->getCharset()}" />
- <meta name="generator" content="{$version}" />
- <meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
- <title>{$pageTitle|escape:"html"}</title>
- <link rel="stylesheet" title="Default" href="{$url->getTemplateFile("style.css")}" type="text/css" media=screen />
- <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")}" />
-
-<!--[if IE]><LINK href="{$url->getTemplateFile("ie.css")}" type=text/css rel=stylesheet><![endif]-->
- <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
-{if $badbehavior}
-   {$badbehavior->showBB2JavaScript()}
-{/if}
-</head>
-
-<body id="home" class="log">
-<div id="wrap">
-
-<!-- The header begins  -->
-<div id="header">
-		<h1><A href="{$url->blogLink()}">{$blog->getBlog()}</A></h1>
-  <div id="subtitle">
-      <!-- Here's the tagline  -->
-		<div class="description">{$blog->getAbout()}</div>
-  </div>
-</div>
-<div id="headerimage"></div>
-<!-- The header ends  -->
-
-<!-- The main content column begins  -->
-<div id="main">
-<div id="content">
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/fdawn/header.template (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/header.template)
===================================================================
--- templates/branches/lifetype-1.2/fdawn/header.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fdawn/header.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" 
+      lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
+<head>
+ <meta http-equiv="Content-Type" content="text/html;charset={$locale->getCharset()}" />
+ <meta name="generator" content="{$version}" />
+ <meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
+ <title>{$pageTitle|escape:"html"}</title>
+ <link rel="stylesheet" title="Default" href="{$url->getTemplateFile("style.css")}" type="text/css" media=screen />
+ <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")}" />
+
+<!--[if IE]><LINK href="{$url->getTemplateFile("ie.css")}" type=text/css rel=stylesheet><![endif]-->
+ <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
+{if $badbehavior}
+   {$badbehavior->showBB2JavaScript()}
+{/if}
+</head>
+
+<body id="home" class="log">
+<div id="wrap">
+
+<!-- The header begins  -->
+<div id="header">
+		<h1><A href="{$url->blogLink()}">{$blog->getBlog()}</A></h1>
+  <div id="subtitle">
+      <!-- Here's the tagline  -->
+		<div class="description">{$blog->getAbout()}</div>
+  </div>
+</div>
+<div id="headerimage"></div>
+<!-- The header ends  -->
+
+<!-- The main content column begins  -->
+<div id="main">
+<div id="content">
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/fdawn/ie.css
===================================================================
--- templates/branches/lifetype-1.2/unported/fdawn/ie.css	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fdawn/ie.css	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,15 +0,0 @@
-#wrap {
-	height:1%;
-	width:expression(document.body.clientWidth > 930? "900px" : "auto");
-}
-#main {
-	height:1%;
-}
-#content {
-	display:inline;
-	overflow:hidden;
-}
-#sidebar {
-	display:inline;
-	word-wrap:break-word;
-}

Copied: templates/branches/lifetype-1.2/fdawn/ie.css (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/ie.css)
===================================================================
--- templates/branches/lifetype-1.2/fdawn/ie.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/fdawn/ie.css	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,15 @@
+#wrap {
+	height:1%;
+	width:expression(document.body.clientWidth > 930? "900px" : "auto");
+}
+#main {
+	height:1%;
+}
+#content {
+	display:inline;
+	overflow:hidden;
+}
+#sidebar {
+	display:inline;
+	word-wrap:break-word;
+}

Copied: templates/branches/lifetype-1.2/fdawn/images (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/images)

Deleted: templates/branches/lifetype-1.2/fdawn/links.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fdawn/links.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fdawn/links.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,77 +0,0 @@
-</DIV>
-<!-- begin sidebar -->
-<DIV id=sidebar>
-<DIV id=searchdiv>
-<form method="post" action="{$url->getIndexUrl()}"><LABEL for=s>Search this site:</LABEL>
-<input type="text" name="searchTerms" value="" size="20" />
-<input type="hidden" name="op" value="Search" />
-<input type="hidden" name="blogId" value="{$blog->getId()}"/>
-<input type="submit" name="Search" value="Go" />
-</form>
-</DIV>
-
-<UL>
-
-
-<li>
-{assign var=blogOwner value=$blog->getOwnerInfo()}
-{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
-{if $blogOwner->hasPicture() && $AboutMyself}  
-  	 <h2>{$locale->tr("about_myself")}</h2>
-  	 <ul>
-  	{assign var=picture value=$blogOwner->getPicture()}
-  	<li><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /></li>
-  	<br/>
-  	{$AboutMyself}
-  	</ul>
-{/if}
-</li>
-
-
-
-
-<LI>
-<H2>Around here</H2>
-<UL>
-{foreach from=$recentposts item=recentpost}
-<LI class=page_item><A title="{$recentpost->getText()|truncate:150:"..."|strip_tags|escape}" href="{$url->postLink($recentpost)}">{$recentpost->getTopic()}</a><br/></LI>
-{/foreach}
-</UL>
-
-
-<LI>
-<H2>Categories</H2>
-<UL>
-{foreach from=$articlecategories item=articleCategory}
-<LI><A href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</A> ({$articleCategory->getNumArticles()})</LI>
-{/foreach}
-</UL>
-
-<LI>
-<H2>Navigate</H2>
-<UL>
-<LI><a title="{$locale->tr("main")}" href="{$url->blogLink()}">{$locale->tr("main")}</a>
-<LI><a title="{$locale->tr("archives")}" href="{$url->templatePage("archives")}">{$locale->tr("archives")}</a>
-<LI><a title="{$locale->tr("links")}" href="{$url->templatePage("bookmark")}">{$locale->tr("links")}</a>
-<LI><a title="{$locale->tr("summary")}" href="{$url->getUrl("/summary.php")}">{$locale->tr("summary")}</a>
-</UL>
-</LI>
-
-
-<LI>
-<H2>Meta</H2>
-<UL>
-<LI><A title="{$locale->tr("admin")}" href="{$url->getAdminUrl()}">{$locale->tr("admin")}</a></LI>
-<LI><A title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a></LI>
-<LI><A title="This page validates as XHTML 1.0 Transitional" href="http://validator.w3.org/check/referer">Valid <ABBR title="eXtensible HyperText Markup Language">XHTML</ABBR></A> </LI>
-<LI><A href="http://gmpg.org/xfn/"><ABBR title="XHTML Friends Network">XFN</ABBR></A> </LI>
-<LI><A title="Powered by LifeType, state-of-the-art semantic personal publishing platform." href="http://www.lifetype.net/">LifeType</A> </LI>
-</UL>
-</LI>
-
-
-</LI>
-
-</UL>
-</DIV>
-<!-- The main column ends  -->	</DIV>
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/fdawn/links.template (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/links.template)
===================================================================
--- templates/branches/lifetype-1.2/fdawn/links.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fdawn/links.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,77 @@
+</DIV>
+<!-- begin sidebar -->
+<DIV id=sidebar>
+<DIV id=searchdiv>
+<form method="post" action="{$url->getIndexUrl()}"><LABEL for=s>Search this site:</LABEL>
+<input type="text" name="searchTerms" value="" size="20" />
+<input type="hidden" name="op" value="Search" />
+<input type="hidden" name="blogId" value="{$blog->getId()}"/>
+<input type="submit" name="Search" value="Go" />
+</form>
+</DIV>
+
+<UL>
+
+
+<li>
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}  
+  	 <h2>{$locale->tr("about_myself")}</h2>
+  	 <ul>
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	<li><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /></li>
+  	<br/>
+  	{$AboutMyself}
+  	</ul>
+{/if}
+</li>
+
+
+
+
+<LI>
+<H2>Around here</H2>
+<UL>
+{foreach from=$recentposts item=recentpost}
+<LI class=page_item><A title="{$recentpost->getText()|truncate:150:"..."|strip_tags|escape}" href="{$url->postLink($recentpost)}">{$recentpost->getTopic()}</a><br/></LI>
+{/foreach}
+</UL>
+
+
+<LI>
+<H2>Categories</H2>
+<UL>
+{foreach from=$articlecategories item=articleCategory}
+<LI><A href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</A> ({$articleCategory->getNumArticles()})</LI>
+{/foreach}
+</UL>
+
+<LI>
+<H2>Navigate</H2>
+<UL>
+<LI><a title="{$locale->tr("main")}" href="{$url->blogLink()}">{$locale->tr("main")}</a>
+<LI><a title="{$locale->tr("archives")}" href="{$url->templatePage("archives")}">{$locale->tr("archives")}</a>
+<LI><a title="{$locale->tr("links")}" href="{$url->templatePage("bookmark")}">{$locale->tr("links")}</a>
+<LI><a title="{$locale->tr("summary")}" href="{$url->getUrl("/summary.php")}">{$locale->tr("summary")}</a>
+</UL>
+</LI>
+
+
+<LI>
+<H2>Meta</H2>
+<UL>
+<LI><A title="{$locale->tr("admin")}" href="{$url->getAdminUrl()}">{$locale->tr("admin")}</a></LI>
+<LI><A title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a></LI>
+<LI><A title="This page validates as XHTML 1.0 Transitional" href="http://validator.w3.org/check/referer">Valid <ABBR title="eXtensible HyperText Markup Language">XHTML</ABBR></A> </LI>
+<LI><A href="http://gmpg.org/xfn/"><ABBR title="XHTML Friends Network">XFN</ABBR></A> </LI>
+<LI><A title="Powered by LifeType, state-of-the-art semantic personal publishing platform." href="http://www.lifetype.net/">LifeType</A> </LI>
+</UL>
+</LI>
+
+
+</LI>
+
+</UL>
+</DIV>
+<!-- The main column ends  -->	</DIV>
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/fdawn/main.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fdawn/main.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fdawn/main.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,19 +0,0 @@
-{include file="$blogtemplate/header.template"}
-	<!-- Loop Start -->
-	{if $showAll}
-		{if $showAll == 1 && $category}
-			<h2>{$locale->tr("posts")}: {$category->getName()}</h2>
-		{/if}
-		{foreach from=$posts item=post}
-			<!-- showing only the topic of the post, in case we have too many! -->
-			{assign var="postDate" value=$post->getDateObject()}
-			{$locale->formatDate($postDate,"%Y.%B%d")} <a href="{$url->postPermalink($post)}">{$post->getTopic()}</a><br/>
-		{/foreach}
-	{else}
-		{foreach from=$posts item=post}
-			{include file="$blogtemplate/post.template"}
-		{/foreach}
-	{/if}
- {pager style="links"}
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/fdawn/main.template (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/main.template)
===================================================================
--- templates/branches/lifetype-1.2/fdawn/main.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fdawn/main.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,19 @@
+{include file="$blogtemplate/header.template"}
+	<!-- Loop Start -->
+	{if $showAll}
+		{if $showAll == 1 && $category}
+			<h2>{$locale->tr("posts")}: {$category->getName()}</h2>
+		{/if}
+		{foreach from=$posts item=post}
+			<!-- showing only the topic of the post, in case we have too many! -->
+			{assign var="postDate" value=$post->getDateObject()}
+			{$locale->formatDate($postDate,"%Y.%B%d")} <a href="{$url->postPermalink($post)}">{$post->getTopic()}</a><br/>
+		{/foreach}
+	{else}
+		{foreach from=$posts item=post}
+			{include file="$blogtemplate/post.template"}
+		{/foreach}
+	{/if}
+ {pager style="links"}
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/fdawn/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fdawn/post.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fdawn/post.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,18 +0,0 @@
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-		<DIV class=entry>
-		
-		
-			<H3 class=entrytitle><A href="{$url->postPermalink($post)}">{$post->getTopic()}</A></H3>
-			<DIV class=entrybody>
-				<P>{$post->getText()}</P>
-				<DIV class=entrymeta>
-				{$locale->formatDate($postDate,"%m/%d,%Y")} Posted to 
-				{foreach name=categories from=$post->getCategories() item=postcategory}
-					<a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
-				{if !$smarty.foreach.categories.last}, {/if}
-				{/foreach} 
-				</DIV>
-			</DIV>
-			<P class=comments_link><A href="{$url->postPermalink($post)}#comments">Comments ({$post->getNumComments()})</A> </P>
-		</DIV><br>

Copied: templates/branches/lifetype-1.2/fdawn/post.template (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/post.template)
===================================================================
--- templates/branches/lifetype-1.2/fdawn/post.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fdawn/post.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,18 @@
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+		<DIV class=entry>
+		
+		
+			<H3 class=entrytitle><A href="{$url->postPermalink($post)}">{$post->getTopic()}</A></H3>
+			<DIV class=entrybody>
+				<P>{$post->getText()}</P>
+				<DIV class=entrymeta>
+				{$locale->formatDate($postDate,"%m/%d,%Y")} Posted to 
+				{foreach name=categories from=$post->getCategories() item=postcategory}
+					<a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
+				{if !$smarty.foreach.categories.last}, {/if}
+				{/foreach} 
+				</DIV>
+			</DIV>
+			<P class=comments_link><A href="{$url->postPermalink($post)}#comments">Comments ({$post->getNumComments()})</A> </P>
+		</DIV><br>

Deleted: templates/branches/lifetype-1.2/fdawn/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fdawn/postandcomments.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fdawn/postandcomments.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,83 +0,0 @@
-{assign var="postPageTitle" value=$post->getTopic()}
-{assign var="postPageTitle" value=" | $postPageTitle"}
-
-{include file="$blogtemplate/header.template"}
-
-	<DIV class=entry>
-		<!-- {$url->postTrackbackLink($post)} -->
-		{assign var="postDate" value=$post->getDateObject()}
-		{assign var="postOwner" value=$post->getUserInfo()}
-		<H3 class=entrytitle><A href="{$url->postPermalink($post)}">{$post->getTopic()}</A></H3>
-		<DIV class=date>Published on {$locale->formatDate($postDate,"%m/%d,%Y")}</DIV>
-		<DIV class=entrybody>
-			<P>{$post->getText()}</P>
-			<BR clear=all>
-			</DIV>
-	</DIV>
-	<DIV class=feedback>
-		<DIV class=meta>Posted by {$postOwner->getUsername()} at
-			{$locale->formatDate($postDate,"%H:%M")}
-			<A class=aposted href="{$url->postPermalink($post)}#comments">{$locale->tr("comment on this")} ({$post->getNumComments()})</A> │
-			<A class=aposted href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</A> │
-			{foreach name=categories from=$post->getCategories() item=postcategory}
-				<a class=aposted href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
-				{if !$smarty.foreach.categories.last}, {/if}
-			{/foreach}<br>
-			{* Prevpost and nextpost use *}
-			<a href="{$url->blogLink()}">Back to Home</a>
-			{assign var=nextpost value=$post->getNextArticle()}
-			{assign var=prevpost value=$post->getPrevArticle()}
-			{if $nextpost == true}
-				<a href="{$url->postPermalink($nextpost)}" title="Previous post: {$nextpost->getTopic()}">{$locale->tr("previous_post")}</a>
-			{/if}
-			{if $prevpost == true}
-				<a href="{$url->postPermalink($prevpost)}" title="Next post: {$prevpost->getTopic()}">{$locale->tr("next_post")}</a>
-			{/if}
-			{* End of article_index *}
-		</DIV>
-	</DIV>
-        {pager style="links"}    
-	
-		<h2 id="comments">Comments </h2>
-	<ol id="commentlist">
-	
-	{assign var="counter" value=1}
-	{foreach name=comment from=$comments item=comment}
-		<a name="{$comment->getId()}"></a>
-		{if $counter%2!=0}
-		<li class="alt" id="comment-{$comment->getId()}">
-		
-		{else}
-		<li class="standard" id="comment-{$comment->getId()}">
-		{/if}
-			<div class="commentname">
-				<span class="commentauthor"><a href="{$comment->getUserUrl()}">{$comment->getUsername()}</a></span>
-			</div>
-			<div class="commentinfo">
-				<span class="commentdate">
-					{assign var=commentDate value=$comment->getDateObject()} {$locale->formatDate($commentDate, "%m/%d,%Y")} | <a href="#comment-{$comment->getId()}" title="">{$locale->formatDate($commentDate, "%H:%M")}</a>
-				</span>
-			</div>
-			<div class='commenttext'>			
-{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>
-		</LI>
-		{assign var="counter" value="`$counter+1`"}
-	{/foreach}
-	</ol>
-
-	<a name="comments"></a>
-
-	<h2 id="commentsformheader">Leave a Reply</h2>
-	{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
-		{include file="$misctemplatepath/commentform.template"}
-	{/if}
-
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/fdawn/postandcomments.template (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/postandcomments.template)
===================================================================
--- templates/branches/lifetype-1.2/fdawn/postandcomments.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fdawn/postandcomments.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,83 @@
+{assign var="postPageTitle" value=$post->getTopic()}
+{assign var="postPageTitle" value=" | $postPageTitle"}
+
+{include file="$blogtemplate/header.template"}
+
+	<DIV class=entry>
+		<!-- {$url->postTrackbackLink($post)} -->
+		{assign var="postDate" value=$post->getDateObject()}
+		{assign var="postOwner" value=$post->getUserInfo()}
+		<H3 class=entrytitle><A href="{$url->postPermalink($post)}">{$post->getTopic()}</A></H3>
+		<DIV class=date>Published on {$locale->formatDate($postDate,"%m/%d,%Y")}</DIV>
+		<DIV class=entrybody>
+			<P>{$post->getText()}</P>
+			<BR clear=all>
+			</DIV>
+	</DIV>
+	<DIV class=feedback>
+		<DIV class=meta>Posted by {$postOwner->getUsername()} at
+			{$locale->formatDate($postDate,"%H:%M")}
+			<A class=aposted href="{$url->postPermalink($post)}#comments">{$locale->tr("comment on this")} ({$post->getNumComments()})</A>
+			<A class=aposted href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</A>
+			{foreach name=categories from=$post->getCategories() item=postcategory}
+				<a class=aposted href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
+				{if !$smarty.foreach.categories.last}, {/if}
+			{/foreach}<br>
+			{* Prevpost and nextpost use *}
+			<a href="{$url->blogLink()}">Back to Home</a>
+			{assign var=nextpost value=$post->getNextArticle()}
+			{assign var=prevpost value=$post->getPrevArticle()}
+			{if $nextpost == true}
+				<a href="{$url->postPermalink($nextpost)}" title="Previous post: {$nextpost->getTopic()}">{$locale->tr("previous_post")}</a>
+			{/if}
+			{if $prevpost == true}
+				<a href="{$url->postPermalink($prevpost)}" title="Next post: {$prevpost->getTopic()}">{$locale->tr("next_post")}</a>
+			{/if}
+			{* End of article_index *}
+		</DIV>
+	</DIV>
+	
+		<h2 id="comments">Comments </h2>
+        {pager style="links"}    
+	<ol id="commentlist">
+	
+	{assign var="counter" value=1}
+	{foreach name=comment from=$comments item=comment}
+		<a name="{$comment->getId()}"></a>
+		{if $counter%2!=0}
+		<li class="alt" id="comment-{$comment->getId()}">
+		
+		{else}
+		<li class="standard" id="comment-{$comment->getId()}">
+		{/if}
+			<div class="commentname">
+				<span class="commentauthor"><a href="{$comment->getUserUrl()}">{$comment->getUsername()}</a></span>
+			</div>
+			<div class="commentinfo">
+				<span class="commentdate">
+					{assign var=commentDate value=$comment->getDateObject()} {$locale->formatDate($commentDate, "%m/%d,%Y")} | <a href="#comment-{$comment->getId()}" title="">{$locale->formatDate($commentDate, "%H:%M")}</a>
+				</span>
+			</div>
+			<div class='commenttext'>			
+{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>
+		</LI>
+		{assign var="counter" value="`$counter+1`"}
+	{/foreach}
+	</ol>
+
+	<a name="comments"></a>
+
+	<h2 id="commentsformheader">Leave a Reply</h2>
+	{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
+		{include file="$misctemplatepath/commentform.template"}
+	{/if}
+
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/fdawn/posttrackbacks.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fdawn/posttrackbacks.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fdawn/posttrackbacks.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,16 +0,0 @@
-{include file="$blogtemplate/header.template"}
-		<div class=entry>
-		<!-- Loop Start -->
-				<p>{$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>": </p>
-				<p>
-					{foreach from=$trackbacks item=trackback}
-						<a href="{$trackback->getUrl()}">{$trackback->getTitle()}</a><br/>
-						<b>{$locale->tr("trackback_excerpt")}:</b> {$trackback->getExcerpt()}<br/>
-						<b>{$locale->tr("trackback_weblog")}:</b> {$trackback->getBlogName()}<br/>
-						{assign var="trackbackDate" value=$trackback->getDateObject()}
-						<b>{$locale->tr("date")}:</b> {$locale->formatDate($trackbackDate, "%d/%m/%Y %H:%M")}<br/><br/>
-					{/foreach}
-				</p>
-		</div>
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/fdawn/posttrackbacks.template (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/posttrackbacks.template)
===================================================================
--- templates/branches/lifetype-1.2/fdawn/posttrackbacks.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fdawn/posttrackbacks.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,16 @@
+{include file="$blogtemplate/header.template"}
+		<div class=entry>
+		<!-- Loop Start -->
+				<p>{$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>": </p>
+				<p>
+					{foreach from=$trackbacks item=trackback}
+						<a href="{$trackback->getUrl()}">{$trackback->getTitle()}</a><br/>
+						<b>{$locale->tr("trackback_excerpt")}:</b> {$trackback->getExcerpt()}<br/>
+						<b>{$locale->tr("trackback_weblog")}:</b> {$trackback->getBlogName()}<br/>
+						{assign var="trackbackDate" value=$trackback->getDateObject()}
+						<b>{$locale->tr("date")}:</b> {$locale->formatDate($trackbackDate, "%d/%m/%Y %H:%M")}<br/><br/>
+					{/foreach}
+				</p>
+		</div>
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/fdawn/resource.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fdawn/resource.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fdawn/resource.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,106 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" 
-      lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
-<head>
- <meta http-equiv="Content-Type" content="text/html;charset={$locale->getCharset()}" />
- <meta name="generator" content="{$version}" />
- <meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
- <title>{$pageTitle|escape:"html"}</title>
- <link rel="stylesheet" title="Default" href="{$url->getTemplateFile("style.css")}" type="text/css" media=screen />
- <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")}" />
-
-<!--[if IE]><LINK href="{$url->getTemplateFile("ie.css")}" type=text/css rel=stylesheet><![endif]-->
-<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
-</script>
-<script type="text/javascript">
-_uacct = "UA-134126-1";
-urchinTracker();
-</script>
-
-{if $badbehavior}
-   {$badbehavior->showBB2JavaScript()}
-{/if}
-</head>
-
-<body id="home" class="log">
-<div id="wrap">
-
-<!-- The header begins  -->
-<div id="header">
-		<h1><A href="{$url->blogLink()}">{$blog->getBlog()}</A></h1>
-  <div id="subtitle">
-      <!-- Here's the tagline  -->
-		<div class="description">{$blog->getAbout()}</div>
-  </div>
-</div>
-<div id="headerimage"></div>
-<!-- The header ends  -->
-
-<div id=resourceMain>
-
-<div class=entry>
-
-
-
-
-	
-		{assign var=metadata value=$resource->getMetadataReader()}
-		{assign var=updated value=$resource->getTimestamp()}
-		
-		<H4>
-			Filename: {$resource->getFileName()} ({$metadata->getRoundedSize()}) | 
-			{$locale->tr("created")} {$locale->formatDate($updated,"%d %B, %Y")} | 
-			<a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a>
-		</H4>
-		<H3>{$resource->getFileName()}</H3>
-		<br/>
-		    
-		<p>{$resource->getDescription()}</p>
-		{if $resource->isImage()}
-		<center><img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" /></center>
-	{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()}
-   		{if $prevresource}<a href="{$url->resourceLink($prevresource)}">&laquo;</a> | {/if}
-   		<a href="{$url->albumLink($album)}">{$locale->tr("back")}</a>
-   		{if $nextresource}| <a href="{$url->resourceLink($nextresource)}">&raquo;</a>{/if}
-	</p>
-
-
-</div></div>
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/fdawn/resource.template (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/resource.template)
===================================================================
--- templates/branches/lifetype-1.2/fdawn/resource.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fdawn/resource.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,106 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" 
+      lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
+<head>
+ <meta http-equiv="Content-Type" content="text/html;charset={$locale->getCharset()}" />
+ <meta name="generator" content="{$version}" />
+ <meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
+ <title>{$pageTitle|escape:"html"}</title>
+ <link rel="stylesheet" title="Default" href="{$url->getTemplateFile("style.css")}" type="text/css" media=screen />
+ <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")}" />
+
+<!--[if IE]><LINK href="{$url->getTemplateFile("ie.css")}" type=text/css rel=stylesheet><![endif]-->
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+_uacct = "UA-134126-1";
+urchinTracker();
+</script>
+
+{if $badbehavior}
+   {$badbehavior->showBB2JavaScript()}
+{/if}
+</head>
+
+<body id="home" class="log">
+<div id="wrap">
+
+<!-- The header begins  -->
+<div id="header">
+		<h1><A href="{$url->blogLink()}">{$blog->getBlog()}</A></h1>
+  <div id="subtitle">
+      <!-- Here's the tagline  -->
+		<div class="description">{$blog->getAbout()}</div>
+  </div>
+</div>
+<div id="headerimage"></div>
+<!-- The header ends  -->
+
+<div id=resourceMain>
+
+<div class=entry>
+
+
+
+
+	
+		{assign var=metadata value=$resource->getMetadataReader()}
+		{assign var=updated value=$resource->getTimestamp()}
+		
+		<H4>
+			Filename: {$resource->getFileName()} ({$metadata->getRoundedSize()}) | 
+			{$locale->tr("created")} {$locale->formatDate($updated,"%d %B, %Y")} | 
+			<a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a>
+		</H4>
+		<H3>{$resource->getFileName()}</H3>
+		<br/>
+		    
+		<p>{$resource->getDescription()}</p>
+		{if $resource->isImage()}
+		<center><img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" /></center>
+	{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()}
+   		{if $prevresource}<a href="{$url->resourceLink($prevresource)}">&laquo;</a> | {/if}
+   		<a href="{$url->albumLink($album)}">{$locale->tr("back")}</a>
+   		{if $nextresource}| <a href="{$url->resourceLink($nextresource)}">&raquo;</a>{/if}
+	</p>
+
+
+</div></div>
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/fdawn/samplerss.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fdawn/samplerss.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fdawn/samplerss.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,20 +0,0 @@
-{include file="$blogtemplate/header.template"}
-		<div class=entry>
-		<!-- Loop Start -->
-				<h3 class="title">Sample template</h3>
-				<p>
-					{$message}
-				</p>
-				<p>
-					And now, some RSS feeds from Slashdot using the RSS parser included in this package:<br/>
-					{if $rss->parse("http://slashdot.org/slashdot.rdf")}
-					{foreach from=$rss->getItems() item=rssItem}
-					<a href="{$rssItem->getLink()}">{$rssItem->getTitle()}</a><br/>
-					{/foreach}
-					{/if}
-					<hr/>
-					<p>This is a sample of the plugin that gets the sinfest strip:</p>
-					<a href="http://sinfest.net"><img src="{$sfstrip->SinfestStripUrl()}" alt="Sinfest strip" width="385"/></a>
-		</div>
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/fdawn/samplerss.template (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/samplerss.template)
===================================================================
--- templates/branches/lifetype-1.2/fdawn/samplerss.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fdawn/samplerss.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,20 @@
+{include file="$blogtemplate/header.template"}
+		<div class=entry>
+		<!-- Loop Start -->
+				<h3 class="title">Sample template</h3>
+				<p>
+					{$message}
+				</p>
+				<p>
+					And now, some RSS feeds from Slashdot using the RSS parser included in this package:<br/>
+					{if $rss->parse("http://slashdot.org/slashdot.rdf")}
+					{foreach from=$rss->getItems() item=rssItem}
+					<a href="{$rssItem->getLink()}">{$rssItem->getTitle()}</a><br/>
+					{/foreach}
+					{/if}
+					<hr/>
+					<p>This is a sample of the plugin that gets the sinfest strip:</p>
+					<a href="http://sinfest.net"><img src="{$sfstrip->SinfestStripUrl()}" alt="Sinfest strip" width="385"/></a>
+		</div>
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"}

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

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

Deleted: templates/branches/lifetype-1.2/fdawn/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fdawn/searchresults.template	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fdawn/searchresults.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,15 +0,0 @@
-{include file="$blogtemplate/header.template"}
-		<div class=entry>
-		<!-- Loop Start -->
-				<H2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
-						{foreach from=$searchresults item=result}
-							{assign var=article value=$result->getArticle()}
-							{foreach name=categories from=$article->getCategories() item=postcategory}
-							<a class=aside href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
-							{if !$smarty.foreach.categories.last}, {/if}
-							{/foreach}							
-								<a href="{$url->postPermalink($article)}">{$article->getTopic()}</a><br/>	
-						{/foreach}
-		</div>
-{include file="$blogtemplate/links.template"}		
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/fdawn/searchresults.template (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/searchresults.template)
===================================================================
--- templates/branches/lifetype-1.2/fdawn/searchresults.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fdawn/searchresults.template	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,15 @@
+{include file="$blogtemplate/header.template"}
+		<div class=entry>
+		<!-- Loop Start -->
+				<H2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+						{foreach from=$searchresults item=result}
+							{assign var=article value=$result->getArticle()}
+							{foreach name=categories from=$article->getCategories() item=postcategory}
+							<a class=aside href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
+							{if !$smarty.foreach.categories.last}, {/if}
+							{/foreach}							
+								<a href="{$url->postPermalink($article)}">{$article->getTopic()}</a><br/>	
+						{/foreach}
+		</div>
+{include file="$blogtemplate/links.template"}		
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/fdawn/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/fdawn/style.css	2008-04-28 21:32:11 UTC (rev 6387)
+++ templates/branches/lifetype-1.2/fdawn/style.css	2008-04-28 21:44:00 UTC (rev 6391)
@@ -1,505 +0,0 @@
-/*
-	Theme Name: fDawn
-	Theme URI: http://www.fahlstad.se
-	Description: Liquid theme with max width, easy to customize.
-	Version: 1.0
-	Author: Fredrik Fahlstad
-	Author URI: http://www.fahlstad.se
-*/
-
-body {
-	margin: 0 auto;
-	padding: 0;
-	font: 76%/115% Verdana,Tahoma,Arial,sans-serif;
-	background: #f4f4f4 url(images/bg.gif);
-}
-
-#wrap {
-	max-width:70em;
-	color: #303030;
-	margin: 0 auto;
-	background-color: #FFFFFF;
-	border-right-width: 1px;
-	border-left-width: 1px;
-	border-right-style: solid;
-	border-left-style: solid;
-	border-right-color: #CCCCCC;
-	border-left-color: #CCCCCC;
-	position: relative;
-}
-
-#header {
-	height: 60px;
-	margin-top: 0px;
-	margin-right: 0;
-	margin-bottom: 0;
-	margin-left: 0;
-	padding-top: 0px;
-	padding-right: 0px;
-	padding-bottom: 0px;
-	padding-left: 0px;
-}
-#main {
-	padding-top: 2em;
-	background:#fff url(images/separator.gif) repeat-y 67% 0;
-	overflow: hidden;
-}
-
-#resourceMain {
-	padding: 2em;
-	background:#fff;
-	overflow: hidden;
-}
-
-
-
-#header h1{
-	margin:0;
-	font-size:2.2em;
-	float: left;
-	padding-left:2%;
-	height:30px;
-	padding-top: 30px;
-	padding-right: 0;
-	padding-bottom: 0;
-}
-#header h1 a {
-	color:#333333;
-	border:0;
-}
-
-.description {
-	float: right;
-	height: 30px;
-	padding-top: 30px;
-	padding-right: 2%;
-}
-
-#frontphoto {
-margin: 0 0 10px 0;
-border: 0;
-}
-
-#sidebar {
-	float: right;
-	font-size: 0.94em;
-	line-height:1.3em;
-	width:29%;
-	margin:0 2% 0 0;
-}
-.pagenav ul li a{
-	list-style-type:none
-	}
-
-#sidebar h2 {
-	border-bottom:solid 1px #CCCCCC;
-	margin-top:20px;
-	font-size: 1.1em;
-}
-
-#headerimage {
-	background-color: #CCCCCC;
-	height: 175px;
-	background-image: url(images/top.jpg);
-	background-repeat: no-repeat;
-	padding: 0px;
-	margin: 0px 2%;
-	background-position: right;
-}
-
-
-.announce {
-margin: 10px 0 10px 0;
-padding: 10px;
-width: 130px;
-color: #505050;
-background-color: #f4f4f4;
-line-height: 1.3em;
-}
-
-#extras {
-float: right;
-width: 100px;
-margin: 0 0 10px 0;
-padding: 0;
-font-size: 0.9em;
-line-height: 1.5em;
-}
-
-#extras p {
-margin: 0 0 1.5em 0;
-}
-
-#content {
-	border-left: 1px none #f0f0f0;
-	border-right: 1px none #f0f0f0;
-	padding: 0 10px;
-	line-height: 1.6em;
-	text-align: left;
-	float: left;
-	width: 59%;
-	margin:0 0 0 2%;
-	border-top-style: none;
-	border-bottom-style: none;
-	overflow: hidden;
-}
-h1,h2,h3,h4 {
-	font-family:Helvetica,Arial,Geneva,sans-serif;
-}
-h2 {
-	font-size: 1.8em;
-	margin: 0 0 0.5em 0;
-}
-
-
-h3 {
-	font-size: 1.6em;
-	margin: 0 0 10px 0;
-
-}
-h4 {
-	font-size:1.4em;
-	margin: 0 0 10px 0;
-}
-
-/* Links
-================================================*/
-a:link,
-a:visited {
-	color:#920D02;
-	/*font-weight:bold;*/
-	text-decoration:none;
-	padding:2px 2px 0;
-	margin:0 -2px;
-	border-bottom:1px dotted #666;
-	}
-/*a:visited {color:#333;}*/
-a:focus {
-	color:#580801;
-	}
-a:hover {
-	color:#580801;
-	border-color:#580801;
-	background-color:#f4f4f4;
-	}
-#footer {
-clear: both;
-margin: 0 auto;
-padding: 10px 0 20px 0;
-border-top: 4px solid #f0f0f0;
-width: 760px;
-text-align: center;
-color: #808080;
-font-size: 0.9em;
-}
-
-.current_page_item a {
-font-weight:bold;
-	}
-
-/************************************************
-*	Comments													*
-************************************************/
-h2#comments{
-	text-align:center;
-	border-top:1px solid #acb1ba;
-	background:#eeeeee;
-	padding:2px;
-	border-bottom:1px solid #acb1ba;
-	margin-bottom:10px;
-	margin-top:80px;
-	font-size: 110%;
-}
-
-ol#commentlist {
-	margin-top:0px;
-	padding: 5px;
-	margin-left: 0px;
-	color: #9b9b9b;
-	list-style-type: none;
-	font-size:0.9em;
-}
-
-#commentlist li  p{
-	margin-top: 8px;
-	margin-bottom: 16px;
-	line-height: 20px;
-}
-
-.commentname {
-	float: left;
-	margin: 0;
-	padding: 0  0 2px 0;
-	font-weight: bold;
-}
-
-.commentinfo{
-	width: 300px;
-	float: right;
-	text-align: right;
-}
-
-.commenttext {
-	clear: both;
-	margin-top: 0px;
-	margin-bottom: 30px;
-	border-top: 1px solid #ebebeb;
-	line-height:12px;
-	color: #5b5b5b;
-	background-color: #F8F8F8;
-	padding: 5px;
-}
-
-.commenttext-admin {
-	clear: both;
-	margin-top: 0px;
-	margin-bottom: 30px;
-	border-top: 1px solid #ebebeb;
-	line-height:12px;
-	color: #5b5b5b;
-	background-color: #CEE4F4;
-	padding: 5px;
-}
-
-#commentsformheader{
-	padding-left:18px;
-	font-size: 1.4em;
-}
-
-#commentsform{
-	margin-top:none;
-	text-align:center;
-	border:1px solid #ddd;
-	background:#ededed;
-	padding:0px 10px;
-}
-
-#commentsform form{
-	text-align:left;
-	margin:0px;
-}
-
-#commentsform p{
-	margin:5px;
-}
-
-#commentsform form textarea{
-	width:100%;
-}
-p.comments_link  img{
-	margin: 0px;
-	padding: 0px;
-	border-top-style: none;
-	border-right-style: none;
-	border-bottom-style: none;
-	border-left-style: none;
-}
-/************************************************
-*	Header																			*
-************************************************/
-h2.entrydate{
-	margin-bottom:1px;
-	font-size: 1.8em;
-	font-weight:normal;
-	text-transform:uppercase;
-}
-
-.entrymeta{
-	font-size: 10pt;
-}
-
-h3.entrytitle {
-	margin-top:0px;
-	padding-bottom:10px;
-	font-weight:bold;
-	color:#000000
-}
-h3.entrytitle a, h3.entrytitle a:visited{
-color:#333333;
-}
-
-.entry{
-	margin-top:8px;
-}
-
-.entrybody p a{
-	/*font-weight:bold;*/
-}
-blockquote {
-	border-left-width: 3px;
-	border-left-style: solid;
-	border-left-color: #CCCCCC;
-	padding-left: 10px;
-	font-style: italic;
-	color: #666666;
-}
-
-.entrybody p {
-font-size:10pt;
-	letter-spacing:1px;
-	line-height:1.5;
-	margin-top:8px;
-	margin-bottom:16px;
-	text-align: justify;
-}
-
-.entrybody li {
-font-size:10pt;
-	letter-spacing:1px;
-	line-height:1.5;
-}
-
-
-
-.entrybody img {
-	padding: 4px;
-	border: 1px solid #CCCCCC;
-}
-code {
-	background-color: #eeeeee;
-	padding: 5px;
-	border: 1px solid #CCCCCC;
-}
-
-
-/* Lists
-================================================*/
-dl,
-ol,
-ul {margin:0 0 1em;}
-dl {margin-top:-0.5em;}
-dt {
-	font-weight:bold;
-	margin:0.5em 0 0;
-	}
-dd {margin:0 0 0 2em;}
-dd p {margin:0 0 0.5em;}
-ul {
-	padding:0 0 0 2.5ex;
-	list-style:square;
-	}
-ol {padding:0 0 0 4ex;}
-li {margin:0 0 0.5em;}
-.code {
-	border:1px solid #ddd;
-	padding:3px 5px 3px 35px;
-	font-family:Courier;
-	list-style-type:decimal-leading-zero;
-	}
-.code code {font-family:Courier;}
-.code li {
-	padding:0 5px;
-	margin:2px 0;
-	background:#f7f7f5;
-	}
-.code li.tab1 {padding-left:5ex;}
-.code li.tab2 {padding-left:10ex;}
-.code li.tab3 {padding-left:15ex;}
-.code .changed {
-	font-weight:bold;
-	color:#600;
-	}
-.code em {
-	font-style:normal;
-	font-weight:bold;
-	color:#600;
-	}
-#sidebar ul, #sidebar ul ol {
-	margin: 0;
-	padding: 0;
-	}
-
-#sidebar ul li {
-	list-style-type: none;
-	list-style-image: none;
-	margin-bottom: 15px;
-	}
-
-#sidebar ul p, #sidebar ul select {
-	margin: 5px 0 8px;
-	}
-
-#sidebar ul ul, #sidebar ul ol {
-	margin: 5px 0 0 10px;
-	}
-
-#sidebar ul ul ul, #sidebar ul ol {
-	margin: 0 0 0 10px;
-	}
-
-ol li, #sidebar ul ol li {
-	list-style: decimal outside;
-	}
-
-#sidebar ul ul li, #sidebar ul ol li {
-	margin: 3px 0em 0em 0.5em;
-	padding: 0.1em 0;
-	list-style:square;
-	font-size:10pt;
-	letter-spacing:1px;
-	line-height:1.5;
-	}
-
-#sidebar p{
-font-size:10pt;
-	letter-spacing:1px;
-	line-height:1.5;
-}
-#searchdiv
-{
-	background-color: #f9f9f9;
-	border: 1px solid #CCCCCC;
-	padding: 5px;
-	font-weight:bold;
-}
-
-#sidebar form {
-	margin: 0px;
-	padding: 0px;
-}
-label {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	font-weight: bold;
-	color: #000000;
-}
-
-img.pic {
-	padding: 5px;
-	border: 1px solid #CCCCCC;
-	margin: 10px;
-}
-.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/fdawn/style.css (from rev 6390, templates/branches/lifetype-1.2/unported/fdawn/style.css)
===================================================================
--- templates/branches/lifetype-1.2/fdawn/style.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/fdawn/style.css	2008-04-28 21:44:00 UTC (rev 6391)
@@ -0,0 +1,505 @@
+/*
+	Theme Name: fDawn
+	Theme URI: http://www.fahlstad.se
+	Description: Liquid theme with max width, easy to customize.
+	Version: 1.0
+	Author: Fredrik Fahlstad
+	Author URI: http://www.fahlstad.se
+*/
+
+body {
+	margin: 0 auto;
+	padding: 0;
+	font: 76%/115% Verdana,Tahoma,Arial,sans-serif;
+	background: #f4f4f4 url(images/bg.gif);
+}
+
+#wrap {
+	max-width:70em;
+	color: #303030;
+	margin: 0 auto;
+	background-color: #FFFFFF;
+	border-right-width: 1px;
+	border-left-width: 1px;
+	border-right-style: solid;
+	border-left-style: solid;
+	border-right-color: #CCCCCC;
+	border-left-color: #CCCCCC;
+	position: relative;
+}
+
+#header {
+	height: 60px;
+	margin-top: 0px;
+	margin-right: 0;
+	margin-bottom: 0;
+	margin-left: 0;
+	padding-top: 0px;
+	padding-right: 0px;
+	padding-bottom: 0px;
+	padding-left: 0px;
+}
+#main {
+	padding-top: 2em;
+	background:#fff url(images/separator.gif) repeat-y 67% 0;
+	overflow: hidden;
+}
+
+#resourceMain {
+	padding: 2em;
+	background:#fff;
+	overflow: hidden;
+}
+
+
+
+#header h1{
+	margin:0;
+	font-size:2.2em;
+	float: left;
+	padding-left:2%;
+	height:30px;
+	padding-top: 30px;
+	padding-right: 0;
+	padding-bottom: 0;
+}
+#header h1 a {
+	color:#333333;
+	border:0;
+}
+
+.description {
+	float: right;
+	height: 30px;
+	padding-top: 30px;
+	padding-right: 2%;
+}
+
+#frontphoto {
+margin: 0 0 10px 0;
+border: 0;
+}
+
+#sidebar {
+	float: right;
+	font-size: 0.94em;
+	line-height:1.3em;
+	width:29%;
+	margin:0 2% 0 0;
+}
+.pagenav ul li a{
+	list-style-type:none
+	}
+
+#sidebar h2 {
+	border-bottom:solid 1px #CCCCCC;
+	margin-top:20px;
+	font-size: 1.1em;
+}
+
+#headerimage {
+	background-color: #CCCCCC;
+	height: 175px;
+	background-image: url(images/top.jpg);
+	background-repeat: no-repeat;
+	padding: 0px;
+	margin: 0px 2%;
+	background-position: right;
+}
+
+
+.announce {
+margin: 10px 0 10px 0;
+padding: 10px;
+width: 130px;
+color: #505050;
+background-color: #f4f4f4;
+line-height: 1.3em;
+}
+
+#extras {
+float: right;
+width: 100px;
+margin: 0 0 10px 0;
+padding: 0;
+font-size: 0.9em;
+line-height: 1.5em;
+}
+
+#extras p {
+margin: 0 0 1.5em 0;
+}
+
+#content {
+	border-left: 1px none #f0f0f0;
+	border-right: 1px none #f0f0f0;
+	padding: 0 10px;
+	line-height: 1.6em;
+	text-align: left;
+	float: left;
+	width: 59%;
+	margin:0 0 0 2%;
+	border-top-style: none;
+	border-bottom-style: none;
+	overflow: hidden;
+}
+h1,h2,h3,h4 {
+	font-family:Helvetica,Arial,Geneva,sans-serif;
+}
+h2 {
+	font-size: 1.8em;
+	margin: 0 0 0.5em 0;
+}
+
+
+h3 {
+	font-size: 1.6em;
+	margin: 0 0 10px 0;
+
+}
+h4 {
+	font-size:1.4em;
+	margin: 0 0 10px 0;
+}
+
+/* Links
+================================================*/
+a:link,
+a:visited {
+	color:#920D02;
+	/*font-weight:bold;*/
+	text-decoration:none;
+	padding:2px 2px 0;
+	margin:0 -2px;
+	border-bottom:1px dotted #666;
+	}
+/*a:visited {color:#333;}*/
+a:focus {
+	color:#580801;
+	}
+a:hover {
+	color:#580801;
+	border-color:#580801;
+	background-color:#f4f4f4;
+	}
+#footer {
+clear: both;
+margin: 0 auto;
+padding: 10px 0 20px 0;
+border-top: 4px solid #f0f0f0;
+width: 760px;
+text-align: center;
+color: #808080;
+font-size: 0.9em;
+}
+
+.current_page_item a {
+font-weight:bold;
+	}
+
+/************************************************
+*	Comments													*
+************************************************/
+h2#comments{
+	text-align:center;
+	border-top:1px solid #acb1ba;
+	background:#eeeeee;
+	padding:2px;
+	border-bottom:1px solid #acb1ba;
+	margin-bottom:10px;
+	margin-top:80px;
+	font-size: 110%;
+}
+
+ol#commentlist {
+	margin-top:0px;
+	padding: 5px;
+	margin-left: 0px;
+	color: #9b9b9b;
+	list-style-type: none;
+	font-size:0.9em;
+}
+
+#commentlist li  p{
+	margin-top: 8px;
+	margin-bottom: 16px;
+	line-height: 20px;
+}
+
+.commentname {
+	float: left;
+	margin: 0;
+	padding: 0  0 2px 0;
+	font-weight: bold;
+}
+
+.commentinfo{
+	width: 300px;
+	float: right;
+	text-align: right;
+}
+
+.commenttext {
+	clear: both;
+	margin-top: 0px;
+	margin-bottom: 30px;
+	border-top: 1px solid #ebebeb;
+	line-height:12px;
+	color: #5b5b5b;
+	background-color: #F8F8F8;
+	padding: 5px;
+}
+
+.commenttext-admin {
+	clear: both;
+	margin-top: 0px;
+	margin-bottom: 30px;
+	border-top: 1px solid #ebebeb;
+	line-height:12px;
+	color: #5b5b5b;
+	background-color: #CEE4F4;
+	padding: 5px;
+}
+
+#commentsformheader{
+	padding-left:18px;
+	font-size: 1.4em;
+}
+
+#commentsform{
+	margin-top:none;
+	text-align:center;
+	border:1px solid #ddd;
+	background:#ededed;
+	padding:0px 10px;
+}
+
+#commentsform form{
+	text-align:left;
+	margin:0px;
+}
+
+#commentsform p{
+	margin:5px;
+}
+
+#commentsform form textarea{
+	width:100%;
+}
+p.comments_link  img{
+	margin: 0px;
+	padding: 0px;
+	border-top-style: none;
+	border-right-style: none;
+	border-bottom-style: none;
+	border-left-style: none;
+}
+/************************************************
+*	Header																			*
+************************************************/
+h2.entrydate{
+	margin-bottom:1px;
+	font-size: 1.8em;
+	font-weight:normal;
+	text-transform:uppercase;
+}
+
+.entrymeta{
+	font-size: 10pt;
+}
+
+h3.entrytitle {
+	margin-top:0px;
+	padding-bottom:10px;
+	font-weight:bold;
+	color:#000000
+}
+h3.entrytitle a, h3.entrytitle a:visited{
+color:#333333;
+}
+
+.entry{
+	margin-top:8px;
+}
+
+.entrybody p a{
+	/*font-weight:bold;*/
+}
+blockquote {
+	border-left-width: 3px;
+	border-left-style: solid;
+	border-left-color: #CCCCCC;
+	padding-left: 10px;
+	font-style: italic;
+	color: #666666;
+}
+
+.entrybody p {
+font-size:10pt;
+	letter-spacing:1px;
+	line-height:1.5;
+	margin-top:8px;
+	margin-bottom:16px;
+	text-align: justify;
+}
+
+.entrybody li {
+font-size:10pt;
+	letter-spacing:1px;
+	line-height:1.5;
+}
+
+
+
+.entrybody img {
+	padding: 4px;
+	border: 1px solid #CCCCCC;
+}
+code {
+	background-color: #eeeeee;
+	padding: 5px;
+	border: 1px solid #CCCCCC;
+}
+
+
+/* Lists
+================================================*/
+dl,
+ol,
+ul {margin:0 0 1em;}
+dl {margin-top:-0.5em;}
+dt {
+	font-weight:bold;
+	margin:0.5em 0 0;
+	}
+dd {margin:0 0 0 2em;}
+dd p {margin:0 0 0.5em;}
+ul {
+	padding:0 0 0 2.5ex;
+	list-style:square;
+	}
+ol {padding:0 0 0 4ex;}
+li {margin:0 0 0.5em;}
+.code {
+	border:1px solid #ddd;
+	padding:3px 5px 3px 35px;
+	font-family:Courier;
+	list-style-type:decimal-leading-zero;
+	}
+.code code {font-family:Courier;}
+.code li {
+	padding:0 5px;
+	margin:2px 0;
+	background:#f7f7f5;
+	}
+.code li.tab1 {padding-left:5ex;}
+.code li.tab2 {padding-left:10ex;}
+.code li.tab3 {padding-left:15ex;}
+.code .changed {
+	font-weight:bold;
+	color:#600;
+	}
+.code em {
+	font-style:normal;
+	font-weight:bold;
+	color:#600;
+	}
+#sidebar ul, #sidebar ul ol {
+	margin: 0;
+	padding: 0;
+	}
+
+#sidebar ul li {
+	list-style-type: none;
+	list-style-image: none;
+	margin-bottom: 15px;
+	}
+
+#sidebar ul p, #sidebar ul select {
+	margin: 5px 0 8px;
+	}
+
+#sidebar ul ul, #sidebar ul ol {
+	margin: 5px 0 0 10px;
+	}
+
+#sidebar ul ul ul, #sidebar ul ol {
+	margin: 0 0 0 10px;
+	}
+
+ol li, #sidebar ul ol li {
+	list-style: decimal outside;
+	}
+
+#sidebar ul ul li, #sidebar ul ol li {
+	margin: 3px 0em 0em 0.5em;
+	padding: 0.1em 0;
+	list-style:square;
+	font-size:10pt;
+	letter-spacing:1px;
+	line-height:1.5;
+	}
+
+#sidebar p{
+font-size:10pt;
+	letter-spacing:1px;
+	line-height:1.5;
+}
+#searchdiv
+{
+	background-color: #f9f9f9;
+	border: 1px solid #CCCCCC;
+	padding: 5px;
+	font-weight:bold;
+}
+
+#sidebar form {
+	margin: 0px;
+	padding: 0px;
+}
+label {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	font-weight: bold;
+	color: #000000;
+}
+
+img.pic {
+	padding: 5px;
+	border: 1px solid #CCCCCC;
+	margin: 10px;
+}
+.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/fdawnWithPlugins (from rev 6390, templates/branches/lifetype-1.2/unported/fdawnWithPlugins)



More information about the pLog-svn mailing list