[pLog-svn] r6330 - templates/branches/lifetype-1.2/SimpleRules

jondaley at devel.lifetype.net jondaley at devel.lifetype.net
Mon Apr 28 08:52:15 EDT 2008 

Author: jondaley
Date: 2008-04-28 08:52:15 -0400 (Mon, 28 Apr 2008)
New Revision: 6330

Modified:
   templates/branches/lifetype-1.2/SimpleRules/about.template
   templates/branches/lifetype-1.2/SimpleRules/aggregator.template
   templates/branches/lifetype-1.2/SimpleRules/album.template
   templates/branches/lifetype-1.2/SimpleRules/albums.template
   templates/branches/lifetype-1.2/SimpleRules/commentarticle.template
   templates/branches/lifetype-1.2/SimpleRules/error.template
   templates/branches/lifetype-1.2/SimpleRules/favicon.ico
   templates/branches/lifetype-1.2/SimpleRules/footer.template
   templates/branches/lifetype-1.2/SimpleRules/header.template
   templates/branches/lifetype-1.2/SimpleRules/impressum.template
   templates/branches/lifetype-1.2/SimpleRules/main.template
   templates/branches/lifetype-1.2/SimpleRules/post.template
   templates/branches/lifetype-1.2/SimpleRules/postandcomments.template
   templates/branches/lifetype-1.2/SimpleRules/posttrackbacks.template
   templates/branches/lifetype-1.2/SimpleRules/readme.txt
   templates/branches/lifetype-1.2/SimpleRules/resource.template
   templates/branches/lifetype-1.2/SimpleRules/searchresults.template
Log:
dos2unix.  removed execute bit.  moved trackback link

Modified: templates/branches/lifetype-1.2/SimpleRules/about.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/about.template	2008-04-28 12:42:36 UTC (rev 6329)
+++ templates/branches/lifetype-1.2/SimpleRules/about.template	2008-04-28 12:52:15 UTC (rev 6330)
@@ -1,14 +1,14 @@
-{assign var=pageTitle value=$blog->getBlog()}
-{assign var=about value=$locale->tr("about")}
-{include file="$blogtemplate/header.template" pageTitle="$pageTitle | $about"}
-<div id="content" class="narrowcolumn">
-<div>
-<div>
-<h2 class="title">{$locale->tr("about")}</h2>
-{$blog->getAbout()}
-</div>
-<br />
-</div>
-</div>
-
+{assign var=pageTitle value=$blog->getBlog()}
+{assign var=about value=$locale->tr("about")}
+{include file="$blogtemplate/header.template" pageTitle="$pageTitle | $about"}
+<div id="content" class="narrowcolumn">
+<div>
+<div>
+<h2 class="title">{$locale->tr("about")}</h2>
+{$blog->getAbout()}
+</div>
+<br />
+</div>
+</div>
+
 {include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/branches/lifetype-1.2/SimpleRules/aggregator.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/aggregator.template	2008-04-28 12:42:36 UTC (rev 6329)
+++ templates/branches/lifetype-1.2/SimpleRules/aggregator.template	2008-04-28 12:52:15 UTC (rev 6330)
@@ -1,25 +1,25 @@
-{assign var="postPageTitle" value=" - RSS Aggregator Beispiel: netzeitung.de"}
-{include file="$blogtemplate/header.template"}
-<div id="content" class="narrowcolumn">
-<div>
-<div>
-<h2 class="title">RSS Aggregator Beispiel: netzeitung.de</h2>
-{if $rss->parse("http://www.netzeitung.de/export/news/rss/titelseite.xml")}
-{assign var=channel value=$rss->getChannel()}
-<p>{$channel->getDescription()}</p>
-<ul style="list-style: none;">
-{foreach from=$rss->getItems() item=rssItem}
-<li>
-<a href="{$rssItem->getLink()}">{$rssItem->getTitle()}</a><br />
-<p>
-{$rssItem->getDescription()}<br /><br />
-</p>
-</li>
-{/foreach}
-</ul>
-{/if}
-</div>
-<br />
-</div>
-</div>
+{assign var="postPageTitle" value=" - RSS Aggregator Beispiel: netzeitung.de"}
+{include file="$blogtemplate/header.template"}
+<div id="content" class="narrowcolumn">
+<div>
+<div>
+<h2 class="title">RSS Aggregator Beispiel: netzeitung.de</h2>
+{if $rss->parse("http://www.netzeitung.de/export/news/rss/titelseite.xml")}
+{assign var=channel value=$rss->getChannel()}
+<p>{$channel->getDescription()}</p>
+<ul style="list-style: none;">
+{foreach from=$rss->getItems() item=rssItem}
+<li>
+<a href="{$rssItem->getLink()}">{$rssItem->getTitle()}</a><br />
+<p>
+{$rssItem->getDescription()}<br /><br />
+</p>
+</li>
+{/foreach}
+</ul>
+{/if}
+</div>
+<br />
+</div>
+</div>
 {include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/branches/lifetype-1.2/SimpleRules/album.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/album.template	2008-04-28 12:42:36 UTC (rev 6329)
+++ templates/branches/lifetype-1.2/SimpleRules/album.template	2008-04-28 12:52:15 UTC (rev 6330)
@@ -1,94 +1,94 @@
-{assign var="postPageTitle" value=" - Gallery"}
-{include file="$blogtemplate/header.template"}
-<div id="content" class="narrowcolumn">
-{assign var="postDate" value=$album->getTimestamp()}
-<div class="blog">
-<h2>{$album->getName()}</h2>
-<div class="post">
-<div class="entry">
-<a href="{$url->albumLink($album)}">
-{$locale->tr("resources")} ({$album->getNumResources()})
-</a> | {$locale->tr("created")} {$locale->formatDate($postDate,"%d %b, %Y")}
-</div>
-</div>
-<p>{$album->getDescription()}</p><br/>
-
-{**
-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 -->
-
-
-<div class="album">
-	<a href="{$url->parentAlbumLink($album)}">
-  	<img src="{$url->getUrl("/imgs/folder.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->getUrl("/imgs/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 -->
-
-
-{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->getUrl("/imgs/sound.gif")}" /></a>
-  		{elseif $resource->isVideo()}
-   	<img alt="Video" src="{$url->getUrl("/imgs/video.gif")}" /></a>
-  		{elseif $resource->isZip()}
-   	<img alt="Zip" src="{$url->getUrl("/imgs/compressed.gif")}" /></a>
-  		{else}
-  	<img alt="File" src="{$url->getUrl("/imgs/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 style="clear:both">&nbsp;</div>
-
-{pager style="links"}  
-
-<!-- end of album contents -->
-
-</div>
-</div>
+{assign var="postPageTitle" value=" - Gallery"}
+{include file="$blogtemplate/header.template"}
+<div id="content" class="narrowcolumn">
+{assign var="postDate" value=$album->getTimestamp()}
+<div class="blog">
+<h2>{$album->getName()}</h2>
+<div class="post">
+<div class="entry">
+<a href="{$url->albumLink($album)}">
+{$locale->tr("resources")} ({$album->getNumResources()})
+</a> | {$locale->tr("created")} {$locale->formatDate($postDate,"%d %b, %Y")}
+</div>
+</div>
+<p>{$album->getDescription()}</p><br/>
+
+{**
+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 -->
+
+
+<div class="album">
+	<a href="{$url->parentAlbumLink($album)}">
+  	<img src="{$url->getUrl("/imgs/folder.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->getUrl("/imgs/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 -->
+
+
+{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->getUrl("/imgs/sound.gif")}" /></a>
+  		{elseif $resource->isVideo()}
+   	<img alt="Video" src="{$url->getUrl("/imgs/video.gif")}" /></a>
+  		{elseif $resource->isZip()}
+   	<img alt="Zip" src="{$url->getUrl("/imgs/compressed.gif")}" /></a>
+  		{else}
+  	<img alt="File" src="{$url->getUrl("/imgs/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 style="clear:both">&nbsp;</div>
+
+{pager style="links"}  
+
+<!-- end of album contents -->
+
+</div>
+</div>
 {include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/branches/lifetype-1.2/SimpleRules/albums.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/albums.template	2008-04-28 12:42:36 UTC (rev 6329)
+++ templates/branches/lifetype-1.2/SimpleRules/albums.template	2008-04-28 12:52:15 UTC (rev 6330)
@@ -1,18 +1,18 @@
-{assign var="postPageTitle" value=" - Gallery"}
-{include file="$blogtemplate/header.template"}
-<div id="content" class="narrowcolumn">
-{foreach from=$albums item=album}
-{assign var="aDate" value=$album->getTimestamp()}
-<div class="post">
-<h2 class="date">{$album->getName()}</h2>
-<div class="entry">
-<a href="{$url->albumLink($album)}">
-{$locale->tr("view")} ({$album->getNumResources()})
-</a>| {$locale->tr("created")} {$locale->formatDate($aDate,"%d %b, %Y")}
-</div>
-{$album->getDescription()|strip_tags|truncate:255:"..."|escape}
-</div>
-<br/>
-{/foreach}
-</div>
-{include file="$blogtemplate/footer.template"}
+{assign var="postPageTitle" value=" - Gallery"}
+{include file="$blogtemplate/header.template"}
+<div id="content" class="narrowcolumn">
+{foreach from=$albums item=album}
+{assign var="aDate" value=$album->getTimestamp()}
+<div class="post">
+<h2 class="date">{$album->getName()}</h2>
+<div class="entry">
+<a href="{$url->albumLink($album)}">
+{$locale->tr("view")} ({$album->getNumResources()})
+</a>| {$locale->tr("created")} {$locale->formatDate($aDate,"%d %b, %Y")}
+</div>
+{$album->getDescription()|strip_tags|truncate:255:"..."|escape}
+</div>
+<br/>
+{/foreach}
+</div>
+{include file="$blogtemplate/footer.template"}

Modified: templates/branches/lifetype-1.2/SimpleRules/commentarticle.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/commentarticle.template	2008-04-28 12:42:36 UTC (rev 6329)
+++ templates/branches/lifetype-1.2/SimpleRules/commentarticle.template	2008-04-28 12:52:15 UTC (rev 6330)
@@ -4,4 +4,4 @@
   <div class="comments-head">Kommentar schreiben</div>
   {include file="$blogtemplate/commentform.template"}
  {/if}
-{include file="$blogtemplate/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: templates/branches/lifetype-1.2/SimpleRules/error.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/error.template	2008-04-28 12:42:36 UTC (rev 6329)
+++ templates/branches/lifetype-1.2/SimpleRules/error.template	2008-04-28 12:52:15 UTC (rev 6330)
@@ -1,17 +1,17 @@
-{include file="$blogtemplate/header.template"}
-<div id="content" class="narrowcolumn">
-
-<div class="post">
-<h2 class="title">{$locale->tr("error")}</h2>
-<div class="entry">
-<br/>
-{$locale->tr($message)}
-<br/><br/>
-{$locale->tr("generated")} {$locale->formatDate($now,"%d %b, %Y")}
-<br/><br/>
-<a href="javascript:history.go(-1)">{$locale->tr("back")}</a>
-</div>
-</div>
-</div>
-
+{include file="$blogtemplate/header.template"}
+<div id="content" class="narrowcolumn">
+
+<div class="post">
+<h2 class="title">{$locale->tr("error")}</h2>
+<div class="entry">
+<br/>
+{$locale->tr($message)}
+<br/><br/>
+{$locale->tr("generated")} {$locale->formatDate($now,"%d %b, %Y")}
+<br/><br/>
+<a href="javascript:history.go(-1)">{$locale->tr("back")}</a>
+</div>
+</div>
+</div>
+
 {include file="$blogtemplate/footer.template"}
\ No newline at end of file


Property changes on: templates/branches/lifetype-1.2/SimpleRules/favicon.ico
___________________________________________________________________
Name: svn:executable
   - *

Modified: templates/branches/lifetype-1.2/SimpleRules/footer.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/footer.template	2008-04-28 12:42:36 UTC (rev 6329)
+++ templates/branches/lifetype-1.2/SimpleRules/footer.template	2008-04-28 12:52:15 UTC (rev 6330)
@@ -1,97 +1,97 @@
-</div>
-</div>
-<div id="menu">
-<div id="menuContent" style="padding:10px;">
-<ul>
-<li>
-<form method="post" action="{$url->getIndexUrl()}">
-<div>
-<input type="text" name="searchTerms" size="15" value="" />
-<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>
-</form>
-</li>
-
-{assign var=blogOwner value=$blog->getOwnerInfo()}
-{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
-{if $blogOwner->hasPicture()}
-
-<li><h2>{$locale->tr("about_myself")}</h2>
-<ul>
-<li><div align="center">
-{assign var=picture value=$blogOwner->getPicture()}
-<a href="{$url->templatePage("about")}">
-  <img style="border:0px" src="{$picture->getPreviewLink()}" alt="{$picture->getDescription()}" />
+</div>
+</div>
+<div id="menu">
+<div id="menuContent" style="padding:10px;">
+<ul>
+<li>
+<form method="post" action="{$url->getIndexUrl()}">
+<div>
+<input type="text" name="searchTerms" size="15" value="" />
+<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>
+</form>
+</li>
+
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture()}
+
+<li><h2>{$locale->tr("about_myself")}</h2>
+<ul>
+<li><div align="center">
+{assign var=picture value=$blogOwner->getPicture()}
+<a href="{$url->templatePage("about")}">
+  <img style="border:0px" src="{$picture->getPreviewLink()}" alt="{$picture->getDescription()}" />
 </a>
-<p>{$AboutMyself}</p>
-</div>
-</li>
-</ul>
-</li>
-{/if}
-
-<li><h2>{$locale->tr("recently")}</h2>
-<ul>
-{foreach from=$recentposts item=post}
-<li><a title="{$post->getTopic()|strip_tags}"
-href="{$url->postLink($post)}">{$post->getTopic()}</a></li>
-{/foreach}
-</ul>
-</li>
-<li><h2>{$locale->tr("categories")}</h2>
-<ul>
-{foreach from=$articlecategories item=articleCategory}
-<li><a href="{$url->categoryLink($articleCategory)}">
-{$articleCategory->getName()}</a>
-[{$articleCategory->getNumArticles()}]</li>
-{/foreach}
-</ul>
-</li>
-<li><h2>{$locale->tr("archives")}</h2>
-<ul>
-{foreach from=$archives item=archivelink}
-<li><a href="{$archivelink->getUrl()}">{$archivelink->getName()}</a>
-[{$archivelink->getNumArticles()}]</li>
-{/foreach}
-</ul>
-</li>
-<li><h2>{$locale->tr("links")}</h2>
-<ul>
-{foreach name=linkcategories from=$mylinkscategories item=linkcategory}
-{if $linkcategory->getNumLinks()>0}
-<li>
-<b>{$linkcategory->getName()}</b>
-
-{foreach name=linkcategorylinks from=$linkcategory->getLinks() item=link}
-{if $smarty.foreach.linkcategorylinks.first}<ul>{/if}
-<li><a href="{$link->getUrl()}"
-title="{$link->getDescription()}">{$link->getName()}</a></li>
-{if $smarty.foreach.linkcategorylinks.last}</ul>{/if}
-{/foreach}
-
-</li>
-{/if}
-{/foreach}
-</ul>
-</li>
-</ul>
-</div>
-</div>
-
-</div>
-<br style="clear:both;" />
-</div>
-
-<div id="footer">
-<p style="float:left;">Design by <a href="http://poolie.kulando.de/">Alexander Kaiser</a>, Powered by <a href="http://www.lifetype.net">Lifetype</a></p>
-<p style="float:right; text-align:right;"><span>
-
-<a title="{$locale->tr("main")}" href="{$url->blogLink()}">{$locale->tr("main")}</a> | <a title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a>
-
-<br />
-<a title="RSS 0.90 feed." href="{$url->rssLink("rss090")}" style="color:#898989;">RSS 0.90</a> | <a title="RSS 1.0 feed." href="{$url->rssLink("rss10")}" style="color:#898989;">RSS 1.0</a> | <a title="RSS 2.0 feed." href="{$url->rssLink("rss20")}" style="color:#898989;">RSS 2.0</a> | <a title="Atom 0.3 feed." href="{$url->rssLink("atom")}" style="color:#898989;">Atom 0.3</a></span></p>
-</div>
-</body>
+<p>{$AboutMyself}</p>
+</div>
+</li>
+</ul>
+</li>
+{/if}
+
+<li><h2>{$locale->tr("recently")}</h2>
+<ul>
+{foreach from=$recentposts item=post}
+<li><a title="{$post->getTopic()|strip_tags}"
+href="{$url->postLink($post)}">{$post->getTopic()}</a></li>
+{/foreach}
+</ul>
+</li>
+<li><h2>{$locale->tr("categories")}</h2>
+<ul>
+{foreach from=$articlecategories item=articleCategory}
+<li><a href="{$url->categoryLink($articleCategory)}">
+{$articleCategory->getName()}</a>
+[{$articleCategory->getNumArticles()}]</li>
+{/foreach}
+</ul>
+</li>
+<li><h2>{$locale->tr("archives")}</h2>
+<ul>
+{foreach from=$archives item=archivelink}
+<li><a href="{$archivelink->getUrl()}">{$archivelink->getName()}</a>
+[{$archivelink->getNumArticles()}]</li>
+{/foreach}
+</ul>
+</li>
+<li><h2>{$locale->tr("links")}</h2>
+<ul>
+{foreach name=linkcategories from=$mylinkscategories item=linkcategory}
+{if $linkcategory->getNumLinks()>0}
+<li>
+<b>{$linkcategory->getName()}</b>
+
+{foreach name=linkcategorylinks from=$linkcategory->getLinks() item=link}
+{if $smarty.foreach.linkcategorylinks.first}<ul>{/if}
+<li><a href="{$link->getUrl()}"
+title="{$link->getDescription()}">{$link->getName()}</a></li>
+{if $smarty.foreach.linkcategorylinks.last}</ul>{/if}
+{/foreach}
+
+</li>
+{/if}
+{/foreach}
+</ul>
+</li>
+</ul>
+</div>
+</div>
+
+</div>
+<br style="clear:both;" />
+</div>
+
+<div id="footer">
+<p style="float:left;">Design by <a href="http://poolie.kulando.de/">Alexander Kaiser</a>, Powered by <a href="http://www.lifetype.net">Lifetype</a></p>
+<p style="float:right; text-align:right;"><span>
+
+<a title="{$locale->tr("main")}" href="{$url->blogLink()}">{$locale->tr("main")}</a> | <a title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a>
+
+<br />
+<a title="RSS 0.90 feed." href="{$url->rssLink("rss090")}" style="color:#898989;">RSS 0.90</a> | <a title="RSS 1.0 feed." href="{$url->rssLink("rss10")}" style="color:#898989;">RSS 1.0</a> | <a title="RSS 2.0 feed." href="{$url->rssLink("rss20")}" style="color:#898989;">RSS 2.0</a> | <a title="Atom 0.3 feed." href="{$url->rssLink("atom")}" style="color:#898989;">Atom 0.3</a></span></p>
+</div>
+</body>
 </html>

Modified: templates/branches/lifetype-1.2/SimpleRules/header.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/header.template	2008-04-28 12:42:36 UTC (rev 6329)
+++ templates/branches/lifetype-1.2/SimpleRules/header.template	2008-04-28 12:52:15 UTC (rev 6330)
@@ -1,42 +1,42 @@
-<!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>
- <title>{$pageTitle|escape:"html"}</title>
-
-<!-- Meta Tags -->
-<meta http-equiv="content-type" content="text/html; charset={$locale->getCharset()}" />
-<meta name="generator" content="{$version}" />
-<meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
-
-<!-- Yepp, that's what you're looking for. Isn't it. -->
-<link rel="stylesheet" type="text/css" media="screen" href="{$url->getTemplateFile("css/poolie.css")}" />
-
-<!-- Feeds -->
-<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")}" />
-{if $badbehavior}
-   {$badbehavior->showBB2JavaScript()}
-{/if}
-</head>
-
-<body>
-<div id="head">
-<div id="geek">
-<p class="geekContent"><span>{$blog->getAbout()}</span></p>
-</div>
-</div>
-
-<div id="main">
-<div id="mainContent">
-<div id="logo">
-<h1><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1>
-</div>
-
-<div id="blog">
+<!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>
+ <title>{$pageTitle|escape:"html"}</title>
+
+<!-- Meta Tags -->
+<meta http-equiv="content-type" content="text/html; charset={$locale->getCharset()}" />
+<meta name="generator" content="{$version}" />
+<meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
+
+<!-- Yepp, that's what you're looking for. Isn't it. -->
+<link rel="stylesheet" type="text/css" media="screen" href="{$url->getTemplateFile("css/poolie.css")}" />
+
+<!-- Feeds -->
+<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")}" />
+{if $badbehavior}
+   {$badbehavior->showBB2JavaScript()}
+{/if}
+</head>
+
+<body>
+<div id="head">
+<div id="geek">
+<p class="geekContent"><span>{$blog->getAbout()}</span></p>
+</div>
+</div>
+
+<div id="main">
+<div id="mainContent">
+<div id="logo">
+<h1><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1>
+</div>
+
+<div id="blog">
 <div id="blogContent" style="padding:10px;">
\ No newline at end of file

Modified: templates/branches/lifetype-1.2/SimpleRules/impressum.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/impressum.template	2008-04-28 12:42:36 UTC (rev 6329)
+++ templates/branches/lifetype-1.2/SimpleRules/impressum.template	2008-04-28 12:52:15 UTC (rev 6330)
@@ -1,13 +1,13 @@
-{assign var="postPageTitle" value=" - Impressum"}
-{include file="$blogtemplate/header.template"}
-<div id="content" class="narrowcolumn">
-<div>
-<div>
-<h2 class="title">Impressum</h2>
-{$blog->getImpressum()}
-</div>
-<br />
-</div>
-</div>
-
+{assign var="postPageTitle" value=" - Impressum"}
+{include file="$blogtemplate/header.template"}
+<div id="content" class="narrowcolumn">
+<div>
+<div>
+<h2 class="title">Impressum</h2>
+{$blog->getImpressum()}
+</div>
+<br />
+</div>
+</div>
+
 {include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/branches/lifetype-1.2/SimpleRules/main.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/main.template	2008-04-28 12:42:36 UTC (rev 6329)
+++ templates/branches/lifetype-1.2/SimpleRules/main.template	2008-04-28 12:52:15 UTC (rev 6330)
@@ -1,7 +1,7 @@
-{include file="$blogtemplate/header.template"}
-
-{foreach from=$posts item=post}
-{include file="$blogtemplate/post.template"}
-{/foreach}
- {pager style="links"}  
+{include file="$blogtemplate/header.template"}
+
+{foreach from=$posts item=post}
+{include file="$blogtemplate/post.template"}
+{/foreach}
+ {pager style="links"}  
 {include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/branches/lifetype-1.2/SimpleRules/post.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/post.template	2008-04-28 12:42:36 UTC (rev 6329)
+++ templates/branches/lifetype-1.2/SimpleRules/post.template	2008-04-28 12:52:15 UTC (rev 6330)
@@ -1,18 +1,17 @@
-<!-- Blog Artikel -->
-<!-- {$url->postTrackbackLink($post)} -->
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-<h2><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h2>
-<small>{$locale->tr("posted_by")} {$postOwner->getUsername()} | {$locale->formatDate($postDate,"%j %b, %Y")}, {$locale->formatDate($postDate,"%H:%M")}</small>
-<div class="entry">
-{$post->getText()}
-</div>
-
-<div>
-<p class="postmetadata">
-{foreach name=categories from=$post->getCategories() item=postcategory}
-<a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
-{/foreach} |
-<a href="{$url->postPermalink($post)}">{$locale->tr("comments")} ({$post->getNumComments()})</a> |
-<a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a></p>
-</div>
\ No newline at end of file
+<!-- Blog Artikel -->
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+<h2><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h2>
+<small>{$locale->tr("posted_by")} {$postOwner->getUsername()} | {$locale->formatDate($postDate,"%j %b, %Y")}, {$locale->formatDate($postDate,"%H:%M")}</small>
+<div class="entry">
+{$post->getText()}
+</div>
+
+<div>
+<p class="postmetadata">
+{foreach name=categories from=$post->getCategories() item=postcategory}
+<a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+{/foreach} |
+<a href="{$url->postPermalink($post)}">{$locale->tr("comments")} ({$post->getNumComments()})</a> |
+<a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a></p>
+</div>

Modified: templates/branches/lifetype-1.2/SimpleRules/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/postandcomments.template	2008-04-28 12:42:36 UTC (rev 6329)
+++ templates/branches/lifetype-1.2/SimpleRules/postandcomments.template	2008-04-28 12:52:15 UTC (rev 6330)
@@ -1,83 +1,86 @@
-{assign var="postPageTitle" value=$post->getTopic()}
-{assign var="postPageTitle" value=" - $postPageTitle"}
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-
-{include file="$blogtemplate/header.template"}
-<div id="content" class="narrowcolumn">
-<div class="navigation">
-{if $post->getNextArticle() != ""}
-<div class="alignleft">
-{assign var=nextpost value=$post->getNextArticle()}
-&laquo; <a href="{$url->postPermalink($nextpost)}">{$nextpost->getTopic()}</a>
-</div>
-{/if}
-
-{if $post->getPrevArticle() != ""}
-<div class="alignright">
-{assign var=prevpost value=$post->getPrevArticle()}
-<a href="{$url->postPermalink($prevpost)}"> {$prevpost->getTopic()}</a> &raquo;
-</div>
-{/if}
-</div>
-<div>&nbsp;</div>
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-<div>
-<div class="post">
-<h2><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h2>
-<small>{$locale->tr("posted_by")} {$postOwner->getUsername()} | {$locale->formatDate($postDate,"%j %b, %Y")}</small>
-<div class="entry">
-{$post->getText()}
-</div>
-<br />
-<p class="postmetadata alt">
-<small>
-This Entry was written on {$locale->formatDate($postDate,"%d %B, %Y %H:%M")} in the Category {foreach name=categories from=$post->getCategories() item=postcategory} <a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
-{/foreach}.<br />
-You can leave a Comment or check the <a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")}</a>.
-</small></p>
-</div>
-</div>
-
-<div>
-<h3 id="comments">{$post->getNumComments()} {$locale->tr("comments")}  and {$post->getNumTrackbacks()} {$locale->tr("trackbacks")} - "{$post->getTopic()}" </h3>
- {pager style="links"}
-{foreach from=$comments item=comment}
-<br />
-
-<ol class="commentlist">
-	
-{if $comment->IsPosterAuthenticated()}
- {assign var=poster value=$comment->getUser()}
- {if $poster->hasPicture()}
-   {assign var=posterimg value=$poster->getPicture()}
-   {assign var=commenter value=$comment->getUser()}
-   <img src="{$posterimg->getPreviewLink()}" alt="{$commenter->getUserName()}" align="right" />
-  {/if}
-{/if}	
-	
-<strong>{$comment->getTopic()}</strong>
-<a name="{$comment->getId()}"></a><p>{$comment->getText()}</p>
-<span class="comments-post">
-{$locale->tr("posted_by")}
-{if $comment->getUserUrl() != ""}
-<a href="{$comment->getUserUrl()}">{$comment->getUsername()}</a>
-{else}
-{$comment->getUsername()}
-{/if}
-{assign var=commentDate value=$comment->getDateObject()}
-am {$locale->formatDate($commentDate, "%d %b %Y, %H:%M")}
-</span>
-</ol>
-{/foreach}
- {pager style="links"}
-</div>
-{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
-<div>
-<div><p>&nbsp;</p></div>
-{include file="$blogtemplate/commentform.template"}
-</div>
-{/if}
-</div>
-{include file="$blogtemplate/footer.template"}
+{assign var="postPageTitle" value=$post->getTopic()}
+{assign var="postPageTitle" value=" - $postPageTitle"}
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+
+{include file="$blogtemplate/header.template"}
+
+<!-- {$url->postTrackbackLink($post)} -->
+
+<div id="content" class="narrowcolumn">
+<div class="navigation">
+{if $post->getNextArticle() != ""}
+<div class="alignleft">
+{assign var=nextpost value=$post->getNextArticle()}
+&laquo; <a href="{$url->postPermalink($nextpost)}">{$nextpost->getTopic()}</a>
+</div>
+{/if}
+
+{if $post->getPrevArticle() != ""}
+<div class="alignright">
+{assign var=prevpost value=$post->getPrevArticle()}
+<a href="{$url->postPermalink($prevpost)}"> {$prevpost->getTopic()}</a> &raquo;
+</div>
+{/if}
+</div>
+<div>&nbsp;</div>
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+<div>
+<div class="post">
+<h2><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h2>
+<small>{$locale->tr("posted_by")} {$postOwner->getUsername()} | {$locale->formatDate($postDate,"%j %b, %Y")}</small>
+<div class="entry">
+{$post->getText()}
+</div>
+<br />
+<p class="postmetadata alt">
+<small>
+This Entry was written on {$locale->formatDate($postDate,"%d %B, %Y %H:%M")} in the Category {foreach name=categories from=$post->getCategories() item=postcategory} <a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+{/foreach}.<br />
+You can leave a Comment or check the <a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")}</a>.
+</small></p>
+</div>
+</div>
+
+<div>
+<h3 id="comments">{$post->getNumComments()} {$locale->tr("comments")}  and {$post->getNumTrackbacks()} {$locale->tr("trackbacks")} - "{$post->getTopic()}" </h3>
+ {pager style="links"}
+{foreach from=$comments item=comment}
+<br />
+
+<ol class="commentlist">
+	
+{if $comment->IsPosterAuthenticated()}
+ {assign var=poster value=$comment->getUser()}
+ {if $poster->hasPicture()}
+   {assign var=posterimg value=$poster->getPicture()}
+   {assign var=commenter value=$comment->getUser()}
+   <img src="{$posterimg->getPreviewLink()}" alt="{$commenter->getUserName()}" align="right" />
+  {/if}
+{/if}	
+	
+<strong>{$comment->getTopic()}</strong>
+<a name="{$comment->getId()}"></a><p>{$comment->getText()}</p>
+<span class="comments-post">
+{$locale->tr("posted_by")}
+{if $comment->getUserUrl() != ""}
+<a href="{$comment->getUserUrl()}">{$comment->getUsername()}</a>
+{else}
+{$comment->getUsername()}
+{/if}
+{assign var=commentDate value=$comment->getDateObject()}
+am {$locale->formatDate($commentDate, "%d %b %Y, %H:%M")}
+</span>
+</ol>
+{/foreach}
+ {pager style="links"}
+</div>
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
+<div>
+<div><p>&nbsp;</p></div>
+{include file="$blogtemplate/commentform.template"}
+</div>
+{/if}
+</div>
+{include file="$blogtemplate/footer.template"}

Modified: templates/branches/lifetype-1.2/SimpleRules/posttrackbacks.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/posttrackbacks.template	2008-04-28 12:42:36 UTC (rev 6329)
+++ templates/branches/lifetype-1.2/SimpleRules/posttrackbacks.template	2008-04-28 12:52:15 UTC (rev 6330)
@@ -1,33 +1,33 @@
-{assign var="postPageTitle" value=$post->getTopic()}
-{assign var="postPageTitle" value=" - $postPageTitle - Trackbacks"}
-{include file="$blogtemplate/header.template"}
-<div id="content" class="narrowcolumn">
-<div class="navigation">
-{if $post->getNextArticle() != ""}
-<div class="alignleft">
-{assign var=nextpost value=$post->getNextArticle()}
-&laquo; <a href="{$url->postTrackbackStatsLink($nextpost)}"> {$nextpost->getTopic()}</a>
-</div>
-{/if}
-
-{if $post->getPrevArticle() != ""}
-<div class="alignright">
-{assign var=prevpost value=$post->getPrevArticle()}
-<a href="{$url->postTrackbackStatsLink($prevpost)}"> {$prevpost->getTopic()}</a> &raquo;
-</div>
-{/if}
-</div>
-<div class="post">
-<h2>{$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>"</h2>
-<div class="entry">
-{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}
-</div>
-</div>
-</div>
+{assign var="postPageTitle" value=$post->getTopic()}
+{assign var="postPageTitle" value=" - $postPageTitle - Trackbacks"}
+{include file="$blogtemplate/header.template"}
+<div id="content" class="narrowcolumn">
+<div class="navigation">
+{if $post->getNextArticle() != ""}
+<div class="alignleft">
+{assign var=nextpost value=$post->getNextArticle()}
+&laquo; <a href="{$url->postTrackbackStatsLink($nextpost)}"> {$nextpost->getTopic()}</a>
+</div>
+{/if}
+
+{if $post->getPrevArticle() != ""}
+<div class="alignright">
+{assign var=prevpost value=$post->getPrevArticle()}
+<a href="{$url->postTrackbackStatsLink($prevpost)}"> {$prevpost->getTopic()}</a> &raquo;
+</div>
+{/if}
+</div>
+<div class="post">
+<h2>{$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>"</h2>
+<div class="entry">
+{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}
+</div>
+</div>
+</div>
 {include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: templates/branches/lifetype-1.2/SimpleRules/readme.txt
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/readme.txt	2008-04-28 12:42:36 UTC (rev 6329)
+++ templates/branches/lifetype-1.2/SimpleRules/readme.txt	2008-04-28 12:52:15 UTC (rev 6330)
@@ -1,26 +1,26 @@
-This is the "SimpleRules" Template for LifeType - www.lifetype.net
-Probably the best Blogging Tool in the world.
-
-This is Version 1.0 of SimpleRules, so you better test it.
-
-You can remove the Link "Design by Alexander Kaiser" but you don't have to ;)
-XHTML and CSS is validated.
-
-Extras:
-	- Integrated Flickr Plugin - If you have it enabled a Link in the footer comes up.
-	- Integrated User Picture - If you have it enabled the User Picture comes up.
-	- Integrated Aggregator (/static/aggregator)
-	- Integrated Gravatar Plugin - If you have it enabled the Gravatars come up with new Comments.
-	- Integrated About Page - Calls up the Info you entered in the Blog-Info Box within your Admin (/static/about)
-
-That's it... so far.
-
-Design and Coding by
-
-Alexander Kaiser
-alex at poolie.de
-http://poolie.kulando.de
-
-
-You should also check out this page:
-http://www.lifetype.net/blog.php/lifetype_development_journal/page/aboutus
+This is the "SimpleRules" Template for LifeType - www.lifetype.net
+Probably the best Blogging Tool in the world.
+
+This is Version 1.0 of SimpleRules, so you better test it.
+
+You can remove the Link "Design by Alexander Kaiser" but you don't have to ;)
+XHTML and CSS is validated.
+
+Extras:
+	- Integrated Flickr Plugin - If you have it enabled a Link in the footer comes up.
+	- Integrated User Picture - If you have it enabled the User Picture comes up.
+	- Integrated Aggregator (/static/aggregator)
+	- Integrated Gravatar Plugin - If you have it enabled the Gravatars come up with new Comments.
+	- Integrated About Page - Calls up the Info you entered in the Blog-Info Box within your Admin (/static/about)
+
+That's it... so far.
+
+Design and Coding by
+
+Alexander Kaiser
+alex at poolie.de
+http://poolie.kulando.de
+
+
+You should also check out this page:
+http://www.lifetype.net/blog.php/lifetype_development_journal/page/aboutus

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

Modified: templates/branches/lifetype-1.2/SimpleRules/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/searchresults.template	2008-04-28 12:42:36 UTC (rev 6329)
+++ templates/branches/lifetype-1.2/SimpleRules/searchresults.template	2008-04-28 12:52:15 UTC (rev 6330)
@@ -1,32 +1,32 @@
-{include file="$blogtemplate/header.template"}
-<div id="content" class="narrowcolumn">
-<h2>{$locale->tr("search_results")}:
-{foreach from=$searchterms item=term}{$term} {/foreach}
-</h2>
-{foreach from=$searchresults item=result}
-<div class="post">
-{assign var=article value=$result->getArticle()}
-{assign var="postDate" value=$article->getDateObject()}
-{assign var="postOwner" value=$article->getUserInfo()}
-<div class="entry">
-<h2>
-<a href="{$url->postPermalink($article)}">
-{$article->getTopic()}</a>
-</h2><br />
-<small>{$locale->tr("posted_by")}
-{$postOwner->getUsername()} {$locale->formatDate($postDate,"%H:%M")}
-
-| {foreach name=categories
-from=$article->getCategories() item=postcategory}
-<a href="{$url->categoryLink($postcategory)}">
-{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
-{/foreach}
-| {$locale->formatDate($postDate,"%j %b, %Y")}
-</small>
-</div>
-{$article->getText()|strip_tags|truncate:300:"...":false}
-</div>
-{/foreach}
-</div>
-
+{include file="$blogtemplate/header.template"}
+<div id="content" class="narrowcolumn">
+<h2>{$locale->tr("search_results")}:
+{foreach from=$searchterms item=term}{$term} {/foreach}
+</h2>
+{foreach from=$searchresults item=result}
+<div class="post">
+{assign var=article value=$result->getArticle()}
+{assign var="postDate" value=$article->getDateObject()}
+{assign var="postOwner" value=$article->getUserInfo()}
+<div class="entry">
+<h2>
+<a href="{$url->postPermalink($article)}">
+{$article->getTopic()}</a>
+</h2><br />
+<small>{$locale->tr("posted_by")}
+{$postOwner->getUsername()} {$locale->formatDate($postDate,"%H:%M")}
+
+| {foreach name=categories
+from=$article->getCategories() item=postcategory}
+<a href="{$url->categoryLink($postcategory)}">
+{$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+{/foreach}
+| {$locale->formatDate($postDate,"%j %b, %Y")}
+</small>
+</div>
+{$article->getText()|strip_tags|truncate:300:"...":false}
+</div>
+{/foreach}
+</div>
+
 {include file="$blogtemplate/footer.template"}
\ No newline at end of file

More information about the pLog-svn mailing list