[pLog-svn] r6406 - in templates/branches/lifetype-1.2: . fgreen flower flyupsky-daytime flyupsky-evening forange forangeWithPlugins unported

jondaley at devel.lifetype.net jondaley at devel.lifetype.net
Tue Apr 29 08:19:30 EDT 2008


Author: jondaley
Date: 2008-04-29 08:19:29 -0400 (Tue, 29 Apr 2008)
New Revision: 6406

Added:
   templates/branches/lifetype-1.2/fgreen/
   templates/branches/lifetype-1.2/fgreen/album.template
   templates/branches/lifetype-1.2/fgreen/albums.template
   templates/branches/lifetype-1.2/fgreen/archives.template
   templates/branches/lifetype-1.2/fgreen/bookmark.template
   templates/branches/lifetype-1.2/fgreen/commentarticle.template
   templates/branches/lifetype-1.2/fgreen/error.template
   templates/branches/lifetype-1.2/fgreen/favicon.ico
   templates/branches/lifetype-1.2/fgreen/features.template
   templates/branches/lifetype-1.2/fgreen/footer.template
   templates/branches/lifetype-1.2/fgreen/header.template
   templates/branches/lifetype-1.2/fgreen/images/
   templates/branches/lifetype-1.2/fgreen/links.template
   templates/branches/lifetype-1.2/fgreen/main.template
   templates/branches/lifetype-1.2/fgreen/post.template
   templates/branches/lifetype-1.2/fgreen/postandcomments.template
   templates/branches/lifetype-1.2/fgreen/posttrackbacks.template
   templates/branches/lifetype-1.2/fgreen/resource.template
   templates/branches/lifetype-1.2/fgreen/screenshot.jpg
   templates/branches/lifetype-1.2/fgreen/searchresults.template
   templates/branches/lifetype-1.2/fgreen/style.css
   templates/branches/lifetype-1.2/flower/
   templates/branches/lifetype-1.2/flower/about.template
   templates/branches/lifetype-1.2/flower/album.template
   templates/branches/lifetype-1.2/flower/albums.template
   templates/branches/lifetype-1.2/flower/bg.jpg
   templates/branches/lifetype-1.2/flower/commentarticle.template
   templates/branches/lifetype-1.2/flower/download.gif
   templates/branches/lifetype-1.2/flower/error.gif
   templates/branches/lifetype-1.2/flower/error.template
   templates/branches/lifetype-1.2/flower/favicon.ico
   templates/branches/lifetype-1.2/flower/folderblue.gif
   templates/branches/lifetype-1.2/flower/footer.template
   templates/branches/lifetype-1.2/flower/header.template
   templates/branches/lifetype-1.2/flower/main.template
   templates/branches/lifetype-1.2/flower/panel.template
   templates/branches/lifetype-1.2/flower/post.template
   templates/branches/lifetype-1.2/flower/postandcomments.template
   templates/branches/lifetype-1.2/flower/posttrackbacks.template
   templates/branches/lifetype-1.2/flower/resource.template
   templates/branches/lifetype-1.2/flower/screenshot.jpg
   templates/branches/lifetype-1.2/flower/searchresults.template
   templates/branches/lifetype-1.2/flower/style.css
   templates/branches/lifetype-1.2/flyupsky-daytime/
   templates/branches/lifetype-1.2/flyupsky-daytime/album.template
   templates/branches/lifetype-1.2/flyupsky-daytime/albums.template
   templates/branches/lifetype-1.2/flyupsky-daytime/bold.gif
   templates/branches/lifetype-1.2/flyupsky-daytime/commentarticle.template
   templates/branches/lifetype-1.2/flyupsky-daytime/download.gif
   templates/branches/lifetype-1.2/flyupsky-daytime/error.gif
   templates/branches/lifetype-1.2/flyupsky-daytime/error.template
   templates/branches/lifetype-1.2/flyupsky-daytime/favicon.ico
   templates/branches/lifetype-1.2/flyupsky-daytime/folderblue.gif
   templates/branches/lifetype-1.2/flyupsky-daytime/footer.template
   templates/branches/lifetype-1.2/flyupsky-daytime/header.template
   templates/branches/lifetype-1.2/flyupsky-daytime/images/
   templates/branches/lifetype-1.2/flyupsky-daytime/italic.gif
   templates/branches/lifetype-1.2/flyupsky-daytime/link.gif
   templates/branches/lifetype-1.2/flyupsky-daytime/main.template
   templates/branches/lifetype-1.2/flyupsky-daytime/nav_bar.inc
   templates/branches/lifetype-1.2/flyupsky-daytime/panel.template
   templates/branches/lifetype-1.2/flyupsky-daytime/post.gif
   templates/branches/lifetype-1.2/flyupsky-daytime/post.template
   templates/branches/lifetype-1.2/flyupsky-daytime/postandcomments.template
   templates/branches/lifetype-1.2/flyupsky-daytime/postsummary.template
   templates/branches/lifetype-1.2/flyupsky-daytime/posttrackbacks.template
   templates/branches/lifetype-1.2/flyupsky-daytime/resource.template
   templates/branches/lifetype-1.2/flyupsky-daytime/screenshot.jpg
   templates/branches/lifetype-1.2/flyupsky-daytime/searchresults.template
   templates/branches/lifetype-1.2/flyupsky-daytime/style.css
   templates/branches/lifetype-1.2/flyupsky-evening/
   templates/branches/lifetype-1.2/flyupsky-evening/album.template
   templates/branches/lifetype-1.2/flyupsky-evening/albums.template
   templates/branches/lifetype-1.2/flyupsky-evening/bold.gif
   templates/branches/lifetype-1.2/flyupsky-evening/commentarticle.template
   templates/branches/lifetype-1.2/flyupsky-evening/download.gif
   templates/branches/lifetype-1.2/flyupsky-evening/error.template
   templates/branches/lifetype-1.2/flyupsky-evening/favicon.ico
   templates/branches/lifetype-1.2/flyupsky-evening/folderblue.gif
   templates/branches/lifetype-1.2/flyupsky-evening/footer.template
   templates/branches/lifetype-1.2/flyupsky-evening/header.template
   templates/branches/lifetype-1.2/flyupsky-evening/images/
   templates/branches/lifetype-1.2/flyupsky-evening/italic.gif
   templates/branches/lifetype-1.2/flyupsky-evening/link.gif
   templates/branches/lifetype-1.2/flyupsky-evening/main.template
   templates/branches/lifetype-1.2/flyupsky-evening/nav_bar.inc
   templates/branches/lifetype-1.2/flyupsky-evening/panel.template
   templates/branches/lifetype-1.2/flyupsky-evening/post.gif
   templates/branches/lifetype-1.2/flyupsky-evening/post.template
   templates/branches/lifetype-1.2/flyupsky-evening/postandcomments.template
   templates/branches/lifetype-1.2/flyupsky-evening/postsummary.template
   templates/branches/lifetype-1.2/flyupsky-evening/posttrackbacks.template
   templates/branches/lifetype-1.2/flyupsky-evening/resource.template
   templates/branches/lifetype-1.2/flyupsky-evening/screenshot.jpg
   templates/branches/lifetype-1.2/flyupsky-evening/searchresults.template
   templates/branches/lifetype-1.2/flyupsky-evening/style.css
   templates/branches/lifetype-1.2/forange/
   templates/branches/lifetype-1.2/forange/album.template
   templates/branches/lifetype-1.2/forange/albums.template
   templates/branches/lifetype-1.2/forange/archives.template
   templates/branches/lifetype-1.2/forange/bookmark.template
   templates/branches/lifetype-1.2/forange/commentarticle.template
   templates/branches/lifetype-1.2/forange/error.template
   templates/branches/lifetype-1.2/forange/favicon.ico
   templates/branches/lifetype-1.2/forange/features.template
   templates/branches/lifetype-1.2/forange/footer.template
   templates/branches/lifetype-1.2/forange/header.template
   templates/branches/lifetype-1.2/forange/images/
   templates/branches/lifetype-1.2/forange/links.template
   templates/branches/lifetype-1.2/forange/main.template
   templates/branches/lifetype-1.2/forange/post.template
   templates/branches/lifetype-1.2/forange/postandcomments.template
   templates/branches/lifetype-1.2/forange/posttrackbacks.template
   templates/branches/lifetype-1.2/forange/resource.template
   templates/branches/lifetype-1.2/forange/samplerss.template
   templates/branches/lifetype-1.2/forange/screenshot.jpg
   templates/branches/lifetype-1.2/forange/searchresults.template
   templates/branches/lifetype-1.2/forange/style.css
   templates/branches/lifetype-1.2/forangeWithPlugins/
   templates/branches/lifetype-1.2/forangeWithPlugins/album.template
   templates/branches/lifetype-1.2/forangeWithPlugins/albums.template
   templates/branches/lifetype-1.2/forangeWithPlugins/archives.template
   templates/branches/lifetype-1.2/forangeWithPlugins/bookmark.template
   templates/branches/lifetype-1.2/forangeWithPlugins/commentarticle.template
   templates/branches/lifetype-1.2/forangeWithPlugins/error.template
   templates/branches/lifetype-1.2/forangeWithPlugins/favicon.ico
   templates/branches/lifetype-1.2/forangeWithPlugins/features.template
   templates/branches/lifetype-1.2/forangeWithPlugins/footer.template
   templates/branches/lifetype-1.2/forangeWithPlugins/header.template
   templates/branches/lifetype-1.2/forangeWithPlugins/images/
   templates/branches/lifetype-1.2/forangeWithPlugins/links.template
   templates/branches/lifetype-1.2/forangeWithPlugins/main.template
   templates/branches/lifetype-1.2/forangeWithPlugins/post.template
   templates/branches/lifetype-1.2/forangeWithPlugins/postandcomments.template
   templates/branches/lifetype-1.2/forangeWithPlugins/posttrackbacks.template
   templates/branches/lifetype-1.2/forangeWithPlugins/resource.template
   templates/branches/lifetype-1.2/forangeWithPlugins/samplerss.template
   templates/branches/lifetype-1.2/forangeWithPlugins/screenshot.jpg
   templates/branches/lifetype-1.2/forangeWithPlugins/searchresults.template
   templates/branches/lifetype-1.2/forangeWithPlugins/style.css
   templates/branches/lifetype-1.2/fsimple/
   templates/branches/lifetype-1.2/fsubtle/
   templates/branches/lifetype-1.2/grey/
   templates/branches/lifetype-1.2/gutenberg/
   templates/branches/lifetype-1.2/human_condition/
   templates/branches/lifetype-1.2/lemons/
   templates/branches/lifetype-1.2/mars-spirit/
   templates/branches/lifetype-1.2/minitemplate/
Removed:
   templates/branches/lifetype-1.2/fgreen/album.template
   templates/branches/lifetype-1.2/fgreen/albums.template
   templates/branches/lifetype-1.2/fgreen/archives.template
   templates/branches/lifetype-1.2/fgreen/bookmark.template
   templates/branches/lifetype-1.2/fgreen/commentarticle.template
   templates/branches/lifetype-1.2/fgreen/error.template
   templates/branches/lifetype-1.2/fgreen/favicon.ico
   templates/branches/lifetype-1.2/fgreen/features.template
   templates/branches/lifetype-1.2/fgreen/footer.template
   templates/branches/lifetype-1.2/fgreen/header.template
   templates/branches/lifetype-1.2/fgreen/images/
   templates/branches/lifetype-1.2/fgreen/links.template
   templates/branches/lifetype-1.2/fgreen/main.template
   templates/branches/lifetype-1.2/fgreen/post.template
   templates/branches/lifetype-1.2/fgreen/postandcomments.template
   templates/branches/lifetype-1.2/fgreen/posttrackbacks.template
   templates/branches/lifetype-1.2/fgreen/resource.template
   templates/branches/lifetype-1.2/fgreen/screenshot.jpg
   templates/branches/lifetype-1.2/fgreen/searchresults.template
   templates/branches/lifetype-1.2/fgreen/style.css
   templates/branches/lifetype-1.2/flower/about.template
   templates/branches/lifetype-1.2/flower/album.template
   templates/branches/lifetype-1.2/flower/albums.template
   templates/branches/lifetype-1.2/flower/bg.jpg
   templates/branches/lifetype-1.2/flower/commentarticle.template
   templates/branches/lifetype-1.2/flower/download.gif
   templates/branches/lifetype-1.2/flower/error.gif
   templates/branches/lifetype-1.2/flower/error.template
   templates/branches/lifetype-1.2/flower/favicon.ico
   templates/branches/lifetype-1.2/flower/folderblue.gif
   templates/branches/lifetype-1.2/flower/footer.template
   templates/branches/lifetype-1.2/flower/header.template
   templates/branches/lifetype-1.2/flower/main.template
   templates/branches/lifetype-1.2/flower/panel.template
   templates/branches/lifetype-1.2/flower/post.template
   templates/branches/lifetype-1.2/flower/postandcomments.template
   templates/branches/lifetype-1.2/flower/posttrackbacks.template
   templates/branches/lifetype-1.2/flower/resource.template
   templates/branches/lifetype-1.2/flower/screenshot.jpg
   templates/branches/lifetype-1.2/flower/searchresults.template
   templates/branches/lifetype-1.2/flower/style.css
   templates/branches/lifetype-1.2/flyupsky-daytime/album.template
   templates/branches/lifetype-1.2/flyupsky-daytime/albums.template
   templates/branches/lifetype-1.2/flyupsky-daytime/bold.gif
   templates/branches/lifetype-1.2/flyupsky-daytime/commentarticle.template
   templates/branches/lifetype-1.2/flyupsky-daytime/download.gif
   templates/branches/lifetype-1.2/flyupsky-daytime/error.gif
   templates/branches/lifetype-1.2/flyupsky-daytime/error.template
   templates/branches/lifetype-1.2/flyupsky-daytime/favicon.ico
   templates/branches/lifetype-1.2/flyupsky-daytime/folderblue.gif
   templates/branches/lifetype-1.2/flyupsky-daytime/footer.template
   templates/branches/lifetype-1.2/flyupsky-daytime/header.template
   templates/branches/lifetype-1.2/flyupsky-daytime/images/
   templates/branches/lifetype-1.2/flyupsky-daytime/italic.gif
   templates/branches/lifetype-1.2/flyupsky-daytime/link.gif
   templates/branches/lifetype-1.2/flyupsky-daytime/main.template
   templates/branches/lifetype-1.2/flyupsky-daytime/nav_bar.inc
   templates/branches/lifetype-1.2/flyupsky-daytime/panel.template
   templates/branches/lifetype-1.2/flyupsky-daytime/post.gif
   templates/branches/lifetype-1.2/flyupsky-daytime/post.template
   templates/branches/lifetype-1.2/flyupsky-daytime/postandcomments.template
   templates/branches/lifetype-1.2/flyupsky-daytime/postsummary.template
   templates/branches/lifetype-1.2/flyupsky-daytime/posttrackbacks.template
   templates/branches/lifetype-1.2/flyupsky-daytime/resource.template
   templates/branches/lifetype-1.2/flyupsky-daytime/screenshot.jpg
   templates/branches/lifetype-1.2/flyupsky-daytime/searchresults.template
   templates/branches/lifetype-1.2/flyupsky-daytime/style.css
   templates/branches/lifetype-1.2/flyupsky-evening/album.template
   templates/branches/lifetype-1.2/flyupsky-evening/albums.template
   templates/branches/lifetype-1.2/flyupsky-evening/bold.gif
   templates/branches/lifetype-1.2/flyupsky-evening/commentarticle.template
   templates/branches/lifetype-1.2/flyupsky-evening/download.gif
   templates/branches/lifetype-1.2/flyupsky-evening/error.template
   templates/branches/lifetype-1.2/flyupsky-evening/favicon.ico
   templates/branches/lifetype-1.2/flyupsky-evening/folderblue.gif
   templates/branches/lifetype-1.2/flyupsky-evening/footer.template
   templates/branches/lifetype-1.2/flyupsky-evening/header.template
   templates/branches/lifetype-1.2/flyupsky-evening/images/
   templates/branches/lifetype-1.2/flyupsky-evening/italic.gif
   templates/branches/lifetype-1.2/flyupsky-evening/link.gif
   templates/branches/lifetype-1.2/flyupsky-evening/main.template
   templates/branches/lifetype-1.2/flyupsky-evening/nav_bar.inc
   templates/branches/lifetype-1.2/flyupsky-evening/panel.template
   templates/branches/lifetype-1.2/flyupsky-evening/post.gif
   templates/branches/lifetype-1.2/flyupsky-evening/post.template
   templates/branches/lifetype-1.2/flyupsky-evening/postandcomments.template
   templates/branches/lifetype-1.2/flyupsky-evening/postsummary.template
   templates/branches/lifetype-1.2/flyupsky-evening/posttrackbacks.template
   templates/branches/lifetype-1.2/flyupsky-evening/resource.template
   templates/branches/lifetype-1.2/flyupsky-evening/screenshot.jpg
   templates/branches/lifetype-1.2/flyupsky-evening/searchresults.template
   templates/branches/lifetype-1.2/flyupsky-evening/style.css
   templates/branches/lifetype-1.2/forange/album.template
   templates/branches/lifetype-1.2/forange/albums.template
   templates/branches/lifetype-1.2/forange/archives.template
   templates/branches/lifetype-1.2/forange/bookmark.template
   templates/branches/lifetype-1.2/forange/commentarticle.template
   templates/branches/lifetype-1.2/forange/error.template
   templates/branches/lifetype-1.2/forange/favicon.ico
   templates/branches/lifetype-1.2/forange/features.template
   templates/branches/lifetype-1.2/forange/footer.template
   templates/branches/lifetype-1.2/forange/header.template
   templates/branches/lifetype-1.2/forange/images/
   templates/branches/lifetype-1.2/forange/links.template
   templates/branches/lifetype-1.2/forange/main.template
   templates/branches/lifetype-1.2/forange/post.template
   templates/branches/lifetype-1.2/forange/postandcomments.template
   templates/branches/lifetype-1.2/forange/posttrackbacks.template
   templates/branches/lifetype-1.2/forange/resource.template
   templates/branches/lifetype-1.2/forange/samplerss.template
   templates/branches/lifetype-1.2/forange/screenshot.jpg
   templates/branches/lifetype-1.2/forange/searchresults.template
   templates/branches/lifetype-1.2/forange/style.css
   templates/branches/lifetype-1.2/forangeWithPlugins/album.template
   templates/branches/lifetype-1.2/forangeWithPlugins/albums.template
   templates/branches/lifetype-1.2/forangeWithPlugins/archives.template
   templates/branches/lifetype-1.2/forangeWithPlugins/bookmark.template
   templates/branches/lifetype-1.2/forangeWithPlugins/commentarticle.template
   templates/branches/lifetype-1.2/forangeWithPlugins/error.template
   templates/branches/lifetype-1.2/forangeWithPlugins/favicon.ico
   templates/branches/lifetype-1.2/forangeWithPlugins/features.template
   templates/branches/lifetype-1.2/forangeWithPlugins/footer.template
   templates/branches/lifetype-1.2/forangeWithPlugins/header.template
   templates/branches/lifetype-1.2/forangeWithPlugins/images/
   templates/branches/lifetype-1.2/forangeWithPlugins/links.template
   templates/branches/lifetype-1.2/forangeWithPlugins/main.template
   templates/branches/lifetype-1.2/forangeWithPlugins/post.template
   templates/branches/lifetype-1.2/forangeWithPlugins/postandcomments.template
   templates/branches/lifetype-1.2/forangeWithPlugins/posttrackbacks.template
   templates/branches/lifetype-1.2/forangeWithPlugins/resource.template
   templates/branches/lifetype-1.2/forangeWithPlugins/samplerss.template
   templates/branches/lifetype-1.2/forangeWithPlugins/screenshot.jpg
   templates/branches/lifetype-1.2/forangeWithPlugins/searchresults.template
   templates/branches/lifetype-1.2/forangeWithPlugins/style.css
   templates/branches/lifetype-1.2/unported/fgreen/
   templates/branches/lifetype-1.2/unported/flower/
   templates/branches/lifetype-1.2/unported/flyupsky-daytime/
   templates/branches/lifetype-1.2/unported/flyupsky-evening/
   templates/branches/lifetype-1.2/unported/forange/
   templates/branches/lifetype-1.2/unported/forangeWithPlugins/
   templates/branches/lifetype-1.2/unported/fsimple/
   templates/branches/lifetype-1.2/unported/fsubtle/
   templates/branches/lifetype-1.2/unported/grey/
   templates/branches/lifetype-1.2/unported/gutenberg/
   templates/branches/lifetype-1.2/unported/human_condition/
   templates/branches/lifetype-1.2/unported/lemons/
   templates/branches/lifetype-1.2/unported/mars-spirit/
   templates/branches/lifetype-1.2/unported/minitemplate/
Log:
ported to 1.2

Copied: templates/branches/lifetype-1.2/fgreen (from rev 6399, templates/branches/lifetype-1.2/unported/fgreen)

Deleted: templates/branches/lifetype-1.2/fgreen/album.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fgreen/album.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/fgreen/album.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/fgreen/album.template (from rev 6405, templates/branches/lifetype-1.2/unported/fgreen/album.template)
===================================================================
--- templates/branches/lifetype-1.2/fgreen/album.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fgreen/album.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/fgreen/albums.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fgreen/albums.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/fgreen/albums.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/fgreen/albums.template (from rev 6405, templates/branches/lifetype-1.2/unported/fgreen/albums.template)
===================================================================
--- templates/branches/lifetype-1.2/fgreen/albums.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fgreen/albums.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/fgreen/archives.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fgreen/archives.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/fgreen/archives.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/fgreen/archives.template (from rev 6405, templates/branches/lifetype-1.2/unported/fgreen/archives.template)
===================================================================
--- templates/branches/lifetype-1.2/fgreen/archives.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fgreen/archives.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/fgreen/bookmark.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fgreen/bookmark.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/fgreen/bookmark.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/fgreen/bookmark.template (from rev 6405, templates/branches/lifetype-1.2/unported/fgreen/bookmark.template)
===================================================================
--- templates/branches/lifetype-1.2/fgreen/bookmark.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fgreen/bookmark.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/fgreen/commentarticle.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fgreen/commentarticle.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/fgreen/commentarticle.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/fgreen/commentarticle.template (from rev 6405, templates/branches/lifetype-1.2/unported/fgreen/commentarticle.template)
===================================================================
--- templates/branches/lifetype-1.2/fgreen/commentarticle.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fgreen/commentarticle.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/fgreen/error.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fgreen/error.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/fgreen/error.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/fgreen/error.template (from rev 6405, templates/branches/lifetype-1.2/unported/fgreen/error.template)
===================================================================
--- templates/branches/lifetype-1.2/fgreen/error.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fgreen/error.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/fgreen/favicon.ico
===================================================================
(Binary files differ)

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

Deleted: templates/branches/lifetype-1.2/fgreen/features.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fgreen/features.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/fgreen/features.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/fgreen/features.template (from rev 6405, templates/branches/lifetype-1.2/unported/fgreen/features.template)
===================================================================
--- templates/branches/lifetype-1.2/fgreen/features.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fgreen/features.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/fgreen/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fgreen/footer.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/fgreen/footer.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,9 +0,0 @@
-	<!-- begin footer -->
-	<DIV id=footer>
-		<P>Using the fGreen 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/fgreen/footer.template (from rev 6405, templates/branches/lifetype-1.2/unported/fgreen/footer.template)
===================================================================
--- templates/branches/lifetype-1.2/fgreen/footer.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fgreen/footer.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,9 @@
+	<!-- begin footer -->
+	<DIV id=footer>
+		<P>Using the fGreen 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/fgreen/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fgreen/header.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/fgreen/header.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,29 +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")}" />
-
- <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">
-<div id="header">
-  <h1 id="blogname"><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1>
-    <div class="description">{$blog->getAbout()}</div>
-  </div>
-<div id="main">
-<div id="content">
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/fgreen/header.template (from rev 6405, templates/branches/lifetype-1.2/unported/fgreen/header.template)
===================================================================
--- templates/branches/lifetype-1.2/fgreen/header.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fgreen/header.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,29 @@
+<!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")}" />
+
+ <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">
+<div id="header">
+  <h1 id="blogname"><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1>
+    <div class="description">{$blog->getAbout()}</div>
+  </div>
+<div id="main">
+<div id="content">
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/fgreen/images (from rev 6405, templates/branches/lifetype-1.2/unported/fgreen/images)

Deleted: templates/branches/lifetype-1.2/fgreen/links.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fgreen/links.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/fgreen/links.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,76 +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="16" />
-<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/fgreen/links.template (from rev 6405, templates/branches/lifetype-1.2/unported/fgreen/links.template)
===================================================================
--- templates/branches/lifetype-1.2/fgreen/links.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fgreen/links.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,76 @@
+</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="16" />
+<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/fgreen/main.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fgreen/main.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/fgreen/main.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,21 +0,0 @@
-{include file="$blogtemplate/header.template"}
-	<!-- Loop Start -->
-	{if $showAll}
-	<div class=entry>
-		{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}
-	</div>
-	{else}
-		{foreach from=$posts item=post name=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/fgreen/main.template (from rev 6405, templates/branches/lifetype-1.2/unported/fgreen/main.template)
===================================================================
--- templates/branches/lifetype-1.2/fgreen/main.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fgreen/main.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,21 @@
+{include file="$blogtemplate/header.template"}
+	<!-- Loop Start -->
+	{if $showAll}
+	<div class=entry>
+		{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}
+	</div>
+	{else}
+		{foreach from=$posts item=post name=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/fgreen/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fgreen/post.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/fgreen/post.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,22 +0,0 @@
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-
-	{if $smarty.foreach.post.first}
-		<div class="entry firstpost">
-	{else}
-		<div class="entry">
-	{/if}
-		<h2 class="entrydate">{$locale->formatDate($postDate,"%m/%d,%Y")}</h2> 
-		<H3 class=entrytitle><A href="{$url->postPermalink($post)}">{$post->getTopic()}</A></H3>   
-		<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 class="entrybody"> 
-			<P>{$post->getText()}</P>
-			<P class=comments_link><A href="{$url->postPermalink($post)}#comments">Comments ({$post->getNumComments()})</A> </P>
-		</div>
-	</div>

Copied: templates/branches/lifetype-1.2/fgreen/post.template (from rev 6405, templates/branches/lifetype-1.2/unported/fgreen/post.template)
===================================================================
--- templates/branches/lifetype-1.2/fgreen/post.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fgreen/post.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,22 @@
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+
+	{if $smarty.foreach.post.first}
+		<div class="entry firstpost">
+	{else}
+		<div class="entry">
+	{/if}
+		<h2 class="entrydate">{$locale->formatDate($postDate,"%m/%d,%Y")}</h2> 
+		<H3 class=entrytitle><A href="{$url->postPermalink($post)}">{$post->getTopic()}</A></H3>   
+		<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 class="entrybody"> 
+			<P>{$post->getText()}</P>
+			<P class=comments_link><A href="{$url->postPermalink($post)}#comments">Comments ({$post->getNumComments()})</A> </P>
+		</div>
+	</div>

Deleted: templates/branches/lifetype-1.2/fgreen/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fgreen/postandcomments.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/fgreen/postandcomments.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,86 +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()}
-		<h2 class="entrydate">{$locale->formatDate($postDate,"%m/%d,%Y")}</h2>
-		<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 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>
-    </DIV>
-	<div id="commentblock">
-	
-		<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>
-
-        {pager style="links"}    
-	<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}
-	</div>
-
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/fgreen/postandcomments.template (from rev 6405, templates/branches/lifetype-1.2/unported/fgreen/postandcomments.template)
===================================================================
--- templates/branches/lifetype-1.2/fgreen/postandcomments.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fgreen/postandcomments.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,86 @@
+{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()}
+		<h2 class="entrydate">{$locale->formatDate($postDate,"%m/%d,%Y")}</h2>
+		<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 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>
+    </DIV>
+	<div id="commentblock">
+	
+		<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>
+
+        {pager style="links"}    
+	<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}
+	</div>
+
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/fgreen/posttrackbacks.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fgreen/posttrackbacks.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/fgreen/posttrackbacks.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/fgreen/posttrackbacks.template (from rev 6405, templates/branches/lifetype-1.2/unported/fgreen/posttrackbacks.template)
===================================================================
--- templates/branches/lifetype-1.2/fgreen/posttrackbacks.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fgreen/posttrackbacks.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/fgreen/resource.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fgreen/resource.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/fgreen/resource.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,67 +0,0 @@
-{include file="$blogtemplate/header.template"}
-
-<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>
-
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/fgreen/resource.template (from rev 6405, templates/branches/lifetype-1.2/unported/fgreen/resource.template)
===================================================================
--- templates/branches/lifetype-1.2/fgreen/resource.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fgreen/resource.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,67 @@
+{include file="$blogtemplate/header.template"}
+
+<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>
+
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

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

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

Deleted: templates/branches/lifetype-1.2/fgreen/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/fgreen/searchresults.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/fgreen/searchresults.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/fgreen/searchresults.template (from rev 6405, templates/branches/lifetype-1.2/unported/fgreen/searchresults.template)
===================================================================
--- templates/branches/lifetype-1.2/fgreen/searchresults.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/fgreen/searchresults.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/fgreen/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/fgreen/style.css	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/fgreen/style.css	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,400 +0,0 @@
-/*
-	Theme Name: fGreen
-	Theme URI: http://www.fahlstad.se
-	Description: A green WordPress theme.
-	Version: 1.0
-	Author: Fredrik Fahlstad
-	Author URI: http://www.fahlstad.se
-*/
-body {
-	background-color: #2A3883;
-	margin: 0px;
-	padding: 0px;
-	color: #142e63;
-	font: small/170% "Lucida Grande", verdana, helvetica, sans-serif;
-	background-image: url(images/bodybg.jpg);
-	background-repeat: repeat-y;
-	background-position: center;
-
-}
-* {
-	margin: 0px;
-	padding: 0px;
-}
-h1, h2, h3, h4, h5, h6 {
-  font-family: "Georgia", "Times New Roman", Times, serif;
-  font-weight: normal;
-}
-
-h1#blogname{
-	height:54px;
-	padding-top:20px;
-	padding-left:20px;
-	font-size:2.2em;
-
-}
-h1#blogname a {
-	color:#FFFFFF;
-}
-h2 {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-h3 {
-	font-size: 1.3em;
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-h3.entrytitle  {
-	color:#000;
-	border:0;
-	font-size:170%;
-}
-h3.entrytitle a{
-	color:#333;
-	border:0;
-}
-.firstpost h3{
-	font-size:200%;
-		color:#4b5ba2;
-
-}
-.arc h2 {
-	font-size:200%;
-	margin:0;
-	padding:0;
-}
-.arc {
-	background-color:#ABC7ED;
-	background-image: url(images/stripes.gif);
-	background-repeat: no-repeat;
-	background-position: right bottom;
-	padding:20px;
-}
-#sidebar {
-	float: right;
-	width: 240px;
-	padding: 20px;
-	color:#7ea317
-}
-
-#wrap {
-	width: 850px;
-	margin-right: auto;
-	margin-left: auto;
-	background-image: url(images/wrap.gif);
-	background-repeat: repeat-y;
-	padding-right: 5px;
-	padding-left: 5px;
-	background-position: center;
-}
-#header {
-	background-image: url(images/top_gr.jpg);
-	background-repeat: no-repeat;
-	height: 100px;
-}
-.entry {
-	padding: 20px;
-}
-.firstpost {
-	background-color:#ABC7ED;
-	background-image: url(images/stripes.gif);
-	background-repeat: no-repeat;
-	background-position: right bottom;
-}
-.firstpost a{
-	text-decoration: none;
-	color:#FFFFFF
-}
-p{
-	padding:20px;
-}
-.entrybody p{
-	margin: 0; 
-	padding: 1em 0 0; 
-	line-height: 140%;
-}
-
-#content {
-	float: left;
-	margin-top: 0;
-	width: 570px;
-	padding-bottom:50px;
-}
-#footer {
-	color: #66CCFF;
-	background-color: #000000;
-	text-align: center;
-	height:50px;
-	clear: both;
-}
-a  {
-	color:#324A9C/*#9BBDE9*/;
-	text-decoration: none;
-}
-a:hover {
-	text-decoration:underline;
-}
-
-#sidebar ul{
-	list-style-type: none;
-	line-height: 1.1em;
-	margin-top: 0px;
-	margin-right: 0px;
-	margin-bottom: 0px;
-	margin-left: 5px;
-}
-#sidebar ul li{
-	padding: 5px 0px 5px 0px; 
-	margin: 0px; 
-}
-#sidebar ul a:link{
-	text-decoration: none;
-	color:#61782c;
-	border:0;
-}
-#sidebar ul a:visited{
-	text-decoration: none;
-		color:#61782c;
-
-}
-#sidebar ul a:hover{
-	text-decoration: underline; 
-}
-#sidebar ul li li{
-	background-image: url(images/bull.gif);
-	background-repeat: no-repeat;
-	background-position: 0px 10px;
-	padding-left: 12px;
-} 
-#sidebar p{
-	font-size:0.9em;
-	padding:0;
-	margin:0;
-	color:#666;
-}
-#sidebar h2{
-	font-size: 1em;
-	text-transform: uppercase;
-	color: #FFFFFF;
-	background-image: url(images/sid_hbg.jpg);
-	background-repeat: no-repeat;
-	display: block;
-	height: 20px;
-	font-weight: bold;
-	font-family: Arial, Helvetica, sans-serif;
-	padding-left: 10px;
-	padding-top: 3px;
-	margin: 0;
-}
-h2.entrydate {
-	font-size: 1.1em;
-	margin-bottom: 10px;
-	margin-top:0;
-}
-.comments_link img {
-	border:0;
-}
-.description {
-	font-size: 0.9em;
-	color: #CAE972;
-	text-align: right;
-	height:24px;
-	padding-right:10px;
-	font-weight:bold;
-}
-/************************************************
-*	Comments													*
-************************************************/
-h2#comments{
-	padding:2px;
-	margin-bottom:10px;
-	margin-top:30px;
-	font-size: 110%;
-}
-#commentblock {
-	padding: 20px;
-}
-
-ol#commentlist {
-	margin-top:0px;
-	padding: 5px;
-	margin-left: 20px;
-	color: #9b9b9b;
-	font-size:0.9em;
-}
-
-#commentlist li  p{
-	margin-bottom: 8px;
-	line-height: 20px;
-	padding:0;
-}
-
-.commentname {
-	margin: 0;
-	padding: 0  0 2px 0;
-	font-weight: bold;
-}
-
-.commentinfo{
-}
-
-.commenttext {
-	clear: both;
-	margin-top: 0px;
-	margin-bottom: 30px;
-	border-top: 1px solid #98A7D6;
-	line-height:12px;
-	color: #5b5b5b;
-	background-color: #e5eaf0;
-	padding: 5px;
-}
-
-.commenttext-admin {
-	clear: both;
-	margin-top: 0px;
-	margin-bottom: 30px;
-	border-top: 1px solid #98A7D6;
-	line-height:12px;
-	color: #5b5b5b;
-	background-color: #E1EBF8;
-	padding: 5px;
-}
-
-#commentsformheader{
-	padding-left:18px;
-	font-size: 1.4em;
-}
-
-#commentsform{
-	margin-top:0;
-	text-align:center;
-	padding:0px 10px;
-}
-
-#commentsform form{
-	text-align:left;
-	margin:0px;
-}
-
-#commentsform p{
-	margin:5px;
-}
-
-#commentsform form textarea{
-	width:99%;
-}
-p.comments_link  img{
-	margin: 0px;
-	padding: 0px;
-	border-top-style: none;
-	border-right-style: none;
-	border-bottom-style: none;
-	border-left-style: none;
-}
-#searchdiv {
-	padding-bottom: 10px;
-}
-#sidebar p {
-	margin-top: 7px;
-	margin-bottom: 7px;
-}
-.nocomments{
-	padding:20px;
-}
-.entrybody ul {
-	margin: 10px 0px 10px 30px;
-}
-.entrybody ol{
-	margin: 10px 0px 10px 30px;
-}
-.entrybody img{
-	padding:5px;
-	margin:5px;
-	border: #ccc solid 1px;
-}
-.firstpost img{
-	padding:5px;
-	margin:5px;
-	border: #616CA4 solid 1px;
-}
-
-blockqoute {
-	margin:10px;
-}
-blockquote{
-	background-image: url(images/qoute.gif);
-	background-repeat: no-repeat;
-	background-position: 0px 0px;
-	font-style: italic;
-	padding-top: 1px;
-	padding-right: 0;
-	padding-bottom: 1px;
-	padding-left: 20px;
-	margin-top: 20px;
-	margin-bottom: 0;
-	margin-left: 20px;
-}
-
-blockquote p { margin: .7em 0; }
-#commentsform form p
-{
-	margin: 0px;
-	padding: 0px;
-}
-
-/* AdSense
-================================================*/
-.adwrap{
-	background:#fff;
-	margin-right: 0;
-	margin-left: 0;
-	padding-top: 20px;
-	padding-right: 20px;
-	padding-bottom: 0px;
-	padding-left: 20px;
-}
-
-
-.adwrapwide iframe,
-.adwrapwide object {
-	width:468px;
-	height:65px;
-}
-
-.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/fgreen/style.css (from rev 6405, templates/branches/lifetype-1.2/unported/fgreen/style.css)
===================================================================
--- templates/branches/lifetype-1.2/fgreen/style.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/fgreen/style.css	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,400 @@
+/*
+	Theme Name: fGreen
+	Theme URI: http://www.fahlstad.se
+	Description: A green WordPress theme.
+	Version: 1.0
+	Author: Fredrik Fahlstad
+	Author URI: http://www.fahlstad.se
+*/
+body {
+	background-color: #2A3883;
+	margin: 0px;
+	padding: 0px;
+	color: #142e63;
+	font: small/170% "Lucida Grande", verdana, helvetica, sans-serif;
+	background-image: url(images/bodybg.jpg);
+	background-repeat: repeat-y;
+	background-position: center;
+
+}
+* {
+	margin: 0px;
+	padding: 0px;
+}
+h1, h2, h3, h4, h5, h6 {
+  font-family: "Georgia", "Times New Roman", Times, serif;
+  font-weight: normal;
+}
+
+h1#blogname{
+	height:54px;
+	padding-top:20px;
+	padding-left:20px;
+	font-size:2.2em;
+
+}
+h1#blogname a {
+	color:#FFFFFF;
+}
+h2 {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+h3 {
+	font-size: 1.3em;
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+h3.entrytitle  {
+	color:#000;
+	border:0;
+	font-size:170%;
+}
+h3.entrytitle a{
+	color:#333;
+	border:0;
+}
+.firstpost h3{
+	font-size:200%;
+		color:#4b5ba2;
+
+}
+.arc h2 {
+	font-size:200%;
+	margin:0;
+	padding:0;
+}
+.arc {
+	background-color:#ABC7ED;
+	background-image: url(images/stripes.gif);
+	background-repeat: no-repeat;
+	background-position: right bottom;
+	padding:20px;
+}
+#sidebar {
+	float: right;
+	width: 240px;
+	padding: 20px;
+	color:#7ea317
+}
+
+#wrap {
+	width: 850px;
+	margin-right: auto;
+	margin-left: auto;
+	background-image: url(images/wrap.gif);
+	background-repeat: repeat-y;
+	padding-right: 5px;
+	padding-left: 5px;
+	background-position: center;
+}
+#header {
+	background-image: url(images/top_gr.jpg);
+	background-repeat: no-repeat;
+	height: 100px;
+}
+.entry {
+	padding: 20px;
+}
+.firstpost {
+	background-color:#ABC7ED;
+	background-image: url(images/stripes.gif);
+	background-repeat: no-repeat;
+	background-position: right bottom;
+}
+.firstpost a{
+	text-decoration: none;
+	color:#FFFFFF
+}
+p{
+	padding:20px;
+}
+.entrybody p{
+	margin: 0; 
+	padding: 1em 0 0; 
+	line-height: 140%;
+}
+
+#content {
+	float: left;
+	margin-top: 0;
+	width: 570px;
+	padding-bottom:50px;
+}
+#footer {
+	color: #66CCFF;
+	background-color: #000000;
+	text-align: center;
+	height:50px;
+	clear: both;
+}
+a  {
+	color:#324A9C/*#9BBDE9*/;
+	text-decoration: none;
+}
+a:hover {
+	text-decoration:underline;
+}
+
+#sidebar ul{
+	list-style-type: none;
+	line-height: 1.1em;
+	margin-top: 0px;
+	margin-right: 0px;
+	margin-bottom: 0px;
+	margin-left: 5px;
+}
+#sidebar ul li{
+	padding: 5px 0px 5px 0px; 
+	margin: 0px; 
+}
+#sidebar ul a:link{
+	text-decoration: none;
+	color:#61782c;
+	border:0;
+}
+#sidebar ul a:visited{
+	text-decoration: none;
+		color:#61782c;
+
+}
+#sidebar ul a:hover{
+	text-decoration: underline; 
+}
+#sidebar ul li li{
+	background-image: url(images/bull.gif);
+	background-repeat: no-repeat;
+	background-position: 0px 10px;
+	padding-left: 12px;
+} 
+#sidebar p{
+	font-size:0.9em;
+	padding:0;
+	margin:0;
+	color:#666;
+}
+#sidebar h2{
+	font-size: 1em;
+	text-transform: uppercase;
+	color: #FFFFFF;
+	background-image: url(images/sid_hbg.jpg);
+	background-repeat: no-repeat;
+	display: block;
+	height: 20px;
+	font-weight: bold;
+	font-family: Arial, Helvetica, sans-serif;
+	padding-left: 10px;
+	padding-top: 3px;
+	margin: 0;
+}
+h2.entrydate {
+	font-size: 1.1em;
+	margin-bottom: 10px;
+	margin-top:0;
+}
+.comments_link img {
+	border:0;
+}
+.description {
+	font-size: 0.9em;
+	color: #CAE972;
+	text-align: right;
+	height:24px;
+	padding-right:10px;
+	font-weight:bold;
+}
+/************************************************
+*	Comments													*
+************************************************/
+h2#comments{
+	padding:2px;
+	margin-bottom:10px;
+	margin-top:30px;
+	font-size: 110%;
+}
+#commentblock {
+	padding: 20px;
+}
+
+ol#commentlist {
+	margin-top:0px;
+	padding: 5px;
+	margin-left: 20px;
+	color: #9b9b9b;
+	font-size:0.9em;
+}
+
+#commentlist li  p{
+	margin-bottom: 8px;
+	line-height: 20px;
+	padding:0;
+}
+
+.commentname {
+	margin: 0;
+	padding: 0  0 2px 0;
+	font-weight: bold;
+}
+
+.commentinfo{
+}
+
+.commenttext {
+	clear: both;
+	margin-top: 0px;
+	margin-bottom: 30px;
+	border-top: 1px solid #98A7D6;
+	line-height:12px;
+	color: #5b5b5b;
+	background-color: #e5eaf0;
+	padding: 5px;
+}
+
+.commenttext-admin {
+	clear: both;
+	margin-top: 0px;
+	margin-bottom: 30px;
+	border-top: 1px solid #98A7D6;
+	line-height:12px;
+	color: #5b5b5b;
+	background-color: #E1EBF8;
+	padding: 5px;
+}
+
+#commentsformheader{
+	padding-left:18px;
+	font-size: 1.4em;
+}
+
+#commentsform{
+	margin-top:0;
+	text-align:center;
+	padding:0px 10px;
+}
+
+#commentsform form{
+	text-align:left;
+	margin:0px;
+}
+
+#commentsform p{
+	margin:5px;
+}
+
+#commentsform form textarea{
+	width:99%;
+}
+p.comments_link  img{
+	margin: 0px;
+	padding: 0px;
+	border-top-style: none;
+	border-right-style: none;
+	border-bottom-style: none;
+	border-left-style: none;
+}
+#searchdiv {
+	padding-bottom: 10px;
+}
+#sidebar p {
+	margin-top: 7px;
+	margin-bottom: 7px;
+}
+.nocomments{
+	padding:20px;
+}
+.entrybody ul {
+	margin: 10px 0px 10px 30px;
+}
+.entrybody ol{
+	margin: 10px 0px 10px 30px;
+}
+.entrybody img{
+	padding:5px;
+	margin:5px;
+	border: #ccc solid 1px;
+}
+.firstpost img{
+	padding:5px;
+	margin:5px;
+	border: #616CA4 solid 1px;
+}
+
+blockqoute {
+	margin:10px;
+}
+blockquote{
+	background-image: url(images/qoute.gif);
+	background-repeat: no-repeat;
+	background-position: 0px 0px;
+	font-style: italic;
+	padding-top: 1px;
+	padding-right: 0;
+	padding-bottom: 1px;
+	padding-left: 20px;
+	margin-top: 20px;
+	margin-bottom: 0;
+	margin-left: 20px;
+}
+
+blockquote p { margin: .7em 0; }
+#commentsform form p
+{
+	margin: 0px;
+	padding: 0px;
+}
+
+/* AdSense
+================================================*/
+.adwrap{
+	background:#fff;
+	margin-right: 0;
+	margin-left: 0;
+	padding-top: 20px;
+	padding-right: 20px;
+	padding-bottom: 0px;
+	padding-left: 20px;
+}
+
+
+.adwrapwide iframe,
+.adwrapwide object {
+	width:468px;
+	height:65px;
+}
+
+.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/flower (from rev 6399, templates/branches/lifetype-1.2/unported/flower)

Deleted: templates/branches/lifetype-1.2/flower/about.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flower/about.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flower/about.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,13 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="content">
- <div class="blog">
-  <div class="blogbody">
-  <h2 class="title">{$locale->tr("about")}</h2>
-  <div class="posted"><a href="{$url->templatePage("about")}">{$locale->tr("permalink")}</a></div>
- You can change the contents of this page by editing the templates/about.template file.
-  </div>
-  <br />
- </div>
-</div>
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flower/about.template (from rev 6405, templates/branches/lifetype-1.2/unported/flower/about.template)
===================================================================
--- templates/branches/lifetype-1.2/flower/about.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flower/about.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,13 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+ <div class="blog">
+  <div class="blogbody">
+  <h2 class="title">{$locale->tr("about")}</h2>
+  <div class="posted"><a href="{$url->templatePage("about")}">{$locale->tr("permalink")}</a></div>
+ You can change the contents of this page by editing the templates/about.template file.
+  </div>
+  <br />
+ </div>
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/flower/album.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flower/album.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flower/album.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,101 +0,0 @@
-{include file="$blogtemplate/header.template"}
-
-<div id="content">
-{assign var="postDate" value=$album->getTimestamp()}
-  <h2>{$locale->tr("album")}</h2>
-
-  <div class="post">
-    <h3 class="storytitle"><a href="{$url->albumLink($album)}">{$album->getName()}</a></h3>
-    <div class="meta">
-        {$locale->tr("created")} {$locale->formatDate($postDate,"%d %b, %Y")}
-    </div>    
-    <div class="storycontent"><p>{$album->getDescription()}</p></div>
- 
-{** 
-    smarty template gets a bit complicated here since we want to show the contents of the album in a nicely
-    arranged table, and that needs some very basic maths... we also need to check after every iteration
-    wether we have to close the current row or start a new one, and so on...
- **}
-    
- <!-- album contents go here -->
-<table style="border:0px;width:100%;" summary="{$locale->tr("album")}">
- <tr>
-  <td style="width:25%;" align="center" >
-   <a href="{$url->parentAlbumLink($album)}">
-    <img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
-    ..
-   </a>
-  </td>
-  {assign var="counter" value=1}
-  {assign var=children value=$album->getChildren()}
-  {foreach from=$children item=childalbum}
-  <td style="width:25%;" align="center" >
-   <a href="{$url->albumLink($childalbum)}">
-   <img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
-   {$childalbum->getName()} ({$childalbum->getNumResources()})
-  </a>
-  <br/><br/>
-  {assign var="counter" value="`$counter+1`"}
-  </td>
-  {if $counter%4}
-   </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 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%4 == 0}
-   </tr>
-   <tr>
-  {/if}
- {/foreach}
- <td></td></tr>
-</table>
-{pager style="links"}
- <!-- end of album contents -->
- 
- </div>
-</div>
-
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flower/album.template (from rev 6405, templates/branches/lifetype-1.2/unported/flower/album.template)
===================================================================
--- templates/branches/lifetype-1.2/flower/album.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flower/album.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,101 @@
+{include file="$blogtemplate/header.template"}
+
+<div id="content">
+{assign var="postDate" value=$album->getTimestamp()}
+  <h2>{$locale->tr("album")}</h2>
+
+  <div class="post">
+    <h3 class="storytitle"><a href="{$url->albumLink($album)}">{$album->getName()}</a></h3>
+    <div class="meta">
+        {$locale->tr("created")} {$locale->formatDate($postDate,"%d %b, %Y")}
+    </div>    
+    <div class="storycontent"><p>{$album->getDescription()}</p></div>
+ 
+{** 
+    smarty template gets a bit complicated here since we want to show the contents of the album in a nicely
+    arranged table, and that needs some very basic maths... we also need to check after every iteration
+    wether we have to close the current row or start a new one, and so on...
+ **}
+    
+ <!-- album contents go here -->
+<table style="border:0px;width:100%;" summary="{$locale->tr("album")}">
+ <tr>
+  <td style="width:25%;" align="center" >
+   <a href="{$url->parentAlbumLink($album)}">
+    <img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
+    ..
+   </a>
+  </td>
+  {assign var="counter" value=1}
+  {assign var=children value=$album->getChildren()}
+  {foreach from=$children item=childalbum}
+  <td style="width:25%;" align="center" >
+   <a href="{$url->albumLink($childalbum)}">
+   <img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
+   {$childalbum->getName()} ({$childalbum->getNumResources()})
+  </a>
+  <br/><br/>
+  {assign var="counter" value="`$counter+1`"}
+  </td>
+  {if $counter%4}
+   </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 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%4 == 0}
+   </tr>
+   <tr>
+  {/if}
+ {/foreach}
+ <td></td></tr>
+</table>
+{pager style="links"}
+ <!-- end of album contents -->
+ 
+ </div>
+</div>
+
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/flower/albums.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flower/albums.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flower/albums.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,26 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="content">
- <h2>{$locale->tr("albums")}</h2>
-{foreach from=$albums item=album}
- {assign var="aDate" value=$album->getTimestamp()}
- <div class="post">
-    <h3 class="storytitle"><a href="{$url->albumLink($album)}">{$album->getName()}</a></h3>
-    <div class="meta">
-        {$locale->tr("created")} {$locale->formatDate($aDate,"%d %b, %Y")}
-    </div>
-    <div class="storycontent">
-    <p>
-       {$album->getDescription()|strip_tags|truncate:255:"..."|escape}
-    </p>
-    </div>
-    <div class="feedback">
-      <a href="{$url->albumLink($album)}">  
-       <img src="{$url->getTemplateFile("folderblue.gif")}" width="10" height="11" style="border:0px;" />
-        {$locale->tr("view")} ({$album->getNumResources()})
-       </a>
-    </div>
- </div>
-{/foreach}
-</div>
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flower/albums.template (from rev 6405, templates/branches/lifetype-1.2/unported/flower/albums.template)
===================================================================
--- templates/branches/lifetype-1.2/flower/albums.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flower/albums.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,26 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+ <h2>{$locale->tr("albums")}</h2>
+{foreach from=$albums item=album}
+ {assign var="aDate" value=$album->getTimestamp()}
+ <div class="post">
+    <h3 class="storytitle"><a href="{$url->albumLink($album)}">{$album->getName()}</a></h3>
+    <div class="meta">
+        {$locale->tr("created")} {$locale->formatDate($aDate,"%d %b, %Y")}
+    </div>
+    <div class="storycontent">
+    <p>
+       {$album->getDescription()|strip_tags|truncate:255:"..."|escape}
+    </p>
+    </div>
+    <div class="feedback">
+      <a href="{$url->albumLink($album)}">  
+       <img src="{$url->getTemplateFile("folderblue.gif")}" width="10" height="11" style="border:0px;" />
+        {$locale->tr("view")} ({$album->getNumResources()})
+       </a>
+    </div>
+ </div>
+{/foreach}
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

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

Copied: templates/branches/lifetype-1.2/flower/bg.jpg (from rev 6405, templates/branches/lifetype-1.2/unported/flower/bg.jpg)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/flower/commentarticle.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flower/commentarticle.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flower/commentarticle.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,6 +0,0 @@
-{include file="$blogtemplate/header.template"}
- {if $blogsettings->getValue("comments_enabled")}
-    <h2>{$locale->tr("add_comment")}</h2>
-    {include file="$blogtemplate/commentform.template"}
- {/if}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flower/commentarticle.template (from rev 6405, templates/branches/lifetype-1.2/unported/flower/commentarticle.template)
===================================================================
--- templates/branches/lifetype-1.2/flower/commentarticle.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flower/commentarticle.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,6 @@
+{include file="$blogtemplate/header.template"}
+ {if $blogsettings->getValue("comments_enabled")}
+    <h2>{$locale->tr("add_comment")}</h2>
+    {include file="$blogtemplate/commentform.template"}
+ {/if}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/flower/download.gif
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/flower/download.gif (from rev 6405, templates/branches/lifetype-1.2/unported/flower/download.gif)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/flower/error.gif
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/flower/error.gif (from rev 6405, templates/branches/lifetype-1.2/unported/flower/error.gif)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/flower/error.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flower/error.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flower/error.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,20 +0,0 @@
-{include file="$blogtemplate/header.template"}
-
-<div id="content">
-
-    <div class="post">
-        <h3 class="storytitle">{$locale->tr("error")}</h3>
-        
-        <div class="meta">
-            {$locale->tr("generated")} {$locale->formatDate($now,"%d %b, %Y")}
-        </div>
-        
-        <div class="storycontent">
-            <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
-            {$locale->tr($message)}
-        </div>    
-    </div>
-</div>
-
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flower/error.template (from rev 6405, templates/branches/lifetype-1.2/unported/flower/error.template)
===================================================================
--- templates/branches/lifetype-1.2/flower/error.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flower/error.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,20 @@
+{include file="$blogtemplate/header.template"}
+
+<div id="content">
+
+    <div class="post">
+        <h3 class="storytitle">{$locale->tr("error")}</h3>
+        
+        <div class="meta">
+            {$locale->tr("generated")} {$locale->formatDate($now,"%d %b, %Y")}
+        </div>
+        
+        <div class="storycontent">
+            <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
+            {$locale->tr($message)}
+        </div>    
+    </div>
+</div>
+
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

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

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

Deleted: templates/branches/lifetype-1.2/flower/folderblue.gif
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/flower/folderblue.gif (from rev 6405, templates/branches/lifetype-1.2/unported/flower/folderblue.gif)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/flower/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flower/footer.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flower/footer.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,6 +0,0 @@
-    </div>
-    <p class="credit">
-        Powered by <a href="http://www.lifetype.net" target="_blank">LifeType</a>
-    </p>
-    </body>
-</html>

Copied: templates/branches/lifetype-1.2/flower/footer.template (from rev 6405, templates/branches/lifetype-1.2/unported/flower/footer.template)
===================================================================
--- templates/branches/lifetype-1.2/flower/footer.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flower/footer.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,6 @@
+    </div>
+    <p class="credit">
+        Powered by <a href="http://www.lifetype.net" target="_blank">LifeType</a>
+    </p>
+    </body>
+</html>

Deleted: templates/branches/lifetype-1.2/flower/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flower/header.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flower/header.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" 
-      lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
-<head>
-    <title>{$pageTitle|escape:"html"}</title>
-    <meta http-equiv="Content-Type" content="text/html;charset={$locale->getCharset()}" />
-    <meta name="generator" content="{$version}" />
-    <meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
-    
-    <link rel="stylesheet" title="default" type="text/css" media="screen" href="{$url->getTemplateFile("style.css")}" />
-    <link rel="alternate" type="text/xml" title="RSS 2.0" href="{$url->rssLink("rss20")}" />
-    <link rel="alternate" type="text/xml" title="RSS 1.0" href="{$url->rssLink("rss10")}" />
-    <link rel="alternate" type="text/xml" title="RSS 0.90" href="{$url->rssLink("rss090")}" />
-    <link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="{$url->rssLink("atom")}" />
- <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
-{if $badbehavior}
-   {$badbehavior->showBB2JavaScript()}
-{/if}
-</head>
-
-<body>
-<div id="rap">
-    <h1 id="header"><a href="{$url->blogLink()}" title="{$blog->getBlog()}">{$blog->getBlog()}</a></h1>
-
-

Copied: templates/branches/lifetype-1.2/flower/header.template (from rev 6405, templates/branches/lifetype-1.2/unported/flower/header.template)
===================================================================
--- templates/branches/lifetype-1.2/flower/header.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flower/header.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" 
+      lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
+<head>
+    <title>{$pageTitle|escape:"html"}</title>
+    <meta http-equiv="Content-Type" content="text/html;charset={$locale->getCharset()}" />
+    <meta name="generator" content="{$version}" />
+    <meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
+    
+    <link rel="stylesheet" title="default" type="text/css" media="screen" href="{$url->getTemplateFile("style.css")}" />
+    <link rel="alternate" type="text/xml" title="RSS 2.0" href="{$url->rssLink("rss20")}" />
+    <link rel="alternate" type="text/xml" title="RSS 1.0" href="{$url->rssLink("rss10")}" />
+    <link rel="alternate" type="text/xml" title="RSS 0.90" href="{$url->rssLink("rss090")}" />
+    <link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="{$url->rssLink("atom")}" />
+ <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
+{if $badbehavior}
+   {$badbehavior->showBB2JavaScript()}
+{/if}
+</head>
+
+<body>
+<div id="rap">
+    <h1 id="header"><a href="{$url->blogLink()}" title="{$blog->getBlog()}">{$blog->getBlog()}</a></h1>
+
+

Deleted: templates/branches/lifetype-1.2/flower/main.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flower/main.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flower/main.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,13 +0,0 @@
-{include file="$blogtemplate/header.template"}
-
-<div id="content">
- {foreach from=$posts item=post}
-  <div class="post">
-    {include file="$blogtemplate/post.template"}
-  </div>
- {/foreach}
- {pager style="links"}
-</div>
-
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/flower/main.template (from rev 6405, templates/branches/lifetype-1.2/unported/flower/main.template)
===================================================================
--- templates/branches/lifetype-1.2/flower/main.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flower/main.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,13 @@
+{include file="$blogtemplate/header.template"}
+
+<div id="content">
+ {foreach from=$posts item=post}
+  <div class="post">
+    {include file="$blogtemplate/post.template"}
+  </div>
+ {/foreach}
+ {pager style="links"}
+</div>
+
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/flower/panel.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flower/panel.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flower/panel.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,80 +0,0 @@
-
-<div id="menu">
-<ul>
-    <li id="search">{$locale->tr("search")}
-	   <form name="search_form" method="post"
-	   	      action="{$url->getIndexUrl()}">
-	      <input type="text" name="searchTerms" value="" size="14" /><br/>
-		  <input type="hidden" name="op" value="Search" />
-		  <input type="hidden" name="blogId" value="{$blog->getId()}"/>
-   </form>
-    </li>
-
-    <li id="wordpress">{$locale->tr("menu")}
-    <ul>
-     <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
-    </ul> 
-    </li>
-
-{assign var=blogOwner value=$blog->getOwnerInfo()}
-{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
-{if $blogOwner->hasPicture() && $AboutMyself}  
-  	 <li id="about_myself">{$locale->tr("about_myself")}
-  	 <ul>
-  	{assign var=picture value=$blogOwner->getPicture()}
-  	<li><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /></li>
-  	<br/>
-  	{$AboutMyself}
-  	</ul>
-  	</li>
-{/if}
-
- <li id="categories">
-  {$locale->tr("categories")}
-  <ul>
-   {foreach from=$articlecategories item=articleCategory}
-    <li><a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} [{$articleCategory->getNumArticles()}]</a></li>
-   {/foreach}
-   </ul>
- </li>
-  
- <li id="archives">
-  {$locale->tr("archives")}
-  <ul>
-  {foreach from=$archives item=archivelink}
-   <li><a href="{$archivelink->getUrl()}">{$archivelink->getName()}</a></li>
-  {/foreach}
-  </ul>
-  </li>
-  <li id="calendar">
-	{$calendar}
-  </li>
-
-    <li id="meta">
-    Meta
-    <ul>
-     <li><a title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}">RSS 0.90</a></li>
-     <li><a title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}">RSS 1.0</a></li>
-     <li><a title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}">RSS 2.0</a></li>
-     <li><a title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}">Atom 0.3</a></li>
-     <li><a href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0 Transitional">Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr></a></li>
-     
-    </ul> 
-    </li>
-
-  <li id="style"> 
-  {$locale->tr("links")}
-  <ul>
-   {foreach from=$mylinkscategories item=linkcategory}
-     <li><b>{$linkcategory->getName()}</b>
-     <ul>
-      {foreach from=$linkcategory->getLinks() item=link}
-       <li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a></li>
-      {/foreach}
-     </ul>
-    </li>
-   {/foreach}  
-   </ul>
-    </li>
-</ul> 
-</div>

Copied: templates/branches/lifetype-1.2/flower/panel.template (from rev 6405, templates/branches/lifetype-1.2/unported/flower/panel.template)
===================================================================
--- templates/branches/lifetype-1.2/flower/panel.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flower/panel.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,80 @@
+
+<div id="menu">
+<ul>
+    <li id="search">{$locale->tr("search")}
+	   <form name="search_form" method="post"
+	   	      action="{$url->getIndexUrl()}">
+	      <input type="text" name="searchTerms" value="" size="14" /><br/>
+		  <input type="hidden" name="op" value="Search" />
+		  <input type="hidden" name="blogId" value="{$blog->getId()}"/>
+   </form>
+    </li>
+
+    <li id="wordpress">{$locale->tr("menu")}
+    <ul>
+     <li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
+    </ul> 
+    </li>
+
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}  
+  	 <li id="about_myself">{$locale->tr("about_myself")}
+  	 <ul>
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	<li><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /></li>
+  	<br/>
+  	{$AboutMyself}
+  	</ul>
+  	</li>
+{/if}
+
+ <li id="categories">
+  {$locale->tr("categories")}
+  <ul>
+   {foreach from=$articlecategories item=articleCategory}
+    <li><a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} [{$articleCategory->getNumArticles()}]</a></li>
+   {/foreach}
+   </ul>
+ </li>
+  
+ <li id="archives">
+  {$locale->tr("archives")}
+  <ul>
+  {foreach from=$archives item=archivelink}
+   <li><a href="{$archivelink->getUrl()}">{$archivelink->getName()}</a></li>
+  {/foreach}
+  </ul>
+  </li>
+  <li id="calendar">
+	{$calendar}
+  </li>
+
+    <li id="meta">
+    Meta
+    <ul>
+     <li><a title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}">RSS 0.90</a></li>
+     <li><a title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}">RSS 1.0</a></li>
+     <li><a title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}">RSS 2.0</a></li>
+     <li><a title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}">Atom 0.3</a></li>
+     <li><a href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0 Transitional">Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr></a></li>
+     
+    </ul> 
+    </li>
+
+  <li id="style"> 
+  {$locale->tr("links")}
+  <ul>
+   {foreach from=$mylinkscategories item=linkcategory}
+     <li><b>{$linkcategory->getName()}</b>
+     <ul>
+      {foreach from=$linkcategory->getLinks() item=link}
+       <li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a></li>
+      {/foreach}
+     </ul>
+    </li>
+   {/foreach}  
+   </ul>
+    </li>
+</ul> 
+</div>

Deleted: templates/branches/lifetype-1.2/flower/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flower/post.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flower/post.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,32 +0,0 @@
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-
-<h3 class="storytitle"><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h3>
-
-{assign var=postCategory value=$post->getCategory()}
-{assign var=postText value=$post->getText()}
-<div class="meta">
-
-  {foreach name=categories from=$post->getCategories() item=postCategory} 
-    <a href="{$url->categoryLink($postCategory)}"
-		   title="{$postCategory->getName()}">
-		   {$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
-  {/foreach}
-
- &#8212; {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
-</div>
-<div class="storycontent">
-    {$postText} 
-    <br style="clear: both;" />
- </div>
-<div class="feedback">
-    <a href="{$url->postPermalink($post)}#comments" title="{$locale->tr("comment on this")}">
-        {if $post->getNumComments() eq 0}{$locale->tr("comment on this")}{else}{$post->getNumComments()} {$locale->tr("comments")}{/if}
-    </a> |
-	{if $post->getNumTrackbacks() > 0}
-	  <a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")}">{$post->getNumTrackbacks()} {$locale->tr("trackbacks")}</a>
-	{else}
-	  {$post->getNumTrackbacks()} {$locale->tr("trackbacks")}
-	{/if}
-</div>    
-

Copied: templates/branches/lifetype-1.2/flower/post.template (from rev 6405, templates/branches/lifetype-1.2/unported/flower/post.template)
===================================================================
--- templates/branches/lifetype-1.2/flower/post.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flower/post.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,32 @@
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+
+<h3 class="storytitle"><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h3>
+
+{assign var=postCategory value=$post->getCategory()}
+{assign var=postText value=$post->getText()}
+<div class="meta">
+
+  {foreach name=categories from=$post->getCategories() item=postCategory} 
+    <a href="{$url->categoryLink($postCategory)}"
+		   title="{$postCategory->getName()}">
+		   {$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+  {/foreach}
+
+ &#8212; {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
+</div>
+<div class="storycontent">
+    {$postText} 
+    <br style="clear: both;" />
+ </div>
+<div class="feedback">
+    <a href="{$url->postPermalink($post)}#comments" title="{$locale->tr("comment on this")}">
+        {if $post->getNumComments() eq 0}{$locale->tr("comment on this")}{else}{$post->getNumComments()} {$locale->tr("comments")}{/if}
+    </a> |
+	{if $post->getNumTrackbacks() > 0}
+	  <a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")}">{$post->getNumTrackbacks()} {$locale->tr("trackbacks")}</a>
+	{else}
+	  {$post->getNumTrackbacks()} {$locale->tr("trackbacks")}
+	{/if}
+</div>    
+

Deleted: templates/branches/lifetype-1.2/flower/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flower/postandcomments.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flower/postandcomments.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,50 +0,0 @@
-{include file="$blogtemplate/header.template"}
-
-<div id="content">
-    {assign var="postDate" value=$post->getDateObject()}
-    {assign var="postOwner" value=$post->getUserInfo()}
-    <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
-    
-    <div class="post">
-        {include file="$blogtemplate/post.template"}
-   		<!-- {$url->postTrackbackLink($post)} -->
-    
-        <h2 id="comments">{$locale->tr("comments")}</h2>
-        {pager style="links"}    
-        
-         <ol id="commentlist">
-        {foreach from=$comments item=comment}
-        {assign var=commentText value=$comment->getText()}
-		{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}
-            <li id="comment-{$comment->getId()}">
-                <p>{$commentText}</p>
-               
-               	<p><cite>{$locale->tr("posted_by")}
-                   {if $comment->getUserUrl() != ""}
-                    <a href="{$comment->getUserUrl()}"}>{$comment->getUsername()}</a>
-                   {else}
-                    {$comment->getUsername()}
-                   {/if} &#8212;
-                   {assign var=commentDate value=$comment->getDateObject()}
-                   {$locale->formatDate($commentDate, "%d %b %Y, %H:%M")}
-                </cite></p>
-            </li>
-        {/foreach}    
-        </ol>
-            
-        {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
-            <br style="clear: both;" />
-           <h2>{$locale->tr("add_comment")}</h2>
-          {include file="$misctemplatepath/commentform.template"}
-        {/if}
-    </div>
-</div>
-
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flower/postandcomments.template (from rev 6405, templates/branches/lifetype-1.2/unported/flower/postandcomments.template)
===================================================================
--- templates/branches/lifetype-1.2/flower/postandcomments.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flower/postandcomments.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,50 @@
+{include file="$blogtemplate/header.template"}
+
+<div id="content">
+    {assign var="postDate" value=$post->getDateObject()}
+    {assign var="postOwner" value=$post->getUserInfo()}
+    <h2>{$locale->formatDate($postDate,"%d %b, %Y")}</h2>
+    
+    <div class="post">
+        {include file="$blogtemplate/post.template"}
+   		<!-- {$url->postTrackbackLink($post)} -->
+    
+        <h2 id="comments">{$locale->tr("comments")}</h2>
+        {pager style="links"}    
+        
+         <ol id="commentlist">
+        {foreach from=$comments item=comment}
+        {assign var=commentText value=$comment->getText()}
+		{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}
+            <li id="comment-{$comment->getId()}">
+                <p>{$commentText}</p>
+               
+               	<p><cite>{$locale->tr("posted_by")}
+                   {if $comment->getUserUrl() != ""}
+                    <a href="{$comment->getUserUrl()}"}>{$comment->getUsername()}</a>
+                   {else}
+                    {$comment->getUsername()}
+                   {/if} &#8212;
+                   {assign var=commentDate value=$comment->getDateObject()}
+                   {$locale->formatDate($commentDate, "%d %b %Y, %H:%M")}
+                </cite></p>
+            </li>
+        {/foreach}    
+        </ol>
+            
+        {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
+            <br style="clear: both;" />
+           <h2>{$locale->tr("add_comment")}</h2>
+          {include file="$misctemplatepath/commentform.template"}
+        {/if}
+    </div>
+</div>
+
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/flower/posttrackbacks.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flower/posttrackbacks.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flower/posttrackbacks.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,17 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="content">
- <div class="blog">
-  <div class="blogbody">
-   <h2 class="title">{$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>"</h2>
-    {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> Date would be here<br/><br/>
-    {/foreach}
-  </div>
- </div>
-</div>
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flower/posttrackbacks.template (from rev 6405, templates/branches/lifetype-1.2/unported/flower/posttrackbacks.template)
===================================================================
--- templates/branches/lifetype-1.2/flower/posttrackbacks.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flower/posttrackbacks.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,17 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+ <div class="blog">
+  <div class="blogbody">
+   <h2 class="title">{$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>"</h2>
+    {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> Date would be here<br/><br/>
+    {/foreach}
+  </div>
+ </div>
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/flower/resource.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flower/resource.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flower/resource.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,58 +0,0 @@
-{include file="$blogtemplate/header.template"}
-{assign var=metadata value=$resource->getMetadataReader()}
-{assign var=updated value=$resource->getTimestamp()}
-<div id="content">
-  <h2>{$locale->tr("resources")}</h2>
-<div class="post">
-    <h3 class="storytitle"><a href="{$url->resourceLink($resource)}">{$resource->getFileName()}</a></h3>
-    <div class="meta">
-        {$locale->tr("created")} {$locale->formatDate($updated,"%d %b, %Y")}
-    </div>
-   <div class="storycontent"><p>{$resource->getDescription()}</p></div>
-  {if $resource->isImage()}
-   <img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
-  {else}
-   <a href="{$url->resourceDownloadLink($resource)}">
-   {* show some information about the file *}
-   {if $resource->isSound()}
-     <img alt="Sound" src="{$url->getUrl("/imgs/sound.gif")}" height="64" width="64" style="border:0px;" /><br/>
-     {$resource->getFileName()}
-     </a><br/>     
-     {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
-     {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
-     {$locale->tr("sample_rate")}: {$metadata->getSampleRate()} Khz
-   {elseif $resource->isVideo()}
-     <img alt="Sound" src="{$url->getUrl("/imgs/video.gif")}" height="64" width="64" style="border:0px;" /><br/>
-     {$resource->getFileName()}
-    </a><br/>
-    {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
-    {$locale->tr("size")}: {$metadata->getHeight()} x {$metadata->getWidth()}<br/>
-    {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
-    {$locale->tr("video_codec")}: {$metadata->getVideoCodec()}<br/>
-    {$locale->tr("audio_codec")}: {$metadata->getAudioCodec()}
-   {elseif $resource->isZip()}
-     <img alt="Sound" src="{$url->getUrl("/imgs/compressed.gif")}" height="64" width="64" style="border:0px;" /><br/>
-     {$resource->getFileName()}
-    </a><br/>
-    {$metadata->getTotalFiles()} {$locale->tr("files")}<br/>
-    {$locale->tr("uncompressed_size")}: {$metadata->getRoundedUncompressedSize()}
-   {else}
-     <img alt="Sound" src="{$url->getUrl("/imgs/file.gif")}" height="64" width="64" style="border:0px;" /><br/>
-     {$resource->getFileName()}
-     </a>    
-   {/if}   
-  {/if}
-  <br/>
-    <div class="feedback">
-        <a href="{$url->resourceDownloadLink($resource)}">
-           <img src="{$url->getTemplateFile("download.gif")}" width="10" height="11" alt="Download" style="border:0px;" />
-           {$locale->tr("download")} ({$metadata->getRoundedSize()})
-        </a> 
-    </div>
-</div>
-  <p>
-   <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
-  </p>
-</div>
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flower/resource.template (from rev 6405, templates/branches/lifetype-1.2/unported/flower/resource.template)
===================================================================
--- templates/branches/lifetype-1.2/flower/resource.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flower/resource.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,58 @@
+{include file="$blogtemplate/header.template"}
+{assign var=metadata value=$resource->getMetadataReader()}
+{assign var=updated value=$resource->getTimestamp()}
+<div id="content">
+  <h2>{$locale->tr("resources")}</h2>
+<div class="post">
+    <h3 class="storytitle"><a href="{$url->resourceLink($resource)}">{$resource->getFileName()}</a></h3>
+    <div class="meta">
+        {$locale->tr("created")} {$locale->formatDate($updated,"%d %b, %Y")}
+    </div>
+   <div class="storycontent"><p>{$resource->getDescription()}</p></div>
+  {if $resource->isImage()}
+   <img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
+  {else}
+   <a href="{$url->resourceDownloadLink($resource)}">
+   {* show some information about the file *}
+   {if $resource->isSound()}
+     <img alt="Sound" src="{$url->getUrl("/imgs/sound.gif")}" height="64" width="64" style="border:0px;" /><br/>
+     {$resource->getFileName()}
+     </a><br/>     
+     {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
+     {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
+     {$locale->tr("sample_rate")}: {$metadata->getSampleRate()} Khz
+   {elseif $resource->isVideo()}
+     <img alt="Sound" src="{$url->getUrl("/imgs/video.gif")}" height="64" width="64" style="border:0px;" /><br/>
+     {$resource->getFileName()}
+    </a><br/>
+    {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
+    {$locale->tr("size")}: {$metadata->getHeight()} x {$metadata->getWidth()}<br/>
+    {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
+    {$locale->tr("video_codec")}: {$metadata->getVideoCodec()}<br/>
+    {$locale->tr("audio_codec")}: {$metadata->getAudioCodec()}
+   {elseif $resource->isZip()}
+     <img alt="Sound" src="{$url->getUrl("/imgs/compressed.gif")}" height="64" width="64" style="border:0px;" /><br/>
+     {$resource->getFileName()}
+    </a><br/>
+    {$metadata->getTotalFiles()} {$locale->tr("files")}<br/>
+    {$locale->tr("uncompressed_size")}: {$metadata->getRoundedUncompressedSize()}
+   {else}
+     <img alt="Sound" src="{$url->getUrl("/imgs/file.gif")}" height="64" width="64" style="border:0px;" /><br/>
+     {$resource->getFileName()}
+     </a>    
+   {/if}   
+  {/if}
+  <br/>
+    <div class="feedback">
+        <a href="{$url->resourceDownloadLink($resource)}">
+           <img src="{$url->getTemplateFile("download.gif")}" width="10" height="11" alt="Download" style="border:0px;" />
+           {$locale->tr("download")} ({$metadata->getRoundedSize()})
+        </a> 
+    </div>
+</div>
+  <p>
+   <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
+  </p>
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

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

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

Deleted: templates/branches/lifetype-1.2/flower/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flower/searchresults.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flower/searchresults.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,21 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="content">
-   <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
-   <p>
-    {foreach from=$searchresults item=result}
-     <div class="searchresult">
-      {assign var=article value=$result->getArticle()}
-      <a href="{$url->postPermalink($article)}"><h3><b>{$article->getTopic()}</b></h3></a>
-     <div align="right">{foreach name=categories from=$article->getCategories() item=postcategory}
-       <a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
-     {/foreach}</div>
-      <p>
-      {$article->getText()|strip_tags|truncate:300:"...":false}
-      </p>
-     </div>
-     <br/>
-    {/foreach}
-   </p> 
-</div>
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flower/searchresults.template (from rev 6405, templates/branches/lifetype-1.2/unported/flower/searchresults.template)
===================================================================
--- templates/branches/lifetype-1.2/flower/searchresults.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flower/searchresults.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,21 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+   <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+   <p>
+    {foreach from=$searchresults item=result}
+     <div class="searchresult">
+      {assign var=article value=$result->getArticle()}
+      <a href="{$url->postPermalink($article)}"><h3><b>{$article->getTopic()}</b></h3></a>
+     <div align="right">{foreach name=categories from=$article->getCategories() item=postcategory}
+       <a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+     {/foreach}</div>
+      <p>
+      {$article->getText()|strip_tags|truncate:300:"...":false}
+      </p>
+     </div>
+     <br/>
+    {/foreach}
+   </p> 
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/flower/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/flower/style.css	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flower/style.css	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,343 +0,0 @@
-/* Flower Layout by uplink/Josh Lyman of podq.com
-	 Just a rather basic layout, with a break from my
-	usual style, I coded it absolutely. Best viewed on
-	a 1024x768 screen, quickly becoming the norm. 
-	 Flower image in the background is an original 
-	photo by Josh Lyman. Visit me at www.podq.com or email
-	me at uplink at podq.com to check out other photos,
-	plus tutorials, notes, downloads, etc.
-	Have a good day!
-*/
-
-a {
-	color: #556B2F;
-}
-
-a img {
-	border: none;
-}
-
-a:visited {
-	color: #342;
-}
-
-a:hover {
-	color: #6B8E23;
-}
-
-acronym, abbr {
-	border-bottom: 1px dashed #6B8E23;
-}
-
-acronym, abbr, span.caps {
-	cursor: help;
-	font-size: 90%;
-	letter-spacing: .07em;
-}
-
-blockquote {
-	border-left: 5px solid #ccc;
-	margin-left: 1.5em;
-	padding-left: 5px;
-}
-
-body {
-	background-color:#FFE9BB;
-	font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
-	font-size:small;
-	margin: 0;
-	padding: 0;
-}
-
-cite {
-	font-size: 90%;
-	font-style: normal;
-}
-
-h2 {
-	border-bottom: 1px groove #eeeeee;
-	font: 90% Georgia, "Times New Roman", Times, serif;
-	letter-spacing: 0.2em;
-	margin: 15px 0 2px 0;
-	padding-bottom: 2px;
-	text-align:center;
-}
-
-h3 {
-	font-family: Georgia, "Times New Roman", Times, serif;
-	margin-top: 0;
-	text-align:center;
-	border-right: 1px dotted #FFFAF0;
-	border-left: 1px dotted #FFFAF0;
-}
-
-ol#comments li p {
-	font-size: 100%;
-}
-
-h2#comments {
-	font-size: 120%;
-	border: 1px dotted #FFFAF0;
-	text-align:center;
-}
-
-p, li, .feedback {
-	font: 90%/175% 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
-	letter-spacing: -1px;
-}
-
-.credit {
-	border: 3px solid #FFFAF0;
-	margin-left: 10%;
-	margin-right: 10%;
-	color: #000000;
-	font-size: 11px;
-	padding: 3px;
-	text-align: center;
-}
-
-.credit a:link, .credit a:hover {
-	color: #6B8E23;
-}
-
-.feedback {
-	color: #ccc;
-	text-align: right;
-	/*margin: 0 5px 0 5px;
-	border: 3px groove #FFFAF0;
-	text-align:center;*/
-}
-
-.meta {
-	font-size: .75em;
-	text-align: center;
-	border: 1px dotted #FFFAF0;
-	border-top: none;
-}
-
-.meta, .meta a {
-	color: #556B2F;
-	font-weight: normal;
-	letter-spacing: 0;
-}
-.meta ul {
-	display: inline;
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-
-.meta li {
-	display: inline;
-}
-
-.storytitle {
-	margin: 0;
-}
-
-.storytitle a {
-	text-decoration: none;
-}
-
-#commentform input, #commentform textarea {
-	background: #fff;
-	border: 1px solid #333;
-}
-
-#commentform textarea {
-	width: 100%;
-}
-
-#rap {
-	position: relative;
-	margin: 10px 10% 10px 10%;
-	width:790px;
-	height: 527px;
-	background-image: url("bg.jpg");
-	background-repeat:no-repeat;
-	background-position:top;
-}
-
-#content {
-	position:relative;
-	left:20px;
-	top:-4px;
-	width:521px;
-	height:407px;
-	overflow:auto;
-	border: 3px solid #FFFAF0;
-	padding: 0 3px 0 3px;
-}
-
-#header {
-	position:relative;
-	left:137px;
-	top:6px;
-	width:404px;
-	height:68px;
-	font: italic normal 250% Georgia, 'Times New Roman', Times, serif;
-	letter-spacing: 0.2em;
-	margin: 0;
-	padding: 15px 10px 15px 60px;
-}
-
-#header a {
-	color: #fff;
-	text-decoration: none;
-	font-family:Georgia, "Times New Roman", Times, serif;
-}
-
-#header a:hover {
-	text-decoration: underline;
-}
-
-#menu {
-	position:relative;
-	left:575px;
-	top:-508px;
-	width:170px;
-	height:498px;
-	overflow: auto;
-	padding: 5px;
-	border: 3px solid #FFFAF0;
-}
-
-#menu form {
-	margin: 0 0 0 13px;
-}
-
-#menu input {
-	background: #FFE9BB;
-	border: 1px solid #6B8E23;
-	letter-spacing: -0.05em;
-	width: 80%;
-	text-align:center;
-}
-
-#menu ul {
-	margin: 0px;
-	color: #556B2F;
-	/*color: #FFD175;*/
-	font-weight: bold;
-	list-style-type: none;
-	margin: 0;
-	padding-left: 3px;
-}
-
-#menu ul li {
-	font: normal 110% Georgia, "Times New Roman", Times, serif;
-	letter-spacing: 0.1em;
-	margin-top: 10px;
-	padding-bottom: 2px; /*border-bottom: dotted 1px #ccc;*/
-}
-
-#menu ul ul {
-	list-style-type: none;
-	font-variant: normal;
-	font-weight: normal;
-	line-height: 100%;
-	margin: 0;
-	padding: 0;
-	text-align: left;
-}
-
-#menu ul ul li {
-	border: 0;
-	font: normal normal 70%/115% 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
-	letter-spacing: 0;
-	margin-top: 0;
-	padding: 0;
-	padding-left: 12px;
-}
-
-#menu ul ul li a {
-	color: #000;
-	text-decoration: none;
-}
-
-#menu ul ul li a:hover {
-	border-bottom: 1px solid #809080;
-}
-
-#calendar {
-	empty-cells: show;
-	margin: 0;
-}
-
-.calMonthHeader, .calMonthNav{
-	font:11px Verdana, Arial, serif;
-	color: #fff;
-	padding: 10px 0px 0px 0px;
-	text-align: center;
-}
-
-#calendar .calMonthForward, #calendar .calMonthForward>a{
-	text-align: center;
-	border:0px;
-}
-
-#calendar .calMonthBackward, #calendar .calMonthBackward>a{
-	text-align: center;
-	border:0px;
-}
-
-.calDayLink {
-	display: block;
-	text-decoration: none;
-}
-#calendar a:hover {
-	background: #e0e6e0;
-	color: #333;
-}
-
-#calendar td {
-    font-size: 10px;
-	color: #6B8E23;
-	letter-spacing: normal;
-	padding: 0px;
-	margin: 0px;
-	text-align: center;
-}
-
-#calendar td.pad:hover {
-	background: #fff;
-}
-
-#calendar td:hover, .calMonthToday {
-	background: #eee;
-	color: #bbb;
-}
-.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/flower/style.css (from rev 6405, templates/branches/lifetype-1.2/unported/flower/style.css)
===================================================================
--- templates/branches/lifetype-1.2/flower/style.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/flower/style.css	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,343 @@
+/* Flower Layout by uplink/Josh Lyman of podq.com
+	 Just a rather basic layout, with a break from my
+	usual style, I coded it absolutely. Best viewed on
+	a 1024x768 screen, quickly becoming the norm. 
+	 Flower image in the background is an original 
+	photo by Josh Lyman. Visit me at www.podq.com or email
+	me at uplink at podq.com to check out other photos,
+	plus tutorials, notes, downloads, etc.
+	Have a good day!
+*/
+
+a {
+	color: #556B2F;
+}
+
+a img {
+	border: none;
+}
+
+a:visited {
+	color: #342;
+}
+
+a:hover {
+	color: #6B8E23;
+}
+
+acronym, abbr {
+	border-bottom: 1px dashed #6B8E23;
+}
+
+acronym, abbr, span.caps {
+	cursor: help;
+	font-size: 90%;
+	letter-spacing: .07em;
+}
+
+blockquote {
+	border-left: 5px solid #ccc;
+	margin-left: 1.5em;
+	padding-left: 5px;
+}
+
+body {
+	background-color:#FFE9BB;
+	font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
+	font-size:small;
+	margin: 0;
+	padding: 0;
+}
+
+cite {
+	font-size: 90%;
+	font-style: normal;
+}
+
+h2 {
+	border-bottom: 1px groove #eeeeee;
+	font: 90% Georgia, "Times New Roman", Times, serif;
+	letter-spacing: 0.2em;
+	margin: 15px 0 2px 0;
+	padding-bottom: 2px;
+	text-align:center;
+}
+
+h3 {
+	font-family: Georgia, "Times New Roman", Times, serif;
+	margin-top: 0;
+	text-align:center;
+	border-right: 1px dotted #FFFAF0;
+	border-left: 1px dotted #FFFAF0;
+}
+
+ol#comments li p {
+	font-size: 100%;
+}
+
+h2#comments {
+	font-size: 120%;
+	border: 1px dotted #FFFAF0;
+	text-align:center;
+}
+
+p, li, .feedback {
+	font: 90%/175% 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
+	letter-spacing: -1px;
+}
+
+.credit {
+	border: 3px solid #FFFAF0;
+	margin-left: 10%;
+	margin-right: 10%;
+	color: #000000;
+	font-size: 11px;
+	padding: 3px;
+	text-align: center;
+}
+
+.credit a:link, .credit a:hover {
+	color: #6B8E23;
+}
+
+.feedback {
+	color: #ccc;
+	text-align: right;
+	/*margin: 0 5px 0 5px;
+	border: 3px groove #FFFAF0;
+	text-align:center;*/
+}
+
+.meta {
+	font-size: .75em;
+	text-align: center;
+	border: 1px dotted #FFFAF0;
+	border-top: none;
+}
+
+.meta, .meta a {
+	color: #556B2F;
+	font-weight: normal;
+	letter-spacing: 0;
+}
+.meta ul {
+	display: inline;
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+.meta li {
+	display: inline;
+}
+
+.storytitle {
+	margin: 0;
+}
+
+.storytitle a {
+	text-decoration: none;
+}
+
+#commentform input, #commentform textarea {
+	background: #fff;
+	border: 1px solid #333;
+}
+
+#commentform textarea {
+	width: 100%;
+}
+
+#rap {
+	position: relative;
+	margin: 10px 10% 10px 10%;
+	width:790px;
+	height: 527px;
+	background-image: url("bg.jpg");
+	background-repeat:no-repeat;
+	background-position:top;
+}
+
+#content {
+	position:relative;
+	left:20px;
+	top:-4px;
+	width:521px;
+	height:407px;
+	overflow:auto;
+	border: 3px solid #FFFAF0;
+	padding: 0 3px 0 3px;
+}
+
+#header {
+	position:relative;
+	left:137px;
+	top:6px;
+	width:404px;
+	height:68px;
+	font: italic normal 250% Georgia, 'Times New Roman', Times, serif;
+	letter-spacing: 0.2em;
+	margin: 0;
+	padding: 15px 10px 15px 60px;
+}
+
+#header a {
+	color: #fff;
+	text-decoration: none;
+	font-family:Georgia, "Times New Roman", Times, serif;
+}
+
+#header a:hover {
+	text-decoration: underline;
+}
+
+#menu {
+	position:relative;
+	left:575px;
+	top:-508px;
+	width:170px;
+	height:498px;
+	overflow: auto;
+	padding: 5px;
+	border: 3px solid #FFFAF0;
+}
+
+#menu form {
+	margin: 0 0 0 13px;
+}
+
+#menu input {
+	background: #FFE9BB;
+	border: 1px solid #6B8E23;
+	letter-spacing: -0.05em;
+	width: 80%;
+	text-align:center;
+}
+
+#menu ul {
+	margin: 0px;
+	color: #556B2F;
+	/*color: #FFD175;*/
+	font-weight: bold;
+	list-style-type: none;
+	margin: 0;
+	padding-left: 3px;
+}
+
+#menu ul li {
+	font: normal 110% Georgia, "Times New Roman", Times, serif;
+	letter-spacing: 0.1em;
+	margin-top: 10px;
+	padding-bottom: 2px; /*border-bottom: dotted 1px #ccc;*/
+}
+
+#menu ul ul {
+	list-style-type: none;
+	font-variant: normal;
+	font-weight: normal;
+	line-height: 100%;
+	margin: 0;
+	padding: 0;
+	text-align: left;
+}
+
+#menu ul ul li {
+	border: 0;
+	font: normal normal 70%/115% 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
+	letter-spacing: 0;
+	margin-top: 0;
+	padding: 0;
+	padding-left: 12px;
+}
+
+#menu ul ul li a {
+	color: #000;
+	text-decoration: none;
+}
+
+#menu ul ul li a:hover {
+	border-bottom: 1px solid #809080;
+}
+
+#calendar {
+	empty-cells: show;
+	margin: 0;
+}
+
+.calMonthHeader, .calMonthNav{
+	font:11px Verdana, Arial, serif;
+	color: #fff;
+	padding: 10px 0px 0px 0px;
+	text-align: center;
+}
+
+#calendar .calMonthForward, #calendar .calMonthForward>a{
+	text-align: center;
+	border:0px;
+}
+
+#calendar .calMonthBackward, #calendar .calMonthBackward>a{
+	text-align: center;
+	border:0px;
+}
+
+.calDayLink {
+	display: block;
+	text-decoration: none;
+}
+#calendar a:hover {
+	background: #e0e6e0;
+	color: #333;
+}
+
+#calendar td {
+    font-size: 10px;
+	color: #6B8E23;
+	letter-spacing: normal;
+	padding: 0px;
+	margin: 0px;
+	text-align: center;
+}
+
+#calendar td.pad:hover {
+	background: #fff;
+}
+
+#calendar td:hover, .calMonthToday {
+	background: #eee;
+	color: #bbb;
+}
+.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/flyupsky-daytime (from rev 6399, templates/branches/lifetype-1.2/unported/flyupsky-daytime)

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/album.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-daytime/album.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/album.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,84 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="album_list">
-{assign var="postDate" value=$album->getTimestamp()}
-<div class="blog">
-<div class="album_outline">
-<div class="album_title">{$locale->tr("albums")}</div>
-<div class="album_content_space">
-
-<div class="album_outline">
-<div class="album_title">{$album->getName()}</div>
-<div class="album_content_space">
-{$album->getDescription()}
-<div class="posted">
-   <a href="{$url->albumLink($album)}">
-     {$locale->tr("resources")} ({$album->getNumResources()})
-   </a> | {$locale->tr("created")} {$locale->formatDate($postDate,"%d %b, %Y")}
-</div>
-</div>
-</div>
-<br />
-<div class="album_sublist">
-<div class="album_content_space">
-	<div class="album_sub">
-	<a href="{$url->parentAlbumLink($album)}">
-    	<img src="{$url->getTemplateFile("images/parentfolder.gif")}" alt="{$locale->tr("parent")}" /></a>
-    	<p>{$locale->tr("parent")}</p>
-	</div>
-{assign var=children value=$album->getChildren()}
-	{foreach from=$children item=childalbum}
-		<div class="album_sub">
-		<a href="{$url->albumLink($childalbum)}">
-		<img src="{$url->getTemplateFile("images/folder.gif")}" alt="{$childalbum->getName()}" /></a>
-		<br />{$childalbum->getName()} ({$childalbum->getNumResources()})
-		</div>
-	{/foreach}
-</div>
-</div>
-<br />
-
-	
-   		{foreach from=$resources item=resource}
-	<div class="album">
-   		{if $resource->hasPreview()}
-   		{*<a target="_blank" href="resserver.php?blogId={$blog->getId()}&amp;resource={$resource->getFileName()}">*}
-   	<a href="{$url->resourceLink($resource)}" title="{$resource->getFileName()}">
-    	<img alt="{$resource->getDescription()}" src="{$url->resourcePreviewLink($resource)}" /></a>
-    	<p>{$resource->getFileName()}</p>
-   		{else}
-   	<a href="{$url->resourceLink($resource)}"  title="{$resource->getFileName()}">
-   		{if $resource->isSound()}
-    	<img alt="Sound" src="{$url->getTemplateFile("images/sound.gif")}" /></a>
-   		{elseif $resource->isVideo()}
-    	<img alt="Video" src="{$url->getTemplateFile("images/video.gif")}" /></a>
-   		{elseif $resource->isZip()}
-    	<img alt="Zip" src="{$url->getTemplateFile("images/compressed.gif")}" /></a>  
-   		{else}
-   	<img alt="File" src="{$url->getTemplateFile("images/file.gif")}" /></a>
-   		{/if}  
-   	<p>{$resource->getFileName()}</p>
-   		{/if}
-   		{assign var=metadata value=$resource->getMetadataReader()}
-  	<p>{$metadata->getRoundedSize()}</p>
-   		{if $resource->isImage()}
-  	<p>{$metadata->getWidth()} x {$metadata->getHeight()}</p>
-   		{elseif $resource->isSound()}
-  	<p>{$metadata->getFormat()|upper} {$metadata->getSampleRate()} bps</p>
-   		{elseif $resource->isVideo()}
-  	<p>{$metadata->getFormat()|upper} {$metadata->getWidth()} x {$metadata->getHeight()}, {$metadata->getLengthString()}</p>
-   		{elseif $resource->isZip()}
-   	<p>{$metadata->getTotalFiles()} {$locale->tr("files")}</p>
-   		{/if}
-
-  	</div>
-  		{/foreach}
-{pager style="links"}
-
-
-</div>
-</div>
-
- 
- </div>
-</div>
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/album.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/album.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-daytime/album.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/album.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,84 @@
+{include file="$blogtemplate/header.template"}
+<div id="album_list">
+{assign var="postDate" value=$album->getTimestamp()}
+<div class="blog">
+<div class="album_outline">
+<div class="album_title">{$locale->tr("albums")}</div>
+<div class="album_content_space">
+
+<div class="album_outline">
+<div class="album_title">{$album->getName()}</div>
+<div class="album_content_space">
+{$album->getDescription()}
+<div class="posted">
+   <a href="{$url->albumLink($album)}">
+     {$locale->tr("resources")} ({$album->getNumResources()})
+   </a> | {$locale->tr("created")} {$locale->formatDate($postDate,"%d %b, %Y")}
+</div>
+</div>
+</div>
+<br />
+<div class="album_sublist">
+<div class="album_content_space">
+	<div class="album_sub">
+	<a href="{$url->parentAlbumLink($album)}">
+    	<img src="{$url->getTemplateFile("images/parentfolder.gif")}" alt="{$locale->tr("parent")}" /></a>
+    	<p>{$locale->tr("parent")}</p>
+	</div>
+{assign var=children value=$album->getChildren()}
+	{foreach from=$children item=childalbum}
+		<div class="album_sub">
+		<a href="{$url->albumLink($childalbum)}">
+		<img src="{$url->getTemplateFile("images/folder.gif")}" alt="{$childalbum->getName()}" /></a>
+		<br />{$childalbum->getName()} ({$childalbum->getNumResources()})
+		</div>
+	{/foreach}
+</div>
+</div>
+<br />
+
+	
+   		{foreach from=$resources item=resource}
+	<div class="album">
+   		{if $resource->hasPreview()}
+   		{*<a target="_blank" href="resserver.php?blogId={$blog->getId()}&amp;resource={$resource->getFileName()}">*}
+   	<a href="{$url->resourceLink($resource)}" title="{$resource->getFileName()}">
+    	<img alt="{$resource->getDescription()}" src="{$url->resourcePreviewLink($resource)}" /></a>
+    	<p>{$resource->getFileName()}</p>
+   		{else}
+   	<a href="{$url->resourceLink($resource)}"  title="{$resource->getFileName()}">
+   		{if $resource->isSound()}
+    	<img alt="Sound" src="{$url->getTemplateFile("images/sound.gif")}" /></a>
+   		{elseif $resource->isVideo()}
+    	<img alt="Video" src="{$url->getTemplateFile("images/video.gif")}" /></a>
+   		{elseif $resource->isZip()}
+    	<img alt="Zip" src="{$url->getTemplateFile("images/compressed.gif")}" /></a>  
+   		{else}
+   	<img alt="File" src="{$url->getTemplateFile("images/file.gif")}" /></a>
+   		{/if}  
+   	<p>{$resource->getFileName()}</p>
+   		{/if}
+   		{assign var=metadata value=$resource->getMetadataReader()}
+  	<p>{$metadata->getRoundedSize()}</p>
+   		{if $resource->isImage()}
+  	<p>{$metadata->getWidth()} x {$metadata->getHeight()}</p>
+   		{elseif $resource->isSound()}
+  	<p>{$metadata->getFormat()|upper} {$metadata->getSampleRate()} bps</p>
+   		{elseif $resource->isVideo()}
+  	<p>{$metadata->getFormat()|upper} {$metadata->getWidth()} x {$metadata->getHeight()}, {$metadata->getLengthString()}</p>
+   		{elseif $resource->isZip()}
+   	<p>{$metadata->getTotalFiles()} {$locale->tr("files")}</p>
+   		{/if}
+
+  	</div>
+  		{/foreach}
+{pager style="links"}
+
+
+</div>
+</div>
+
+ 
+ </div>
+</div>
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/albums.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-daytime/albums.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/albums.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,28 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="album_list">
-
-<div class="blog">
-<div class="album_outline">
-<div class="album_title">{$locale->tr("albums")}</div>
-<div class="album_content_space">
-	<div class="clear">&nbsp;</div>
-
-
-  	{foreach from=$albums item=album}
-	<div class="album">
-		<a href="{$url->albumLink($album)}"><img src="{$url->getTemplateFile("images/folder.gif")}" alt="{$album->getName()}" /></a>
-
-		<p>{$album->getName()} ({$album->getNumResources()})</p>
-
-		</div>
-	{/foreach}
-
-
-	<div class="clear">&nbsp;</div>
-
-</div>
-</div>
- 
-</div>
-</div>
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/albums.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/albums.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-daytime/albums.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/albums.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,28 @@
+{include file="$blogtemplate/header.template"}
+<div id="album_list">
+
+<div class="blog">
+<div class="album_outline">
+<div class="album_title">{$locale->tr("albums")}</div>
+<div class="album_content_space">
+	<div class="clear">&nbsp;</div>
+
+
+  	{foreach from=$albums item=album}
+	<div class="album">
+		<a href="{$url->albumLink($album)}"><img src="{$url->getTemplateFile("images/folder.gif")}" alt="{$album->getName()}" /></a>
+
+		<p>{$album->getName()} ({$album->getNumResources()})</p>
+
+		</div>
+	{/foreach}
+
+
+	<div class="clear">&nbsp;</div>
+
+</div>
+</div>
+ 
+</div>
+</div>
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/bold.gif
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/bold.gif (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/bold.gif)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/commentarticle.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-daytime/commentarticle.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/commentarticle.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,7 +0,0 @@
-{include file="$blogtemplate/header.template"}
- <div class="comments-head"><a name="comments"></a>Comments</div>
- {if $blogsettings->getValue("comments_enabled")}
-  <div class="comments-head">Post a comment</div>
-  {include file="$blogtemplate/commentform.template"}
- {/if}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/commentarticle.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/commentarticle.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-daytime/commentarticle.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/commentarticle.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,7 @@
+{include file="$blogtemplate/header.template"}
+ <div class="comments-head"><a name="comments"></a>Comments</div>
+ {if $blogsettings->getValue("comments_enabled")}
+  <div class="comments-head">Post a comment</div>
+  {include file="$blogtemplate/commentform.template"}
+ {/if}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/download.gif
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/download.gif (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/download.gif)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/error.gif
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/error.gif (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/error.gif)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/error.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-daytime/error.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/error.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,16 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="container">
- <div class="blog">
-
-<div class="err_outline">
-<div class="err_title">{$locale->tr("error")}</div>
-<div class="err_content_space">
-{$locale->tr($message)}
-
-</div>
-</div>
-
- </div>
-</div>
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/error.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/error.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-daytime/error.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/error.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,16 @@
+{include file="$blogtemplate/header.template"}
+<div id="container">
+ <div class="blog">
+
+<div class="err_outline">
+<div class="err_title">{$locale->tr("error")}</div>
+<div class="err_content_space">
+{$locale->tr($message)}
+
+</div>
+</div>
+
+ </div>
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

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

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

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/folderblue.gif
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/folderblue.gif (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/folderblue.gif)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-daytime/footer.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/footer.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,9 +0,0 @@
-<div class="clear">&nbsp;</div>
-<div id="footer">
-<div id="credits">
-<p>Designed by <a href="http://www.flyupsky.net" target="_blank">Gut</a> | Powered by <a href="http://www.lifetype.net" target="_blank">LifeType</a> | Valid <a href="http://validator.w3.org/check/referer" target="_blank">XHTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer" target="_blank">CSS</a></p>
-</div>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/footer.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/footer.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-daytime/footer.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/footer.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,9 @@
+<div class="clear">&nbsp;</div>
+<div id="footer">
+<div id="credits">
+<p>Designed by <a href="http://www.flyupsky.net" target="_blank">Gut</a> | Powered by <a href="http://www.lifetype.net" target="_blank">LifeType</a> | Valid <a href="http://validator.w3.org/check/referer" target="_blank">XHTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer" target="_blank">CSS</a></p>
+</div>
+</div>
+</div>
+</body>
+</html>
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-daytime/header.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/header.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,29 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" 
-      lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
-<head>
- <meta http-equiv="Content-Type" content="text/html;charset={$locale->getCharset()}" />
- <title>{$pageTitle|escape:"html"}</title>
- <meta name="generator" content="{$version}" />
- <meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
- <link rel="stylesheet" title="Default" href="{$url->getTemplateFile("style.css")}" type="text/css" />
- <link rel="alternate" type="text/xml" title="RSS 2.0" href="{$url->rssLink("rss20")}" />
- <link rel="alternate" type="text/xml" title="RSS 1.0" href="{$url->rssLink("rss10")}" />
- <link rel="alternate" type="text/xml" title="RSS 0.90" href="{$url->rssLink("rss090")}" />
- <link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="{$url->rssLink("atom")}" />
- <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
-{if $badbehavior}
-   {$badbehavior->showBB2JavaScript()}
-{/if}
-</head>
-<body>
-<div id="outframe">
-<div id="header">
-<div id="nav_r">
-   {include file="$blogtemplate/nav_bar.inc"}
-</div>
-<div id="title"><a href="{$url->blogLink()}" accesskey="1">{$blog->getBlog()}</a><br /><span class="description">{$blog->getAbout()}</span>
-</div>
-</div>
-
-   

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/header.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/header.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-daytime/header.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/header.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" 
+      lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
+<head>
+ <meta http-equiv="Content-Type" content="text/html;charset={$locale->getCharset()}" />
+ <title>{$pageTitle|escape:"html"}</title>
+ <meta name="generator" content="{$version}" />
+ <meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
+ <link rel="stylesheet" title="Default" href="{$url->getTemplateFile("style.css")}" type="text/css" />
+ <link rel="alternate" type="text/xml" title="RSS 2.0" href="{$url->rssLink("rss20")}" />
+ <link rel="alternate" type="text/xml" title="RSS 1.0" href="{$url->rssLink("rss10")}" />
+ <link rel="alternate" type="text/xml" title="RSS 0.90" href="{$url->rssLink("rss090")}" />
+ <link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="{$url->rssLink("atom")}" />
+ <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
+{if $badbehavior}
+   {$badbehavior->showBB2JavaScript()}
+{/if}
+</head>
+<body>
+<div id="outframe">
+<div id="header">
+<div id="nav_r">
+   {include file="$blogtemplate/nav_bar.inc"}
+</div>
+<div id="title"><a href="{$url->blogLink()}" accesskey="1">{$blog->getBlog()}</a><br /><span class="description">{$blog->getAbout()}</span>
+</div>
+</div>
+
+   

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/images (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/images)

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/italic.gif
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/italic.gif (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/italic.gif)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/link.gif
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/link.gif (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/link.gif)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/main.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-daytime/main.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/main.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,16 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="content">
-<div class="blog">
-{foreach from=$posts item=post}
-{** <!-- I don't like showing summary only --> **}
-{**if $showAll}
-  {include file="$blogtemplate/postsummary.template"}
-{else**}
-  {include file="$blogtemplate/post.template"}
-{**/if**}
-{/foreach}
-{pager style="links"}
-</div>
-</div>
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/main.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/main.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-daytime/main.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/main.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,16 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+<div class="blog">
+{foreach from=$posts item=post}
+{** <!-- I don't like showing summary only --> **}
+{**if $showAll}
+  {include file="$blogtemplate/postsummary.template"}
+{else**}
+  {include file="$blogtemplate/post.template"}
+{**/if**}
+{/foreach}
+{pager style="links"}
+</div>
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/nav_bar.inc
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-daytime/nav_bar.inc	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/nav_bar.inc	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,5 +0,0 @@
-
-    <a href="{$url->blogLink()}">{$locale->tr("main")}</a> | 
-    <a href="admin.php" accesskey="2">{$locale->tr("dashboard")}</a> | 
-    <a href="{$url->albumLink()}">{$locale->tr("albums")}</a>
-    
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/nav_bar.inc (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/nav_bar.inc)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-daytime/nav_bar.inc	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/nav_bar.inc	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,5 @@
+
+    <a href="{$url->blogLink()}">{$locale->tr("main")}</a> | 
+    <a href="admin.php" accesskey="2">{$locale->tr("dashboard")}</a> | 
+    <a href="{$url->albumLink()}">{$locale->tr("albums")}</a>
+    
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/panel.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-daytime/panel.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/panel.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,86 +0,0 @@
-<div id="links">
-{assign var=blogOwner value=$blog->getOwnerInfo()}
-{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
-{if $blogOwner->hasPicture() && $AboutMyself}  
-  	 <div class="sidetitle"><h4>{$locale->tr("about_myself")}</h4></div>
-  	{assign var=picture value=$blogOwner->getPicture()}
-  	<p><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /><br/>
-  	{$AboutMyself}</p>
-{/if}
-<div class="sidetitle">
-    {$locale->tr("calendar")}
-   </div>
- <div class="sideCal">
-    {$calendar}
- </div>
-<div class="sidetitle">
-{$locale->tr("search")}
-</div>
-    <div class="side" id="Search"> 
-	<form id="search_form"  name="search_form" method="post" action="{$url->getIndexUrl()}">
-	<!--fieldset-->
-	<label for="searchTerms"><input type="text" id="searchTerms" name="searchTerms" value="" size="10"/></label>
-	<input type="submit" name="Search" value="{$locale->tr("search_s")}" class="button" />
-	<input type="hidden" name="op" value="Search" />
-	<input type="hidden" name="blogId" value="{$blog->getId()}" />
-	<!--/fieldset-->
-	</form>
-    </div>   
- <div class="sidetitle">
-  {$locale->tr("recently")}
- </div>
- <div class="side">
-  <ul>
-  {foreach from=$recentposts item=post}
-<li><a title="{$post->getText()|strip_tags|truncate:15:"..."|escape}" href="{$url->postLink($post)}">{$post->getTopic()}</a></li>
-  {/foreach}
-  </ul>
- </div>
-
- <div class="sidetitle">
-  {$locale->tr("categories")}
- </div>
- <div class="side">
-<ul>
-   {foreach from=$articlecategories item=articleCategory}
-<li><a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a> [{$articleCategory->getNumArticles()}]
-<a class="nodecoration" href="{$url->categoryRssLink($articleCategory)}"><img border="0" src="{$url->getUrl("/imgs/rss_logo_small.gif")}" alt="RSS Feed for this category." height="12" /></a></li>
-   {/foreach}
-</ul>
- </div>
-
- <div class="sidetitle">
-  {$locale->tr("archives")}
- </div>
- <div class="side">
-<ul>
-  {foreach from=$archives item=archivelink}
-<li><a href="{$archivelink->getUrl()}">{$archivelink->getName()}</a> [{$archivelink->getNumArticles()}]</li>
-  {/foreach}
-</ul>
- </div>
- <div class="sidetitle">
-  {$locale->tr("links")}
- </div>
- <div class="side">
-
-   {foreach from=$mylinkscategories item=linkcategory}
-<b>{$linkcategory->getName()}</b><br />
-      {foreach from=$linkcategory->getLinks() item=link}
-<a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a><br />
-      {/foreach}
-   {/foreach}  
- </div>
-   <div class="sidetitle">
-    {$locale->tr("syndicate")}
-   </div>
-   <div class="side">
-<ul>
-<li><a title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img border="0" src="{$url->getUrl("/imgs/rss090_logo.gif")}" alt="" /></a></li>
-<li><a title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img border="0" src="{$url->getUrl("/imgs/rss10_logo.gif")}" alt="" /></a></li>
-<li><a title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img border="0" src="{$url->getUrl("/imgs/rss20_logo.gif")}" alt="" /></a></li>
-<li><a title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img border="0" src="{$url->getUrl("/imgs/atom_logo.png")}" alt="" /></a></li>
-</ul>
-   </div>
-
-</div>

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/panel.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/panel.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-daytime/panel.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/panel.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,86 @@
+<div id="links">
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}  
+  	 <div class="sidetitle"><h4>{$locale->tr("about_myself")}</h4></div>
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	<p><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /><br/>
+  	{$AboutMyself}</p>
+{/if}
+<div class="sidetitle">
+    {$locale->tr("calendar")}
+   </div>
+ <div class="sideCal">
+    {$calendar}
+ </div>
+<div class="sidetitle">
+{$locale->tr("search")}
+</div>
+    <div class="side" id="Search"> 
+	<form id="search_form"  name="search_form" method="post" action="{$url->getIndexUrl()}">
+	<!--fieldset-->
+	<label for="searchTerms"><input type="text" id="searchTerms" name="searchTerms" value="" size="10"/></label>
+	<input type="submit" name="Search" value="{$locale->tr("search_s")}" class="button" />
+	<input type="hidden" name="op" value="Search" />
+	<input type="hidden" name="blogId" value="{$blog->getId()}" />
+	<!--/fieldset-->
+	</form>
+    </div>   
+ <div class="sidetitle">
+  {$locale->tr("recently")}
+ </div>
+ <div class="side">
+  <ul>
+  {foreach from=$recentposts item=post}
+<li><a title="{$post->getText()|strip_tags|truncate:15:"..."|escape}" href="{$url->postLink($post)}">{$post->getTopic()}</a></li>
+  {/foreach}
+  </ul>
+ </div>
+
+ <div class="sidetitle">
+  {$locale->tr("categories")}
+ </div>
+ <div class="side">
+<ul>
+   {foreach from=$articlecategories item=articleCategory}
+<li><a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a> [{$articleCategory->getNumArticles()}]
+<a class="nodecoration" href="{$url->categoryRssLink($articleCategory)}"><img border="0" src="{$url->getUrl("/imgs/rss_logo_small.gif")}" alt="RSS Feed for this category." height="12" /></a></li>
+   {/foreach}
+</ul>
+ </div>
+
+ <div class="sidetitle">
+  {$locale->tr("archives")}
+ </div>
+ <div class="side">
+<ul>
+  {foreach from=$archives item=archivelink}
+<li><a href="{$archivelink->getUrl()}">{$archivelink->getName()}</a> [{$archivelink->getNumArticles()}]</li>
+  {/foreach}
+</ul>
+ </div>
+ <div class="sidetitle">
+  {$locale->tr("links")}
+ </div>
+ <div class="side">
+
+   {foreach from=$mylinkscategories item=linkcategory}
+<b>{$linkcategory->getName()}</b><br />
+      {foreach from=$linkcategory->getLinks() item=link}
+<a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a><br />
+      {/foreach}
+   {/foreach}  
+ </div>
+   <div class="sidetitle">
+    {$locale->tr("syndicate")}
+   </div>
+   <div class="side">
+<ul>
+<li><a title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img border="0" src="{$url->getUrl("/imgs/rss090_logo.gif")}" alt="" /></a></li>
+<li><a title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img border="0" src="{$url->getUrl("/imgs/rss10_logo.gif")}" alt="" /></a></li>
+<li><a title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img border="0" src="{$url->getUrl("/imgs/rss20_logo.gif")}" alt="" /></a></li>
+<li><a title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img border="0" src="{$url->getUrl("/imgs/atom_logo.png")}" alt="" /></a></li>
+</ul>
+   </div>
+
+</div>

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/post.gif
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/post.gif (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/post.gif)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-daytime/post.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/post.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,27 +0,0 @@
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-<div class="blogbody">
-
-<div class="post_outline">
-<div class="post_title"><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></div>
-<div class="post_content_space">
-<div class="posted">
-	{$postOwner->getUsername()} | {$locale->formatDate($postDate,"%d %b, %Y")}, {$locale->formatDate($postDate,"%H:%M")} | 
-	{foreach name=categories from=$post->getCategories() item=postCategory}
-		<a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
-	{/foreach} | ({$post->getNumReads()} Reads)
-</div>
-<div class="post_content">
- {$post->getText()}
-</div>
-<blockquote class="mt">Trackback URL: {$url->getTrackbackUrl()}?id={$post->getId()}</blockquote>
-<div class="posted">
-	<a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> | <a href="{$url->postPermalink($post)}">{$locale->tr("comments")}({$post->getNumComments()})</a> | 
-    <a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")}({$post->getNumTrackbacks()})</a>
-</div>
-</div>
-</div>
-
-</div>
-<br/>
-

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/post.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/post.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-daytime/post.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/post.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,27 @@
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+<div class="blogbody">
+
+<div class="post_outline">
+<div class="post_title"><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></div>
+<div class="post_content_space">
+<div class="posted">
+	{$postOwner->getUsername()} | {$locale->formatDate($postDate,"%d %b, %Y")}, {$locale->formatDate($postDate,"%H:%M")} | 
+	{foreach name=categories from=$post->getCategories() item=postCategory}
+		<a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+	{/foreach} | ({$post->getNumReads()} Reads)
+</div>
+<div class="post_content">
+ {$post->getText()}
+</div>
+<blockquote class="mt">Trackback URL: {$url->getTrackbackUrl()}?id={$post->getId()}</blockquote>
+<div class="posted">
+	<a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> | <a href="{$url->postPermalink($post)}">{$locale->tr("comments")}({$post->getNumComments()})</a> | 
+    <a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")}({$post->getNumTrackbacks()})</a>
+</div>
+</div>
+</div>
+
+</div>
+<br/>
+

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-daytime/postandcomments.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/postandcomments.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,75 +0,0 @@
-{include file="$blogtemplate/header.template"}
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-
-<div id="container">
-
-{* Prevpost and nextpost use *}
-<div id="article_index">
-  {assign var=nextpost value=$post->getNextArticle()}
-   {assign var=prevpost value=$post->getPrevArticle()}
- {if $prevpost == true}
-     <a href="{$url->postPermalink($prevpost)}" title="{$locale->tr("previous_post")}: {$prevpost->getTopic()}">&laquo; {$locale->tr("previous_post")}</a> |
-   {/if}
-   {if $nextpost == true}
-     <a href="{$url->postPermalink($nextpost)}" title="{$locale->tr("next_post")}: {$nextpost->getTopic()}">{$locale->tr("next_post")}&raquo;</a>
-   {/if}
-   </div>
-{* End of article_index *}
-
-
-<div class="blog">
- <!--{$url->postTrackbackLink($post)}-->
- {include file="$blogtemplate/post.template"}
-        {pager style="links"}    
-</div>
-
-
-
-{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
- <div class="blog">
-
-
- <!--div class="comments-head">
-  <a name="comments"></a>Comments
- </div-->
- {foreach name=comment from=$comments item=comment}
-
-<div class="comment_outline">
-<div class="comment_title"><div class="comments-head">[{$smarty.foreach.comment.iteration}] {$comment->getTopic()}</div></div>
-<div class="comment_content_space">
-{if $comment->IsPosterAuthenticated()}
-	{assign var=poster value=$comment->getUser()}
-	{if $poster->hasPicture()}
-		{assign var=posterimg value=$poster->getPicture()}
-		<img src="{$posterimg->getPreviewLink()}" alt="{$poster->getUserName()}" align="right" class="poster_avatar"/>
-	{/if}
-{/if}
-{$comment->gettext()}
-
-<div class="comments-post">
-[<a href="{$url->postPermalink($post)}#CommentForm">{$locale->tr("comments")}</a>]|
-    {$locale->tr("posted_by")}
-    {if $comment->getUserUrl() != ""}
-     <a href="{$comment->getUserUrl()}"}>{$comment->getUsername()}</a>
-    {else}
-     {$comment->getUsername()}
-    {/if}
-	|{assign var=commentDate value=$comment->getDateObject()}
-    {$locale->formatDate($commentDate, "%d %b %Y, %H:%M")}
-</div>
-</div>
-</div>
-<br />
-{/foreach}
-
-
- {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
-   {include file="$misctemplatepath/commentform.template"}
- {/if}
- </div>
- {/if}
- <div class="clear">&nbsp;</div>
-</div>
-{include file="$blogtemplate/panel.template"} 
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/postandcomments.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/postandcomments.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-daytime/postandcomments.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/postandcomments.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,75 @@
+{include file="$blogtemplate/header.template"}
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+
+<div id="container">
+
+{* Prevpost and nextpost use *}
+<div id="article_index">
+  {assign var=nextpost value=$post->getNextArticle()}
+   {assign var=prevpost value=$post->getPrevArticle()}
+ {if $prevpost == true}
+     <a href="{$url->postPermalink($prevpost)}" title="{$locale->tr("previous_post")}: {$prevpost->getTopic()}">&laquo; {$locale->tr("previous_post")}</a> |
+   {/if}
+   {if $nextpost == true}
+     <a href="{$url->postPermalink($nextpost)}" title="{$locale->tr("next_post")}: {$nextpost->getTopic()}">{$locale->tr("next_post")}&raquo;</a>
+   {/if}
+   </div>
+{* End of article_index *}
+
+
+<div class="blog">
+ <!--{$url->postTrackbackLink($post)}-->
+ {include file="$blogtemplate/post.template"}
+        {pager style="links"}    
+</div>
+
+
+
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
+ <div class="blog">
+
+
+ <!--div class="comments-head">
+  <a name="comments"></a>Comments
+ </div-->
+ {foreach name=comment from=$comments item=comment}
+
+<div class="comment_outline">
+<div class="comment_title"><div class="comments-head">[{$smarty.foreach.comment.iteration}] {$comment->getTopic()}</div></div>
+<div class="comment_content_space">
+{if $comment->IsPosterAuthenticated()}
+	{assign var=poster value=$comment->getUser()}
+	{if $poster->hasPicture()}
+		{assign var=posterimg value=$poster->getPicture()}
+		<img src="{$posterimg->getPreviewLink()}" alt="{$poster->getUserName()}" align="right" class="poster_avatar"/>
+	{/if}
+{/if}
+{$comment->gettext()}
+
+<div class="comments-post">
+[<a href="{$url->postPermalink($post)}#CommentForm">{$locale->tr("comments")}</a>]|
+    {$locale->tr("posted_by")}
+    {if $comment->getUserUrl() != ""}
+     <a href="{$comment->getUserUrl()}"}>{$comment->getUsername()}</a>
+    {else}
+     {$comment->getUsername()}
+    {/if}
+	|{assign var=commentDate value=$comment->getDateObject()}
+    {$locale->formatDate($commentDate, "%d %b %Y, %H:%M")}
+</div>
+</div>
+</div>
+<br />
+{/foreach}
+
+
+ {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
+   {include file="$misctemplatepath/commentform.template"}
+ {/if}
+ </div>
+ {/if}
+ <div class="clear">&nbsp;</div>
+</div>
+{include file="$blogtemplate/panel.template"} 
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/postsummary.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-daytime/postsummary.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/postsummary.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,19 +0,0 @@
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-
-<div class="blogbody">
-
-<div class="post_outline">
-<div class="post_title"><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></div>
-<div class="post_content_space">
-<div class="posted">
-	{$postOwner->getUsername()} | {$locale->formatDate($postDate,"%d %b, %Y")}, {$locale->formatDate($postDate,"%H:%M")} |
-	{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>
-</div>
-
-</div>
-<br/>

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/postsummary.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/postsummary.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-daytime/postsummary.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/postsummary.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,19 @@
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+
+<div class="blogbody">
+
+<div class="post_outline">
+<div class="post_title"><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></div>
+<div class="post_content_space">
+<div class="posted">
+	{$postOwner->getUsername()} | {$locale->formatDate($postDate,"%d %b, %Y")}, {$locale->formatDate($postDate,"%H:%M")} |
+	{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>
+</div>
+
+</div>
+<br/>

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/posttrackbacks.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-daytime/posttrackbacks.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/posttrackbacks.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,22 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="content">
- <div class="blog">
-
- <div class="tb_outline">
-<div class="tb_title">{$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>"</div>
-<div class="tb_content_space">
-	{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> Date would be here<br/><br/>
-    {/foreach}
-
-
-</div>
-</div>
- </div>
-</div>
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/posttrackbacks.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/posttrackbacks.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-daytime/posttrackbacks.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/posttrackbacks.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,22 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+ <div class="blog">
+
+ <div class="tb_outline">
+<div class="tb_title">{$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>"</div>
+<div class="tb_content_space">
+	{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> Date would be here<br/><br/>
+    {/foreach}
+
+
+</div>
+</div>
+ </div>
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/resource.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-daytime/resource.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/resource.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,59 +0,0 @@
-{include file="$blogtemplate/header.template"}
-{assign var=metadata value=$resource->getMetadataReader()}
-{assign var=updated value=$resource->getTimestamp()}
-{assign var=album value=$resource->getAlbum()}
-<div id="album_list">
- <div class="blog">
-
-<div class="album_outline">
-<div class="album_title">{$resource->getFileName()}</div>
-<div class="album_content_space">
-
-	<div class="posted">
-	<img src="{$url->getTemplateFile("folderblue.gif")}" width="10" height="11" alt="Download" style="border:0px;" />
-	<a href="{$url->albumLink($album)}">{$album->getName()}</a> | 
-    <img src="{$url->getTemplateFile("download.gif")}" width="10" height="11" alt="Download" style="border:0px;" />
-    <a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a> 
-    ({$metadata->getRoundedSize()}) | {$locale->tr("created")} {$locale->formatDate($updated,"%d %b, %Y")}
-   </div>
-
-	<p>{$resource->getDescription()}</p>
-  {if $resource->isImage()}
-   <img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
-  {else}
-   <a href="{$url->resourceDownloadLink($resource)}">
-   {* show some information about the file *}
-   {if $resource->isSound()}
-     <img alt="Sound" src="{$url->getTemplateFile("images/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->getTemplateFile("images/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->getTemplateFile("images/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->getTemplateFile("images/file.gif")}" height="64" width="64" style="border:0px;" /><br/>
-     {$resource->getFileName()}
-     </a>    
-   {/if}   
-  {/if}
-</div>
-</div>
-
- </div>
-</div>
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/resource.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/resource.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-daytime/resource.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/resource.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,59 @@
+{include file="$blogtemplate/header.template"}
+{assign var=metadata value=$resource->getMetadataReader()}
+{assign var=updated value=$resource->getTimestamp()}
+{assign var=album value=$resource->getAlbum()}
+<div id="album_list">
+ <div class="blog">
+
+<div class="album_outline">
+<div class="album_title">{$resource->getFileName()}</div>
+<div class="album_content_space">
+
+	<div class="posted">
+	<img src="{$url->getTemplateFile("folderblue.gif")}" width="10" height="11" alt="Download" style="border:0px;" />
+	<a href="{$url->albumLink($album)}">{$album->getName()}</a> | 
+    <img src="{$url->getTemplateFile("download.gif")}" width="10" height="11" alt="Download" style="border:0px;" />
+    <a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a> 
+    ({$metadata->getRoundedSize()}) | {$locale->tr("created")} {$locale->formatDate($updated,"%d %b, %Y")}
+   </div>
+
+	<p>{$resource->getDescription()}</p>
+  {if $resource->isImage()}
+   <img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
+  {else}
+   <a href="{$url->resourceDownloadLink($resource)}">
+   {* show some information about the file *}
+   {if $resource->isSound()}
+     <img alt="Sound" src="{$url->getTemplateFile("images/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->getTemplateFile("images/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->getTemplateFile("images/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->getTemplateFile("images/file.gif")}" height="64" width="64" style="border:0px;" /><br/>
+     {$resource->getFileName()}
+     </a>    
+   {/if}   
+  {/if}
+</div>
+</div>
+
+ </div>
+</div>
+{include file="$blogtemplate/footer.template"}

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

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

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-daytime/searchresults.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/searchresults.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,32 +0,0 @@
-{include file="$blogtemplate/header.template"}
-
-<div id="container">
- <div class="blog">
-
-<div class="sr_outline">
-<div class="sr_title"><div class="comments-head">{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</div></div>
-{foreach from=$searchresults item=result}
-<div class="sr_content_space">
-
-	{assign var=article value=$result->getArticle()}
-
-	<a href="{$url->postPermalink($article)}">{$article->getTopic()}</a>
-	<div class="posted">
-	{foreach name=categories from=$article->getCategories() item=articleCategory}
-		{$locale->tr("categories")}: <a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a>
-		{if !$smarty.foreach.categories.last}, {/if}
-	{/foreach}
-	</div>
-</div>
-<br />
-{/foreach}
-</div>
-
-</div>
-
-</div>
-
-{include file="$blogtemplate/panel.template"}
-
-{include file="$blogtemplate/footer.template"}
-

Copied: templates/branches/lifetype-1.2/flyupsky-daytime/searchresults.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/searchresults.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-daytime/searchresults.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/searchresults.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,32 @@
+{include file="$blogtemplate/header.template"}
+
+<div id="container">
+ <div class="blog">
+
+<div class="sr_outline">
+<div class="sr_title"><div class="comments-head">{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</div></div>
+{foreach from=$searchresults item=result}
+<div class="sr_content_space">
+
+	{assign var=article value=$result->getArticle()}
+
+	<a href="{$url->postPermalink($article)}">{$article->getTopic()}</a>
+	<div class="posted">
+	{foreach name=categories from=$article->getCategories() item=articleCategory}
+		{$locale->tr("categories")}: <a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a>
+		{if !$smarty.foreach.categories.last}, {/if}
+	{/foreach}
+	</div>
+</div>
+<br />
+{/foreach}
+</div>
+
+</div>
+
+</div>
+
+{include file="$blogtemplate/panel.template"}
+
+{include file="$blogtemplate/footer.template"}
+

Deleted: templates/branches/lifetype-1.2/flyupsky-daytime/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-daytime/style.css	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/style.css	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,777 +0,0 @@
-html {
-/* IE Horizontal scrollbar fix */
-overflow-y: scroll;
-/* force scrollbars in moz */
-height: 100%;
-margin-bottom: 1px;
-}
-
-body {
-text-align: center;
-margin: 0;
-padding: 0;
-background-color: #613412;
-background: transparent url(images/bg.gif);
-font-family: lucida grande, verdana, arial, sans-serif;
-color:black;
-}
-
-#outframe {
-background: transparent url(images/border.gif) repeat-y scroll;
-width:776px;
-padding: 0px;
-
-}
-
-#header {
-text-align: left;
-padding: 0px;
-margin: 0px auto;
-height: 180px;
-width: 776px;
-background: transparent url(images/logo.jpg) no-repeat scroll top left;
-color: #666666;
-}
-
-#title {
-	position: relative;
-	left: 0px;
-	top: -25px;
-	padding-left: 20px;
-	font-size:28px;
-	font-family: lucida grande, verdana, arial, sans-serif;
-	font-weight: bold;
-	color: #FFFFFF;
-}
-
-.description{
-	font-size:14px;
-	color: #FFFFFF;
-}
-#title a{
-	text-decoration: none;
-	color: #227388;
-}
-#title a:hover{
-	text-decoration: none;
-	color: #FFFFFF;
-}
-
-#nav_r{
-	position: relative;
-	left: 0px;
-	top: 110px;
-	width: 100%;
-	height: 25px;
-	padding-left: 20px;
-	padding-top:22px;
-/*	text-align: center;*/
-	/*background: transparent url(images/nav_bar.gif) no-repeat scroll left top;*/
-	color: #FFFFFF;
-	font: 12px georgia, times new roman, times, serif;
-}
-
-#nav_r a		{ color: #FFFFFF; background: transparent; text-decoration: none;}
-#nav_r a:link	{ color: #FFFFFF; background: transparent; text-decoration: none;}
-#nav_r a:visited	{ color: #FFFFFF; background: transparent; text-decoration: none;}
-#nav_r a:active	{ color: #FFFFFF; background: transparent; text-decoration: none;}
-#nav_r a:hover	{ color: #B4E6FA; background: transparent;text-decoration: underline; }
-
-
-
-
-#content,#container {
-color: #666666;
-background: #FFFFFF;
-float: left;
-width: 510px;
-text-align: left;
-margin-left: 15px;
-/*border: 2px solid #0F964F;*/
-}
-
-/*  The css tag is set for pre_post and next_post.
-The colomun is blocked by div tag which is named as article_index */
-#article_index{
-text-align:center;
-font-size:12px;
-margin-top:5px;
-color: white;
-}
-
-#article_index	a		{ color: #F36D20; background: transparent; text-decoration: none;}
-#article_index	a:link	{ color: #F36D20; background: transparent; }
-#article_index	a:visited	{ color: #F36D20; background: transparent; }
-#article_index	a:active	{ color: #F36D20; background: transparent; }
-#article_index	a:hover	{ color: #148EAC; background: transparent; }
-
-.blog {
-float: left;
-width: 98%;
-font-size: 12px;
-padding-bottom: 10px;
-padding-right: 10px;
-background: transparent;
-}
-
-.blog a:link {color: #F36D20;text-decoration: none; background: none;}
-.blog a:visited {color: #F36D20;text-decoration: none; background: none;}
-.blog a:active {color: #F36D20;text-decoration: none;}
-.blog a:hover {color: #148EAC;text-decoration: underline;}
-
-.blogbody {
-font-size: 12px;
-line-height: 140%;
-color: #666666;
-
-background: transparent;
-}
-
-
-
-/*  add by reic */
-blockquote {
-color: #666;
-border: #777777 1px solid;
-background-color: #eee;
-margin: 20px 25px;
-padding: 0px 10px;
-font-size:12px;
-font-weight:normal;
-line-height:150%;
-width: auto;
-}
-
-
-blockquote.mt {
-border: 1px solid White;
-text-align: center;
-font-size:10px;
-padding: 2px 0px;
-}
-
-h3.title {
-font-size: large;
-background: #0F964F;
-color: #FFFFFF;
-
-}
-h3.title a,
-h3.title a:link,
-h3.title a:visited
-{
-color: #FFFFFF;
-background:transparent;
-text-decoration:none;
-display: block;
-
-padding-left: 5px;
-padding-bottom: 3px;
-padding-top: 5px;}
-h3.title a:active,h3.title a:hover
-{
-display:block;
-color: #FFFFFF;
-text-decoration:underline;
-background:transparent;}
-
-div.posted {
-	color: #0F964F;
-	font: 12px georgia, times new roman, times, serif;
-	padding: 0px 5px 10px 5px;
-	text-align: right;
-	word-spacing: 0.09em;
-	text-align: right;
-}
-
-div.post_content {
-	padding-top: 10px;
-	padding-bottom: 10px;
-	color: #666666;
-}
-
-div.post_outline {
-	width: 100%;
-	background-color: #0F964F; 
-	padding:2px; 
-	border-bottom: 2px solid #DDDDDD;
-	border-right: 2px solid #DDDDDD;
-}
-
-div.post_title {
-	font-size: 16px;
-	background-color: #0F964F; 
-	height:20px; 
-	line-height: 140%;
-	color: #FFFFFF; 
-	padding-top:1px;
-	padding-left: 5px
-}
-
-.post_title a,
-.post_title a:link,
-.post_title a:visited
-{
-	color: #FFFFFF;
-	background:transparent;
-	text-decoration:none;
-	padding-left: 5px;
-	padding-bottom: 3px;
-	padding-top: 5px;
-}
-
-.post_title a:active,.post_title a:hover
-{
-	color: #B4E6FA;
-	text-decoration:underline;
-	background:transparent;
-}
-
-.post_content_space {
-	background-color: #FFFFFF; 
-	padding:10px; 
-	padding-bottom: 2px;
-}
-
-
-#links {
-float: left;
-width: 190px;
-font: 12px lucida grande, verdana, arial, sans-serif;
-margin-left:10px;
-background: White;
-
-
-color: #666666;
-/*	border-top: 5px solid #006600; */
-}
-
-#links	a		{ color: #227388; background: transparent; text-decoration: none;}
-#links	a:link	{ color: #227388; background: transparent; text-decoration: none;}
-#links	a:visited	{ color: #227388; background: transparent; text-decoration: none;}
-#links	a:active,#links	a:hover
-{ color: #F36D20; text-decoration: underline;}
-
-.sidetitle {
-height: 20px;
-font-size: 12px;
-line-height: 140%;
-background: #A9D6F3;
-border: 1px solid #FFFFFF;
-border-bottom: 2px solid #DDDDDD;
-border-right: 2px solid #DDDDDD;
-color: #666666;
-padding-top:5px;
-text-align: center;
-}
-
-.side {
-text-align: left;
-margin: 5px 5px 10px;
-}
-
-.sideCal {
-text-align: center;
-margin: 5px 5px 10px;
-}
-
-div.side ul {
-list-style: none url(post.gif);
-margin:5px 0px 0px 0px;
-padding:0px 0px 0px 1.7em;
-}
-
-div.side li {
-background: transparent;
-font: 12px arial, sans-seriflucida grande, verdana;
-/*line-height: 100%*/
-color: #666666;
-}
-
-#footer {
-width:100%;
-height: 30px;
-padding-top:15px;
-text-align: left;
-background: transparent url(images/footer.gif) no-repeat scroll left bottom;
-color: #666666;
-}
-
-#credits {
-float: left;
-position: relative;
-top: -10px;
-width: 100%;
-margin: 0px;
-padding: 5px;
-background: transparent;
-color: #666666;
-text-align: center;
-}
-
-#credits p {
-font-size: 10px;
-margin: 0px;
-padding-top: 10px;
-}
-
-#credits	a		{ color: #227388; background: transparent; text-decoration: none;}
-#credits	a:link	{ color: #227388; background: transparent; text-decoration: none;}
-#credits	a:visited	{ color: #227388; background: transparent; text-decoration: none;}
-#credits	a:active   { color: #227388; background: transparent; text-decoration: none;}
-#credits	a:hover
-{ color: #EDA4A4;text-decoration: underline;}
-
-.calendar {
-  font-size: 12px;
-}
-
-.calMonth td { 
-/*  border: 1px dotted #DDDDDD; */
-  text-align: right; 
-  padding:2px;
-  margin:0px; 
-  font-size: 12px;
-} 
-
-.calMonth table{
-	margin: 0px auto;
-	font-size: 12px;
-}
-
-.calMonthCurrent {
-	color: #767E8A;
-	font-weight: bold;
-	font-size: 12px;
-}
-
-.calMonthHeader {
-	color: #767E8A;
-	font-weight: bold;
-	font-size: 12px;
-	background-color: #EFEFEF;
-	margin-top: 2px;
-}
-
-th.calMonthBackward {
-	font-size: 12px;
-}
-
-th.calMonthForward {
-	font-size: 12px;
-}
-
-.calMonthToday {
- color: #666;
-/* background: transparent url(images/today.gif) no-repeat center;
-*/
- background-color: #FFFFCC;
- border-right: 2px solid #666666;
- border-bottom: 2px solid #666666;
-*/
- font-size: 12px;
-}
-
-#space {
-float: left;
-width: 395px;
-padding: 5px 0px 5px 5px;
-background: transparent;
-color: #666666;
-
-}
-
-/* Comment set */
-.comments-head{
-font-size: 12px;
-}
-
-.comments-body {
-font-family:verdana, arial, sans-serif;
-color:#666;
-font-size:12px;
-background-color: #FFFFFF;
-line-height:140%;
-}
-.com_countandpost{
-border-top:2px solid;
-font-size:12px;
-height:14px;
-}
-.comments-count{float:left;
-background: #666;
-color:white;
-width:35px;
-text-align:center;
-}
-
-.comments-post {
-font-family:verdana, arial, sans-serif;
-text-align: right;
-color:#666;
-font-size:12px;
-font-weight:normal;
-background: transparent;
-}
-
-
-/* comment form */
-div.cf_outline {
-	width: 100%;
-	background-color: #EDA4A4; 
-	padding:2px; 
-	border-bottom: 2px solid #DDDDDD;
-	border-right: 2px solid #DDDDDD;
-}
-
-div.cf_title {
-	font-size: 16px;
-	background-color: #EDA4A4; 
-	height:20px; 
-	line-height: 140%;
-	color: #FFFFFF; 
-	padding-top:1px;
-	padding-left: 5px
-}
-
-.cf_title a,
-.cf_title a:link,
-.cf_title a:visited
-{
-	color: #FFFFFF;
-	background:transparent;
-	text-decoration:none;
-	padding-left: 5px;
-	padding-bottom: 3px;
-	padding-top: 5px;
-}
-
-.cf_title a:active,.cf_title a:hover
-{
-	color: #FFDD06;
-	text-decoration:underline;
-	background:transparent;
-}
-
-.cf_content_space {
-	background: transparent url(images/bg_white.gif);
-	background-color: #FFFFFF; 
-	padding:10px; 
-	padding-bottom: 2px;
-}
-
-.cf_left {
-	background:transparent;
-	width:200px; 
-	float:left; 
-	text-align:left; 
-	padding-right: 5px;
-}
-
-.cf_right {
-	background:transparent;
-	padding-left: 5px;
-}
-
-/* comments */
-div.comment_outline {
-	width: 100%;
-	background-color: #C4C4C4; 
-	padding:2px; 
-	border-bottom: 2px solid #DDDDDD;
-	border-right: 2px solid #DDDDDD;
-}
-
-div.comment_title {
-	font-size: 16px;
-	background-color: #C4C4C4; 
-	height:20px; 
-	line-height: 140%;
-	color: #FFFFFF; 
-	padding-top:1px;
-	padding-left: 5px
-}
-
-
-.comment_content_space {	
-	background: transparent url(images/bg_white.gif);
-	background-color: #FFFFFF; 
-	padding:10px;
-	padding-top: 2px;
-	padding-bottom: 2px;
-}
-
-/* search result */
-div.sr_outline {
-	width: 100%;
-	background-color: #0F964F; 
-	padding:2px; 
-	border-bottom: 2px solid #DDDDDD;
-	border-right: 2px solid #DDDDDD;
-}
-
-div.sr_title {
-	font-size: 16px;
-	background-color: #0F964F; 
-	height:20px; 
-	line-height: 140%;
-	color: #FFFFFF; 
-	padding-top:1px;
-	padding-left: 5px
-}
-
-.sr_title a,
-.sr_title a:link,
-.sr_title a:visited
-{
-	color: #FFFFFF;
-	background:transparent;
-	text-decoration:none;
-	padding-left: 5px;
-	padding-bottom: 3px;
-	padding-top: 5px;
-}
-
-.sr_title a:active,.sr_title a:hover
-{
-	color: #FFDD06;
-	text-decoration:underline;
-	background:transparent;
-}
-
-.sr_content_space {
-	background: transparent url(images/bg_white.gif);
-	background-color: #FFFFFF; 
-	padding:10px; 
-}
-
-/* trackback list */
-div.tb_outline {
-	width: 100%;
-	background-color: #EDA4A4; 
-	padding:2px; 
-	border-bottom: 2px solid #DDDDDD;
-	border-right: 2px solid #DDDDDD;
-}
-
-div.tb_title {
-	font-size: 16px;
-	background-color: #EDA4A4; 
-	height:20px; 
-	line-height: 140%;
-	color: #FFFFFF; 
-	padding-top:1px;
-	padding-left: 5px
-}
-
-.tb_title a,
-.tb_title a:link,
-.tb_title a:visited
-{
-	color: #FFFFFF;
-	background:transparent;
-	text-decoration:none;
-	padding-bottom: 3px;
-	padding-top: 5px;
-}
-
-.tb_title a:active,.tb_title a:hover
-{
-	color: #FFDD06;
-	text-decoration:underline;
-	background:transparent;
-}
-
-.tb_content_space {
-	background: transparent url(images/bg_white.gif);
-	background-color: #FFFFFF; 
-	padding:10px; 
-}
-
-/* error box */
-div.err_outline {
-	width: 100%;
-	background-color: #919191; 
-	padding:2px; 
-	border-bottom: 2px solid #DDDDDD;
-	border-right: 2px solid #DDDDDD;
-}
-
-div.err_title {
-	font-size: 16px;
-	background-color: #919191; 
-	height:20px; 
-	line-height: 140%;
-	color: #FFFFFF; 
-	padding-top:1px;
-	padding-left: 5px
-}
-
-.err_title a,
-.err_title a:link,
-.err_title a:visited
-{
-	color: #FFFFFF;
-	background:transparent;
-	text-decoration:none;
-	padding-left: 5px;
-	padding-bottom: 3px;
-	padding-top: 5px;
-}
-
-.err_title a:active,.err_title a:hover
-{
-	color: #FFDD06;
-	text-decoration:underline;
-	background:transparent;
-}
-
-.err_content_space {
-	background: transparent url(images/bg_white.gif);
-	background-color: #FFFFFF; 
-	padding:10px; 
-}
-
-/* ******************  albums  *************** */
-
-#album_list {
-	color: #666666;
-	background: #FFFFFF;
-	float: left;
-	width: 720px;
-	text-align: left;
-	margin-left: 15px;
-}
-
-/* album box */
-div.album_outline {
-	width: 100%;
-	background-color: #53A1B6; 
-	padding:2px; 
-	border-bottom: 2px solid #DDDDDD;
-	border-right: 2px solid #DDDDDD;
-}
-
-div.album_title {
-	font-size: 16px;
-	background-color: #53A1B6; 
-	height:20px; 
-	line-height: 140%;
-	color: #FFFFFF; 
-	padding-top:1px;
-	padding-left: 5px
-}
-
-.album_title a,
-.album_title a:link,
-.album_title a:visited
-{
-	color: #FFFFFF;
-	background:transparent;
-	text-decoration:none;
-	padding-left: 5px;
-	padding-bottom: 3px;
-	padding-top: 5px;
-}
-
-.album_title a:active,.album_title a:hover
-{
-	color: #FFDD06;
-	text-decoration:underline;
-	background:transparent;
-}
-
-.album_content_space {
-/*	text-align: center;*/
-	background: transparent url(images/bg_white.gif);
-	background-color: #FFFFFF; 
-	padding:10px; 
-	padding-bottom: 2px;
-	height:100%;
-}
-
-
-div.album {
-	text-align: center;
-    float: left;
-    width:150px;
-    margin-bottom:20px;
-	background:transparent;
-}
-
-.album p {
-   	text-align: center;
-   	padding:0;
-   	margin:0;
-   	width:150px;
-   	}
-
-.album_sublist {
-	float: left;
-	width: 100px;
-	background-color: #53A1B6; 
-	padding:2px; 
-	border-bottom: 2px solid #DDDDDD;
-	margin-right: 20px;
-}
-
-.album_sub {
-	margin-bottom: 20px;
-	margin-right: 20px;
-
-
-}
-		
-.clear{
-clear: both;
-}
-img{
-	border: 0px;
-}
-
-.button {
-height: 25px;
-padding-left: 5px;
-padding-right: 5px;
-
-font-size: 12px;
-border: 1px solid #FFFFFF;
-border-bottom: 1px solid #666666;
-border-right: 1px solid #666666;
-background-color: #EEEEEE;
-
-}
-.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/flyupsky-daytime/style.css (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-daytime/style.css)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-daytime/style.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-daytime/style.css	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,777 @@
+html {
+/* IE Horizontal scrollbar fix */
+overflow-y: scroll;
+/* force scrollbars in moz */
+height: 100%;
+margin-bottom: 1px;
+}
+
+body {
+text-align: center;
+margin: 0;
+padding: 0;
+background-color: #613412;
+background: transparent url(images/bg.gif);
+font-family: lucida grande, verdana, arial, sans-serif;
+color:black;
+}
+
+#outframe {
+background: transparent url(images/border.gif) repeat-y scroll;
+width:776px;
+padding: 0px;
+
+}
+
+#header {
+text-align: left;
+padding: 0px;
+margin: 0px auto;
+height: 180px;
+width: 776px;
+background: transparent url(images/logo.jpg) no-repeat scroll top left;
+color: #666666;
+}
+
+#title {
+	position: relative;
+	left: 0px;
+	top: -25px;
+	padding-left: 20px;
+	font-size:28px;
+	font-family: lucida grande, verdana, arial, sans-serif;
+	font-weight: bold;
+	color: #FFFFFF;
+}
+
+.description{
+	font-size:14px;
+	color: #FFFFFF;
+}
+#title a{
+	text-decoration: none;
+	color: #227388;
+}
+#title a:hover{
+	text-decoration: none;
+	color: #FFFFFF;
+}
+
+#nav_r{
+	position: relative;
+	left: 0px;
+	top: 110px;
+	width: 100%;
+	height: 25px;
+	padding-left: 20px;
+	padding-top:22px;
+/*	text-align: center;*/
+	/*background: transparent url(images/nav_bar.gif) no-repeat scroll left top;*/
+	color: #FFFFFF;
+	font: 12px georgia, times new roman, times, serif;
+}
+
+#nav_r a		{ color: #FFFFFF; background: transparent; text-decoration: none;}
+#nav_r a:link	{ color: #FFFFFF; background: transparent; text-decoration: none;}
+#nav_r a:visited	{ color: #FFFFFF; background: transparent; text-decoration: none;}
+#nav_r a:active	{ color: #FFFFFF; background: transparent; text-decoration: none;}
+#nav_r a:hover	{ color: #B4E6FA; background: transparent;text-decoration: underline; }
+
+
+
+
+#content,#container {
+color: #666666;
+background: #FFFFFF;
+float: left;
+width: 510px;
+text-align: left;
+margin-left: 15px;
+/*border: 2px solid #0F964F;*/
+}
+
+/*  The css tag is set for pre_post and next_post.
+The colomun is blocked by div tag which is named as article_index */
+#article_index{
+text-align:center;
+font-size:12px;
+margin-top:5px;
+color: white;
+}
+
+#article_index	a		{ color: #F36D20; background: transparent; text-decoration: none;}
+#article_index	a:link	{ color: #F36D20; background: transparent; }
+#article_index	a:visited	{ color: #F36D20; background: transparent; }
+#article_index	a:active	{ color: #F36D20; background: transparent; }
+#article_index	a:hover	{ color: #148EAC; background: transparent; }
+
+.blog {
+float: left;
+width: 98%;
+font-size: 12px;
+padding-bottom: 10px;
+padding-right: 10px;
+background: transparent;
+}
+
+.blog a:link {color: #F36D20;text-decoration: none; background: none;}
+.blog a:visited {color: #F36D20;text-decoration: none; background: none;}
+.blog a:active {color: #F36D20;text-decoration: none;}
+.blog a:hover {color: #148EAC;text-decoration: underline;}
+
+.blogbody {
+font-size: 12px;
+line-height: 140%;
+color: #666666;
+
+background: transparent;
+}
+
+
+
+/*  add by reic */
+blockquote {
+color: #666;
+border: #777777 1px solid;
+background-color: #eee;
+margin: 20px 25px;
+padding: 0px 10px;
+font-size:12px;
+font-weight:normal;
+line-height:150%;
+width: auto;
+}
+
+
+blockquote.mt {
+border: 1px solid White;
+text-align: center;
+font-size:10px;
+padding: 2px 0px;
+}
+
+h3.title {
+font-size: large;
+background: #0F964F;
+color: #FFFFFF;
+
+}
+h3.title a,
+h3.title a:link,
+h3.title a:visited
+{
+color: #FFFFFF;
+background:transparent;
+text-decoration:none;
+display: block;
+
+padding-left: 5px;
+padding-bottom: 3px;
+padding-top: 5px;}
+h3.title a:active,h3.title a:hover
+{
+display:block;
+color: #FFFFFF;
+text-decoration:underline;
+background:transparent;}
+
+div.posted {
+	color: #0F964F;
+	font: 12px georgia, times new roman, times, serif;
+	padding: 0px 5px 10px 5px;
+	text-align: right;
+	word-spacing: 0.09em;
+	text-align: right;
+}
+
+div.post_content {
+	padding-top: 10px;
+	padding-bottom: 10px;
+	color: #666666;
+}
+
+div.post_outline {
+	width: 100%;
+	background-color: #0F964F; 
+	padding:2px; 
+	border-bottom: 2px solid #DDDDDD;
+	border-right: 2px solid #DDDDDD;
+}
+
+div.post_title {
+	font-size: 16px;
+	background-color: #0F964F; 
+	height:20px; 
+	line-height: 140%;
+	color: #FFFFFF; 
+	padding-top:1px;
+	padding-left: 5px
+}
+
+.post_title a,
+.post_title a:link,
+.post_title a:visited
+{
+	color: #FFFFFF;
+	background:transparent;
+	text-decoration:none;
+	padding-left: 5px;
+	padding-bottom: 3px;
+	padding-top: 5px;
+}
+
+.post_title a:active,.post_title a:hover
+{
+	color: #B4E6FA;
+	text-decoration:underline;
+	background:transparent;
+}
+
+.post_content_space {
+	background-color: #FFFFFF; 
+	padding:10px; 
+	padding-bottom: 2px;
+}
+
+
+#links {
+float: left;
+width: 190px;
+font: 12px lucida grande, verdana, arial, sans-serif;
+margin-left:10px;
+background: White;
+
+
+color: #666666;
+/*	border-top: 5px solid #006600; */
+}
+
+#links	a		{ color: #227388; background: transparent; text-decoration: none;}
+#links	a:link	{ color: #227388; background: transparent; text-decoration: none;}
+#links	a:visited	{ color: #227388; background: transparent; text-decoration: none;}
+#links	a:active,#links	a:hover
+{ color: #F36D20; text-decoration: underline;}
+
+.sidetitle {
+height: 20px;
+font-size: 12px;
+line-height: 140%;
+background: #A9D6F3;
+border: 1px solid #FFFFFF;
+border-bottom: 2px solid #DDDDDD;
+border-right: 2px solid #DDDDDD;
+color: #666666;
+padding-top:5px;
+text-align: center;
+}
+
+.side {
+text-align: left;
+margin: 5px 5px 10px;
+}
+
+.sideCal {
+text-align: center;
+margin: 5px 5px 10px;
+}
+
+div.side ul {
+list-style: none url(post.gif);
+margin:5px 0px 0px 0px;
+padding:0px 0px 0px 1.7em;
+}
+
+div.side li {
+background: transparent;
+font: 12px arial, sans-seriflucida grande, verdana;
+/*line-height: 100%*/
+color: #666666;
+}
+
+#footer {
+width:100%;
+height: 30px;
+padding-top:15px;
+text-align: left;
+background: transparent url(images/footer.gif) no-repeat scroll left bottom;
+color: #666666;
+}
+
+#credits {
+float: left;
+position: relative;
+top: -10px;
+width: 100%;
+margin: 0px;
+padding: 5px;
+background: transparent;
+color: #666666;
+text-align: center;
+}
+
+#credits p {
+font-size: 10px;
+margin: 0px;
+padding-top: 10px;
+}
+
+#credits	a		{ color: #227388; background: transparent; text-decoration: none;}
+#credits	a:link	{ color: #227388; background: transparent; text-decoration: none;}
+#credits	a:visited	{ color: #227388; background: transparent; text-decoration: none;}
+#credits	a:active   { color: #227388; background: transparent; text-decoration: none;}
+#credits	a:hover
+{ color: #EDA4A4;text-decoration: underline;}
+
+.calendar {
+  font-size: 12px;
+}
+
+.calMonth td { 
+/*  border: 1px dotted #DDDDDD; */
+  text-align: right; 
+  padding:2px;
+  margin:0px; 
+  font-size: 12px;
+} 
+
+.calMonth table{
+	margin: 0px auto;
+	font-size: 12px;
+}
+
+.calMonthCurrent {
+	color: #767E8A;
+	font-weight: bold;
+	font-size: 12px;
+}
+
+.calMonthHeader {
+	color: #767E8A;
+	font-weight: bold;
+	font-size: 12px;
+	background-color: #EFEFEF;
+	margin-top: 2px;
+}
+
+th.calMonthBackward {
+	font-size: 12px;
+}
+
+th.calMonthForward {
+	font-size: 12px;
+}
+
+.calMonthToday {
+ color: #666;
+/* background: transparent url(images/today.gif) no-repeat center;
+*/
+ background-color: #FFFFCC;
+ border-right: 2px solid #666666;
+ border-bottom: 2px solid #666666;
+*/
+ font-size: 12px;
+}
+
+#space {
+float: left;
+width: 395px;
+padding: 5px 0px 5px 5px;
+background: transparent;
+color: #666666;
+
+}
+
+/* Comment set */
+.comments-head{
+font-size: 12px;
+}
+
+.comments-body {
+font-family:verdana, arial, sans-serif;
+color:#666;
+font-size:12px;
+background-color: #FFFFFF;
+line-height:140%;
+}
+.com_countandpost{
+border-top:2px solid;
+font-size:12px;
+height:14px;
+}
+.comments-count{float:left;
+background: #666;
+color:white;
+width:35px;
+text-align:center;
+}
+
+.comments-post {
+font-family:verdana, arial, sans-serif;
+text-align: right;
+color:#666;
+font-size:12px;
+font-weight:normal;
+background: transparent;
+}
+
+
+/* comment form */
+div.cf_outline {
+	width: 100%;
+	background-color: #EDA4A4; 
+	padding:2px; 
+	border-bottom: 2px solid #DDDDDD;
+	border-right: 2px solid #DDDDDD;
+}
+
+div.cf_title {
+	font-size: 16px;
+	background-color: #EDA4A4; 
+	height:20px; 
+	line-height: 140%;
+	color: #FFFFFF; 
+	padding-top:1px;
+	padding-left: 5px
+}
+
+.cf_title a,
+.cf_title a:link,
+.cf_title a:visited
+{
+	color: #FFFFFF;
+	background:transparent;
+	text-decoration:none;
+	padding-left: 5px;
+	padding-bottom: 3px;
+	padding-top: 5px;
+}
+
+.cf_title a:active,.cf_title a:hover
+{
+	color: #FFDD06;
+	text-decoration:underline;
+	background:transparent;
+}
+
+.cf_content_space {
+	background: transparent url(images/bg_white.gif);
+	background-color: #FFFFFF; 
+	padding:10px; 
+	padding-bottom: 2px;
+}
+
+.cf_left {
+	background:transparent;
+	width:200px; 
+	float:left; 
+	text-align:left; 
+	padding-right: 5px;
+}
+
+.cf_right {
+	background:transparent;
+	padding-left: 5px;
+}
+
+/* comments */
+div.comment_outline {
+	width: 100%;
+	background-color: #C4C4C4; 
+	padding:2px; 
+	border-bottom: 2px solid #DDDDDD;
+	border-right: 2px solid #DDDDDD;
+}
+
+div.comment_title {
+	font-size: 16px;
+	background-color: #C4C4C4; 
+	height:20px; 
+	line-height: 140%;
+	color: #FFFFFF; 
+	padding-top:1px;
+	padding-left: 5px
+}
+
+
+.comment_content_space {	
+	background: transparent url(images/bg_white.gif);
+	background-color: #FFFFFF; 
+	padding:10px;
+	padding-top: 2px;
+	padding-bottom: 2px;
+}
+
+/* search result */
+div.sr_outline {
+	width: 100%;
+	background-color: #0F964F; 
+	padding:2px; 
+	border-bottom: 2px solid #DDDDDD;
+	border-right: 2px solid #DDDDDD;
+}
+
+div.sr_title {
+	font-size: 16px;
+	background-color: #0F964F; 
+	height:20px; 
+	line-height: 140%;
+	color: #FFFFFF; 
+	padding-top:1px;
+	padding-left: 5px
+}
+
+.sr_title a,
+.sr_title a:link,
+.sr_title a:visited
+{
+	color: #FFFFFF;
+	background:transparent;
+	text-decoration:none;
+	padding-left: 5px;
+	padding-bottom: 3px;
+	padding-top: 5px;
+}
+
+.sr_title a:active,.sr_title a:hover
+{
+	color: #FFDD06;
+	text-decoration:underline;
+	background:transparent;
+}
+
+.sr_content_space {
+	background: transparent url(images/bg_white.gif);
+	background-color: #FFFFFF; 
+	padding:10px; 
+}
+
+/* trackback list */
+div.tb_outline {
+	width: 100%;
+	background-color: #EDA4A4; 
+	padding:2px; 
+	border-bottom: 2px solid #DDDDDD;
+	border-right: 2px solid #DDDDDD;
+}
+
+div.tb_title {
+	font-size: 16px;
+	background-color: #EDA4A4; 
+	height:20px; 
+	line-height: 140%;
+	color: #FFFFFF; 
+	padding-top:1px;
+	padding-left: 5px
+}
+
+.tb_title a,
+.tb_title a:link,
+.tb_title a:visited
+{
+	color: #FFFFFF;
+	background:transparent;
+	text-decoration:none;
+	padding-bottom: 3px;
+	padding-top: 5px;
+}
+
+.tb_title a:active,.tb_title a:hover
+{
+	color: #FFDD06;
+	text-decoration:underline;
+	background:transparent;
+}
+
+.tb_content_space {
+	background: transparent url(images/bg_white.gif);
+	background-color: #FFFFFF; 
+	padding:10px; 
+}
+
+/* error box */
+div.err_outline {
+	width: 100%;
+	background-color: #919191; 
+	padding:2px; 
+	border-bottom: 2px solid #DDDDDD;
+	border-right: 2px solid #DDDDDD;
+}
+
+div.err_title {
+	font-size: 16px;
+	background-color: #919191; 
+	height:20px; 
+	line-height: 140%;
+	color: #FFFFFF; 
+	padding-top:1px;
+	padding-left: 5px
+}
+
+.err_title a,
+.err_title a:link,
+.err_title a:visited
+{
+	color: #FFFFFF;
+	background:transparent;
+	text-decoration:none;
+	padding-left: 5px;
+	padding-bottom: 3px;
+	padding-top: 5px;
+}
+
+.err_title a:active,.err_title a:hover
+{
+	color: #FFDD06;
+	text-decoration:underline;
+	background:transparent;
+}
+
+.err_content_space {
+	background: transparent url(images/bg_white.gif);
+	background-color: #FFFFFF; 
+	padding:10px; 
+}
+
+/* ******************  albums  *************** */
+
+#album_list {
+	color: #666666;
+	background: #FFFFFF;
+	float: left;
+	width: 720px;
+	text-align: left;
+	margin-left: 15px;
+}
+
+/* album box */
+div.album_outline {
+	width: 100%;
+	background-color: #53A1B6; 
+	padding:2px; 
+	border-bottom: 2px solid #DDDDDD;
+	border-right: 2px solid #DDDDDD;
+}
+
+div.album_title {
+	font-size: 16px;
+	background-color: #53A1B6; 
+	height:20px; 
+	line-height: 140%;
+	color: #FFFFFF; 
+	padding-top:1px;
+	padding-left: 5px
+}
+
+.album_title a,
+.album_title a:link,
+.album_title a:visited
+{
+	color: #FFFFFF;
+	background:transparent;
+	text-decoration:none;
+	padding-left: 5px;
+	padding-bottom: 3px;
+	padding-top: 5px;
+}
+
+.album_title a:active,.album_title a:hover
+{
+	color: #FFDD06;
+	text-decoration:underline;
+	background:transparent;
+}
+
+.album_content_space {
+/*	text-align: center;*/
+	background: transparent url(images/bg_white.gif);
+	background-color: #FFFFFF; 
+	padding:10px; 
+	padding-bottom: 2px;
+	height:100%;
+}
+
+
+div.album {
+	text-align: center;
+    float: left;
+    width:150px;
+    margin-bottom:20px;
+	background:transparent;
+}
+
+.album p {
+   	text-align: center;
+   	padding:0;
+   	margin:0;
+   	width:150px;
+   	}
+
+.album_sublist {
+	float: left;
+	width: 100px;
+	background-color: #53A1B6; 
+	padding:2px; 
+	border-bottom: 2px solid #DDDDDD;
+	margin-right: 20px;
+}
+
+.album_sub {
+	margin-bottom: 20px;
+	margin-right: 20px;
+
+
+}
+		
+.clear{
+clear: both;
+}
+img{
+	border: 0px;
+}
+
+.button {
+height: 25px;
+padding-left: 5px;
+padding-right: 5px;
+
+font-size: 12px;
+border: 1px solid #FFFFFF;
+border-bottom: 1px solid #666666;
+border-right: 1px solid #666666;
+background-color: #EEEEEE;
+
+}
+.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/flyupsky-evening (from rev 6399, templates/branches/lifetype-1.2/unported/flyupsky-evening)

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/album.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-evening/album.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-evening/album.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,84 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="album_list">
-{assign var="postDate" value=$album->getTimestamp()}
-<div class="blog">
-<div class="album_outline">
-<div class="album_title">{$locale->tr("albums")}</div>
-<div class="album_content_space">
-
-<div class="album_outline">
-<div class="album_title">{$album->getName()}</div>
-<div class="album_content_space">
-{$album->getDescription()}
-<div class="posted">
-   <a href="{$url->albumLink($album)}">
-     {$locale->tr("resources")} ({$album->getNumResources()})
-   </a> | {$locale->tr("created")} {$locale->formatDate($postDate,"%d %b, %Y")}
-</div>
-</div>
-</div>
-<br />
-<div class="album_sublist">
-<div class="album_content_space">
-	<div class="album_sub">
-	<a href="{$url->parentAlbumLink($album)}">
-    	<img src="{$url->getTemplateFile("images/parentfolder.gif")}" alt="{$locale->tr("parent")}" /></a>
-    	<p>{$locale->tr("parent")}</p>
-	</div>
-{assign var=children value=$album->getChildren()}
-	{foreach from=$children item=childalbum}
-		<div class="album_sub">
-		<a href="{$url->albumLink($childalbum)}">
-		<img src="{$url->getTemplateFile("images/folder.gif")}" alt="{$childalbum->getName()}" /></a>
-		<br />{$childalbum->getName()} ({$childalbum->getNumResources()})
-		</div>
-	{/foreach}
-</div>
-</div>
-<br />
-
-	
-   		{foreach from=$resources item=resource}
-	<div class="album">
-   		{if $resource->hasPreview()}
-   		{*<a target="_blank" href="resserver.php?blogId={$blog->getId()}&amp;resource={$resource->getFileName()}">*}
-   	<a href="{$url->resourceLink($resource)}" title="{$resource->getFileName()}">
-    	<img alt="{$resource->getDescription()}" src="{$url->resourcePreviewLink($resource)}" /></a>
-    	<p>{$resource->getFileName()}</p>
-   		{else}
-   	<a href="{$url->resourceLink($resource)}"  title="{$resource->getFileName()}">
-   		{if $resource->isSound()}
-    	<img alt="Sound" src="{$url->getTemplateFile("images/sound.gif")}" /></a>
-   		{elseif $resource->isVideo()}
-    	<img alt="Video" src="{$url->getTemplateFile("images/video.gif")}" /></a>
-   		{elseif $resource->isZip()}
-    	<img alt="Zip" src="{$url->getTemplateFile("images/compressed.gif")}" /></a>  
-   		{else}
-   	<img alt="File" src="{$url->getTemplateFile("images/file.gif")}" /></a>
-   		{/if}  
-   	<p>{$resource->getFileName()}</p>
-   		{/if}
-   		{assign var=metadata value=$resource->getMetadataReader()}
-  	<p>{$metadata->getRoundedSize()}</p>
-   		{if $resource->isImage()}
-  	<p>{$metadata->getWidth()} x {$metadata->getHeight()}</p>
-   		{elseif $resource->isSound()}
-  	<p>{$metadata->getFormat()|upper} {$metadata->getSampleRate()} bps</p>
-   		{elseif $resource->isVideo()}
-  	<p>{$metadata->getFormat()|upper} {$metadata->getWidth()} x {$metadata->getHeight()}, {$metadata->getLengthString()}</p>
-   		{elseif $resource->isZip()}
-   	<p>{$metadata->getTotalFiles()} {$locale->tr("files")}</p>
-   		{/if}
-
-  	</div>
-  		{/foreach}
-{pager style="links"}
-
-
-</div>
-</div>
-
- 
- </div>
-</div>
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flyupsky-evening/album.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/album.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-evening/album.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-evening/album.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,84 @@
+{include file="$blogtemplate/header.template"}
+<div id="album_list">
+{assign var="postDate" value=$album->getTimestamp()}
+<div class="blog">
+<div class="album_outline">
+<div class="album_title">{$locale->tr("albums")}</div>
+<div class="album_content_space">
+
+<div class="album_outline">
+<div class="album_title">{$album->getName()}</div>
+<div class="album_content_space">
+{$album->getDescription()}
+<div class="posted">
+   <a href="{$url->albumLink($album)}">
+     {$locale->tr("resources")} ({$album->getNumResources()})
+   </a> | {$locale->tr("created")} {$locale->formatDate($postDate,"%d %b, %Y")}
+</div>
+</div>
+</div>
+<br />
+<div class="album_sublist">
+<div class="album_content_space">
+	<div class="album_sub">
+	<a href="{$url->parentAlbumLink($album)}">
+    	<img src="{$url->getTemplateFile("images/parentfolder.gif")}" alt="{$locale->tr("parent")}" /></a>
+    	<p>{$locale->tr("parent")}</p>
+	</div>
+{assign var=children value=$album->getChildren()}
+	{foreach from=$children item=childalbum}
+		<div class="album_sub">
+		<a href="{$url->albumLink($childalbum)}">
+		<img src="{$url->getTemplateFile("images/folder.gif")}" alt="{$childalbum->getName()}" /></a>
+		<br />{$childalbum->getName()} ({$childalbum->getNumResources()})
+		</div>
+	{/foreach}
+</div>
+</div>
+<br />
+
+	
+   		{foreach from=$resources item=resource}
+	<div class="album">
+   		{if $resource->hasPreview()}
+   		{*<a target="_blank" href="resserver.php?blogId={$blog->getId()}&amp;resource={$resource->getFileName()}">*}
+   	<a href="{$url->resourceLink($resource)}" title="{$resource->getFileName()}">
+    	<img alt="{$resource->getDescription()}" src="{$url->resourcePreviewLink($resource)}" /></a>
+    	<p>{$resource->getFileName()}</p>
+   		{else}
+   	<a href="{$url->resourceLink($resource)}"  title="{$resource->getFileName()}">
+   		{if $resource->isSound()}
+    	<img alt="Sound" src="{$url->getTemplateFile("images/sound.gif")}" /></a>
+   		{elseif $resource->isVideo()}
+    	<img alt="Video" src="{$url->getTemplateFile("images/video.gif")}" /></a>
+   		{elseif $resource->isZip()}
+    	<img alt="Zip" src="{$url->getTemplateFile("images/compressed.gif")}" /></a>  
+   		{else}
+   	<img alt="File" src="{$url->getTemplateFile("images/file.gif")}" /></a>
+   		{/if}  
+   	<p>{$resource->getFileName()}</p>
+   		{/if}
+   		{assign var=metadata value=$resource->getMetadataReader()}
+  	<p>{$metadata->getRoundedSize()}</p>
+   		{if $resource->isImage()}
+  	<p>{$metadata->getWidth()} x {$metadata->getHeight()}</p>
+   		{elseif $resource->isSound()}
+  	<p>{$metadata->getFormat()|upper} {$metadata->getSampleRate()} bps</p>
+   		{elseif $resource->isVideo()}
+  	<p>{$metadata->getFormat()|upper} {$metadata->getWidth()} x {$metadata->getHeight()}, {$metadata->getLengthString()}</p>
+   		{elseif $resource->isZip()}
+   	<p>{$metadata->getTotalFiles()} {$locale->tr("files")}</p>
+   		{/if}
+
+  	</div>
+  		{/foreach}
+{pager style="links"}
+
+
+</div>
+</div>
+
+ 
+ </div>
+</div>
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/albums.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-evening/albums.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-evening/albums.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,28 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="album_list">
-
-<div class="blog">
-<div class="album_outline">
-<div class="album_title">{$locale->tr("albums")}</div>
-<div class="album_content_space">
-	<div class="clear">&nbsp;</div>
-
-
-  	{foreach from=$albums item=album}
-	<div class="album">
-		<a href="{$url->albumLink($album)}"><img src="{$url->getTemplateFile("images/folder.gif")}" alt="{$album->getName()}" /></a>
-
-		<p>{$album->getName()} ({$album->getNumResources()})</p>
-
-		</div>
-	{/foreach}
-
-
-	<div class="clear">&nbsp;</div>
-
-</div>
-</div>
- 
-</div>
-</div>
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flyupsky-evening/albums.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/albums.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-evening/albums.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-evening/albums.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,28 @@
+{include file="$blogtemplate/header.template"}
+<div id="album_list">
+
+<div class="blog">
+<div class="album_outline">
+<div class="album_title">{$locale->tr("albums")}</div>
+<div class="album_content_space">
+	<div class="clear">&nbsp;</div>
+
+
+  	{foreach from=$albums item=album}
+	<div class="album">
+		<a href="{$url->albumLink($album)}"><img src="{$url->getTemplateFile("images/folder.gif")}" alt="{$album->getName()}" /></a>
+
+		<p>{$album->getName()} ({$album->getNumResources()})</p>
+
+		</div>
+	{/foreach}
+
+
+	<div class="clear">&nbsp;</div>
+
+</div>
+</div>
+ 
+</div>
+</div>
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/bold.gif
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/flyupsky-evening/bold.gif (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/bold.gif)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/commentarticle.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-evening/commentarticle.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-evening/commentarticle.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,7 +0,0 @@
-{include file="$blogtemplate/header.template"}
- <div class="comments-head"><a name="comments"></a>Comments</div>
- {if $blogsettings->getValue("comments_enabled")}
-  <div class="comments-head">Post a comment</div>
-  {include file="$blogtemplate/commentform.template"}
- {/if}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flyupsky-evening/commentarticle.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/commentarticle.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-evening/commentarticle.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-evening/commentarticle.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,7 @@
+{include file="$blogtemplate/header.template"}
+ <div class="comments-head"><a name="comments"></a>Comments</div>
+ {if $blogsettings->getValue("comments_enabled")}
+  <div class="comments-head">Post a comment</div>
+  {include file="$blogtemplate/commentform.template"}
+ {/if}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/download.gif
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/flyupsky-evening/download.gif (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/download.gif)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/error.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-evening/error.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-evening/error.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,16 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="container">
- <div class="blog">
-
-<div class="err_outline">
-<div class="err_title">{$locale->tr("error")}</div>
-<div class="err_content_space">
-{$locale->tr($message)}
-
-</div>
-</div>
-
- </div>
-</div>
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flyupsky-evening/error.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/error.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-evening/error.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-evening/error.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,16 @@
+{include file="$blogtemplate/header.template"}
+<div id="container">
+ <div class="blog">
+
+<div class="err_outline">
+<div class="err_title">{$locale->tr("error")}</div>
+<div class="err_content_space">
+{$locale->tr($message)}
+
+</div>
+</div>
+
+ </div>
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

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

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

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/folderblue.gif
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/flyupsky-evening/folderblue.gif (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/folderblue.gif)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-evening/footer.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-evening/footer.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,9 +0,0 @@
-<div class="clear">&nbsp;</div>
-<div id="footer">
-<div id="credits">
-<p>Designed by <a href="http://www.flyupsky.net" target="_blank">Gut</a> | Powered by <a href="http://www.lifetype.net" target="_blank">LifeType</a> | Valid <a href="http://validator.w3.org/check/referer" target="_blank">XHTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer" target="_blank">CSS</a></p>
-</div>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/flyupsky-evening/footer.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/footer.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-evening/footer.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-evening/footer.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,9 @@
+<div class="clear">&nbsp;</div>
+<div id="footer">
+<div id="credits">
+<p>Designed by <a href="http://www.flyupsky.net" target="_blank">Gut</a> | Powered by <a href="http://www.lifetype.net" target="_blank">LifeType</a> | Valid <a href="http://validator.w3.org/check/referer" target="_blank">XHTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer" target="_blank">CSS</a></p>
+</div>
+</div>
+</div>
+</body>
+</html>
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-evening/header.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-evening/header.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,29 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" 
-      lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
-<head>
- <meta http-equiv="Content-Type" content="text/html;charset={$locale->getCharset()}" />
- <title>{$pageTitle|escape:"html"}</title>
- <meta name="generator" content="{$version}" />
- <meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
- <link rel="stylesheet" title="Default" href="{$url->getTemplateFile("style.css")}" type="text/css" />
- <link rel="alternate" type="text/xml" title="RSS 2.0" href="{$url->rssLink("rss20")}" />
- <link rel="alternate" type="text/xml" title="RSS 1.0" href="{$url->rssLink("rss10")}" />
- <link rel="alternate" type="text/xml" title="RSS 0.90" href="{$url->rssLink("rss090")}" />
- <link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="{$url->rssLink("atom")}" />
- <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
-{if $badbehavior}
-   {$badbehavior->showBB2JavaScript()}
-{/if}
-</head>
-<body>
-<div id="outframe">
-<div id="header">
-<div id="nav_r">
-   {include file="$blogtemplate/nav_bar.inc"}
-</div>
-<div id="title"><a href="{$url->blogLink()}" accesskey="1">{$blog->getBlog()}</a><br /><span class="description">{$blog->getAbout()}</span>
-</div>
-</div>
-
-   

Copied: templates/branches/lifetype-1.2/flyupsky-evening/header.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/header.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-evening/header.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-evening/header.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" 
+      lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
+<head>
+ <meta http-equiv="Content-Type" content="text/html;charset={$locale->getCharset()}" />
+ <title>{$pageTitle|escape:"html"}</title>
+ <meta name="generator" content="{$version}" />
+ <meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
+ <link rel="stylesheet" title="Default" href="{$url->getTemplateFile("style.css")}" type="text/css" />
+ <link rel="alternate" type="text/xml" title="RSS 2.0" href="{$url->rssLink("rss20")}" />
+ <link rel="alternate" type="text/xml" title="RSS 1.0" href="{$url->rssLink("rss10")}" />
+ <link rel="alternate" type="text/xml" title="RSS 0.90" href="{$url->rssLink("rss090")}" />
+ <link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="{$url->rssLink("atom")}" />
+ <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
+{if $badbehavior}
+   {$badbehavior->showBB2JavaScript()}
+{/if}
+</head>
+<body>
+<div id="outframe">
+<div id="header">
+<div id="nav_r">
+   {include file="$blogtemplate/nav_bar.inc"}
+</div>
+<div id="title"><a href="{$url->blogLink()}" accesskey="1">{$blog->getBlog()}</a><br /><span class="description">{$blog->getAbout()}</span>
+</div>
+</div>
+
+   

Copied: templates/branches/lifetype-1.2/flyupsky-evening/images (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/images)

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/italic.gif
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/flyupsky-evening/italic.gif (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/italic.gif)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/link.gif
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/flyupsky-evening/link.gif (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/link.gif)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/main.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-evening/main.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-evening/main.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,16 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="content">
-<div class="blog">
-{foreach from=$posts item=post}
-{** <!-- I don't like showing summary only --> **}
-{**if $showAll}
-  {include file="$blogtemplate/postsummary.template"}
-{else**}
-  {include file="$blogtemplate/post.template"}
-{**/if**}
-{/foreach}
-{pager style="links"}
-</div>
-</div>
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/flyupsky-evening/main.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/main.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-evening/main.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-evening/main.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,16 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+<div class="blog">
+{foreach from=$posts item=post}
+{** <!-- I don't like showing summary only --> **}
+{**if $showAll}
+  {include file="$blogtemplate/postsummary.template"}
+{else**}
+  {include file="$blogtemplate/post.template"}
+{**/if**}
+{/foreach}
+{pager style="links"}
+</div>
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/nav_bar.inc
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-evening/nav_bar.inc	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-evening/nav_bar.inc	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,5 +0,0 @@
-
-    <a href="{$url->blogLink()}">{$locale->tr("main")}</a> | 
-    <a href="admin.php" accesskey="2">{$locale->tr("dashboard")}</a> | 
-    <a href="{$url->albumLink()}">{$locale->tr("albums")}</a>
-    
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/flyupsky-evening/nav_bar.inc (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/nav_bar.inc)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-evening/nav_bar.inc	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-evening/nav_bar.inc	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,5 @@
+
+    <a href="{$url->blogLink()}">{$locale->tr("main")}</a> | 
+    <a href="admin.php" accesskey="2">{$locale->tr("dashboard")}</a> | 
+    <a href="{$url->albumLink()}">{$locale->tr("albums")}</a>
+    
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/panel.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-evening/panel.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-evening/panel.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,86 +0,0 @@
-<div id="links">
-{assign var=blogOwner value=$blog->getOwnerInfo()}
-{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
-{if $blogOwner->hasPicture() && $AboutMyself}  
-  	 <div class="sidetitle"><h4>{$locale->tr("about_myself")}</h4></div>
-  	{assign var=picture value=$blogOwner->getPicture()}
-  	<p><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /><br/>
-  	{$AboutMyself}</p>
-{/if}
-<div class="sidetitle">
-    {$locale->tr("calendar")}
-   </div>
- <div class="sideCal">
-    {$calendar}
- </div>
-<div class="sidetitle">
-{$locale->tr("search")}
-</div>
-    <div class="side" id="Search"> 
-	<form id="search_form"  name="search_form" method="post" action="{$url->getIndexUrl()}">
-	<!--fieldset-->
-	<label for="searchTerms"><input type="text" id="searchTerms" name="searchTerms" value="" size="10"/></label>
-	<input type="submit" name="Search" value="{$locale->tr("search_s")}" class="button" />
-	<input type="hidden" name="op" value="Search" />
-	<input type="hidden" name="blogId" value="{$blog->getId()}" />
-	<!--/fieldset-->
-	</form>
-    </div>   
- <div class="sidetitle">
-  {$locale->tr("recently")}
- </div>
- <div class="side">
-  <ul>
-  {foreach from=$recentposts item=post}
-<li><a title="{$post->getText()|strip_tags|truncate:15:"..."|escape}" href="{$url->postLink($post)}">{$post->getTopic()}</a></li>
-  {/foreach}
-  </ul>
- </div>
-
- <div class="sidetitle">
-  {$locale->tr("categories")}
- </div>
- <div class="side">
-<ul>
-   {foreach from=$articlecategories item=articleCategory}
-<li><a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a> [{$articleCategory->getNumArticles()}]
-<a class="nodecoration" href="{$url->categoryRssLink($articleCategory)}"><img border="0" src="{$url->getUrl("/imgs/rss_logo_small.gif")}" alt="RSS Feed for this category." height="12" /></a></li>
-   {/foreach}
-</ul>
- </div>
-
- <div class="sidetitle">
-  {$locale->tr("archives")}
- </div>
- <div class="side">
-<ul>
-  {foreach from=$archives item=archivelink}
-<li><a href="{$archivelink->getUrl()}">{$archivelink->getName()}</a> [{$archivelink->getNumArticles()}]</li>
-  {/foreach}
-</ul>
- </div>
- <div class="sidetitle">
-  {$locale->tr("links")}
- </div>
- <div class="side">
-
-   {foreach from=$mylinkscategories item=linkcategory}
-<b>{$linkcategory->getName()}</b><br />
-      {foreach from=$linkcategory->getLinks() item=link}
-<a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a><br />
-      {/foreach}
-   {/foreach}  
- </div>
-   <div class="sidetitle">
-    {$locale->tr("syndicate")}
-   </div>
-   <div class="side">
-<ul>
-<li><a title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img border="0" src="{$url->getUrl("/imgs/rss090_logo.gif")}" alt="" /></a></li>
-<li><a title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img border="0" src="{$url->getUrl("/imgs/rss10_logo.gif")}" alt="" /></a></li>
-<li><a title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img border="0" src="{$url->getUrl("/imgs/rss20_logo.gif")}" alt="" /></a></li>
-<li><a title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img border="0" src="{$url->getUrl("/imgs/atom_logo.png")}" alt="" /></a></li>
-</ul>
-   </div>
-
-</div>

Copied: templates/branches/lifetype-1.2/flyupsky-evening/panel.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/panel.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-evening/panel.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-evening/panel.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,86 @@
+<div id="links">
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}  
+  	 <div class="sidetitle"><h4>{$locale->tr("about_myself")}</h4></div>
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	<p><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /><br/>
+  	{$AboutMyself}</p>
+{/if}
+<div class="sidetitle">
+    {$locale->tr("calendar")}
+   </div>
+ <div class="sideCal">
+    {$calendar}
+ </div>
+<div class="sidetitle">
+{$locale->tr("search")}
+</div>
+    <div class="side" id="Search"> 
+	<form id="search_form"  name="search_form" method="post" action="{$url->getIndexUrl()}">
+	<!--fieldset-->
+	<label for="searchTerms"><input type="text" id="searchTerms" name="searchTerms" value="" size="10"/></label>
+	<input type="submit" name="Search" value="{$locale->tr("search_s")}" class="button" />
+	<input type="hidden" name="op" value="Search" />
+	<input type="hidden" name="blogId" value="{$blog->getId()}" />
+	<!--/fieldset-->
+	</form>
+    </div>   
+ <div class="sidetitle">
+  {$locale->tr("recently")}
+ </div>
+ <div class="side">
+  <ul>
+  {foreach from=$recentposts item=post}
+<li><a title="{$post->getText()|strip_tags|truncate:15:"..."|escape}" href="{$url->postLink($post)}">{$post->getTopic()}</a></li>
+  {/foreach}
+  </ul>
+ </div>
+
+ <div class="sidetitle">
+  {$locale->tr("categories")}
+ </div>
+ <div class="side">
+<ul>
+   {foreach from=$articlecategories item=articleCategory}
+<li><a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a> [{$articleCategory->getNumArticles()}]
+<a class="nodecoration" href="{$url->categoryRssLink($articleCategory)}"><img border="0" src="{$url->getUrl("/imgs/rss_logo_small.gif")}" alt="RSS Feed for this category." height="12" /></a></li>
+   {/foreach}
+</ul>
+ </div>
+
+ <div class="sidetitle">
+  {$locale->tr("archives")}
+ </div>
+ <div class="side">
+<ul>
+  {foreach from=$archives item=archivelink}
+<li><a href="{$archivelink->getUrl()}">{$archivelink->getName()}</a> [{$archivelink->getNumArticles()}]</li>
+  {/foreach}
+</ul>
+ </div>
+ <div class="sidetitle">
+  {$locale->tr("links")}
+ </div>
+ <div class="side">
+
+   {foreach from=$mylinkscategories item=linkcategory}
+<b>{$linkcategory->getName()}</b><br />
+      {foreach from=$linkcategory->getLinks() item=link}
+<a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a><br />
+      {/foreach}
+   {/foreach}  
+ </div>
+   <div class="sidetitle">
+    {$locale->tr("syndicate")}
+   </div>
+   <div class="side">
+<ul>
+<li><a title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img border="0" src="{$url->getUrl("/imgs/rss090_logo.gif")}" alt="" /></a></li>
+<li><a title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img border="0" src="{$url->getUrl("/imgs/rss10_logo.gif")}" alt="" /></a></li>
+<li><a title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img border="0" src="{$url->getUrl("/imgs/rss20_logo.gif")}" alt="" /></a></li>
+<li><a title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img border="0" src="{$url->getUrl("/imgs/atom_logo.png")}" alt="" /></a></li>
+</ul>
+   </div>
+
+</div>

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/post.gif
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/flyupsky-evening/post.gif (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/post.gif)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-evening/post.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-evening/post.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,27 +0,0 @@
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-<div class="blogbody">
-
-<div class="post_outline">
-<div class="post_title"><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></div>
-<div class="post_content_space">
-<div class="posted">
-	{$postOwner->getUsername()} | {$locale->formatDate($postDate,"%d %b, %Y")}, {$locale->formatDate($postDate,"%H:%M")} | 
-	{foreach name=categories from=$post->getCategories() item=postCategory}
-		<a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
-	{/foreach} | ({$post->getNumReads()} Reads)
-</div>
-<div class="post_content">
- {$post->getText()}
-</div>
-<blockquote class="mt">Trackback URL: {$url->getTrackbackUrl()}?id={$post->getId()}</blockquote>
-<div class="posted">
-	<a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> | <a href="{$url->postPermalink($post)}">{$locale->tr("comments")}({$post->getNumComments()})</a> | 
-    <a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")}({$post->getNumTrackbacks()})</a>
-</div>
-</div>
-</div>
-
-</div>
-<br/>
-

Copied: templates/branches/lifetype-1.2/flyupsky-evening/post.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/post.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-evening/post.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-evening/post.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,27 @@
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+<div class="blogbody">
+
+<div class="post_outline">
+<div class="post_title"><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></div>
+<div class="post_content_space">
+<div class="posted">
+	{$postOwner->getUsername()} | {$locale->formatDate($postDate,"%d %b, %Y")}, {$locale->formatDate($postDate,"%H:%M")} | 
+	{foreach name=categories from=$post->getCategories() item=postCategory}
+		<a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+	{/foreach} | ({$post->getNumReads()} Reads)
+</div>
+<div class="post_content">
+ {$post->getText()}
+</div>
+<blockquote class="mt">Trackback URL: {$url->getTrackbackUrl()}?id={$post->getId()}</blockquote>
+<div class="posted">
+	<a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> | <a href="{$url->postPermalink($post)}">{$locale->tr("comments")}({$post->getNumComments()})</a> | 
+    <a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")}({$post->getNumTrackbacks()})</a>
+</div>
+</div>
+</div>
+
+</div>
+<br/>
+

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-evening/postandcomments.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-evening/postandcomments.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,75 +0,0 @@
-{include file="$blogtemplate/header.template"}
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-
-<div id="container">
-
-{* Prevpost and nextpost use *}
-<div id="article_index">
-  {assign var=nextpost value=$post->getNextArticle()}
-   {assign var=prevpost value=$post->getPrevArticle()}
- {if $prevpost == true}
-     <a href="{$url->postPermalink($prevpost)}" title="{$locale->tr("previous_post")}: {$prevpost->getTopic()}">&laquo; {$locale->tr("previous_post")}</a> |
-   {/if}
-   {if $nextpost == true}
-     <a href="{$url->postPermalink($nextpost)}" title="{$locale->tr("next_post")}: {$nextpost->getTopic()}">{$locale->tr("next_post")}&raquo;</a>
-   {/if}
-   </div>
-{* End of article_index *}
-
-
-<div class="blog">
- <!--{$url->postTrackbackLink($post)}-->
- {include file="$blogtemplate/post.template"}
-        {pager style="links"}    
-</div>
-
-
-
-{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
- <div class="blog">
-
-
- <!--div class="comments-head">
-  <a name="comments"></a>Comments
- </div-->
- {foreach name=comment from=$comments item=comment}
-
-<div class="comment_outline">
-<div class="comment_title"><div class="comments-head">[{$smarty.foreach.comment.iteration}] {$comment->getTopic()}</div></div>
-<div class="comment_content_space">
-{if $comment->IsPosterAuthenticated()}
-	{assign var=poster value=$comment->getUser()}
-	{if $poster->hasPicture()}
-		{assign var=posterimg value=$poster->getPicture()}
-		<img src="{$posterimg->getPreviewLink()}" alt="{$poster->getUserName()}" align="right" class="poster_avatar"/>
-	{/if}
-{/if}
-{$comment->gettext()}
-
-<div class="comments-post">
-[<a href="{$url->postPermalink($post)}#CommentForm">{$locale->tr("comments")}</a>]|
-    {$locale->tr("posted_by")}
-    {if $comment->getUserUrl() != ""}
-     <a href="{$comment->getUserUrl()}"}>{$comment->getUsername()}</a>
-    {else}
-     {$comment->getUsername()}
-    {/if}
-	|{assign var=commentDate value=$comment->getDateObject()}
-    {$locale->formatDate($commentDate, "%d %b %Y, %H:%M")}
-</div>
-</div>
-</div>
-<br />
-{/foreach}
-
-
- {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
-   {include file="$misctemplatepath/commentform.template"}
- {/if}
- </div>
- {/if}
- <div class="clear">&nbsp;</div>
-</div>
-{include file="$blogtemplate/panel.template"} 
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flyupsky-evening/postandcomments.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/postandcomments.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-evening/postandcomments.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-evening/postandcomments.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,75 @@
+{include file="$blogtemplate/header.template"}
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+
+<div id="container">
+
+{* Prevpost and nextpost use *}
+<div id="article_index">
+  {assign var=nextpost value=$post->getNextArticle()}
+   {assign var=prevpost value=$post->getPrevArticle()}
+ {if $prevpost == true}
+     <a href="{$url->postPermalink($prevpost)}" title="{$locale->tr("previous_post")}: {$prevpost->getTopic()}">&laquo; {$locale->tr("previous_post")}</a> |
+   {/if}
+   {if $nextpost == true}
+     <a href="{$url->postPermalink($nextpost)}" title="{$locale->tr("next_post")}: {$nextpost->getTopic()}">{$locale->tr("next_post")}&raquo;</a>
+   {/if}
+   </div>
+{* End of article_index *}
+
+
+<div class="blog">
+ <!--{$url->postTrackbackLink($post)}-->
+ {include file="$blogtemplate/post.template"}
+        {pager style="links"}    
+</div>
+
+
+
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
+ <div class="blog">
+
+
+ <!--div class="comments-head">
+  <a name="comments"></a>Comments
+ </div-->
+ {foreach name=comment from=$comments item=comment}
+
+<div class="comment_outline">
+<div class="comment_title"><div class="comments-head">[{$smarty.foreach.comment.iteration}] {$comment->getTopic()}</div></div>
+<div class="comment_content_space">
+{if $comment->IsPosterAuthenticated()}
+	{assign var=poster value=$comment->getUser()}
+	{if $poster->hasPicture()}
+		{assign var=posterimg value=$poster->getPicture()}
+		<img src="{$posterimg->getPreviewLink()}" alt="{$poster->getUserName()}" align="right" class="poster_avatar"/>
+	{/if}
+{/if}
+{$comment->gettext()}
+
+<div class="comments-post">
+[<a href="{$url->postPermalink($post)}#CommentForm">{$locale->tr("comments")}</a>]|
+    {$locale->tr("posted_by")}
+    {if $comment->getUserUrl() != ""}
+     <a href="{$comment->getUserUrl()}"}>{$comment->getUsername()}</a>
+    {else}
+     {$comment->getUsername()}
+    {/if}
+	|{assign var=commentDate value=$comment->getDateObject()}
+    {$locale->formatDate($commentDate, "%d %b %Y, %H:%M")}
+</div>
+</div>
+</div>
+<br />
+{/foreach}
+
+
+ {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
+   {include file="$misctemplatepath/commentform.template"}
+ {/if}
+ </div>
+ {/if}
+ <div class="clear">&nbsp;</div>
+</div>
+{include file="$blogtemplate/panel.template"} 
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/postsummary.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-evening/postsummary.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-evening/postsummary.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,19 +0,0 @@
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-
-<div class="blogbody">
-
-<div class="post_outline">
-<div class="post_title"><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></div>
-<div class="post_content_space">
-<div class="posted">
-	{$postOwner->getUsername()} | {$locale->formatDate($postDate,"%d %b, %Y")}, {$locale->formatDate($postDate,"%H:%M")} |
-	{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>
-</div>
-
-</div>
-<br/>

Copied: templates/branches/lifetype-1.2/flyupsky-evening/postsummary.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/postsummary.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-evening/postsummary.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-evening/postsummary.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,19 @@
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+
+<div class="blogbody">
+
+<div class="post_outline">
+<div class="post_title"><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></div>
+<div class="post_content_space">
+<div class="posted">
+	{$postOwner->getUsername()} | {$locale->formatDate($postDate,"%d %b, %Y")}, {$locale->formatDate($postDate,"%H:%M")} |
+	{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>
+</div>
+
+</div>
+<br/>

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/posttrackbacks.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-evening/posttrackbacks.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-evening/posttrackbacks.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,22 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="content">
- <div class="blog">
-
- <div class="tb_outline">
-<div class="tb_title">{$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>"</div>
-<div class="tb_content_space">
-	{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> Date would be here<br/><br/>
-    {/foreach}
-
-
-</div>
-</div>
- </div>
-</div>
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flyupsky-evening/posttrackbacks.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/posttrackbacks.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-evening/posttrackbacks.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-evening/posttrackbacks.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,22 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+ <div class="blog">
+
+ <div class="tb_outline">
+<div class="tb_title">{$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>"</div>
+<div class="tb_content_space">
+	{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> Date would be here<br/><br/>
+    {/foreach}
+
+
+</div>
+</div>
+ </div>
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/resource.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-evening/resource.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-evening/resource.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,59 +0,0 @@
-{include file="$blogtemplate/header.template"}
-{assign var=metadata value=$resource->getMetadataReader()}
-{assign var=updated value=$resource->getTimestamp()}
-{assign var=album value=$resource->getAlbum()}
-<div id="album_list">
- <div class="blog">
-
-<div class="album_outline">
-<div class="album_title">{$resource->getFileName()}</div>
-<div class="album_content_space">
-
-	<div class="posted">
-	<img src="{$url->getTemplateFile("folderblue.gif")}" width="10" height="11" alt="Download" style="border:0px;" />
-	<a href="{$url->albumLink($album)}">{$album->getName()}</a> | 
-    <img src="{$url->getTemplateFile("download.gif")}" width="10" height="11" alt="Download" style="border:0px;" />
-    <a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a> 
-    ({$metadata->getRoundedSize()}) | {$locale->tr("created")} {$locale->formatDate($updated,"%d %b, %Y")}
-   </div>
-
-	<p>{$resource->getDescription()}</p>
-  {if $resource->isImage()}
-   <img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
-  {else}
-   <a href="{$url->resourceDownloadLink($resource)}">
-   {* show some information about the file *}
-   {if $resource->isSound()}
-     <img alt="Sound" src="{$url->getTemplateFile("images/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->getTemplateFile("images/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->getTemplateFile("images/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->getTemplateFile("images/file.gif")}" height="64" width="64" style="border:0px;" /><br/>
-     {$resource->getFileName()}
-     </a>    
-   {/if}   
-  {/if}
-</div>
-</div>
-
- </div>
-</div>
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/flyupsky-evening/resource.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/resource.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-evening/resource.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-evening/resource.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,59 @@
+{include file="$blogtemplate/header.template"}
+{assign var=metadata value=$resource->getMetadataReader()}
+{assign var=updated value=$resource->getTimestamp()}
+{assign var=album value=$resource->getAlbum()}
+<div id="album_list">
+ <div class="blog">
+
+<div class="album_outline">
+<div class="album_title">{$resource->getFileName()}</div>
+<div class="album_content_space">
+
+	<div class="posted">
+	<img src="{$url->getTemplateFile("folderblue.gif")}" width="10" height="11" alt="Download" style="border:0px;" />
+	<a href="{$url->albumLink($album)}">{$album->getName()}</a> | 
+    <img src="{$url->getTemplateFile("download.gif")}" width="10" height="11" alt="Download" style="border:0px;" />
+    <a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a> 
+    ({$metadata->getRoundedSize()}) | {$locale->tr("created")} {$locale->formatDate($updated,"%d %b, %Y")}
+   </div>
+
+	<p>{$resource->getDescription()}</p>
+  {if $resource->isImage()}
+   <img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
+  {else}
+   <a href="{$url->resourceDownloadLink($resource)}">
+   {* show some information about the file *}
+   {if $resource->isSound()}
+     <img alt="Sound" src="{$url->getTemplateFile("images/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->getTemplateFile("images/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->getTemplateFile("images/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->getTemplateFile("images/file.gif")}" height="64" width="64" style="border:0px;" /><br/>
+     {$resource->getFileName()}
+     </a>    
+   {/if}   
+  {/if}
+</div>
+</div>
+
+ </div>
+</div>
+{include file="$blogtemplate/footer.template"}

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

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

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-evening/searchresults.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-evening/searchresults.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,32 +0,0 @@
-{include file="$blogtemplate/header.template"}
-
-<div id="container">
- <div class="blog">
-
-<div class="sr_outline">
-<div class="sr_title"><div class="comments-head">{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</div></div>
-{foreach from=$searchresults item=result}
-<div class="sr_content_space">
-
-	{assign var=article value=$result->getArticle()}
-
-	<a href="{$url->postPermalink($article)}">{$article->getTopic()}</a>
-	<div class="posted">
-	{foreach name=categories from=$article->getCategories() item=articleCategory}
-		{$locale->tr("categories")}: <a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a>
-		{if !$smarty.foreach.categories.last}, {/if}
-	{/foreach}
-	</div>
-</div>
-<br />
-{/foreach}
-</div>
-
-</div>
-
-</div>
-
-{include file="$blogtemplate/panel.template"}
-
-{include file="$blogtemplate/footer.template"}
-

Copied: templates/branches/lifetype-1.2/flyupsky-evening/searchresults.template (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/searchresults.template)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-evening/searchresults.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-evening/searchresults.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,32 @@
+{include file="$blogtemplate/header.template"}
+
+<div id="container">
+ <div class="blog">
+
+<div class="sr_outline">
+<div class="sr_title"><div class="comments-head">{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</div></div>
+{foreach from=$searchresults item=result}
+<div class="sr_content_space">
+
+	{assign var=article value=$result->getArticle()}
+
+	<a href="{$url->postPermalink($article)}">{$article->getTopic()}</a>
+	<div class="posted">
+	{foreach name=categories from=$article->getCategories() item=articleCategory}
+		{$locale->tr("categories")}: <a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a>
+		{if !$smarty.foreach.categories.last}, {/if}
+	{/foreach}
+	</div>
+</div>
+<br />
+{/foreach}
+</div>
+
+</div>
+
+</div>
+
+{include file="$blogtemplate/panel.template"}
+
+{include file="$blogtemplate/footer.template"}
+

Deleted: templates/branches/lifetype-1.2/flyupsky-evening/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/flyupsky-evening/style.css	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/flyupsky-evening/style.css	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,773 +0,0 @@
-html {
-/* IE Horizontal scrollbar fix */
-overflow-y: scroll;
-/* force scrollbars in moz */
-height: 100%;
-margin-bottom: 1px;
-}
-
-body {
-text-align: center;
-margin: 0;
-padding: 0;
-background-color: #613412;
-background: transparent url(images/bg.gif);
-font-family: lucida grande, verdana, arial, sans-serif;
-color:black;
-}
-
-#outframe {
-background: transparent url(images/border.gif) repeat-y scroll;
-width:766px;
-padding: 0px;
-
-}
-
-#header {
-text-align: left;
-padding: 0px;
-margin: 0px auto;
-height: 180px;
-width: 766px;
-background: transparent url(images/logo.jpg) no-repeat scroll top left;
-color: #666666;
-}
-
-#title {
-	position: relative;
-	left: 0px;
-	top: -25px;
-	padding-left: 20px;
-	font-size:28px;
-	font-family: lucida grande, verdana, arial, sans-serif;
-	font-weight: bold;
-	color: #FFFFFF;
-}
-
-.description{
-	font-size:14px;
-	color: #FFFFFF;
-}
-#title a{
-	text-decoration: none;
-	color: #FFFFFF;
-}
-#title a:hover{
-	text-decoration: none;
-	color: #EFEFEF;
-}
-
-#nav_r{
-	position: relative;
-	left: 0px;
-	top: 110px;
-	width: 100%;
-	height: 25px;
-	padding-left: 20px;
-	padding-top:22px;
-	color: #FFFFFF;
-	font: 12px georgia, times new roman, times, serif;
-}
-
-#nav_r a		{ color: #FFFFFF; background: transparent; text-decoration: none;}
-#nav_r a:link	{ color: #FFFFFF; background: transparent; text-decoration: none;}
-#nav_r a:visited	{ color: #FFFFFF; background: transparent; text-decoration: none;}
-#nav_r a:active	{ color: #FFFFFF; background: transparent; text-decoration: none;}
-#nav_r a:hover	{ color: #FFDD06; background: transparent;text-decoration: underline; }
-
-
-
-
-#content,#container {
-color: #666666;
-background: #FFFFFF;
-float: left;
-width: 510px;
-text-align: left;
-margin-left: 15px;
-/*border: 2px solid #2A6C49;*/
-}
-
-/*  The css tag is set for pre_post and next_post.
-The colomun is blocked by div tag which is named as article_index */
-#article_index{
-text-align:center;
-font-size:12px;
-margin-top:5px;
-color: white;
-}
-
-#article_index	a		{ color: #F36D20; background: transparent; text-decoration: none;}
-#article_index	a:link	{ color: #F36D20; background: transparent; }
-#article_index	a:visited	{ color: #F36D20; background: transparent; }
-#article_index	a:active	{ color: #F36D20; background: transparent; }
-#article_index	a:hover	{ color: #148EAC; background: transparent; }
-
-.blog {
-float: left;
-width: 98%;
-font-size: 12px;
-padding-bottom: 10px;
-padding-right: 10px;
-background: transparent;
-}
-
-.blog a:link {color: #F36D20;text-decoration: none; background: none;}
-.blog a:visited {color: #F36D20;text-decoration: none; background: none;}
-.blog a:active {color: #F36D20;text-decoration: none;}
-.blog a:hover {color: #148EAC;text-decoration: underline;}
-
-.blogbody {
-font-size: 12px;
-line-height: 140%;
-color: #666666;
-
-background: transparent;
-}
-
-
-
-/*  add by reic */
-blockquote {
-color: #666;
-border: #777777 1px solid;
-background-color: #eee;
-margin: 20px 25px;
-padding: 0px 10px;
-font-size:12px;
-font-weight:normal;
-line-height:150%;
-width: auto;
-}
-
-
-blockquote.mt {
-border: 1px solid White;
-text-align: center;
-font-size:10px;
-padding: 2px 0px;
-}
-
-h3.title {
-font-size: large;
-/*text-transform: capitalize;*/
-background: #2A6C49;
-color: #FFFFFF;
-
-}
-h3.title a,
-h3.title a:link,
-h3.title a:visited
-{
-color: #FFFFFF;
-background:transparent;
-text-decoration:none;
-display: block;
-
-padding-left: 5px;
-padding-bottom: 3px;
-padding-top: 5px;}
-h3.title a:active,h3.title a:hover
-{
-display:block;
-color: #FFFFFF;
-text-decoration:underline;
-background:transparent;}
-
-div.posted {
-	color: #2A6C49;
-	font: 12px georgia, times new roman, times, serif;
-	padding: 0px 5px 10px 5px;
-	text-align: right;
-	word-spacing: 0.09em;
-	text-align: right;
-}
-
-div.post_content {
-	padding-top: 10px;
-	padding-bottom: 10px;
-	color: #666666;
-}
-
-div.post_outline {
-	width: 100%;
-	background-color: #2A6C49; 
-	padding:2px; 
-	border-bottom: 2px solid #DDDDDD;
-	border-right: 2px solid #DDDDDD;
-}
-
-div.post_title {
-	font-size: 16px;
-	background-color: #2A6C49; 
-	height:20px; 
-	line-height: 140%;
-	color: #FFFFFF; 
-	padding-top:1px;
-	padding-left: 5px
-}
-
-.post_title a,
-.post_title a:link,
-.post_title a:visited
-{
-	color: #FFFFFF;
-	background:transparent;
-	text-decoration:none;
-	padding-left: 5px;
-	padding-bottom: 3px;
-	padding-top: 5px;
-}
-
-.post_title a:active,.post_title a:hover
-{
-	color: #FFDD06;
-	text-decoration:underline;
-	background:transparent;
-}
-
-.post_content_space {
-	background-color: #FFFFFF; 
-	padding:10px; 
-	padding-bottom: 2px;
-}
-
-
-#links {
-float: left;
-width: 190px;
-font: 12px lucida grande, verdana, arial, sans-serif;
-margin-left:10px;
-background: White;
-
-
-color: #666666;
-}
-
-#links	a		{ color: #148EAC; background: transparent; text-decoration: none;}
-#links	a:link	{ color: #148EAC; background: transparent; text-decoration: none;}
-#links	a:visited	{ color: #148EAC; background: transparent; text-decoration: none;}
-#links	a:active,#links	a:hover
-{ color: #F36D20; text-decoration: underline;}
-
-.sidetitle {
-height: 20px;
-font-size: 12px;
-line-height: 140%;
-background: #F7A21C;
-border: 1px solid #FFFFFF;
-border-bottom: 2px solid #DDDDDD;
-border-right: 2px solid #DDDDDD;
-color: #FFFFFF;
-padding-top:5px;
-text-align: center;
-}
-
-.side {
-text-align: left;
-margin: 5px 5px 10px;
-}
-
-.sideCal {
-text-align: center;
-margin: 5px 5px 10px;
-}
-
-div.side ul {
-list-style: none url(post.gif);
-margin:5px 0px 0px 0px;
-padding:0px 0px 0px 1.7em;
-}
-
-div.side li {
-background: transparent;
-font: 12px arial, sans-seriflucida grande, verdana;
-/*line-height: 100%*/
-color: #666666;
-}
-
-#footer {
-width:100%;
-height: 30px;
-padding-top:15px;
-text-align: left;
-background: transparent url(images/footer.gif) no-repeat scroll left bottom;
-color: #FFFFFF;
-}
-
-#credits {
-float: left;
-width: 100%;
-margin: 0px;
-padding: 5px;
-background: transparent;
-color: #FFFFFF;
-text-align: center;
-}
-
-#credits p {
-font-size: 10px;
-margin: 0px;
-padding-top: 10px;
-}
-
-#credits	a		{ color: #FFCC66; background: transparent; text-decoration: none;}
-#credits	a:link	{ color: #FFCC66; background: transparent; text-decoration: none;}
-#credits	a:visited	{ color: #FFCC66; background: transparent; text-decoration: none;}
-#credits	a:active   { color: #FFCC66; background: transparent; text-decoration: none;}
-#credits	a:hover
-{ color: #CCCCCC;text-decoration: underline;}
-
-.calendar {
-  font-size: 12px;
-}
-
-.calMonth td { 
-/*  border: 1px dotted #DDDDDD; */
-  text-align: right; 
-  padding:2px;
-  margin:0px; 
-  font-size: 12px;
-} 
-
-.calMonth table{
-	margin: 0px auto;
-	font-size: 12px;
-}
-
-.calMonthCurrent {
-	color: #767E8A;
-	font-weight: bold;
-	font-size: 12px;
-}
-
-.calMonthHeader {
-	color: #767E8A;
-	font-weight: bold;
-	font-size: 12px;
-	background-color: #EFEFEF;
-	margin-top: 2px;
-}
-
-th.calMonthBackward {
-	font-size: 12px;
-}
-
-th.calMonthForward {
-	font-size: 12px;
-}
-
-.calMonthToday {
- color: #666;
-/* background: transparent url(images/today.gif) no-repeat center;
-*/
- background-color: #FFFFCC;
- border-right: 2px solid #666666;
- border-bottom: 2px solid #666666;
-*/
- font-size: 12px;
-}
-
-#space {
-float: left;
-width: 395px;
-padding: 5px 0px 5px 5px;
-background: transparent;
-color: #666666;
-
-}
-
-/* Comment set */
-.comments-head{
-font-size: 12px;
-}
-
-.comments-body {
-font-family:verdana, arial, sans-serif;
-color:#666;
-font-size:12px;
-background-color: #FFFFFF;
-line-height:140%;
-}
-.com_countandpost{
-border-top:2px solid;
-font-size:12px;
-height:14px;
-}
-.comments-count{float:left;
-background: #666;
-color:white;
-width:35px;
-text-align:center;
-}
-
-.comments-post {
-font-family:verdana, arial, sans-serif;
-text-align: right;
-color:#666;
-font-size:12px;
-font-weight:normal;
-background: transparent;
-}
-
-
-/* comment form */
-div.cf_outline {
-	width: 100%;
-	background-color: #CC6666; 
-	padding:2px; 
-	border-bottom: 2px solid #DDDDDD;
-	border-right: 2px solid #DDDDDD;
-}
-
-div.cf_title {
-	font-size: 16px;
-	background-color: #CC6666; 
-	height:20px; 
-	line-height: 140%;
-	color: #FFFFFF; 
-	padding-top:1px;
-	padding-left: 5px
-}
-
-.cf_title a,
-.cf_title a:link,
-.cf_title a:visited
-{
-	color: #FFFFFF;
-	background:transparent;
-	text-decoration:none;
-	padding-left: 5px;
-	padding-bottom: 3px;
-	padding-top: 5px;
-}
-
-.cf_title a:active,.cf_title a:hover
-{
-	color: #FFDD06;
-	text-decoration:underline;
-	background:transparent;
-}
-
-.cf_content_space {
-	background: transparent url(images/bg_white.gif);
-	background-color: #FFFFFF; 
-	padding:10px; 
-	padding-bottom: 2px;
-}
-
-.cf_left {
-	background:transparent;
-	width:200px; 
-	float:left; 
-	text-align:left; 
-	padding-right: 5px;
-}
-
-.cf_right {
-	background:transparent;
-	padding-left: 5px;
-}
-
-/* comments */
-div.comment_outline {
-	width: 100%;
-	background-color: #919191; 
-	padding:2px; 
-	border-bottom: 2px solid #DDDDDD;
-	border-right: 2px solid #DDDDDD;
-}
-
-div.comment_title {
-	font-size: 16px;
-	background-color: #919191; 
-	height:20px; 
-	line-height: 140%;
-	color: #FFFFFF; 
-	padding-top:1px;
-	padding-left: 5px
-}
-
-
-.comment_content_space {	
-	background: transparent url(images/bg_white.gif);
-	background-color: #FFFFFF; 
-	padding:10px;
-	padding-top: 2px;
-	padding-bottom: 2px;
-}
-
-/* search result */
-div.sr_outline {
-	width: 100%;
-	background-color: #2A6C49; 
-	padding:2px; 
-	border-bottom: 2px solid #DDDDDD;
-	border-right: 2px solid #DDDDDD;
-}
-
-div.sr_title {
-	font-size: 16px;
-	background-color: #2A6C49; 
-	height:20px; 
-	line-height: 140%;
-	color: #FFFFFF; 
-	padding-top:1px;
-	padding-left: 5px
-}
-
-.sr_title a,
-.sr_title a:link,
-.sr_title a:visited
-{
-	color: #FFFFFF;
-	background:transparent;
-	text-decoration:none;
-	padding-left: 5px;
-	padding-bottom: 3px;
-	padding-top: 5px;
-}
-
-.sr_title a:active,.sr_title a:hover
-{
-	color: #FFDD06;
-	text-decoration:underline;
-	background:transparent;
-}
-
-.sr_content_space {
-	background: transparent url(images/bg_white.gif);
-	background-color: #FFFFFF; 
-	padding:10px; 
-}
-
-/* trackback list */
-div.tb_outline {
-	width: 100%;
-	background-color: #CC6666; 
-	padding:2px; 
-	border-bottom: 2px solid #DDDDDD;
-	border-right: 2px solid #DDDDDD;
-}
-
-div.tb_title {
-	font-size: 16px;
-	background-color: #CC6666; 
-	height:20px; 
-	line-height: 140%;
-	color: #FFFFFF; 
-	padding-top:1px;
-	padding-left: 5px
-}
-
-.tb_title a,
-.tb_title a:link,
-.tb_title a:visited
-{
-	color: #FFFFFF;
-	background:transparent;
-	text-decoration:none;
-	padding-bottom: 3px;
-	padding-top: 5px;
-}
-
-.tb_title a:active,.tb_title a:hover
-{
-	color: #FFDD06;
-	text-decoration:underline;
-	background:transparent;
-}
-
-.tb_content_space {
-	background: transparent url(images/bg_white.gif);
-	background-color: #FFFFFF; 
-	padding:10px; 
-}
-
-/* error box */
-div.err_outline {
-	width: 100%;
-	background-color: #919191; 
-	padding:2px; 
-	border-bottom: 2px solid #DDDDDD;
-	border-right: 2px solid #DDDDDD;
-}
-
-div.err_title {
-	font-size: 16px;
-	background-color: #919191; 
-	height:20px; 
-	line-height: 140%;
-	color: #FFFFFF; 
-	padding-top:1px;
-	padding-left: 5px
-}
-
-.err_title a,
-.err_title a:link,
-.err_title a:visited
-{
-	color: #FFFFFF;
-	background:transparent;
-	text-decoration:none;
-	padding-left: 5px;
-	padding-bottom: 3px;
-	padding-top: 5px;
-}
-
-.err_title a:active,.err_title a:hover
-{
-	color: #FFDD06;
-	text-decoration:underline;
-	background:transparent;
-}
-
-.err_content_space {
-	background: transparent url(images/bg_white.gif);
-	background-color: #FFFFFF; 
-	padding:10px; 
-}
-
-/* ******************  albums  *************** */
-
-#album_list {
-	color: #666666;
-	background: #FFFFFF;
-	float: left;
-	width: 720px;
-	text-align: left;
-	margin-left: 15px;
-}
-
-/* album box */
-div.album_outline {
-	width: 100%;
-	background-color: #6C5D2A; 
-	padding:2px; 
-	border-bottom: 2px solid #DDDDDD;
-	border-right: 2px solid #DDDDDD;
-}
-
-div.album_title {
-	font-size: 16px;
-	background-color: #6C5D2A; 
-	height:20px; 
-	line-height: 140%;
-	color: #FFFFFF; 
-	padding-top:1px;
-	padding-left: 5px
-}
-
-.album_title a,
-.album_title a:link,
-.album_title a:visited
-{
-	color: #FFFFFF;
-	background:transparent;
-	text-decoration:none;
-	padding-left: 5px;
-	padding-bottom: 3px;
-	padding-top: 5px;
-}
-
-.album_title a:active,.album_title a:hover
-{
-	color: #FFDD06;
-	text-decoration:underline;
-	background:transparent;
-}
-
-.album_content_space {
-/*	text-align: center;*/
-	background: transparent url(images/bg_white.gif);
-	background-color: #FFFFFF; 
-	padding:10px; 
-	padding-bottom: 2px;
-	height:100%;
-}
-
-
-div.album {
-	text-align: center;
-    float: left;
-    width:150px;
-    margin-bottom:20px;
-	background:transparent;
-}
-
-.album p {
-   	text-align: center;
-   	padding:0;
-   	margin:0;
-   	width:150px;
-   	}
-
-.album_sublist {
-	float: left;
-	width: 100px;
-	background-color: #6C5D2A; 
-	padding:2px; 
-	border-bottom: 2px solid #DDDDDD;
-	margin-right: 20px;
-}
-
-.album_sub {
-	margin-bottom: 20px;
-	margin-right: 20px;
-
-
-}
-		
-.clear{
-clear: both;
-}
-img{
-	border: 0px;
-}
-
-.button {
-height: 25px;
-padding-left: 5px;
-padding-right: 5px;
-
-font-size: 12px;
-border: 1px solid #FFFFFF;
-border-bottom: 1px solid #666666;
-border-right: 1px solid #666666;
-background-color: #EEEEEE;
-
-}
-.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/flyupsky-evening/style.css (from rev 6405, templates/branches/lifetype-1.2/unported/flyupsky-evening/style.css)
===================================================================
--- templates/branches/lifetype-1.2/flyupsky-evening/style.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/flyupsky-evening/style.css	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,773 @@
+html {
+/* IE Horizontal scrollbar fix */
+overflow-y: scroll;
+/* force scrollbars in moz */
+height: 100%;
+margin-bottom: 1px;
+}
+
+body {
+text-align: center;
+margin: 0;
+padding: 0;
+background-color: #613412;
+background: transparent url(images/bg.gif);
+font-family: lucida grande, verdana, arial, sans-serif;
+color:black;
+}
+
+#outframe {
+background: transparent url(images/border.gif) repeat-y scroll;
+width:766px;
+padding: 0px;
+
+}
+
+#header {
+text-align: left;
+padding: 0px;
+margin: 0px auto;
+height: 180px;
+width: 766px;
+background: transparent url(images/logo.jpg) no-repeat scroll top left;
+color: #666666;
+}
+
+#title {
+	position: relative;
+	left: 0px;
+	top: -25px;
+	padding-left: 20px;
+	font-size:28px;
+	font-family: lucida grande, verdana, arial, sans-serif;
+	font-weight: bold;
+	color: #FFFFFF;
+}
+
+.description{
+	font-size:14px;
+	color: #FFFFFF;
+}
+#title a{
+	text-decoration: none;
+	color: #FFFFFF;
+}
+#title a:hover{
+	text-decoration: none;
+	color: #EFEFEF;
+}
+
+#nav_r{
+	position: relative;
+	left: 0px;
+	top: 110px;
+	width: 100%;
+	height: 25px;
+	padding-left: 20px;
+	padding-top:22px;
+	color: #FFFFFF;
+	font: 12px georgia, times new roman, times, serif;
+}
+
+#nav_r a		{ color: #FFFFFF; background: transparent; text-decoration: none;}
+#nav_r a:link	{ color: #FFFFFF; background: transparent; text-decoration: none;}
+#nav_r a:visited	{ color: #FFFFFF; background: transparent; text-decoration: none;}
+#nav_r a:active	{ color: #FFFFFF; background: transparent; text-decoration: none;}
+#nav_r a:hover	{ color: #FFDD06; background: transparent;text-decoration: underline; }
+
+
+
+
+#content,#container {
+color: #666666;
+background: #FFFFFF;
+float: left;
+width: 510px;
+text-align: left;
+margin-left: 15px;
+/*border: 2px solid #2A6C49;*/
+}
+
+/*  The css tag is set for pre_post and next_post.
+The colomun is blocked by div tag which is named as article_index */
+#article_index{
+text-align:center;
+font-size:12px;
+margin-top:5px;
+color: white;
+}
+
+#article_index	a		{ color: #F36D20; background: transparent; text-decoration: none;}
+#article_index	a:link	{ color: #F36D20; background: transparent; }
+#article_index	a:visited	{ color: #F36D20; background: transparent; }
+#article_index	a:active	{ color: #F36D20; background: transparent; }
+#article_index	a:hover	{ color: #148EAC; background: transparent; }
+
+.blog {
+float: left;
+width: 98%;
+font-size: 12px;
+padding-bottom: 10px;
+padding-right: 10px;
+background: transparent;
+}
+
+.blog a:link {color: #F36D20;text-decoration: none; background: none;}
+.blog a:visited {color: #F36D20;text-decoration: none; background: none;}
+.blog a:active {color: #F36D20;text-decoration: none;}
+.blog a:hover {color: #148EAC;text-decoration: underline;}
+
+.blogbody {
+font-size: 12px;
+line-height: 140%;
+color: #666666;
+
+background: transparent;
+}
+
+
+
+/*  add by reic */
+blockquote {
+color: #666;
+border: #777777 1px solid;
+background-color: #eee;
+margin: 20px 25px;
+padding: 0px 10px;
+font-size:12px;
+font-weight:normal;
+line-height:150%;
+width: auto;
+}
+
+
+blockquote.mt {
+border: 1px solid White;
+text-align: center;
+font-size:10px;
+padding: 2px 0px;
+}
+
+h3.title {
+font-size: large;
+/*text-transform: capitalize;*/
+background: #2A6C49;
+color: #FFFFFF;
+
+}
+h3.title a,
+h3.title a:link,
+h3.title a:visited
+{
+color: #FFFFFF;
+background:transparent;
+text-decoration:none;
+display: block;
+
+padding-left: 5px;
+padding-bottom: 3px;
+padding-top: 5px;}
+h3.title a:active,h3.title a:hover
+{
+display:block;
+color: #FFFFFF;
+text-decoration:underline;
+background:transparent;}
+
+div.posted {
+	color: #2A6C49;
+	font: 12px georgia, times new roman, times, serif;
+	padding: 0px 5px 10px 5px;
+	text-align: right;
+	word-spacing: 0.09em;
+	text-align: right;
+}
+
+div.post_content {
+	padding-top: 10px;
+	padding-bottom: 10px;
+	color: #666666;
+}
+
+div.post_outline {
+	width: 100%;
+	background-color: #2A6C49; 
+	padding:2px; 
+	border-bottom: 2px solid #DDDDDD;
+	border-right: 2px solid #DDDDDD;
+}
+
+div.post_title {
+	font-size: 16px;
+	background-color: #2A6C49; 
+	height:20px; 
+	line-height: 140%;
+	color: #FFFFFF; 
+	padding-top:1px;
+	padding-left: 5px
+}
+
+.post_title a,
+.post_title a:link,
+.post_title a:visited
+{
+	color: #FFFFFF;
+	background:transparent;
+	text-decoration:none;
+	padding-left: 5px;
+	padding-bottom: 3px;
+	padding-top: 5px;
+}
+
+.post_title a:active,.post_title a:hover
+{
+	color: #FFDD06;
+	text-decoration:underline;
+	background:transparent;
+}
+
+.post_content_space {
+	background-color: #FFFFFF; 
+	padding:10px; 
+	padding-bottom: 2px;
+}
+
+
+#links {
+float: left;
+width: 190px;
+font: 12px lucida grande, verdana, arial, sans-serif;
+margin-left:10px;
+background: White;
+
+
+color: #666666;
+}
+
+#links	a		{ color: #148EAC; background: transparent; text-decoration: none;}
+#links	a:link	{ color: #148EAC; background: transparent; text-decoration: none;}
+#links	a:visited	{ color: #148EAC; background: transparent; text-decoration: none;}
+#links	a:active,#links	a:hover
+{ color: #F36D20; text-decoration: underline;}
+
+.sidetitle {
+height: 20px;
+font-size: 12px;
+line-height: 140%;
+background: #F7A21C;
+border: 1px solid #FFFFFF;
+border-bottom: 2px solid #DDDDDD;
+border-right: 2px solid #DDDDDD;
+color: #FFFFFF;
+padding-top:5px;
+text-align: center;
+}
+
+.side {
+text-align: left;
+margin: 5px 5px 10px;
+}
+
+.sideCal {
+text-align: center;
+margin: 5px 5px 10px;
+}
+
+div.side ul {
+list-style: none url(post.gif);
+margin:5px 0px 0px 0px;
+padding:0px 0px 0px 1.7em;
+}
+
+div.side li {
+background: transparent;
+font: 12px arial, sans-seriflucida grande, verdana;
+/*line-height: 100%*/
+color: #666666;
+}
+
+#footer {
+width:100%;
+height: 30px;
+padding-top:15px;
+text-align: left;
+background: transparent url(images/footer.gif) no-repeat scroll left bottom;
+color: #FFFFFF;
+}
+
+#credits {
+float: left;
+width: 100%;
+margin: 0px;
+padding: 5px;
+background: transparent;
+color: #FFFFFF;
+text-align: center;
+}
+
+#credits p {
+font-size: 10px;
+margin: 0px;
+padding-top: 10px;
+}
+
+#credits	a		{ color: #FFCC66; background: transparent; text-decoration: none;}
+#credits	a:link	{ color: #FFCC66; background: transparent; text-decoration: none;}
+#credits	a:visited	{ color: #FFCC66; background: transparent; text-decoration: none;}
+#credits	a:active   { color: #FFCC66; background: transparent; text-decoration: none;}
+#credits	a:hover
+{ color: #CCCCCC;text-decoration: underline;}
+
+.calendar {
+  font-size: 12px;
+}
+
+.calMonth td { 
+/*  border: 1px dotted #DDDDDD; */
+  text-align: right; 
+  padding:2px;
+  margin:0px; 
+  font-size: 12px;
+} 
+
+.calMonth table{
+	margin: 0px auto;
+	font-size: 12px;
+}
+
+.calMonthCurrent {
+	color: #767E8A;
+	font-weight: bold;
+	font-size: 12px;
+}
+
+.calMonthHeader {
+	color: #767E8A;
+	font-weight: bold;
+	font-size: 12px;
+	background-color: #EFEFEF;
+	margin-top: 2px;
+}
+
+th.calMonthBackward {
+	font-size: 12px;
+}
+
+th.calMonthForward {
+	font-size: 12px;
+}
+
+.calMonthToday {
+ color: #666;
+/* background: transparent url(images/today.gif) no-repeat center;
+*/
+ background-color: #FFFFCC;
+ border-right: 2px solid #666666;
+ border-bottom: 2px solid #666666;
+*/
+ font-size: 12px;
+}
+
+#space {
+float: left;
+width: 395px;
+padding: 5px 0px 5px 5px;
+background: transparent;
+color: #666666;
+
+}
+
+/* Comment set */
+.comments-head{
+font-size: 12px;
+}
+
+.comments-body {
+font-family:verdana, arial, sans-serif;
+color:#666;
+font-size:12px;
+background-color: #FFFFFF;
+line-height:140%;
+}
+.com_countandpost{
+border-top:2px solid;
+font-size:12px;
+height:14px;
+}
+.comments-count{float:left;
+background: #666;
+color:white;
+width:35px;
+text-align:center;
+}
+
+.comments-post {
+font-family:verdana, arial, sans-serif;
+text-align: right;
+color:#666;
+font-size:12px;
+font-weight:normal;
+background: transparent;
+}
+
+
+/* comment form */
+div.cf_outline {
+	width: 100%;
+	background-color: #CC6666; 
+	padding:2px; 
+	border-bottom: 2px solid #DDDDDD;
+	border-right: 2px solid #DDDDDD;
+}
+
+div.cf_title {
+	font-size: 16px;
+	background-color: #CC6666; 
+	height:20px; 
+	line-height: 140%;
+	color: #FFFFFF; 
+	padding-top:1px;
+	padding-left: 5px
+}
+
+.cf_title a,
+.cf_title a:link,
+.cf_title a:visited
+{
+	color: #FFFFFF;
+	background:transparent;
+	text-decoration:none;
+	padding-left: 5px;
+	padding-bottom: 3px;
+	padding-top: 5px;
+}
+
+.cf_title a:active,.cf_title a:hover
+{
+	color: #FFDD06;
+	text-decoration:underline;
+	background:transparent;
+}
+
+.cf_content_space {
+	background: transparent url(images/bg_white.gif);
+	background-color: #FFFFFF; 
+	padding:10px; 
+	padding-bottom: 2px;
+}
+
+.cf_left {
+	background:transparent;
+	width:200px; 
+	float:left; 
+	text-align:left; 
+	padding-right: 5px;
+}
+
+.cf_right {
+	background:transparent;
+	padding-left: 5px;
+}
+
+/* comments */
+div.comment_outline {
+	width: 100%;
+	background-color: #919191; 
+	padding:2px; 
+	border-bottom: 2px solid #DDDDDD;
+	border-right: 2px solid #DDDDDD;
+}
+
+div.comment_title {
+	font-size: 16px;
+	background-color: #919191; 
+	height:20px; 
+	line-height: 140%;
+	color: #FFFFFF; 
+	padding-top:1px;
+	padding-left: 5px
+}
+
+
+.comment_content_space {	
+	background: transparent url(images/bg_white.gif);
+	background-color: #FFFFFF; 
+	padding:10px;
+	padding-top: 2px;
+	padding-bottom: 2px;
+}
+
+/* search result */
+div.sr_outline {
+	width: 100%;
+	background-color: #2A6C49; 
+	padding:2px; 
+	border-bottom: 2px solid #DDDDDD;
+	border-right: 2px solid #DDDDDD;
+}
+
+div.sr_title {
+	font-size: 16px;
+	background-color: #2A6C49; 
+	height:20px; 
+	line-height: 140%;
+	color: #FFFFFF; 
+	padding-top:1px;
+	padding-left: 5px
+}
+
+.sr_title a,
+.sr_title a:link,
+.sr_title a:visited
+{
+	color: #FFFFFF;
+	background:transparent;
+	text-decoration:none;
+	padding-left: 5px;
+	padding-bottom: 3px;
+	padding-top: 5px;
+}
+
+.sr_title a:active,.sr_title a:hover
+{
+	color: #FFDD06;
+	text-decoration:underline;
+	background:transparent;
+}
+
+.sr_content_space {
+	background: transparent url(images/bg_white.gif);
+	background-color: #FFFFFF; 
+	padding:10px; 
+}
+
+/* trackback list */
+div.tb_outline {
+	width: 100%;
+	background-color: #CC6666; 
+	padding:2px; 
+	border-bottom: 2px solid #DDDDDD;
+	border-right: 2px solid #DDDDDD;
+}
+
+div.tb_title {
+	font-size: 16px;
+	background-color: #CC6666; 
+	height:20px; 
+	line-height: 140%;
+	color: #FFFFFF; 
+	padding-top:1px;
+	padding-left: 5px
+}
+
+.tb_title a,
+.tb_title a:link,
+.tb_title a:visited
+{
+	color: #FFFFFF;
+	background:transparent;
+	text-decoration:none;
+	padding-bottom: 3px;
+	padding-top: 5px;
+}
+
+.tb_title a:active,.tb_title a:hover
+{
+	color: #FFDD06;
+	text-decoration:underline;
+	background:transparent;
+}
+
+.tb_content_space {
+	background: transparent url(images/bg_white.gif);
+	background-color: #FFFFFF; 
+	padding:10px; 
+}
+
+/* error box */
+div.err_outline {
+	width: 100%;
+	background-color: #919191; 
+	padding:2px; 
+	border-bottom: 2px solid #DDDDDD;
+	border-right: 2px solid #DDDDDD;
+}
+
+div.err_title {
+	font-size: 16px;
+	background-color: #919191; 
+	height:20px; 
+	line-height: 140%;
+	color: #FFFFFF; 
+	padding-top:1px;
+	padding-left: 5px
+}
+
+.err_title a,
+.err_title a:link,
+.err_title a:visited
+{
+	color: #FFFFFF;
+	background:transparent;
+	text-decoration:none;
+	padding-left: 5px;
+	padding-bottom: 3px;
+	padding-top: 5px;
+}
+
+.err_title a:active,.err_title a:hover
+{
+	color: #FFDD06;
+	text-decoration:underline;
+	background:transparent;
+}
+
+.err_content_space {
+	background: transparent url(images/bg_white.gif);
+	background-color: #FFFFFF; 
+	padding:10px; 
+}
+
+/* ******************  albums  *************** */
+
+#album_list {
+	color: #666666;
+	background: #FFFFFF;
+	float: left;
+	width: 720px;
+	text-align: left;
+	margin-left: 15px;
+}
+
+/* album box */
+div.album_outline {
+	width: 100%;
+	background-color: #6C5D2A; 
+	padding:2px; 
+	border-bottom: 2px solid #DDDDDD;
+	border-right: 2px solid #DDDDDD;
+}
+
+div.album_title {
+	font-size: 16px;
+	background-color: #6C5D2A; 
+	height:20px; 
+	line-height: 140%;
+	color: #FFFFFF; 
+	padding-top:1px;
+	padding-left: 5px
+}
+
+.album_title a,
+.album_title a:link,
+.album_title a:visited
+{
+	color: #FFFFFF;
+	background:transparent;
+	text-decoration:none;
+	padding-left: 5px;
+	padding-bottom: 3px;
+	padding-top: 5px;
+}
+
+.album_title a:active,.album_title a:hover
+{
+	color: #FFDD06;
+	text-decoration:underline;
+	background:transparent;
+}
+
+.album_content_space {
+/*	text-align: center;*/
+	background: transparent url(images/bg_white.gif);
+	background-color: #FFFFFF; 
+	padding:10px; 
+	padding-bottom: 2px;
+	height:100%;
+}
+
+
+div.album {
+	text-align: center;
+    float: left;
+    width:150px;
+    margin-bottom:20px;
+	background:transparent;
+}
+
+.album p {
+   	text-align: center;
+   	padding:0;
+   	margin:0;
+   	width:150px;
+   	}
+
+.album_sublist {
+	float: left;
+	width: 100px;
+	background-color: #6C5D2A; 
+	padding:2px; 
+	border-bottom: 2px solid #DDDDDD;
+	margin-right: 20px;
+}
+
+.album_sub {
+	margin-bottom: 20px;
+	margin-right: 20px;
+
+
+}
+		
+.clear{
+clear: both;
+}
+img{
+	border: 0px;
+}
+
+.button {
+height: 25px;
+padding-left: 5px;
+padding-right: 5px;
+
+font-size: 12px;
+border: 1px solid #FFFFFF;
+border-bottom: 1px solid #666666;
+border-right: 1px solid #666666;
+background-color: #EEEEEE;
+
+}
+.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/forange (from rev 6399, templates/branches/lifetype-1.2/unported/forange)

Deleted: templates/branches/lifetype-1.2/forange/album.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forange/album.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forange/album.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/album.template (from rev 6405, templates/branches/lifetype-1.2/unported/forange/album.template)
===================================================================
--- templates/branches/lifetype-1.2/forange/album.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forange/album.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/albums.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forange/albums.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forange/albums.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/albums.template (from rev 6405, templates/branches/lifetype-1.2/unported/forange/albums.template)
===================================================================
--- templates/branches/lifetype-1.2/forange/albums.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forange/albums.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/archives.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forange/archives.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forange/archives.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/archives.template (from rev 6405, templates/branches/lifetype-1.2/unported/forange/archives.template)
===================================================================
--- templates/branches/lifetype-1.2/forange/archives.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forange/archives.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/bookmark.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forange/bookmark.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forange/bookmark.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/bookmark.template (from rev 6405, templates/branches/lifetype-1.2/unported/forange/bookmark.template)
===================================================================
--- templates/branches/lifetype-1.2/forange/bookmark.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forange/bookmark.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/commentarticle.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forange/commentarticle.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forange/commentarticle.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/commentarticle.template (from rev 6405, templates/branches/lifetype-1.2/unported/forange/commentarticle.template)
===================================================================
--- templates/branches/lifetype-1.2/forange/commentarticle.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forange/commentarticle.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/error.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forange/error.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forange/error.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/error.template (from rev 6405, templates/branches/lifetype-1.2/unported/forange/error.template)
===================================================================
--- templates/branches/lifetype-1.2/forange/error.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forange/error.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/favicon.ico
===================================================================
(Binary files differ)

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

Deleted: templates/branches/lifetype-1.2/forange/features.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forange/features.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forange/features.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/features.template (from rev 6405, templates/branches/lifetype-1.2/unported/forange/features.template)
===================================================================
--- templates/branches/lifetype-1.2/forange/features.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forange/features.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forange/footer.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forange/footer.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,9 +0,0 @@
-	<!-- begin footer -->
-	<DIV id=footer>
-		<P>Using the forange 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/forange/footer.template (from rev 6405, templates/branches/lifetype-1.2/unported/forange/footer.template)
===================================================================
--- templates/branches/lifetype-1.2/forange/footer.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forange/footer.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,9 @@
+	<!-- begin footer -->
+	<DIV id=footer>
+		<P>Using the forange 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/forange/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forange/header.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forange/header.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,29 +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")}" />
-
- <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
-{if $badbehavior}
-   {$badbehavior->showBB2JavaScript()}
-{/if}
-</head>
-
-<body>
-
-<div id="wrap">
-	<div id="header">		
-		<h1 id="blogname"><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1>
-		<div id="description">{$blog->getAbout()}</div>
-	</div>
-	<div id="main">
-		<div id="content">
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/forange/header.template (from rev 6405, templates/branches/lifetype-1.2/unported/forange/header.template)
===================================================================
--- templates/branches/lifetype-1.2/forange/header.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forange/header.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,29 @@
+<!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")}" />
+
+ <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
+{if $badbehavior}
+   {$badbehavior->showBB2JavaScript()}
+{/if}
+</head>
+
+<body>
+
+<div id="wrap">
+	<div id="header">		
+		<h1 id="blogname"><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1>
+		<div id="description">{$blog->getAbout()}</div>
+	</div>
+	<div id="main">
+		<div id="content">
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/forange/images (from rev 6405, templates/branches/lifetype-1.2/unported/forange/images)

Deleted: templates/branches/lifetype-1.2/forange/links.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forange/links.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forange/links.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,76 +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>
-
-
-{assign var=blogOwner value=$blog->getOwnerInfo()}
-{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
-{if $blogOwner->hasPicture() && $AboutMyself}  
-  	 <li id="about_myself">{$locale->tr("about_myself")}
-  	 <ul>
-  	{assign var=picture value=$blogOwner->getPicture()}
-  	<li><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /></li>
-  	<br/>
-  	{$AboutMyself}
-  	</ul>
-  	</li>
-{/if}
-
-
-
-
-<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/forange/links.template (from rev 6405, templates/branches/lifetype-1.2/unported/forange/links.template)
===================================================================
--- templates/branches/lifetype-1.2/forange/links.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forange/links.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,76 @@
+</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>
+
+
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}  
+  	 <li id="about_myself">{$locale->tr("about_myself")}
+  	 <ul>
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	<li><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /></li>
+  	<br/>
+  	{$AboutMyself}
+  	</ul>
+  	</li>
+{/if}
+
+
+
+
+<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/forange/main.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forange/main.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forange/main.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/main.template (from rev 6405, templates/branches/lifetype-1.2/unported/forange/main.template)
===================================================================
--- templates/branches/lifetype-1.2/forange/main.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forange/main.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forange/post.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forange/post.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/post.template (from rev 6405, templates/branches/lifetype-1.2/unported/forange/post.template)
===================================================================
--- templates/branches/lifetype-1.2/forange/post.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forange/post.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forange/postandcomments.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forange/postandcomments.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,82 +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>
-	
-		<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"}

Copied: templates/branches/lifetype-1.2/forange/postandcomments.template (from rev 6405, templates/branches/lifetype-1.2/unported/forange/postandcomments.template)
===================================================================
--- templates/branches/lifetype-1.2/forange/postandcomments.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forange/postandcomments.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,82 @@
+{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/forange/posttrackbacks.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forange/posttrackbacks.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forange/posttrackbacks.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/posttrackbacks.template (from rev 6405, templates/branches/lifetype-1.2/unported/forange/posttrackbacks.template)
===================================================================
--- templates/branches/lifetype-1.2/forange/posttrackbacks.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forange/posttrackbacks.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/resource.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forange/resource.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forange/resource.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,91 +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 $badbehavior}
-   {$badbehavior->showBB2JavaScript()}
-{/if}
-</head>
-<body>
-
-<div id="wrap">
-	<div id="header">		
-		<h1 id="blogname"><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1>
-		<div id="description">{$blog->getAbout()}</div>
-	</div>
-
-<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/forange/resource.template (from rev 6405, templates/branches/lifetype-1.2/unported/forange/resource.template)
===================================================================
--- templates/branches/lifetype-1.2/forange/resource.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forange/resource.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,91 @@
+<!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 $badbehavior}
+   {$badbehavior->showBB2JavaScript()}
+{/if}
+</head>
+<body>
+
+<div id="wrap">
+	<div id="header">		
+		<h1 id="blogname"><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1>
+		<div id="description">{$blog->getAbout()}</div>
+	</div>
+
+<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/forange/samplerss.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forange/samplerss.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forange/samplerss.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/samplerss.template (from rev 6405, templates/branches/lifetype-1.2/unported/forange/samplerss.template)
===================================================================
--- templates/branches/lifetype-1.2/forange/samplerss.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forange/samplerss.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/screenshot.jpg
===================================================================
(Binary files differ)

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

Deleted: templates/branches/lifetype-1.2/forange/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forange/searchresults.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forange/searchresults.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/searchresults.template (from rev 6405, templates/branches/lifetype-1.2/unported/forange/searchresults.template)
===================================================================
--- templates/branches/lifetype-1.2/forange/searchresults.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forange/searchresults.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forange/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/forange/style.css	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forange/style.css	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,406 +0,0 @@
-/*
-	Theme Name: fOrange
-	Theme URI: http://www.fahlstad.se
-	Description: A colorful theme.
-	Version: 1.0
-	Author: Fredrik Fahlstad
-	Author URI: http://www.fahlstad.se
-*/
-
-body {
-	font-size: 62.5%;
-	color: #000;
-	margin: 0px;
-	padding: 0px;
-	font-family: Arial, Helvetica, sans-serif;
-	background: #E8B36D url(images/bg_center_orange.gif) repeat-y center;
-}
-#wrap {
-	margin: 0px auto;
-	width: 770px;
-}
-#header {
-	clear: both;
-	height: 110px;
-	background: url(images/top.jpg) no-repeat;
-}
-#description {
-	font-weight: bold;
-	color: #FFFFFF;
-	float: right;
-	font-size: 10pt;
-	margin-top: 40px;
-	margin-right: 20px;
-	letter-spacing:1px;
-}
-#main {
-	clear: both;
-	overflow: hidden;
-	margin-top: 1.5em;
-}
-
-#resourceMain {
-	background-color:white;
-	padding: 20px;
-}
-
-
-#content {
-	float: left;
-	width: 480px;
-	padding: 20px;
-	font-size: 1.2em;
-	line-height: 1.6em;
-}
-#sidebar {
-	float: right;
-	width: 227px;
-	padding: 10px;
-	font-size: 10pt;
-}
-#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;
-}
-
-h1#blogname{
-	font-size:3.2em;
-	font-family: "Century Gothic";
-	font-weight: normal;
-	margin: 0px;
-	letter-spacing: -2px;
-	padding-top: 0px;
-	padding-right: 0px;
-	padding-bottom: 0px;
-	padding-left: 20px;
-}
-h1#blogname  a{
-	color: #FFFFFF;
-}
-h1, h2, h3, h4, h5, h6 {
-	font-family: Georgia, "Times New Roman", Times, serif;
-	margin: 0; 
-	padding: 0;
-}
-	h2 a{
-	font-size: 12pt;
-	margin-top: 2em;
-	font-weight: normal;
-}
-	h3 a{
-	font-size: 1.4em;
-	font-weight: normal;
-		display:block
-
-}
-			a { 
-			color: #0099EA;
-			text-decoration: none;
-		}
-		
-		a:visited {
-		}
-		
-		a:hover, a:visited:hover {
-  color: #0099EA;
-  text-decoration:underline;
-		}
-
-	#sidebar ul {
-	list-style: none;
-	padding-left: 10px;
-	margin-left: 10px;
-}
-
-#sidebar h2 {
-	font-size: 12px;
-	font-weight:normal;
-	text-transform:uppercase;
-	color:#C52;
-}
-
-#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:10pt;
-	letter-spacing:1px;
-	line-height:1.5;
-
-}
-
-#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 #E6F1F5;
-}
-
-#sidebar ul ul ul li{
-	border:0px;
-	margin-left:5px;
-}
-
-#sidebar form { margin-top: 20px; }
-#sidebar a{
-	color:#069;
-	}
-
-
-/************************************************
-*	Comments													*
-************************************************/
-h2#comments{
-	text-align:center;
-	padding:2px;
-	margin-bottom:10px;
-	margin-top:80px;
-	font-size: 110%;
-}
-
-ol#commentlist {
-	margin-top:0px;
-	padding: 5px;
-	margin-left: 20px;
-	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 #E6F1F5;
-	line-height:12px;
-	color: #5b5b5b;
-	background-color: #FBFDFD;
-	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 #E6F1F5;
-	background:#FBFDFD;
-	padding:0px 10px;
-}
-
-#commentsform form{
-	text-align:left;
-	margin:0px;
-}
-
-#commentsform p{
-	margin:5px;
-}
-
-#commentsform form textarea{
-	width:90%;
-}
-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 {
-	font-size: 13pt;
-	margin-bottom:5px;
-}
-
-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;
-}
-
-h3.entrytitle a, h3.entrytitle a:visited{
-			color: #069;
-			font-size: 14pt;
-
-
-}
-
-.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 {
-	margin-top:8px;
-	margin-bottom:16px;
-	text-align: justify;
-	font-size:10pt;
-	letter-spacing:1px;
-	line-height:1.5;
-
-}
-
-.entrybody li {
-	font-size:10pt;
-	letter-spacing:1px;
-	line-height:1.5;
-}
-
-.entrybody a {
-	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;
-}
-#searchdiv
-{
-	padding: 5px;
-	margin-bottom: 20px;
-	font-weight:bold;
-}
-
-#sidebar form {
-	margin: 0px;
-	padding: 0px;
-}
-label {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	color: #000;
-}
-.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/forange/style.css (from rev 6405, templates/branches/lifetype-1.2/unported/forange/style.css)
===================================================================
--- templates/branches/lifetype-1.2/forange/style.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/forange/style.css	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,406 @@
+/*
+	Theme Name: fOrange
+	Theme URI: http://www.fahlstad.se
+	Description: A colorful theme.
+	Version: 1.0
+	Author: Fredrik Fahlstad
+	Author URI: http://www.fahlstad.se
+*/
+
+body {
+	font-size: 62.5%;
+	color: #000;
+	margin: 0px;
+	padding: 0px;
+	font-family: Arial, Helvetica, sans-serif;
+	background: #E8B36D url(images/bg_center_orange.gif) repeat-y center;
+}
+#wrap {
+	margin: 0px auto;
+	width: 770px;
+}
+#header {
+	clear: both;
+	height: 110px;
+	background: url(images/top.jpg) no-repeat;
+}
+#description {
+	font-weight: bold;
+	color: #FFFFFF;
+	float: right;
+	font-size: 10pt;
+	margin-top: 40px;
+	margin-right: 20px;
+	letter-spacing:1px;
+}
+#main {
+	clear: both;
+	overflow: hidden;
+	margin-top: 1.5em;
+}
+
+#resourceMain {
+	background-color:white;
+	padding: 20px;
+}
+
+
+#content {
+	float: left;
+	width: 480px;
+	padding: 20px;
+	font-size: 1.2em;
+	line-height: 1.6em;
+}
+#sidebar {
+	float: right;
+	width: 227px;
+	padding: 10px;
+	font-size: 10pt;
+}
+#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;
+}
+
+h1#blogname{
+	font-size:3.2em;
+	font-family: "Century Gothic";
+	font-weight: normal;
+	margin: 0px;
+	letter-spacing: -2px;
+	padding-top: 0px;
+	padding-right: 0px;
+	padding-bottom: 0px;
+	padding-left: 20px;
+}
+h1#blogname  a{
+	color: #FFFFFF;
+}
+h1, h2, h3, h4, h5, h6 {
+	font-family: Georgia, "Times New Roman", Times, serif;
+	margin: 0; 
+	padding: 0;
+}
+	h2 a{
+	font-size: 12pt;
+	margin-top: 2em;
+	font-weight: normal;
+}
+	h3 a{
+	font-size: 1.4em;
+	font-weight: normal;
+		display:block
+
+}
+			a { 
+			color: #0099EA;
+			text-decoration: none;
+		}
+		
+		a:visited {
+		}
+		
+		a:hover, a:visited:hover {
+  color: #0099EA;
+  text-decoration:underline;
+		}
+
+	#sidebar ul {
+	list-style: none;
+	padding-left: 10px;
+	margin-left: 10px;
+}
+
+#sidebar h2 {
+	font-size: 12px;
+	font-weight:normal;
+	text-transform:uppercase;
+	color:#C52;
+}
+
+#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:10pt;
+	letter-spacing:1px;
+	line-height:1.5;
+
+}
+
+#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 #E6F1F5;
+}
+
+#sidebar ul ul ul li{
+	border:0px;
+	margin-left:5px;
+}
+
+#sidebar form { margin-top: 20px; }
+#sidebar a{
+	color:#069;
+	}
+
+
+/************************************************
+*	Comments													*
+************************************************/
+h2#comments{
+	text-align:center;
+	padding:2px;
+	margin-bottom:10px;
+	margin-top:80px;
+	font-size: 110%;
+}
+
+ol#commentlist {
+	margin-top:0px;
+	padding: 5px;
+	margin-left: 20px;
+	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 #E6F1F5;
+	line-height:12px;
+	color: #5b5b5b;
+	background-color: #FBFDFD;
+	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 #E6F1F5;
+	background:#FBFDFD;
+	padding:0px 10px;
+}
+
+#commentsform form{
+	text-align:left;
+	margin:0px;
+}
+
+#commentsform p{
+	margin:5px;
+}
+
+#commentsform form textarea{
+	width:90%;
+}
+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 {
+	font-size: 13pt;
+	margin-bottom:5px;
+}
+
+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;
+}
+
+h3.entrytitle a, h3.entrytitle a:visited{
+			color: #069;
+			font-size: 14pt;
+
+
+}
+
+.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 {
+	margin-top:8px;
+	margin-bottom:16px;
+	text-align: justify;
+	font-size:10pt;
+	letter-spacing:1px;
+	line-height:1.5;
+
+}
+
+.entrybody li {
+	font-size:10pt;
+	letter-spacing:1px;
+	line-height:1.5;
+}
+
+.entrybody a {
+	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;
+}
+#searchdiv
+{
+	padding: 5px;
+	margin-bottom: 20px;
+	font-weight:bold;
+}
+
+#sidebar form {
+	margin: 0px;
+	padding: 0px;
+}
+label {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-weight: bold;
+	color: #000;
+}
+.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/forangeWithPlugins (from rev 6399, templates/branches/lifetype-1.2/unported/forangeWithPlugins)

Deleted: templates/branches/lifetype-1.2/forangeWithPlugins/album.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forangeWithPlugins/album.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/album.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/album.template (from rev 6405, templates/branches/lifetype-1.2/unported/forangeWithPlugins/album.template)
===================================================================
--- templates/branches/lifetype-1.2/forangeWithPlugins/album.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/album.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/albums.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forangeWithPlugins/albums.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/albums.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/albums.template (from rev 6405, templates/branches/lifetype-1.2/unported/forangeWithPlugins/albums.template)
===================================================================
--- templates/branches/lifetype-1.2/forangeWithPlugins/albums.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/albums.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/archives.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forangeWithPlugins/archives.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/archives.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/archives.template (from rev 6405, templates/branches/lifetype-1.2/unported/forangeWithPlugins/archives.template)
===================================================================
--- templates/branches/lifetype-1.2/forangeWithPlugins/archives.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/archives.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/bookmark.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forangeWithPlugins/bookmark.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/bookmark.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/bookmark.template (from rev 6405, templates/branches/lifetype-1.2/unported/forangeWithPlugins/bookmark.template)
===================================================================
--- templates/branches/lifetype-1.2/forangeWithPlugins/bookmark.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/bookmark.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/commentarticle.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forangeWithPlugins/commentarticle.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/commentarticle.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/commentarticle.template (from rev 6405, templates/branches/lifetype-1.2/unported/forangeWithPlugins/commentarticle.template)
===================================================================
--- templates/branches/lifetype-1.2/forangeWithPlugins/commentarticle.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/commentarticle.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/error.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forangeWithPlugins/error.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/error.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/error.template (from rev 6405, templates/branches/lifetype-1.2/unported/forangeWithPlugins/error.template)
===================================================================
--- templates/branches/lifetype-1.2/forangeWithPlugins/error.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/error.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/favicon.ico
===================================================================
(Binary files differ)

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

Deleted: templates/branches/lifetype-1.2/forangeWithPlugins/features.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forangeWithPlugins/features.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/features.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/features.template (from rev 6405, templates/branches/lifetype-1.2/unported/forangeWithPlugins/features.template)
===================================================================
--- templates/branches/lifetype-1.2/forangeWithPlugins/features.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/features.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forangeWithPlugins/footer.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/footer.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,9 +0,0 @@
-	<!-- begin footer -->
-	<DIV id=footer>
-		<P>Using the forange 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/forangeWithPlugins/footer.template (from rev 6405, templates/branches/lifetype-1.2/unported/forangeWithPlugins/footer.template)
===================================================================
--- templates/branches/lifetype-1.2/forangeWithPlugins/footer.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/footer.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,9 @@
+	<!-- begin footer -->
+	<DIV id=footer>
+		<P>Using the forange 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/forangeWithPlugins/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forangeWithPlugins/header.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/header.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,29 +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")}" />
-
- <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
-{if $badbehavior}
-   {$badbehavior->showBB2JavaScript()}
-{/if}
-</head>
-
-<body>
-
-<div id="wrap">
-	<div id="header">		
-		<h1 id="blogname"><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1>
-		<div id="description">{$blog->getAbout()}</div>
-	</div>
-	<div id="main">
-		<div id="content">
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/forangeWithPlugins/header.template (from rev 6405, templates/branches/lifetype-1.2/unported/forangeWithPlugins/header.template)
===================================================================
--- templates/branches/lifetype-1.2/forangeWithPlugins/header.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/header.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,29 @@
+<!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")}" />
+
+ <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
+{if $badbehavior}
+   {$badbehavior->showBB2JavaScript()}
+{/if}
+</head>
+
+<body>
+
+<div id="wrap">
+	<div id="header">		
+		<h1 id="blogname"><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1>
+		<div id="description">{$blog->getAbout()}</div>
+	</div>
+	<div id="main">
+		<div id="content">
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/forangeWithPlugins/images (from rev 6405, templates/branches/lifetype-1.2/unported/forangeWithPlugins/images)

Deleted: templates/branches/lifetype-1.2/forangeWithPlugins/links.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forangeWithPlugins/links.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/links.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,99 +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}  
-  	 <li id="about_myself">{$locale->tr("about_myself")}
-  	 <ul>
-  	{assign var=picture value=$blogOwner->getPicture()}
-  	<li><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /></li>
-  	<br/>
-  	{$AboutMyself}
-  	</ul>
-  	</li>
-{/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>
-<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/forangeWithPlugins/links.template (from rev 6405, templates/branches/lifetype-1.2/unported/forangeWithPlugins/links.template)
===================================================================
--- templates/branches/lifetype-1.2/forangeWithPlugins/links.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/links.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,99 @@
+</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}  
+  	 <li id="about_myself">{$locale->tr("about_myself")}
+  	 <ul>
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	<li><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /></li>
+  	<br/>
+  	{$AboutMyself}
+  	</ul>
+  	</li>
+{/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>
+<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/forangeWithPlugins/main.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forangeWithPlugins/main.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/main.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/main.template (from rev 6405, templates/branches/lifetype-1.2/unported/forangeWithPlugins/main.template)
===================================================================
--- templates/branches/lifetype-1.2/forangeWithPlugins/main.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/main.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forangeWithPlugins/post.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/post.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/post.template (from rev 6405, templates/branches/lifetype-1.2/unported/forangeWithPlugins/post.template)
===================================================================
--- templates/branches/lifetype-1.2/forangeWithPlugins/post.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/post.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forangeWithPlugins/postandcomments.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/postandcomments.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,85 +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>
-	
-		<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>
-
-	<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/forangeWithPlugins/postandcomments.template (from rev 6405, templates/branches/lifetype-1.2/unported/forangeWithPlugins/postandcomments.template)
===================================================================
--- templates/branches/lifetype-1.2/forangeWithPlugins/postandcomments.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/postandcomments.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,85 @@
+{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 !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>
+
+	<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/forangeWithPlugins/posttrackbacks.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forangeWithPlugins/posttrackbacks.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/posttrackbacks.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/posttrackbacks.template (from rev 6405, templates/branches/lifetype-1.2/unported/forangeWithPlugins/posttrackbacks.template)
===================================================================
--- templates/branches/lifetype-1.2/forangeWithPlugins/posttrackbacks.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/posttrackbacks.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/resource.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forangeWithPlugins/resource.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/resource.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,91 +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 $badbehavior}
-   {$badbehavior->showBB2JavaScript()}
-{/if}
-</head>
-<body>
-
-<div id="wrap">
-	<div id="header">		
-		<h1 id="blogname"><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1>
-		<div id="description">{$blog->getAbout()}</div>
-	</div>
-
-<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/forangeWithPlugins/resource.template (from rev 6405, templates/branches/lifetype-1.2/unported/forangeWithPlugins/resource.template)
===================================================================
--- templates/branches/lifetype-1.2/forangeWithPlugins/resource.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/resource.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,91 @@
+<!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 $badbehavior}
+   {$badbehavior->showBB2JavaScript()}
+{/if}
+</head>
+<body>
+
+<div id="wrap">
+	<div id="header">		
+		<h1 id="blogname"><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1>
+		<div id="description">{$blog->getAbout()}</div>
+	</div>
+
+<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/forangeWithPlugins/samplerss.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forangeWithPlugins/samplerss.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/samplerss.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/samplerss.template (from rev 6405, templates/branches/lifetype-1.2/unported/forangeWithPlugins/samplerss.template)
===================================================================
--- templates/branches/lifetype-1.2/forangeWithPlugins/samplerss.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/samplerss.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/screenshot.jpg
===================================================================
(Binary files differ)

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

Deleted: templates/branches/lifetype-1.2/forangeWithPlugins/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/forangeWithPlugins/searchresults.template	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/searchresults.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/searchresults.template (from rev 6405, templates/branches/lifetype-1.2/unported/forangeWithPlugins/searchresults.template)
===================================================================
--- templates/branches/lifetype-1.2/forangeWithPlugins/searchresults.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/searchresults.template	2008-04-29 12:19:29 UTC (rev 6406)
@@ -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/forangeWithPlugins/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/forangeWithPlugins/style.css	2008-04-29 11:54:57 UTC (rev 6399)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/style.css	2008-04-29 12:19:29 UTC (rev 6406)
@@ -1,406 +0,0 @@
-/*
-	Theme Name: fOrange
-	Theme URI: http://www.fahlstad.se
-	Description: A colorful theme.
-	Version: 1.0
-	Author: Fredrik Fahlstad
-	Author URI: http://www.fahlstad.se
-*/
-
-body {
-	font-size: 62.5%;
-	color: #000;
-	margin: 0px;
-	padding: 0px;
-	font-family: Arial, Helvetica, sans-serif;
-	background: #E8B36D url(images/bg_center_orange.gif) repeat-y center;
-}
-#wrap {
-	margin: 0px auto;
-	width: 770px;
-}
-#header {
-	clear: both;
-	height: 110px;
-	background: url(images/top.jpg) no-repeat;
-}
-#description {
-	font-weight: bold;
-	color: #FFFFFF;
-	float: right;
-	font-size: 10pt;
-	margin-top: 40px;
-	margin-right: 20px;
-	letter-spacing:1px;
-}
-#main {
-	clear: both;
-	overflow: hidden;
-	margin-top: 1.5em;
-}
-
-#resourceMain {
-	background-color:white;
-	padding: 20px;
-}
-
-
-#content {
-	float: left;
-	width: 480px;
-	padding: 20px;
-	font-size: 1.2em;
-	line-height: 1.6em;
-}
-#sidebar {
-	float: right;
-	width: 227px;
-	padding: 10px;
-	font-size: 10pt;
-}
-#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;
-}
-
-h1#blogname{
-	font-size:3.2em;
-	font-family: "Century Gothic";
-	font-weight: normal;
-	margin: 0px;
-	letter-spacing: -2px;
-	padding-top: 0px;
-	padding-right: 0px;
-	padding-bottom: 0px;
-	padding-left: 20px;
-}
-h1#blogname  a{
-	color: #FFFFFF;
-}
-h1, h2, h3, h4, h5, h6 {
-	font-family: Georgia, "Times New Roman", Times, serif;
-	margin: 0; 
-	padding: 0;
-}
-	h2 a{
-	font-size: 12pt;
-	margin-top: 2em;
-	font-weight: normal;
-}
-	h3 a{
-	font-size: 1.4em;
-	font-weight: normal;
-		display:block
-
-}
-			a { 
-			color: #0099EA;
-			text-decoration: none;
-		}
-		
-		a:visited {
-		}
-		
-		a:hover, a:visited:hover {
-  color: #0099EA;
-  text-decoration:underline;
-		}
-
-	#sidebar ul {
-	list-style: none;
-	padding-left: 10px;
-	margin-left: 10px;
-}
-
-#sidebar h2 {
-	font-size: 12px;
-	font-weight:normal;
-	text-transform:uppercase;
-	color:#C52;
-}
-
-#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:10pt;
-	letter-spacing:1px;
-	line-height:1.5;
-
-}
-
-#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 #E6F1F5;
-}
-
-#sidebar ul ul ul li{
-	border:0px;
-	margin-left:5px;
-}
-
-#sidebar form { margin-top: 20px; }
-#sidebar a{
-	color:#069;
-	}
-
-
-/************************************************
-*	Comments													*
-************************************************/
-h2#comments{
-	text-align:center;
-	padding:2px;
-	margin-bottom:10px;
-	margin-top:80px;
-	font-size: 110%;
-}
-
-ol#commentlist {
-	margin-top:0px;
-	padding: 5px;
-	margin-left: 20px;
-	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 #E6F1F5;
-	line-height:12px;
-	color: #5b5b5b;
-	background-color: #FBFDFD;
-	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 #E6F1F5;
-	background:#FBFDFD;
-	padding:0px 10px;
-}
-
-#commentsform form{
-	text-align:left;
-	margin:0px;
-}
-
-#commentsform p{
-	margin:5px;
-}
-
-#commentsform form textarea{
-	width:90%;
-}
-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 {
-	font-size: 13pt;
-	margin-bottom:5px;
-}
-
-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;
-}
-
-h3.entrytitle a, h3.entrytitle a:visited{
-			color: #069;
-			font-size: 14pt;
-
-
-}
-
-.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 {
-	margin-top:8px;
-	margin-bottom:16px;
-	text-align: justify;
-	font-size:10pt;
-	letter-spacing:1px;
-	line-height:1.5;
-
-}
-
-.entrybody li {
-	font-size:10pt;
-	letter-spacing:1px;
-	line-height:1.5;
-}
-
-.entrybody a {
-	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;
-}
-#searchdiv
-{
-	padding: 5px;
-	margin-bottom: 20px;
-	font-weight:bold;
-}
-
-#sidebar form {
-	margin: 0px;
-	padding: 0px;
-}
-label {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	color: #000;
-}
-.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/forangeWithPlugins/style.css (from rev 6405, templates/branches/lifetype-1.2/unported/forangeWithPlugins/style.css)
===================================================================
--- templates/branches/lifetype-1.2/forangeWithPlugins/style.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/forangeWithPlugins/style.css	2008-04-29 12:19:29 UTC (rev 6406)
@@ -0,0 +1,406 @@
+/*
+	Theme Name: fOrange
+	Theme URI: http://www.fahlstad.se
+	Description: A colorful theme.
+	Version: 1.0
+	Author: Fredrik Fahlstad
+	Author URI: http://www.fahlstad.se
+*/
+
+body {
+	font-size: 62.5%;
+	color: #000;
+	margin: 0px;
+	padding: 0px;
+	font-family: Arial, Helvetica, sans-serif;
+	background: #E8B36D url(images/bg_center_orange.gif) repeat-y center;
+}
+#wrap {
+	margin: 0px auto;
+	width: 770px;
+}
+#header {
+	clear: both;
+	height: 110px;
+	background: url(images/top.jpg) no-repeat;
+}
+#description {
+	font-weight: bold;
+	color: #FFFFFF;
+	float: right;
+	font-size: 10pt;
+	margin-top: 40px;
+	margin-right: 20px;
+	letter-spacing:1px;
+}
+#main {
+	clear: both;
+	overflow: hidden;
+	margin-top: 1.5em;
+}
+
+#resourceMain {
+	background-color:white;
+	padding: 20px;
+}
+
+
+#content {
+	float: left;
+	width: 480px;
+	padding: 20px;
+	font-size: 1.2em;
+	line-height: 1.6em;
+}
+#sidebar {
+	float: right;
+	width: 227px;
+	padding: 10px;
+	font-size: 10pt;
+}
+#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;
+}
+
+h1#blogname{
+	font-size:3.2em;
+	font-family: "Century Gothic";
+	font-weight: normal;
+	margin: 0px;
+	letter-spacing: -2px;
+	padding-top: 0px;
+	padding-right: 0px;
+	padding-bottom: 0px;
+	padding-left: 20px;
+}
+h1#blogname  a{
+	color: #FFFFFF;
+}
+h1, h2, h3, h4, h5, h6 {
+	font-family: Georgia, "Times New Roman", Times, serif;
+	margin: 0; 
+	padding: 0;
+}
+	h2 a{
+	font-size: 12pt;
+	margin-top: 2em;
+	font-weight: normal;
+}
+	h3 a{
+	font-size: 1.4em;
+	font-weight: normal;
+		display:block
+
+}
+			a { 
+			color: #0099EA;
+			text-decoration: none;
+		}
+		
+		a:visited {
+		}
+		
+		a:hover, a:visited:hover {
+  color: #0099EA;
+  text-decoration:underline;
+		}
+
+	#sidebar ul {
+	list-style: none;
+	padding-left: 10px;
+	margin-left: 10px;
+}
+
+#sidebar h2 {
+	font-size: 12px;
+	font-weight:normal;
+	text-transform:uppercase;
+	color:#C52;
+}
+
+#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:10pt;
+	letter-spacing:1px;
+	line-height:1.5;
+
+}
+
+#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 #E6F1F5;
+}
+
+#sidebar ul ul ul li{
+	border:0px;
+	margin-left:5px;
+}
+
+#sidebar form { margin-top: 20px; }
+#sidebar a{
+	color:#069;
+	}
+
+
+/************************************************
+*	Comments													*
+************************************************/
+h2#comments{
+	text-align:center;
+	padding:2px;
+	margin-bottom:10px;
+	margin-top:80px;
+	font-size: 110%;
+}
+
+ol#commentlist {
+	margin-top:0px;
+	padding: 5px;
+	margin-left: 20px;
+	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 #E6F1F5;
+	line-height:12px;
+	color: #5b5b5b;
+	background-color: #FBFDFD;
+	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 #E6F1F5;
+	background:#FBFDFD;
+	padding:0px 10px;
+}
+
+#commentsform form{
+	text-align:left;
+	margin:0px;
+}
+
+#commentsform p{
+	margin:5px;
+}
+
+#commentsform form textarea{
+	width:90%;
+}
+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 {
+	font-size: 13pt;
+	margin-bottom:5px;
+}
+
+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;
+}
+
+h3.entrytitle a, h3.entrytitle a:visited{
+			color: #069;
+			font-size: 14pt;
+
+
+}
+
+.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 {
+	margin-top:8px;
+	margin-bottom:16px;
+	text-align: justify;
+	font-size:10pt;
+	letter-spacing:1px;
+	line-height:1.5;
+
+}
+
+.entrybody li {
+	font-size:10pt;
+	letter-spacing:1px;
+	line-height:1.5;
+}
+
+.entrybody a {
+	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;
+}
+#searchdiv
+{
+	padding: 5px;
+	margin-bottom: 20px;
+	font-weight:bold;
+}
+
+#sidebar form {
+	margin: 0px;
+	padding: 0px;
+}
+label {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-weight: bold;
+	color: #000;
+}
+.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/fsimple (from rev 6405, templates/branches/lifetype-1.2/unported/fsimple)

Copied: templates/branches/lifetype-1.2/fsubtle (from rev 6405, templates/branches/lifetype-1.2/unported/fsubtle)

Copied: templates/branches/lifetype-1.2/grey (from rev 6405, templates/branches/lifetype-1.2/unported/grey)

Copied: templates/branches/lifetype-1.2/gutenberg (from rev 6405, templates/branches/lifetype-1.2/unported/gutenberg)

Copied: templates/branches/lifetype-1.2/human_condition (from rev 6405, templates/branches/lifetype-1.2/unported/human_condition)

Copied: templates/branches/lifetype-1.2/lemons (from rev 6405, templates/branches/lifetype-1.2/unported/lemons)

Copied: templates/branches/lifetype-1.2/mars-spirit (from rev 6405, templates/branches/lifetype-1.2/unported/mars-spirit)

Copied: templates/branches/lifetype-1.2/minitemplate (from rev 6405, templates/branches/lifetype-1.2/unported/minitemplate)



More information about the pLog-svn mailing list