[pLog-svn] r6332 - templates/branches/lifetype-1.2/beautiful_day

jondaley at devel.lifetype.net jondaley at devel.lifetype.net
Mon Apr 28 08:59:05 EDT 2008


Author: jondaley
Date: 2008-04-28 08:59:05 -0400 (Mon, 28 Apr 2008)
New Revision: 6332

Modified:
   templates/branches/lifetype-1.2/beautiful_day/album.template
   templates/branches/lifetype-1.2/beautiful_day/albums.template
   templates/branches/lifetype-1.2/beautiful_day/default.css
   templates/branches/lifetype-1.2/beautiful_day/footer.template
   templates/branches/lifetype-1.2/beautiful_day/header.template
   templates/branches/lifetype-1.2/beautiful_day/post.template
   templates/branches/lifetype-1.2/beautiful_day/resource.template
   templates/branches/lifetype-1.2/beautiful_day/screenshot.jpg
   templates/branches/lifetype-1.2/beautiful_day/searchresults.template
Log:
nice template - I haven't seen this one before.  dos2unix

Modified: templates/branches/lifetype-1.2/beautiful_day/album.template
===================================================================
--- templates/branches/lifetype-1.2/beautiful_day/album.template	2008-04-28 12:56:54 UTC (rev 6331)
+++ templates/branches/lifetype-1.2/beautiful_day/album.template	2008-04-28 12:59:05 UTC (rev 6332)
@@ -1,82 +1,82 @@
-   		{include file="$blogtemplate/header.template"} 
-
-<h2>{$locale->tr("albums")}</h2>
-
-<h3>{$album->getName()}</h3>
-<p>{$album->getDescription()}</p>
-
-<!-- album contents go here -->
- 
-<div id="album">
-
-	<div class="clearer">&nbsp;</div>
- 
-	<div class="album">
-	<a href="{$url->parentAlbumLink($album)}">
-    	<img src="{$url->getTemplateFile("img/parentfolder.gif")}" alt="{$locale->tr("parent")}" /></a>
-    	<p>{$locale->tr("parent")}</p>
-	</div>
-
-  {if $pager->getCurrentPage() == 1}
-	{assign var="counter" value=1}
-   	{assign var=children value=$album->getChildren()}
-   	{foreach from=$children item=childalbum}
-	<div class="album">
-   	<a href="{$url->albumLink($childalbum)}">
-   	<img src="{$url->getTemplateFile("img/folder.gif")}" alt="{$childalbum->getName()}" /></a>
-   	<p>{$childalbum->getName()} ({$childalbum->getNumResources()})</p>
-   		{assign var="counter" value="`$counter+1`"}
-   		{if $counter%3 == 0}
-   		{/if}
-	</div>
-   	{/foreach}
-  {/if}
- 
-<!-- show the resources here -->
-
- {** assign var=resources value=$album->getResources() **}
- {** use the code above if you want to display all the resources at once, or leave it commented **}
- {** if you would like to use the new paged display that was introduced in lifetype 1.1 **} 
- {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)}">
-    	<img alt="{$resource->getDescription()}" src="{$url->resourcePreviewLink($resource)}" /></a>
-    	<p>{$resource->getFileName()}</p>
-   		{else}
-   	<a href="{$url->resourceLink($resource)}">
-   		{if $resource->isSound()}
-    	<img alt="Sound" src="{$url->getTemplateFile("img/sound.gif")}" /></a>
-   		{elseif $resource->isVideo()}
-    	<img alt="Video" src="{$url->getTemplateFile("img/video.gif")}" /></a>
-   		{elseif $resource->isZip()}
-    	<img alt="Zip" src="{$url->getTemplateFile("img/compressed.gif")}" /></a>
-   		{else}
-   	<img alt="File" src="{$url->getTemplateFile("img/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}
-   		{assign var="counter" value="`$counter+1`"}
-   		{if $counter%3 == 0}
-   		{/if}
-  	</div>
-  		{/foreach}
-
-	<div class="clearer">&nbsp;</div>
-
-</div>
-
-<!-- end of album contents --> 
+   		{include file="$blogtemplate/header.template"} 
+
+<h2>{$locale->tr("albums")}</h2>
+
+<h3>{$album->getName()}</h3>
+<p>{$album->getDescription()}</p>
+
+<!-- album contents go here -->
+ 
+<div id="album">
+
+	<div class="clearer">&nbsp;</div>
+ 
+	<div class="album">
+	<a href="{$url->parentAlbumLink($album)}">
+    	<img src="{$url->getTemplateFile("img/parentfolder.gif")}" alt="{$locale->tr("parent")}" /></a>
+    	<p>{$locale->tr("parent")}</p>
+	</div>
+
+  {if $pager->getCurrentPage() == 1}
+	{assign var="counter" value=1}
+   	{assign var=children value=$album->getChildren()}
+   	{foreach from=$children item=childalbum}
+	<div class="album">
+   	<a href="{$url->albumLink($childalbum)}">
+   	<img src="{$url->getTemplateFile("img/folder.gif")}" alt="{$childalbum->getName()}" /></a>
+   	<p>{$childalbum->getName()} ({$childalbum->getNumResources()})</p>
+   		{assign var="counter" value="`$counter+1`"}
+   		{if $counter%3 == 0}
+   		{/if}
+	</div>
+   	{/foreach}
+  {/if}
+ 
+<!-- show the resources here -->
+
+ {** assign var=resources value=$album->getResources() **}
+ {** use the code above if you want to display all the resources at once, or leave it commented **}
+ {** if you would like to use the new paged display that was introduced in lifetype 1.1 **} 
+ {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)}">
+    	<img alt="{$resource->getDescription()}" src="{$url->resourcePreviewLink($resource)}" /></a>
+    	<p>{$resource->getFileName()}</p>
+   		{else}
+   	<a href="{$url->resourceLink($resource)}">
+   		{if $resource->isSound()}
+    	<img alt="Sound" src="{$url->getTemplateFile("img/sound.gif")}" /></a>
+   		{elseif $resource->isVideo()}
+    	<img alt="Video" src="{$url->getTemplateFile("img/video.gif")}" /></a>
+   		{elseif $resource->isZip()}
+    	<img alt="Zip" src="{$url->getTemplateFile("img/compressed.gif")}" /></a>
+   		{else}
+   	<img alt="File" src="{$url->getTemplateFile("img/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}
+   		{assign var="counter" value="`$counter+1`"}
+   		{if $counter%3 == 0}
+   		{/if}
+  	</div>
+  		{/foreach}
+
+	<div class="clearer">&nbsp;</div>
+
+</div>
+
+<!-- end of album contents --> 
 		{include file="$blogtemplate/footer.template"} 
\ No newline at end of file

Modified: templates/branches/lifetype-1.2/beautiful_day/albums.template
===================================================================
--- templates/branches/lifetype-1.2/beautiful_day/albums.template	2008-04-28 12:56:54 UTC (rev 6331)
+++ templates/branches/lifetype-1.2/beautiful_day/albums.template	2008-04-28 12:59:05 UTC (rev 6332)
@@ -1,27 +1,27 @@
-{include file="$blogtemplate/header.template"} 
-
-<h2>{$locale->tr("albums")}</h2>
-
- <!-- album contents go here -->
- 
-<div id="album">
-	
-	<div class="clearer">&nbsp;</div>
-
-		{assign var="counter" value=0}
-  		{foreach from=$albums item=album}
-	<div class="album">
-	<a href="{$url->albumLink($album)}"><img src="{$url->getTemplateFile("img/folder.gif")}" alt="{$album->getName()}" /></a>
-  	<p>{$album->getName()} ({$album->getNumResources()})</p>
-  		{assign var="counter" value="`$counter+1`"}
-		{if $counter%3 == 0}
-		{/if}
-	</div>
-		{/foreach}
-
-	<div class="clearer">&nbsp;</div>
-
-</div>
-
-<!-- end of the albums -->
+{include file="$blogtemplate/header.template"} 
+
+<h2>{$locale->tr("albums")}</h2>
+
+ <!-- album contents go here -->
+ 
+<div id="album">
+	
+	<div class="clearer">&nbsp;</div>
+
+		{assign var="counter" value=0}
+  		{foreach from=$albums item=album}
+	<div class="album">
+	<a href="{$url->albumLink($album)}"><img src="{$url->getTemplateFile("img/folder.gif")}" alt="{$album->getName()}" /></a>
+  	<p>{$album->getName()} ({$album->getNumResources()})</p>
+  		{assign var="counter" value="`$counter+1`"}
+		{if $counter%3 == 0}
+		{/if}
+	</div>
+		{/foreach}
+
+	<div class="clearer">&nbsp;</div>
+
+</div>
+
+<!-- end of the albums -->
 {include file="$blogtemplate/footer.template"} 
\ No newline at end of file

Modified: templates/branches/lifetype-1.2/beautiful_day/default.css
===================================================================
--- templates/branches/lifetype-1.2/beautiful_day/default.css	2008-04-28 12:56:54 UTC (rev 6331)
+++ templates/branches/lifetype-1.2/beautiful_day/default.css	2008-04-28 12:59:05 UTC (rev 6332)
@@ -1,226 +1,226 @@
-/* standard elements */
-html {min-height: 100%;}
-
-* {
-	margin: 0;
-	padding: 0;
-}
-
-img {
-	border: 0;
-}
-
-a {color: #963;}
-a:hover {color: #C60;}
-
-body {
-	background: #CCD8E0 url(img/bg.jpg) repeat-x left bottom;
-	color: #444;
-	font: normal 62.5% Tahoma,sans-serif;
-}
-
-p,code,ul {padding-bottom: 1.2em;}
-
-li {list-style: none;}
-
-h1 {
-	font: normal 1.8em Tahoma,sans-serif;
-	margin-bottom: 4px;
-}
-
-code {
-	background: #FFF;
-	border: 1px solid #EEE;
-	border-left: 6px solid #C1CAD3;
-	color: #666;
-	display: block;
-	font: normal 1em Tahoma,sans-serif;
-	line-height: 1.6em;
-	margin-bottom: 12px;
-	padding: 8px 10px;
-	white-space: pre;
-}
-
-blockquote {
-	background: url(img/quote.gif) no-repeat;
-	display: block;
-	font-weight: bold;
-	padding-left: 28px;
-}
-
-h1,h2,h3 {padding-top: 6px;}
-
-/* misc */
-.clearer {clear: both;}
-
-.left {float: left;}
-
-.right {float: right;}
-
-/* structure */
-.container {
-	background: #FFF;
-	font-size: 1.2em;
-	margin: 0 auto;
-	padding: 0 10px 10px;
-	width: 780px;
-}
-
-/* header */
-.top {
-	background: url(img/clouds.gif) repeat-x;
-	padding: 50px 10px 0;
-}
-
-/* title */
-.header {
-	background: #FFF;
-	font-size: 1.2em;
-	height: 150px;
-	margin: 0 auto;
-	padding: 10px 10px 5px;
-	width: 780px;
-}
-.header .left, .header .right {
-	background: #A4A4A0;
-	color: #FFF;
-	height: 150px;	
-}
-.header .left {
-	background: #B3C2C7 url(img/header.jpg) no-repeat;
-	font: normal 2.8em "Trebuchet MS",sans-serif;
-	line-height: 150px;
-	text-align: center;	
-	width: 564px;
-}
-.header .right {
-	overflow: auto;
-	width: 212px;
-}
-.header .right p,.header .right h2 {padding: 0 16px;}
-.header .right h2 {padding-top: 16px; font: normal 1.6em "Trebuchet MS",sans-serif;}
-
-/* navigation */
-.navigation {	
-	background: #D9E1E5 url(img/nav.gif);
-	border: 1px solid #DFEEF7;
-	border-color: #DFEEF7 #CFDEE7;
-	height: 41px;
-}
-.navigation a {
-	background: #D9E1E5 url(img/nav.gif);
-	border-right: 1px solid #AFBEC7;
-	color: #456;
-	display: block;
-	float: left;
-	font: bold 1.1em sans-serif;
-	line-height: 41px;
-	padding: 0 20px;
-	text-decoration: none;
-}
-.navigation a:hover {background-position: left bottom; color: #234;}
-
-/* main */
-.main {
-	border-top: 4px solid #FFF;
-	background: url(img/bgmain.gif) repeat-y;
-}
-
-/* sub navigation */
-.sidenav {
-	float: right;
-	width: 210px;
-}
-.sidenav h2 {
-	color: #5A5A43;
-	font-size: 1em;
-	line-height: 30px;
-	margin: 0;
-	padding-left: 12px;
-}
-.sidenav ul {
-	padding: 0;
-	border-top: 1px solid #EAEADA;
-}
-.sidenav li {border-bottom: 1px solid #EAEADA;}
-.sidenav li a {
-	font-size: 1.1em;
-	color: #554;
-	display: block;
-	padding: 8px 0 8px 5%;
-	text-decoration: none;
-	width: 95%;
-}
-.sidenav li a:hover {
-	background: #F0F0EB;
-	color: #654;	
-}
-
-/* content */
-.content {
-	float: left;
-	margin: 10px 0;
-	padding: 0 16px;
-	width: 531px;
-}
-.content .descr {
-	color: #664;
-	font-size: 0.9em;
-	margin-bottom: 6px;
-}
-.content li {
-	list-style: url(img/li.gif);
-	margin-left: 18px;
-}
-.content p {font-family: "Lucida Sans Unicode",sans-serif;}
-
-/* footer */
-.footer {
-	background: url(img/bgfooter.gif) repeat-x;
-	color: #FFF;
-	font: bold 1em sans-serif;
-	line-height: 39px;
-	text-align: center;
-}
-.footer a,.footer a:hover {color: #FFF;}
-
-#CommentForm fieldset {
-	border:2px solid #d4d0cd; 
-	padding-top:10px; 
-	margin-top:10px; 
-	padding-left:10px; 
-	padding-bottom:10px;
-	}
-
-#CommentForm legend {
-	color:#525150;
-	padding:2px 4px 2px 4px;
-	background-color: #ffffff;
-	font-weight : bold;
-	}
-
-#CommentForm label {
-	width:13em;
-	float:left;
-	display:block;
-	clear:both; 
-	float:left;
-	margin-top:8px;
-	margin-bottom:0px;
-	}
-	
-#CommentForm input {
-	margin-top:
-	8px;margin-bottom:8px;
-	}
-	
-#Submit {
-	margin-top:8px;
-	margin-bottom:8px;
-	margin-left:6em;
-	}
-	
-#CommentForm textarea {
-	margin-top:8px;
-	margin-bottom:0px;
-	}
+/* standard elements */
+html {min-height: 100%;}
+
+* {
+	margin: 0;
+	padding: 0;
+}
+
+img {
+	border: 0;
+}
+
+a {color: #963;}
+a:hover {color: #C60;}
+
+body {
+	background: #CCD8E0 url(img/bg.jpg) repeat-x left bottom;
+	color: #444;
+	font: normal 62.5% Tahoma,sans-serif;
+}
+
+p,code,ul {padding-bottom: 1.2em;}
+
+li {list-style: none;}
+
+h1 {
+	font: normal 1.8em Tahoma,sans-serif;
+	margin-bottom: 4px;
+}
+
+code {
+	background: #FFF;
+	border: 1px solid #EEE;
+	border-left: 6px solid #C1CAD3;
+	color: #666;
+	display: block;
+	font: normal 1em Tahoma,sans-serif;
+	line-height: 1.6em;
+	margin-bottom: 12px;
+	padding: 8px 10px;
+	white-space: pre;
+}
+
+blockquote {
+	background: url(img/quote.gif) no-repeat;
+	display: block;
+	font-weight: bold;
+	padding-left: 28px;
+}
+
+h1,h2,h3 {padding-top: 6px;}
+
+/* misc */
+.clearer {clear: both;}
+
+.left {float: left;}
+
+.right {float: right;}
+
+/* structure */
+.container {
+	background: #FFF;
+	font-size: 1.2em;
+	margin: 0 auto;
+	padding: 0 10px 10px;
+	width: 780px;
+}
+
+/* header */
+.top {
+	background: url(img/clouds.gif) repeat-x;
+	padding: 50px 10px 0;
+}
+
+/* title */
+.header {
+	background: #FFF;
+	font-size: 1.2em;
+	height: 150px;
+	margin: 0 auto;
+	padding: 10px 10px 5px;
+	width: 780px;
+}
+.header .left, .header .right {
+	background: #A4A4A0;
+	color: #FFF;
+	height: 150px;	
+}
+.header .left {
+	background: #B3C2C7 url(img/header.jpg) no-repeat;
+	font: normal 2.8em "Trebuchet MS",sans-serif;
+	line-height: 150px;
+	text-align: center;	
+	width: 564px;
+}
+.header .right {
+	overflow: auto;
+	width: 212px;
+}
+.header .right p,.header .right h2 {padding: 0 16px;}
+.header .right h2 {padding-top: 16px; font: normal 1.6em "Trebuchet MS",sans-serif;}
+
+/* navigation */
+.navigation {	
+	background: #D9E1E5 url(img/nav.gif);
+	border: 1px solid #DFEEF7;
+	border-color: #DFEEF7 #CFDEE7;
+	height: 41px;
+}
+.navigation a {
+	background: #D9E1E5 url(img/nav.gif);
+	border-right: 1px solid #AFBEC7;
+	color: #456;
+	display: block;
+	float: left;
+	font: bold 1.1em sans-serif;
+	line-height: 41px;
+	padding: 0 20px;
+	text-decoration: none;
+}
+.navigation a:hover {background-position: left bottom; color: #234;}
+
+/* main */
+.main {
+	border-top: 4px solid #FFF;
+	background: url(img/bgmain.gif) repeat-y;
+}
+
+/* sub navigation */
+.sidenav {
+	float: right;
+	width: 210px;
+}
+.sidenav h2 {
+	color: #5A5A43;
+	font-size: 1em;
+	line-height: 30px;
+	margin: 0;
+	padding-left: 12px;
+}
+.sidenav ul {
+	padding: 0;
+	border-top: 1px solid #EAEADA;
+}
+.sidenav li {border-bottom: 1px solid #EAEADA;}
+.sidenav li a {
+	font-size: 1.1em;
+	color: #554;
+	display: block;
+	padding: 8px 0 8px 5%;
+	text-decoration: none;
+	width: 95%;
+}
+.sidenav li a:hover {
+	background: #F0F0EB;
+	color: #654;	
+}
+
+/* content */
+.content {
+	float: left;
+	margin: 10px 0;
+	padding: 0 16px;
+	width: 531px;
+}
+.content .descr {
+	color: #664;
+	font-size: 0.9em;
+	margin-bottom: 6px;
+}
+.content li {
+	list-style: url(img/li.gif);
+	margin-left: 18px;
+}
+.content p {font-family: "Lucida Sans Unicode",sans-serif;}
+
+/* footer */
+.footer {
+	background: url(img/bgfooter.gif) repeat-x;
+	color: #FFF;
+	font: bold 1em sans-serif;
+	line-height: 39px;
+	text-align: center;
+}
+.footer a,.footer a:hover {color: #FFF;}
+
+#CommentForm fieldset {
+	border:2px solid #d4d0cd; 
+	padding-top:10px; 
+	margin-top:10px; 
+	padding-left:10px; 
+	padding-bottom:10px;
+	}
+
+#CommentForm legend {
+	color:#525150;
+	padding:2px 4px 2px 4px;
+	background-color: #ffffff;
+	font-weight : bold;
+	}
+
+#CommentForm label {
+	width:13em;
+	float:left;
+	display:block;
+	clear:both; 
+	float:left;
+	margin-top:8px;
+	margin-bottom:0px;
+	}
+	
+#CommentForm input {
+	margin-top:
+	8px;margin-bottom:8px;
+	}
+	
+#Submit {
+	margin-top:8px;
+	margin-bottom:8px;
+	margin-left:6em;
+	}
+	
+#CommentForm textarea {
+	margin-top:8px;
+	margin-bottom:0px;
+	}

Modified: templates/branches/lifetype-1.2/beautiful_day/footer.template
===================================================================
--- templates/branches/lifetype-1.2/beautiful_day/footer.template	2008-04-28 12:56:54 UTC (rev 6331)
+++ templates/branches/lifetype-1.2/beautiful_day/footer.template	2008-04-28 12:59:05 UTC (rev 6332)
@@ -1,84 +1,84 @@
-<div class="pager">
-{pager style="links"}
-</div>
-
-</div>
-<div class="sidenav">
-
-{assign var=blogOwner value=$blog->getOwnerInfo()}
-{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
-{if $blogOwner->hasPicture() && $AboutMyself}  
-  	<h2>{$locale->tr("about_myself")}</h2>
-  	<div id="AboutMyself">
-  	{assign var=picture value=$blogOwner->getPicture()}
-  	<img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" />
-  	<p>{$AboutMyself}</p>
-  	</div>
-{/if}
-
-<!--Calendar-->
-<h2> {$locale->tr("calendar")} </h2>
-<ul>
-<li>
-<div align="center">
-{$calendar}
-</div>
-</li>
-</ul>
-
-<!--Search-->
-<form name="search_form" method="post" action="{$url->getIndexUrl()}">
-<h2> {$locale->tr("search")} </h2>
-<ul>
-<li><div align="center">
-<input type="text" name="searchTerms" value="" size="14" /><br/>
-<input type="hidden" name="op" value="Search" />
-<input type="hidden" name="blogId" value="{$blog->getId()}" />
-<input type="submit" name="Search" value="{$locale->tr("search")}" />
-</div></li>
-</ul>
-</form>
-
-<!--Recent Articles-->
-<h2> {$locale->tr("recently")} </h2>
-<ul>
-{foreach from=$recentposts item=recentpost}
-<li><a title="{$recentpost->getText()|truncate:150:"..."|strip_tags|escape}" href="{$url->postLink($recentpost)}">{$recentpost->getTopic()}</a></li>
-{/foreach}
-</ul>
-
-<!--archives-->
-<h2> {$locale->tr("archives")} </h2>
-<ul>
-{foreach from=$archives item=month}
-<li><a href="{$month->getUrl()}">{$month->getName()}</a></li>
-{/foreach}
-</ul>
-
-<!--categories-->
-<h2> {$locale->tr("categories")} </h2>
-<ul>
-{foreach from=$articlecategories item=articleCategory}
-<a href="{$url->categoryRssLink($articleCategory)}"><img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" style="border:0px;" alt="RSS 0.90" align="middle" /></a> <a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a> [{$articleCategory->getNumArticles()}]<br/>
-{/foreach}
-</ul>
-
-<!--Syndicate-->
-<h2> {$locale->tr("syndicate")} </h2>
-<ul>
-<a class="nodecoration" title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img src="{$url->getUrl("/imgs/rss090_logo.gif")}" style="border:0px;" alt="RSS 0.90" /></a>
-<a class="nodecoration" title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img src="{$url->getUrl("/imgs/rss10_logo.gif")}" style="border:0px;" alt="RSS 1.0" /></a>
-<a class="nodecoration" title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img src="{$url->getUrl("/imgs/rss20_logo.gif")}" style="border:0px;" alt="RSS 2.0" /></a>
-<a class="nodecoration" title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img src="{$url->getUrl("/imgs/atom_logo.png")}" style="border:0px;" alt="Atom 0.3" /></a>
-</ul>
-
-</div>
-
-<div class="clearer"><span></span></div>
-
-</div>
-<div class="footer">Template design by <a href="http://templates.arcsin.se">Arcsin</a>. Ported by <a href="http://www.gracianet.org">GràciaNet</a>. <a href="http://www.lifetype.net">Powered by Lifetype</a>
-</div>
-</div>
-</body>
+<div class="pager">
+{pager style="links"}
+</div>
+
+</div>
+<div class="sidenav">
+
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}  
+  	<h2>{$locale->tr("about_myself")}</h2>
+  	<div id="AboutMyself">
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	<img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" />
+  	<p>{$AboutMyself}</p>
+  	</div>
+{/if}
+
+<!--Calendar-->
+<h2> {$locale->tr("calendar")} </h2>
+<ul>
+<li>
+<div align="center">
+{$calendar}
+</div>
+</li>
+</ul>
+
+<!--Search-->
+<form name="search_form" method="post" action="{$url->getIndexUrl()}">
+<h2> {$locale->tr("search")} </h2>
+<ul>
+<li><div align="center">
+<input type="text" name="searchTerms" value="" size="14" /><br/>
+<input type="hidden" name="op" value="Search" />
+<input type="hidden" name="blogId" value="{$blog->getId()}" />
+<input type="submit" name="Search" value="{$locale->tr("search")}" />
+</div></li>
+</ul>
+</form>
+
+<!--Recent Articles-->
+<h2> {$locale->tr("recently")} </h2>
+<ul>
+{foreach from=$recentposts item=recentpost}
+<li><a title="{$recentpost->getText()|truncate:150:"..."|strip_tags|escape}" href="{$url->postLink($recentpost)}">{$recentpost->getTopic()}</a></li>
+{/foreach}
+</ul>
+
+<!--archives-->
+<h2> {$locale->tr("archives")} </h2>
+<ul>
+{foreach from=$archives item=month}
+<li><a href="{$month->getUrl()}">{$month->getName()}</a></li>
+{/foreach}
+</ul>
+
+<!--categories-->
+<h2> {$locale->tr("categories")} </h2>
+<ul>
+{foreach from=$articlecategories item=articleCategory}
+<a href="{$url->categoryRssLink($articleCategory)}"><img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" style="border:0px;" alt="RSS 0.90" align="middle" /></a> <a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a> [{$articleCategory->getNumArticles()}]<br/>
+{/foreach}
+</ul>
+
+<!--Syndicate-->
+<h2> {$locale->tr("syndicate")} </h2>
+<ul>
+<a class="nodecoration" title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img src="{$url->getUrl("/imgs/rss090_logo.gif")}" style="border:0px;" alt="RSS 0.90" /></a>
+<a class="nodecoration" title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img src="{$url->getUrl("/imgs/rss10_logo.gif")}" style="border:0px;" alt="RSS 1.0" /></a>
+<a class="nodecoration" title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img src="{$url->getUrl("/imgs/rss20_logo.gif")}" style="border:0px;" alt="RSS 2.0" /></a>
+<a class="nodecoration" title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img src="{$url->getUrl("/imgs/atom_logo.png")}" style="border:0px;" alt="Atom 0.3" /></a>
+</ul>
+
+</div>
+
+<div class="clearer"><span></span></div>
+
+</div>
+<div class="footer">Template design by <a href="http://templates.arcsin.se">Arcsin</a>. Ported by <a href="http://www.gracianet.org">GràciaNet</a>. <a href="http://www.lifetype.net">Powered by Lifetype</a>
+</div>
+</div>
+</body>
 </html>
\ No newline at end of file

Modified: templates/branches/lifetype-1.2/beautiful_day/header.template
===================================================================
--- templates/branches/lifetype-1.2/beautiful_day/header.template	2008-04-28 12:56:54 UTC (rev 6331)
+++ templates/branches/lifetype-1.2/beautiful_day/header.template	2008-04-28 12:59:05 UTC (rev 6332)
@@ -1,48 +1,48 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
-<html>
-
-<head>
-<meta http-equiv="content-type" content="text/html; charset={$locale->getCharset()}"/>
-<meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
-<link rel="stylesheet" type="text/css" href="{$url->getTemplateFile("default.css")}" media="screen"/>
-
-<link rel="alternate" type="application/xml" title="RSS 2.0" href="{$url->rssLink("rss20")}" />
-<link rel="alternate" type="application/xml" title="RSS 1.0" href="{$url->rssLink("rss10")}" />
-<link rel="alternate" type="application/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")}" />
-
-<title>{$pageTitle|escape:"html"}</title>
-{if $badbehavior}
-   {$badbehavior->showBB2JavaScript()}
-{/if}
-</head>
-
-<body>
-<div class="top">
-<div class="header">
-<div class="left">
-{$blog->getBlog()}
-</div>
-<div class="right">
-<h2>{$blog->getAbout()}</h2>
-</div>
-</div>
-</div>
-
-<div class="container">
-
-<div class="navigation">
-<a title="{$locale->tr("main")}" href="{$url->blogLink()}">{$locale->tr("main")}</a>
-<a title="{$locale->tr("archives")}" href="{$url->templatePage("archives")}">{$locale->tr("archives")}</a>
-<a title="{$locale->tr("admin")}" href="{$url->getAdminUrl()}">{$locale->tr("admin")}</a>
-<a title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a>
-<a title="{$locale->tr("summary")}" href="{$url->getUrl("/summary.php")}">{$locale->tr("summary")}</a>
-<a href="{$url->templatePage("links")}">{$locale->tr("my_links")}</a>
-<div class="clearer"><span></span></div>
-</div>
-
-<div class="main">
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
+<html>
+
+<head>
+<meta http-equiv="content-type" content="text/html; charset={$locale->getCharset()}"/>
+<meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
+<link rel="stylesheet" type="text/css" href="{$url->getTemplateFile("default.css")}" media="screen"/>
+
+<link rel="alternate" type="application/xml" title="RSS 2.0" href="{$url->rssLink("rss20")}" />
+<link rel="alternate" type="application/xml" title="RSS 1.0" href="{$url->rssLink("rss10")}" />
+<link rel="alternate" type="application/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")}" />
+
+<title>{$pageTitle|escape:"html"}</title>
+{if $badbehavior}
+   {$badbehavior->showBB2JavaScript()}
+{/if}
+</head>
+
+<body>
+<div class="top">
+<div class="header">
+<div class="left">
+{$blog->getBlog()}
+</div>
+<div class="right">
+<h2>{$blog->getAbout()}</h2>
+</div>
+</div>
+</div>
+
+<div class="container">
+
+<div class="navigation">
+<a title="{$locale->tr("main")}" href="{$url->blogLink()}">{$locale->tr("main")}</a>
+<a title="{$locale->tr("archives")}" href="{$url->templatePage("archives")}">{$locale->tr("archives")}</a>
+<a title="{$locale->tr("admin")}" href="{$url->getAdminUrl()}">{$locale->tr("admin")}</a>
+<a title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a>
+<a title="{$locale->tr("summary")}" href="{$url->getUrl("/summary.php")}">{$locale->tr("summary")}</a>
+<a href="{$url->templatePage("links")}">{$locale->tr("my_links")}</a>
+<div class="clearer"><span></span></div>
+</div>
+
+<div class="main">
+
 <div class="content">
\ No newline at end of file

Modified: templates/branches/lifetype-1.2/beautiful_day/post.template
===================================================================
--- templates/branches/lifetype-1.2/beautiful_day/post.template	2008-04-28 12:56:54 UTC (rev 6331)
+++ templates/branches/lifetype-1.2/beautiful_day/post.template	2008-04-28 12:59:05 UTC (rev 6332)
@@ -1,29 +1,29 @@
-<h2>{$post->getTopic()}</h2>
-		{assign var="postDate" value=$post->getDateObject()}
-		{assign var="postOwner" value=$post->getUserInfo()}
-<p class="date">{$postOwner->getUsername()} | {$locale->formatDate($postDate,"%d %B, %Y %H:%M")}</p>
-
-<div>
-{$post->getText()}
-</div>
-
-{if $OnMainPage}
-
-<p class="footer">
-<img src="{$url->getTemplateFile("img/category.gif")}" alt="" />{foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->categoryLink($postCategory)}" title="{$locale->tr("category")}: {$postCategory->getName()}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach} | 
-<img src="{$url->getTemplateFile("img/permalink.gif")}" alt="" /><a title="{$locale->tr("permalink_title")} -> {$post->getTopic()}" href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> | 
-{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $post->getNumComments() > 0 }<img src="{$url->getTemplateFile("img/comment.gif")}" alt="" /><a href="{$url->postPermalink($post)}#comments" title="{$locale->tr("comments")|capitalize} -> {$post->getTopic()}">{if $post->getNumComments() == 0 }{$locale->tr("add_comment")}{else if}{$locale->tr("comments")|capitalize} ({$post->getNumComments()}){/if}</a> | {/if} 
-<img src="{$url->getTemplateFile("img/trackback.gif")}" alt="" />{if $post->getNumTrackbacks() > 0}<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")} -> {$post->getTopic()}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a>{else}{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()}){/if}
-</p>
-
-{else}
-
-<p class="footer">
-<img src="{$url->getTemplateFile("img/category.gif")}" alt="" />{foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->categoryLink($postCategory)}" title="{$locale->tr("category")}: {$postCategory->getName()}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach} | 
-{assign var=nextpost value=$post->getNextArticle()}{if $nextpost == true}<img src="{$url->getTemplateFile("img/next.gif")}" alt="" /><a href="{$url->postPermalink($nextpost)}" title="{$locale->tr("next_post")}: {$nextpost->getTopic()}">{$locale->tr("next_post")}</a> | {/if}
-{assign var=prevpost value=$post->getPrevArticle()}{if $prevpost == true}<img src="{$url->getTemplateFile("img/previous.gif")}" alt="" /><a href="{$url->postPermalink($prevpost)}" title="{$locale->tr("previous_post")}: {$prevpost->getTopic()}">{$locale->tr("previous_post")}</a> | {/if} 
-{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $post->getNumComments() > 0 }<img src="{$url->getTemplateFile("img/comment.gif")}" alt="" />{$locale->tr("comments")|capitalize} ({$post->getNumComments()}) | {/if}
-<img src="{$url->getTemplateFile("img/trackback.gif")}" alt="" />{if $post->getNumTrackbacks() > 0}<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")} -> {$post->getTopic()}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a>{else}{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()}){/if}
-</p>
-
-{/if}
+<h2>{$post->getTopic()}</h2>
+		{assign var="postDate" value=$post->getDateObject()}
+		{assign var="postOwner" value=$post->getUserInfo()}
+<p class="date">{$postOwner->getUsername()} | {$locale->formatDate($postDate,"%d %B, %Y %H:%M")}</p>
+
+<div>
+{$post->getText()}
+</div>
+
+{if $OnMainPage}
+
+<p class="footer">
+<img src="{$url->getTemplateFile("img/category.gif")}" alt="" />{foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->categoryLink($postCategory)}" title="{$locale->tr("category")}: {$postCategory->getName()}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach} | 
+<img src="{$url->getTemplateFile("img/permalink.gif")}" alt="" /><a title="{$locale->tr("permalink_title")} -> {$post->getTopic()}" href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> | 
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $post->getNumComments() > 0 }<img src="{$url->getTemplateFile("img/comment.gif")}" alt="" /><a href="{$url->postPermalink($post)}#comments" title="{$locale->tr("comments")|capitalize} -> {$post->getTopic()}">{if $post->getNumComments() == 0 }{$locale->tr("add_comment")}{else if}{$locale->tr("comments")|capitalize} ({$post->getNumComments()}){/if}</a> | {/if} 
+<img src="{$url->getTemplateFile("img/trackback.gif")}" alt="" />{if $post->getNumTrackbacks() > 0}<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")} -> {$post->getTopic()}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a>{else}{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()}){/if}
+</p>
+
+{else}
+
+<p class="footer">
+<img src="{$url->getTemplateFile("img/category.gif")}" alt="" />{foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->categoryLink($postCategory)}" title="{$locale->tr("category")}: {$postCategory->getName()}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach} | 
+{assign var=nextpost value=$post->getNextArticle()}{if $nextpost == true}<img src="{$url->getTemplateFile("img/next.gif")}" alt="" /><a href="{$url->postPermalink($nextpost)}" title="{$locale->tr("next_post")}: {$nextpost->getTopic()}">{$locale->tr("next_post")}</a> | {/if}
+{assign var=prevpost value=$post->getPrevArticle()}{if $prevpost == true}<img src="{$url->getTemplateFile("img/previous.gif")}" alt="" /><a href="{$url->postPermalink($prevpost)}" title="{$locale->tr("previous_post")}: {$prevpost->getTopic()}">{$locale->tr("previous_post")}</a> | {/if} 
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $post->getNumComments() > 0 }<img src="{$url->getTemplateFile("img/comment.gif")}" alt="" />{$locale->tr("comments")|capitalize} ({$post->getNumComments()}) | {/if}
+<img src="{$url->getTemplateFile("img/trackback.gif")}" alt="" />{if $post->getNumTrackbacks() > 0}<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")} -> {$post->getTopic()}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a>{else}{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()}){/if}
+</p>
+
+{/if}

Modified: templates/branches/lifetype-1.2/beautiful_day/resource.template
===================================================================
--- templates/branches/lifetype-1.2/beautiful_day/resource.template	2008-04-28 12:56:54 UTC (rev 6331)
+++ templates/branches/lifetype-1.2/beautiful_day/resource.template	2008-04-28 12:59:05 UTC (rev 6332)
@@ -1,74 +1,74 @@
-		{include file="$blogtemplate/header.template"} 
-
-<h2>{$locale->tr("albums")}</h2>
-
-		{assign var=metadata value=$resource->getMetadataReader()}
-		{assign var=updated value=$resource->getTimestamp()}
-<div id="album">
-	<h3>{$resource->getFileName()}</h3>
-
-	<div id="Resource-Desc">
-    	<a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a> 
-    	({$metadata->getRoundedSize()}) | {$locale->tr("created")} {$locale->formatDate($updated,"%d %b, %Y")}</div>
- 
- 	<div id="Resource">    
-  	<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("img/sound.gif")}" /></a>
-     	<p>{$resource->getFileName()}</p>
-     	<p>{$locale->tr("format")}: {$metadata->getFormat()|upper}</p>
-     	<p>{$locale->tr("length")}: {$metadata->getLengthString()}</p>
-     	<p>{$locale->tr("sample_rate")}: {$metadata->getSampleRate()} Khz</p>
-   
-   		{elseif $resource->isVideo()}
-     	<img alt="Sound" src="{$url->getTemplateFile("img/video.gif")}" /></a>
-     	<p>{$resource->getFileName()}</p>
-     	<p>{$locale->tr("format")}: {$metadata->getFormat()|upper}</p>
-    	<p>{$locale->tr("size")}: {$metadata->getHeight()} x {$metadata->getWidth()}</p>
-    	<p>{$locale->tr("length")}: {$metadata->getLengthString()}</p>
-    	<p>{$locale->tr("video_codec")}: {$metadata->getVideoCodec()}</p>
-    	<p>{$locale->tr("audio_codec")}: {$metadata->getAudioCodec()}</p>
-   
-   		{elseif $resource->isZip()}
-     	<img alt="Zip" src="{$url->getTemplateFile("img/compressed.gif")}" /></a>
-     	<p>{$resource->getFileName()}</p> 
-    	<p>{$metadata->getTotalFiles()} {$locale->tr("files")}</p>
-    	<p>{$locale->tr("uncompressed_size")}: {$metadata->getRoundedUncompressedSize()}</p>
-   
-   		{else}
-     	<img alt="File" src="{$url->getTemplateFile("img/file.gif")}" /></a>
-     	<p>{$resource->getFileName()}</p>
-         
-   		{/if}   
-  		{/if}
- 	</div>
- 
- 
-		{assign var=album value=$resource->getAlbum()} 
-	<p><a href="{$url->albumLink($album)}">{$locale->tr("parent")}</a></p>
-
-</div>
-
-</div>
-
-
-<div class="clearer">&nbsp;</div> 
-
-</div>
-
-<div id="Bottommenu"><a href="http://www.w3.org/WAI/">Accessible</a> and Valid <a href="http://validator.w3.org/check/referer">XHTML 1.0 Strict</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></div>
-
-
-<!-- Please leave the credit intact. Thank you. -->
-<div id="Bottom">Powered by <a href="http://www.lifetype.net">LifeType</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a></div>
-
-</div>
-</body>
+		{include file="$blogtemplate/header.template"} 
+
+<h2>{$locale->tr("albums")}</h2>
+
+		{assign var=metadata value=$resource->getMetadataReader()}
+		{assign var=updated value=$resource->getTimestamp()}
+<div id="album">
+	<h3>{$resource->getFileName()}</h3>
+
+	<div id="Resource-Desc">
+    	<a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a> 
+    	({$metadata->getRoundedSize()}) | {$locale->tr("created")} {$locale->formatDate($updated,"%d %b, %Y")}</div>
+ 
+ 	<div id="Resource">    
+  	<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("img/sound.gif")}" /></a>
+     	<p>{$resource->getFileName()}</p>
+     	<p>{$locale->tr("format")}: {$metadata->getFormat()|upper}</p>
+     	<p>{$locale->tr("length")}: {$metadata->getLengthString()}</p>
+     	<p>{$locale->tr("sample_rate")}: {$metadata->getSampleRate()} Khz</p>
+   
+   		{elseif $resource->isVideo()}
+     	<img alt="Sound" src="{$url->getTemplateFile("img/video.gif")}" /></a>
+     	<p>{$resource->getFileName()}</p>
+     	<p>{$locale->tr("format")}: {$metadata->getFormat()|upper}</p>
+    	<p>{$locale->tr("size")}: {$metadata->getHeight()} x {$metadata->getWidth()}</p>
+    	<p>{$locale->tr("length")}: {$metadata->getLengthString()}</p>
+    	<p>{$locale->tr("video_codec")}: {$metadata->getVideoCodec()}</p>
+    	<p>{$locale->tr("audio_codec")}: {$metadata->getAudioCodec()}</p>
+   
+   		{elseif $resource->isZip()}
+     	<img alt="Zip" src="{$url->getTemplateFile("img/compressed.gif")}" /></a>
+     	<p>{$resource->getFileName()}</p> 
+    	<p>{$metadata->getTotalFiles()} {$locale->tr("files")}</p>
+    	<p>{$locale->tr("uncompressed_size")}: {$metadata->getRoundedUncompressedSize()}</p>
+   
+   		{else}
+     	<img alt="File" src="{$url->getTemplateFile("img/file.gif")}" /></a>
+     	<p>{$resource->getFileName()}</p>
+         
+   		{/if}   
+  		{/if}
+ 	</div>
+ 
+ 
+		{assign var=album value=$resource->getAlbum()} 
+	<p><a href="{$url->albumLink($album)}">{$locale->tr("parent")}</a></p>
+
+</div>
+
+</div>
+
+
+<div class="clearer">&nbsp;</div> 
+
+</div>
+
+<div id="Bottommenu"><a href="http://www.w3.org/WAI/">Accessible</a> and Valid <a href="http://validator.w3.org/check/referer">XHTML 1.0 Strict</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></div>
+
+
+<!-- Please leave the credit intact. Thank you. -->
+<div id="Bottom">Powered by <a href="http://www.lifetype.net">LifeType</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a></div>
+
+</div>
+</body>
 </html>
\ No newline at end of file

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

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



More information about the pLog-svn mailing list