[pLog-svn] r6381 - in templates/branches/lifetype-1.2: . almost-spring unported
jondaley at devel.lifetype.net
jondaley at devel.lifetype.net
Mon Apr 28 16:34:54 EDT 2008
Author: jondaley
Date: 2008-04-28 16:34:54 -0400 (Mon, 28 Apr 2008)
New Revision: 6381
Added:
templates/branches/lifetype-1.2/almost-spring/
templates/branches/lifetype-1.2/almost-spring/album.template
templates/branches/lifetype-1.2/almost-spring/albums.template
templates/branches/lifetype-1.2/almost-spring/commentarticle.template
templates/branches/lifetype-1.2/almost-spring/error.template
templates/branches/lifetype-1.2/almost-spring/favicon.ico
templates/branches/lifetype-1.2/almost-spring/footer.template
templates/branches/lifetype-1.2/almost-spring/header.template
templates/branches/lifetype-1.2/almost-spring/img/
templates/branches/lifetype-1.2/almost-spring/main.template
templates/branches/lifetype-1.2/almost-spring/panel.template
templates/branches/lifetype-1.2/almost-spring/post.template
templates/branches/lifetype-1.2/almost-spring/postandcomments.template
templates/branches/lifetype-1.2/almost-spring/posttrackbacks.template
templates/branches/lifetype-1.2/almost-spring/resource.template
templates/branches/lifetype-1.2/almost-spring/screenshot.jpg
templates/branches/lifetype-1.2/almost-spring/searchresults.template
templates/branches/lifetype-1.2/almost-spring/style.css
templates/branches/lifetype-1.2/andreas-2-columns/
Removed:
templates/branches/lifetype-1.2/almost-spring/album.template
templates/branches/lifetype-1.2/almost-spring/albums.template
templates/branches/lifetype-1.2/almost-spring/commentarticle.template
templates/branches/lifetype-1.2/almost-spring/error.template
templates/branches/lifetype-1.2/almost-spring/favicon.ico
templates/branches/lifetype-1.2/almost-spring/footer.template
templates/branches/lifetype-1.2/almost-spring/header.template
templates/branches/lifetype-1.2/almost-spring/img/
templates/branches/lifetype-1.2/almost-spring/main.template
templates/branches/lifetype-1.2/almost-spring/panel.template
templates/branches/lifetype-1.2/almost-spring/post.template
templates/branches/lifetype-1.2/almost-spring/postandcomments.template
templates/branches/lifetype-1.2/almost-spring/posttrackbacks.template
templates/branches/lifetype-1.2/almost-spring/resource.template
templates/branches/lifetype-1.2/almost-spring/screenshot.jpg
templates/branches/lifetype-1.2/almost-spring/searchresults.template
templates/branches/lifetype-1.2/almost-spring/style.css
templates/branches/lifetype-1.2/unported/almost-spring/
templates/branches/lifetype-1.2/unported/andreas-2-columns/
Log:
ported to 1.2
Copied: templates/branches/lifetype-1.2/almost-spring (from rev 6377, templates/branches/lifetype-1.2/unported/almost-spring)
Deleted: templates/branches/lifetype-1.2/almost-spring/album.template
===================================================================
--- templates/branches/lifetype-1.2/unported/almost-spring/album.template 2008-04-28 20:27:24 UTC (rev 6377)
+++ templates/branches/lifetype-1.2/almost-spring/album.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -1,87 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="content">
-<div class="post">
-<h2 class="posttitle"><a>{$album->getName()}</a></h2>
-<p class="postmeta">
-{$album->getDescription()}
-</p>
-<!-- album contents go here -->
-<div id="album">
-<table style="border:0px;width:93%" summary="Album Resources">
-<tr>
-<td style="width:30%;" align="center" >
-<a class="nodecoration" href="{$url->parentAlbumLink($album)}">
-<img style="border:0px" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
-..
-</a>
-</td>
-{assign var="counter" value=1}
-{assign var=children value=$album->getChildren()}
-{foreach from=$children item=childalbum}
-<td style="width:30%;" align="center" >
-<a class="nodecoration" href="{$url->albumLink($childalbum)}">
-<img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
-{$childalbum->getName()} ({$childalbum->getNumResources()})
-</a>
-<br/><br/>
-{assign var="counter" value="`$counter+1`"}
-</td>
-{if $counter%3 == 0}
-</tr>
-<tr>
-{/if}
-{/foreach}
-<!--- show the resources here -->
-
-
-{foreach from=$resources item=resource}
-<td style="width:30%;" align="center" >
-{if $resource->hasPreview()}
-{*<a class="nodecoration" target="_blank" href="resserver.php?blogId={$blog->getId()}&resource={$resource->getFileName()}">*}
-<a class="nodecoration" 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%3 == 0}
-</tr>
-<tr>
-{/if}
-{/foreach}
-<td></td></tr>
-</table>
-{pager style="links"}
-</div>
-<!-- end of album contents -->
-</div>
-</div>
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Copied: templates/branches/lifetype-1.2/almost-spring/album.template (from rev 6380, templates/branches/lifetype-1.2/unported/almost-spring/album.template)
===================================================================
--- templates/branches/lifetype-1.2/almost-spring/album.template (rev 0)
+++ templates/branches/lifetype-1.2/almost-spring/album.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -0,0 +1,87 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+<div class="post">
+<h2 class="posttitle"><a>{$album->getName()}</a></h2>
+<p class="postmeta">
+{$album->getDescription()}
+</p>
+<!-- album contents go here -->
+<div id="album">
+<table style="border:0px;width:93%" summary="Album Resources">
+<tr>
+<td style="width:30%;" align="center" >
+<a class="nodecoration" href="{$url->parentAlbumLink($album)}">
+<img style="border:0px" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
+..
+</a>
+</td>
+{assign var="counter" value=1}
+{assign var=children value=$album->getChildren()}
+{foreach from=$children item=childalbum}
+<td style="width:30%;" align="center" >
+<a class="nodecoration" href="{$url->albumLink($childalbum)}">
+<img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
+{$childalbum->getName()} ({$childalbum->getNumResources()})
+</a>
+<br/><br/>
+{assign var="counter" value="`$counter+1`"}
+</td>
+{if $counter%3 == 0}
+</tr>
+<tr>
+{/if}
+{/foreach}
+<!--- show the resources here -->
+
+
+{foreach from=$resources item=resource}
+<td style="width:30%;" align="center" >
+{if $resource->hasPreview()}
+{*<a class="nodecoration" target="_blank" href="resserver.php?blogId={$blog->getId()}&resource={$resource->getFileName()}">*}
+<a class="nodecoration" 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%3 == 0}
+</tr>
+<tr>
+{/if}
+{/foreach}
+<td></td></tr>
+</table>
+{pager style="links"}
+</div>
+<!-- end of album contents -->
+</div>
+</div>
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Deleted: templates/branches/lifetype-1.2/almost-spring/albums.template
===================================================================
--- templates/branches/lifetype-1.2/unported/almost-spring/albums.template 2008-04-28 20:27:24 UTC (rev 6377)
+++ templates/branches/lifetype-1.2/almost-spring/albums.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -1,30 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="content">
-<div class="post">
-<h2 class="posttitle"><a>{$locale->tr("albums")}</a></h2>
-<p class="postmeta"> </p>
-<!-- album contents go here -->
-<div id="album">
-<table style="border:0px;width:93%;" summary="Albums">
-<tr>
-{assign var="counter" value=0}
-{foreach from=$albums item=album}
-<td style="width:30%;" align="center">
-<a class="nodecoration" href="{$url->albumLink($album)}">
-<img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
-{$album->getName()} ({$album->getNumResources()})
-</a>
-{assign var="counter" value="`$counter+1`"}
-</td>
-{if $counter%3 == 0}
-</tr>
-<tr>
-{/if}
-{/foreach}
-<td></td></tr>
-</table>
-</div>
-<!-- end of the albums -->
-</div>
-</div>
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Copied: templates/branches/lifetype-1.2/almost-spring/albums.template (from rev 6380, templates/branches/lifetype-1.2/unported/almost-spring/albums.template)
===================================================================
--- templates/branches/lifetype-1.2/almost-spring/albums.template (rev 0)
+++ templates/branches/lifetype-1.2/almost-spring/albums.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -0,0 +1,30 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+<div class="post">
+<h2 class="posttitle"><a>{$locale->tr("albums")}</a></h2>
+<p class="postmeta"> </p>
+<!-- album contents go here -->
+<div id="album">
+<table style="border:0px;width:93%;" summary="Albums">
+<tr>
+{assign var="counter" value=0}
+{foreach from=$albums item=album}
+<td style="width:30%;" align="center">
+<a class="nodecoration" href="{$url->albumLink($album)}">
+<img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
+{$album->getName()} ({$album->getNumResources()})
+</a>
+{assign var="counter" value="`$counter+1`"}
+</td>
+{if $counter%3 == 0}
+</tr>
+<tr>
+{/if}
+{/foreach}
+<td></td></tr>
+</table>
+</div>
+<!-- end of the albums -->
+</div>
+</div>
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Deleted: templates/branches/lifetype-1.2/almost-spring/commentarticle.template
===================================================================
Copied: templates/branches/lifetype-1.2/almost-spring/commentarticle.template (from rev 6380, templates/branches/lifetype-1.2/unported/almost-spring/commentarticle.template)
===================================================================
Deleted: templates/branches/lifetype-1.2/almost-spring/error.template
===================================================================
--- templates/branches/lifetype-1.2/unported/almost-spring/error.template 2008-04-28 20:27:24 UTC (rev 6377)
+++ templates/branches/lifetype-1.2/almost-spring/error.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -1,9 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="content">
-<div class="post">
-<p class="post-info">{$locale->tr("error")}</p>
-<p>{$locale->tr($message)}</p>
-<p><a href="javascript:history.go(-1)">{$locale->tr("back")}</a></p>
-</div>
-</div>
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Copied: templates/branches/lifetype-1.2/almost-spring/error.template (from rev 6380, templates/branches/lifetype-1.2/unported/almost-spring/error.template)
===================================================================
--- templates/branches/lifetype-1.2/almost-spring/error.template (rev 0)
+++ templates/branches/lifetype-1.2/almost-spring/error.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -0,0 +1,9 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+<div class="post">
+<p class="post-info">{$locale->tr("error")}</p>
+<p>{$locale->tr($message)}</p>
+<p><a href="javascript:history.go(-1)">{$locale->tr("back")}</a></p>
+</div>
+</div>
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Deleted: templates/branches/lifetype-1.2/almost-spring/favicon.ico
===================================================================
(Binary files differ)
Copied: templates/branches/lifetype-1.2/almost-spring/favicon.ico (from rev 6380, templates/branches/lifetype-1.2/unported/almost-spring/favicon.ico)
===================================================================
(Binary files differ)
Deleted: templates/branches/lifetype-1.2/almost-spring/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/almost-spring/footer.template 2008-04-28 20:27:24 UTC (rev 6377)
+++ templates/branches/lifetype-1.2/almost-spring/footer.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -1,9 +0,0 @@
-<div id="footer">
-<p>
-ThemeDesign by <a href="http://beccary.com/goodies/wordpress-themes/">Becca Wei</a>. Modify by <a href="http://blog.ysmis.cc/mit">MIT</a>.
-</p>
-</div>
-
-</div>
-</body>
-</html>
\ No newline at end of file
Copied: templates/branches/lifetype-1.2/almost-spring/footer.template (from rev 6380, templates/branches/lifetype-1.2/unported/almost-spring/footer.template)
===================================================================
--- templates/branches/lifetype-1.2/almost-spring/footer.template (rev 0)
+++ templates/branches/lifetype-1.2/almost-spring/footer.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -0,0 +1,9 @@
+<div id="footer">
+<p>
+ThemeDesign by <a href="http://beccary.com/goodies/wordpress-themes/">Becca Wei</a>. Modify by <a href="http://blog.ysmis.cc/mit">MIT</a>.
+</p>
+</div>
+
+</div>
+</body>
+</html>
\ No newline at end of file
Deleted: templates/branches/lifetype-1.2/almost-spring/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/almost-spring/header.template 2008-04-28 20:27:24 UTC (rev 6377)
+++ templates/branches/lifetype-1.2/almost-spring/header.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -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>
-<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" />
-<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="wrapper">
-
-<div id="header">
-<h1><a href="{$url->blogLink()}" accesskey="1"> {$blog->getBlog()}</a></h1>
-<div class="description">{$blog->getAbout()}</div>
-</div>
\ No newline at end of file
Copied: templates/branches/lifetype-1.2/almost-spring/header.template (from rev 6380, templates/branches/lifetype-1.2/unported/almost-spring/header.template)
===================================================================
--- templates/branches/lifetype-1.2/almost-spring/header.template (rev 0)
+++ templates/branches/lifetype-1.2/almost-spring/header.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -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>
+<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" />
+<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="wrapper">
+
+<div id="header">
+<h1><a href="{$url->blogLink()}" accesskey="1"> {$blog->getBlog()}</a></h1>
+<div class="description">{$blog->getAbout()}</div>
+</div>
Copied: templates/branches/lifetype-1.2/almost-spring/img (from rev 6380, templates/branches/lifetype-1.2/unported/almost-spring/img)
Deleted: templates/branches/lifetype-1.2/almost-spring/main.template
===================================================================
--- templates/branches/lifetype-1.2/unported/almost-spring/main.template 2008-04-28 20:27:24 UTC (rev 6377)
+++ templates/branches/lifetype-1.2/almost-spring/main.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -1,10 +0,0 @@
-{include file="$blogtemplate/header.template"}
- <div id="content">
- {foreach from=$posts item=post}
- {include file="$blogtemplate/post.template"}
- {/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/almost-spring/main.template (from rev 6380, templates/branches/lifetype-1.2/unported/almost-spring/main.template)
===================================================================
--- templates/branches/lifetype-1.2/almost-spring/main.template (rev 0)
+++ templates/branches/lifetype-1.2/almost-spring/main.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -0,0 +1,10 @@
+{include file="$blogtemplate/header.template"}
+ <div id="content">
+ {foreach from=$posts item=post}
+ {include file="$blogtemplate/post.template"}
+ {/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/almost-spring/panel.template
===================================================================
--- templates/branches/lifetype-1.2/unported/almost-spring/panel.template 2008-04-28 20:27:24 UTC (rev 6377)
+++ templates/branches/lifetype-1.2/almost-spring/panel.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -1,110 +0,0 @@
-<div id="sidebar" style="word-wrap: break-word;">
-<ul>
-
-{assign var=blogOwner value=$blog->getOwnerInfo()}
-{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
-{if $blogOwner->hasPicture() && $AboutMyself}
-<li>
- <h2>{$locale->tr("about_myself")}</h2>
- <ul>
- <div id="AboutMyself">
- {assign var=picture value=$blogOwner->getPicture()}
- <li><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /></li>
- <li>{$AboutMyself}</li>
- </div>
- </ul>
-</li>
-{/if}
-
-
-<li>
-<h2>Meta</h2>
-<ul>
-<li><a href="{$url->blogLink()}"> {$locale->tr("main")}</a></li>
-<li><a href="{$url->getAdminUrl()}" accesskey="2">{$locale->tr("dashboard")}</a></li>
-<li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
-</ul>
-</li>
-
-<li>
-<!--Calendar-->
-<h2>calendar</h2>
-<ul>
-<div align="center">
-{$calendar}
-</div>
-</ul>
-</li>
-
-<li>
-<!--Search-->
-<form name="search_form" method="post" action="{$url->getIndexUrl()}">
-<h2>search</h2>
-<ul>
-<li>
-<div align="center">
-<input type="text" name="searchTerms" value="" size="14" />
-<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>
-</li>
-
-<li>
-<!--Recent Articles-->
-<h2>recent articles</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>
-</li>
-
-<li>
-<!--archives-->
-<h2>archives</h2>
-<ul>
-{foreach from=$archives item=month}
-<li><a href="{$month->getUrl()}">{$month->getName()}</a></li>
-{/foreach}
-</ul>
-</li>
-
-<li>
-<!--categories-->
-<h2>categories</h2>
-<ul>
-{foreach from=$articlecategories item=articleCategory}
-<li><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()} [{$articleCategory->getNumArticles()}]</a></li>
-{/foreach}
-</ul>
-</li>
-
-<li>
-<!--Mylink-->
-{foreach from=$mylinkscategories item=linkcategory}
-<h2>{$linkcategory->getName()}</h2>
-<ul>
-{foreach from=$linkcategory->getLinks() item=link}
-<li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a></li>
-{/foreach}
-</ul>
-{/foreach}
-</li>
-
-<li>
-<!--Syndicate-->
-<h2>syndicate</h2>
-<ul>
-<li><a class="nodecoration" title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img src="{$url->getUrl("/imgs/rss090_logo.gif")}" style="border:0px;" alt="RSS 0.90" /></a></li>
-<li><a class="nodecoration" title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img src="{$url->getUrl("/imgs/rss10_logo.gif")}" style="border:0px;" alt="RSS 1.0" /></a></li>
-<li><a class="nodecoration" title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img src="{$url->getUrl("/imgs/rss20_logo.gif")}" style="border:0px;" alt="RSS 2.0" /></a></li>
-<li><a class="nodecoration" title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img src="{$url->getUrl("/imgs/atom_logo.png")}" style="border:0px;" alt="Atom 0.3" /></a></li>
-</ul>
-</li>
-
-</ul>
-</div>
\ No newline at end of file
Copied: templates/branches/lifetype-1.2/almost-spring/panel.template (from rev 6380, templates/branches/lifetype-1.2/unported/almost-spring/panel.template)
===================================================================
--- templates/branches/lifetype-1.2/almost-spring/panel.template (rev 0)
+++ templates/branches/lifetype-1.2/almost-spring/panel.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -0,0 +1,110 @@
+<div id="sidebar" style="word-wrap: break-word;">
+<ul>
+
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}
+<li>
+ <h2>{$locale->tr("about_myself")}</h2>
+ <ul>
+ <div id="AboutMyself">
+ {assign var=picture value=$blogOwner->getPicture()}
+ <li><img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /></li>
+ <li>{$AboutMyself}</li>
+ </div>
+ </ul>
+</li>
+{/if}
+
+
+<li>
+<h2>Meta</h2>
+<ul>
+<li><a href="{$url->blogLink()}"> {$locale->tr("main")}</a></li>
+<li><a href="{$url->getAdminUrl()}" accesskey="2">{$locale->tr("dashboard")}</a></li>
+<li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
+</ul>
+</li>
+
+<li>
+<!--Calendar-->
+<h2>calendar</h2>
+<ul>
+<div align="center">
+{$calendar}
+</div>
+</ul>
+</li>
+
+<li>
+<!--Search-->
+<form name="search_form" method="post" action="{$url->getIndexUrl()}">
+<h2>search</h2>
+<ul>
+<li>
+<div align="center">
+<input type="text" name="searchTerms" value="" size="14" />
+<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>
+</li>
+
+<li>
+<!--Recent Articles-->
+<h2>recent articles</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>
+</li>
+
+<li>
+<!--archives-->
+<h2>archives</h2>
+<ul>
+{foreach from=$archives item=month}
+<li><a href="{$month->getUrl()}">{$month->getName()}</a></li>
+{/foreach}
+</ul>
+</li>
+
+<li>
+<!--categories-->
+<h2>categories</h2>
+<ul>
+{foreach from=$articlecategories item=articleCategory}
+<li><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()} [{$articleCategory->getNumArticles()}]</a></li>
+{/foreach}
+</ul>
+</li>
+
+<li>
+<!--Mylink-->
+{foreach from=$mylinkscategories item=linkcategory}
+<h2>{$linkcategory->getName()}</h2>
+<ul>
+{foreach from=$linkcategory->getLinks() item=link}
+<li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a></li>
+{/foreach}
+</ul>
+{/foreach}
+</li>
+
+<li>
+<!--Syndicate-->
+<h2>syndicate</h2>
+<ul>
+<li><a class="nodecoration" title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}"><img src="{$url->getUrl("/imgs/rss090_logo.gif")}" style="border:0px;" alt="RSS 0.90" /></a></li>
+<li><a class="nodecoration" title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}"><img src="{$url->getUrl("/imgs/rss10_logo.gif")}" style="border:0px;" alt="RSS 1.0" /></a></li>
+<li><a class="nodecoration" title="Link to the RSS 2.0 feed." href="{$url->rssLink("rss20")}"><img src="{$url->getUrl("/imgs/rss20_logo.gif")}" style="border:0px;" alt="RSS 2.0" /></a></li>
+<li><a class="nodecoration" title="Link to the Atom 0.3 feed." href="{$url->rssLink("atom")}"><img src="{$url->getUrl("/imgs/atom_logo.png")}" style="border:0px;" alt="Atom 0.3" /></a></li>
+</ul>
+</li>
+
+</ul>
+</div>
\ No newline at end of file
Deleted: templates/branches/lifetype-1.2/almost-spring/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/almost-spring/post.template 2008-04-28 20:27:24 UTC (rev 6377)
+++ templates/branches/lifetype-1.2/almost-spring/post.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -1,16 +0,0 @@
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-<!-- post start -->
-<div class="post">
-<h2 class="posttitle"><a href="{$url->postPermalink($post)}" rel="bookmark" title="Permanent Link: {$post->getTopic()}"> {$post->getTopic()} </a></h2>
-
-<p class="postmeta">[ {foreach name=categories from=$post->getCategories() item=postcategory}<a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
-{if !$smarty.foreach.categories.last}, {/if}
-{/foreach}]
-{$locale->formatDate($postDate,"%d %B, %Y %H:%M") }:: {$locale->tr("num_reads")} ({$post->getNumReads()})</p>
-
-<div class="postentry">{$post->getText()}</div>
-<p class="postfeedback"><a href="{$url->postPermalink($post)}#Comments" class="commentslink"> ({$post->getNumComments()}) {$locale->tr("comment on this")} </a> <a href="{$url->postTrackbackStatsLink($post)}" class="commentslink"> ({$post->getNumTrackbacks()}) {$locale->tr("trackbacks")} </a> <a href="{$url->postPermalink($post)}" title="Permanent Link: {$post->getTopic()}" class="permalink">{$locale->tr("permalink")}</a>
-</p>
-
-</div>
Copied: templates/branches/lifetype-1.2/almost-spring/post.template (from rev 6380, templates/branches/lifetype-1.2/unported/almost-spring/post.template)
===================================================================
--- templates/branches/lifetype-1.2/almost-spring/post.template (rev 0)
+++ templates/branches/lifetype-1.2/almost-spring/post.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -0,0 +1,16 @@
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+<!-- post start -->
+<div class="post">
+<h2 class="posttitle"><a href="{$url->postPermalink($post)}" rel="bookmark" title="Permanent Link: {$post->getTopic()}"> {$post->getTopic()} </a></h2>
+
+<p class="postmeta">[ {foreach name=categories from=$post->getCategories() item=postcategory}<a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
+{if !$smarty.foreach.categories.last}, {/if}
+{/foreach}]
+{$locale->formatDate($postDate,"%d %B, %Y %H:%M") }:: {$locale->tr("num_reads")} ({$post->getNumReads()})</p>
+
+<div class="postentry">{$post->getText()}</div>
+<p class="postfeedback"><a href="{$url->postPermalink($post)}#Comments" class="commentslink"> ({$post->getNumComments()}) {$locale->tr("comment on this")} </a> <a href="{$url->postTrackbackStatsLink($post)}" class="commentslink"> ({$post->getNumTrackbacks()}) {$locale->tr("trackbacks")} </a> <a href="{$url->postPermalink($post)}" title="Permanent Link: {$post->getTopic()}" class="permalink">{$locale->tr("permalink")}</a>
+</p>
+
+</div>
Deleted: templates/branches/lifetype-1.2/almost-spring/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/almost-spring/postandcomments.template 2008-04-28 20:27:24 UTC (rev 6377)
+++ templates/branches/lifetype-1.2/almost-spring/postandcomments.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -1,64 +0,0 @@
-{assign var="postPageTitle" value=$post->getTopic()}
-{assign var="postPageTitle" value=" - $postPageTitle"}
-{include file="$blogtemplate/header.template"}
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-{assign var=nextpost value=$post->getNextArticle()}
-{assign var=prevpost value=$post->getPrevArticle()}
-{assign var=postId value=$post->getId()}
-<div id="content">
-<div class="post">
-<p align="center">
-{if $prevpost == true}
-<a href="{$url->postPermalink($prevpost)}" title="{$locale->tr("previous_post")}: {$prevpost->getTopic()}">« {$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")}»</a>
-{/if}
-</p>
-{include file="$blogtemplate/post.template"}
- <!-- {$url->postTrackbackLink($post)} -->
- {pager style="links"}
-
-{* show comments *}
-<h2 id="comments"><a name="Comments"></a>{$post->getNumComments()} {$locale->tr("comments")} in "{$post->getTopic()}"</h2>
-<ol id="commentlist">
-{assign var="counter" value=1}
-{foreach name=comment from=$comments item=comment}
-{if $counter%2 == 1}
-<li class="alt" id="comment-{$comment->getId()}">
-{else}
-<li class="" id="comment-{$comment->getId()}">
-{/if}
-<a name="{$comment->getId()}"></a>
-<h3 class="commenttitle">
-{if $comment->getUserUrl() != ""}
-<a href="{$comment->getUserUrl()}"}>{$comment->getUsername()}</a>
-{else}
-{$comment->getUsername()}
-{/if} said: {$comment->getTopic()}</h3>
-<p class="commentmeta">
-{assign var=commentDate value=$comment->getDateObject()}
-{$locale->formatDate($commentDate, "%d/%m/%Y, at %H:%M")} [<a href="{$url->postPermalink($post)}#NewComment"> {$locale->tr("reply")} </a>]
-</p>
-{if $comment->IsPosterAuthenticated()}
- {assign var=poster value=$comment->getUser()}
- {if $poster->hasPicture()}
- {assign var=posterimg value=$poster->getPicture()}
- <img src="{$posterimg->getPreviewLink()}" alt="{$poster->getUserName()}" align="right" class="poster_avatar"/>
- {/if}
-{/if}
-{$comment->gettext()}
-</li>
-{assign var="counter" value="`$counter+1`"}
-{/foreach}
-</ol>
-{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
-<h3 id="respond"><a name="NewComment"></a>{$locale->tr("add_comment")}</h3>
-{include file="$misctemplatepath/commentform.template"}
-{/if}
-
-</div>
-</div>
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}
Copied: templates/branches/lifetype-1.2/almost-spring/postandcomments.template (from rev 6380, templates/branches/lifetype-1.2/unported/almost-spring/postandcomments.template)
===================================================================
--- templates/branches/lifetype-1.2/almost-spring/postandcomments.template (rev 0)
+++ templates/branches/lifetype-1.2/almost-spring/postandcomments.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -0,0 +1,64 @@
+{assign var="postPageTitle" value=$post->getTopic()}
+{assign var="postPageTitle" value=" - $postPageTitle"}
+{include file="$blogtemplate/header.template"}
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+{assign var=nextpost value=$post->getNextArticle()}
+{assign var=prevpost value=$post->getPrevArticle()}
+{assign var=postId value=$post->getId()}
+<div id="content">
+<div class="post">
+<p align="center">
+{if $prevpost == true}
+<a href="{$url->postPermalink($prevpost)}" title="{$locale->tr("previous_post")}: {$prevpost->getTopic()}">« {$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")}»</a>
+{/if}
+</p>
+{include file="$blogtemplate/post.template"}
+ <!-- {$url->postTrackbackLink($post)} -->
+ {pager style="links"}
+
+{* show comments *}
+<h2 id="comments"><a name="Comments"></a>{$post->getNumComments()} {$locale->tr("comments")} in "{$post->getTopic()}"</h2>
+<ol id="commentlist">
+{assign var="counter" value=1}
+{foreach name=comment from=$comments item=comment}
+{if $counter%2 == 1}
+<li class="alt" id="comment-{$comment->getId()}">
+{else}
+<li class="" id="comment-{$comment->getId()}">
+{/if}
+<a name="{$comment->getId()}"></a>
+<h3 class="commenttitle">
+{if $comment->getUserUrl() != ""}
+<a href="{$comment->getUserUrl()}"}>{$comment->getUsername()}</a>
+{else}
+{$comment->getUsername()}
+{/if} said: {$comment->getTopic()}</h3>
+<p class="commentmeta">
+{assign var=commentDate value=$comment->getDateObject()}
+{$locale->formatDate($commentDate, "%d/%m/%Y, at %H:%M")} [<a href="{$url->postPermalink($post)}#NewComment"> {$locale->tr("reply")} </a>]
+</p>
+{if $comment->IsPosterAuthenticated()}
+ {assign var=poster value=$comment->getUser()}
+ {if $poster->hasPicture()}
+ {assign var=posterimg value=$poster->getPicture()}
+ <img src="{$posterimg->getPreviewLink()}" alt="{$poster->getUserName()}" align="right" class="poster_avatar"/>
+ {/if}
+{/if}
+{$comment->gettext()}
+</li>
+{assign var="counter" value="`$counter+1`"}
+{/foreach}
+</ol>
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
+<h3 id="respond"><a name="NewComment"></a>{$locale->tr("add_comment")}</h3>
+{include file="$misctemplatepath/commentform.template"}
+{/if}
+
+</div>
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
Deleted: templates/branches/lifetype-1.2/almost-spring/posttrackbacks.template
===================================================================
--- templates/branches/lifetype-1.2/unported/almost-spring/posttrackbacks.template 2008-04-28 20:27:24 UTC (rev 6377)
+++ templates/branches/lifetype-1.2/almost-spring/posttrackbacks.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -1,17 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="content">
-<div class="post">
-<h2 class="post-title">{$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>":</h2>
-<br/<br/>
-{foreach from=$trackbacks item=trackback}
-<b>{$locale->tr("trackbacks_for_article")}:</b><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/>
-<div class="post-footer"> </div>
-{/foreach}
-</div>
-</div>
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Copied: templates/branches/lifetype-1.2/almost-spring/posttrackbacks.template (from rev 6380, templates/branches/lifetype-1.2/unported/almost-spring/posttrackbacks.template)
===================================================================
--- templates/branches/lifetype-1.2/almost-spring/posttrackbacks.template (rev 0)
+++ templates/branches/lifetype-1.2/almost-spring/posttrackbacks.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -0,0 +1,17 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+<div class="post">
+<h2 class="post-title">{$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>":</h2>
+<br/<br/>
+{foreach from=$trackbacks item=trackback}
+<b>{$locale->tr("trackbacks_for_article")}:</b><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/>
+<div class="post-footer"> </div>
+{/foreach}
+</div>
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Deleted: templates/branches/lifetype-1.2/almost-spring/resource.template
===================================================================
--- templates/branches/lifetype-1.2/unported/almost-spring/resource.template 2008-04-28 20:27:24 UTC (rev 6377)
+++ templates/branches/lifetype-1.2/almost-spring/resource.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -1,58 +0,0 @@
-{include file="$blogtemplate/header.template"}
-{assign var=metadata value=$resource->getMetadataReader()}
-{assign var=updated value=$resource->getTimestamp()}
-<div id="content">
-<div class="post">
-<h2>{$resource->getFileName()}</h2>
-<br/>
-<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 id="album">
-<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/>
-</div>
-<p>
-{assign var=album value=$resource->getAlbum()}
-{if $prevresource}<a href="{$url->resourceLink($prevresource)}">«</a> | {/if}
-<a href="{$url->albumLink($album)}">{$locale->tr("back")}</a>
-{if $nextresource}| <a href="{$url->resourceLink($nextresource)}">»</a>{/if}
-</p>
-</div>
-</div>
-</div>
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Copied: templates/branches/lifetype-1.2/almost-spring/resource.template (from rev 6380, templates/branches/lifetype-1.2/unported/almost-spring/resource.template)
===================================================================
--- templates/branches/lifetype-1.2/almost-spring/resource.template (rev 0)
+++ templates/branches/lifetype-1.2/almost-spring/resource.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -0,0 +1,58 @@
+{include file="$blogtemplate/header.template"}
+{assign var=metadata value=$resource->getMetadataReader()}
+{assign var=updated value=$resource->getTimestamp()}
+<div id="content">
+<div class="post">
+<h2>{$resource->getFileName()}</h2>
+<br/>
+<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 id="album">
+<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/>
+</div>
+<p>
+{assign var=album value=$resource->getAlbum()}
+{if $prevresource}<a href="{$url->resourceLink($prevresource)}">«</a> | {/if}
+<a href="{$url->albumLink($album)}">{$locale->tr("back")}</a>
+{if $nextresource}| <a href="{$url->resourceLink($nextresource)}">»</a>{/if}
+</p>
+</div>
+</div>
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Deleted: templates/branches/lifetype-1.2/almost-spring/screenshot.jpg
===================================================================
(Binary files differ)
Copied: templates/branches/lifetype-1.2/almost-spring/screenshot.jpg (from rev 6380, templates/branches/lifetype-1.2/unported/almost-spring/screenshot.jpg)
===================================================================
(Binary files differ)
Deleted: templates/branches/lifetype-1.2/almost-spring/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/almost-spring/searchresults.template 2008-04-28 20:27:24 UTC (rev 6377)
+++ templates/branches/lifetype-1.2/almost-spring/searchresults.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -1,22 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="content">
-<div class="post">
-<h2 class="post-title">{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2><br/>
-<div class="post-info">
-{foreach from=$searchresults item=result}
-{assign var=article value=$result->getArticle()}
-<h3 class="post-title"><a href="{$url->postPermalink($article)}">{$article->getTopic()}</a></h3>
-
-{$locale->tr("categories")}:
-{foreach name=categories from=$article->getCategories() item=articleCategory}
-<a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
-{/foreach}
-
-<div class="post-content">{$article->getText()|strip_tags|truncate:300:"...":false}</div>
-<div class="post-footer"> </div>
-{/foreach}
-</div>
-</div>
-</div>
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Copied: templates/branches/lifetype-1.2/almost-spring/searchresults.template (from rev 6380, templates/branches/lifetype-1.2/unported/almost-spring/searchresults.template)
===================================================================
--- templates/branches/lifetype-1.2/almost-spring/searchresults.template (rev 0)
+++ templates/branches/lifetype-1.2/almost-spring/searchresults.template 2008-04-28 20:34:54 UTC (rev 6381)
@@ -0,0 +1,22 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+<div class="post">
+<h2 class="post-title">{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2><br/>
+<div class="post-info">
+{foreach from=$searchresults item=result}
+{assign var=article value=$result->getArticle()}
+<h3 class="post-title"><a href="{$url->postPermalink($article)}">{$article->getTopic()}</a></h3>
+
+{$locale->tr("categories")}:
+{foreach name=categories from=$article->getCategories() item=articleCategory}
+<a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+{/foreach}
+
+<div class="post-content">{$article->getText()|strip_tags|truncate:300:"...":false}</div>
+<div class="post-footer"> </div>
+{/foreach}
+</div>
+</div>
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Deleted: templates/branches/lifetype-1.2/almost-spring/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/almost-spring/style.css 2008-04-28 20:27:24 UTC (rev 6377)
+++ templates/branches/lifetype-1.2/almost-spring/style.css 2008-04-28 20:34:54 UTC (rev 6381)
@@ -1,349 +0,0 @@
-/*
-ATTENTION:
-This CSSheet is original designed for Wordpress by Becca Wei at http://beccary.com/goodies/wordpress-themes/
-Modify for blog.ysmis.cc by MIT at http://blog.ysmis.cc/mit
-Some rights reserved.
-*/
-
-/*
-Theme Name: Almost Spring
-Theme URI: http://beccary.com/goodies/wordpress-themes/
-Description: A two column theme. Light and simple with greens and oranges.
-Version: 1.0
-Author: Becca Wei
-Author URI: http://beccary.com
-
-Theme last updated: 22.03.05
-*/
-
-
-
-/* Basics and Typography */
-
-body {
-margin: 0;
-padding: 0;
-background: #E8E8CE url(img/bg.gif) repeat-x fixed;
-font-size: 78%;
-font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, sans-serif;
-color: #333;
-text-align: center;
-}
-p {
-font-size: 1em;
-line-height: 1.5em;
-margin: 1.2em 0;
-}
-ol, ul {
-font-size: 1em;
-line-height: 1.5em;
-margin: 1.2em 0 1.2em 2em;
-padding: 0;
-}
-h1, h2, h3, h4, h5, h6 {
-margin: 1.2em 0;
-font-family: "Lucida Grande", Tahoma, Arial, sans-serif;
-color: #9BBB38;
-}
-h1, h2 {
-font-size: 1.4em;
-}
-h3 {
-font-size: 1.3em;
-}
-h4 {
-font-size: 1.2em;
-}
-a {
-text-decoration: none;
-}
-a:link {
-color: #E58712;
-}
-a:visited {
-color: #B96F17;
-}
-a:hover, a:active {
-color: #9BBB38;
-}
-input, textarea, select {
-border: 1px solid #C1C0B5;
-background-color: #FAFAF0;
-color: #333;
-font-size: 1em;
-font-family: "Lucida Sans Unicode", Tahoma, Arial, sans-serif;
-}
-blockquote {
-margin: 0 20px;
-padding: 0 20px;
-border-left: 4px solid #E8E7D0;
-font-size: 0.9em;
-}
-code {
-font-family: monospace;
-color: #666;
-}
-form, img {
-margin: 0;
-padding: 0;
-border: 0;
-}
-.small {
-font-size: 0.9em;
-color: #999;
-}
-
-
-
-/* Layout */
-
-#wrapper {
-margin: 0 auto;
-width: 750px;
-background-color: #FFF;
-text-align: left;
-}
-#topnav{
-text-align: right;
-letter-spacing:0.1em;
-margin-right: 30px;
-margin-bottom: 20px;
-border-bottom: 1px dashed #999999;
-}
-#topnav li{
-list-style: none;
-display: inline;
-}
-#header {
-padding: 30px 0 0 0;
-background-color: #F5F5E7;
-border-bottom: 10px solid #9BBB38;
-}
-
-/* Header Styles */
-#header h1 {
-margin: 0;
-font-size: 1.8em;
-}
-#header h1 a {
-text-decoration: none;
-color: #80904F;
-}
-
-
-#content {
-float: left;
-padding: 0 20px;
-width: 520px;
-voice-family: "\"}\"";
-voice-family: inherit;
-width: 480px;
-}
-html>body #content {
-width: 480px;
-}
-html #content {
-overflow: hidden;
-/* So IE won't break things */
-}
-#sidebar {
-float: right;
-padding: 1.8em 20px 0 20px;
-width: 230px;
-font-size: 0.9em;
-voice-family: "\"}\"";
-voice-family: inherit;
-width: 190px;
-}
-html>body #sidebar {
-width: 190px;
-}
-
-/* Lots of sidebar styles, so they're below */
-
-#footer {
-clear: both;
-font-size: 0.9em;
-text-align: center;
-}
-
-/* Footer Styles */
-#footer p {
-margin: 0;
-padding: 10px 0 20px 0;
-background-color: #E8E8CE;
-border-top: 10px solid #9BBB38;
-font-size: 0.9em;
-text-align: right;
-}
-
-
-
-/* Sidebar Styles */
-
-#sidebar h2 {
- display: inline;
- margin: 1.2em 0 0.6em 0;
- padding: 0 10px 0 0;
- background: url(img/arrow.gif) no-repeat center right;
- font-size: 1.1em;
-}
-#sidebar ul {
- margin: 0;
- padding: 0;
- list-style-type: none;
-}
-#sidebar ul li {
-}
-#sidebar ul ul {
- margin: 1.2em 0;
- border-top: 1px solid #E8E7D0;
- background-color: #FAFAF0;
-}
-#sidebar ul ul li {
- padding: 0 0 0 10px;
- border-bottom: 1px solid #E8E7D0;
-}
-#sidebar ul ul li a {
- display: block;
- margin: 0 0 0 -10px;
- padding: 2px 10px 0 10px;
- width: 190px;
- voice-family: "\"}\"";
- voice-family: inherit;
- width: 170px;
-}
-html>body #sidebar ul ul li a {
- width: 170px;
-}
-#sidebar ul ul li a:hover {
- background-color: #FFF;
-}
-/* Nested lists? */
-#sidebar ul ul ul {
- margin: 0;
- border: none;
-}
-#sidebar ul ul ul li {
- margin: 0 0 0 -10px;
- padding: 0 0 0 25px;
- border-bottom: none;
- border-top: 1px solid #E8E7D0;
-}
-#sidebar ul ul ul li a {
- margin: 0 0 0 -25px;
- padding: 2px 10px 0 25px;
- width: 190px;
- voice-family: "\"}\"";
- voice-family: inherit;
- width: 155px;
-}
-html>body #sidebar ul ul ul li a {
- width: 155px;
-}
-
-
-/* Blog */
-
-.post {
-}
-.posttitle {
-margin-bottom: 0;
-width: 100%;
-color: #FFF;
-overflow: auto;
-/* Width and overflow to clear '.posttitle a' */
-}
-.posttitle a {
-float: left;
-padding: 0 10px;
-background: #9BBB38 url(img/posttitle.gif) no-repeat top right;
-}
-.posttitle a:link, .posttitle a:visited {
-color: #FFF;
-}
-.posttitle a:hover, .posttitle a:active {
-background: #E8E7D0 url(img/posttitle.gif) no-repeat 100% -91px;
-color: #80904F;
-}
-.postmeta {
-margin-top: 0;
-padding-top: 1px;
-background: url(img/postmeta.gif) no-repeat top left;
-font-size: 0.9em;
-color: #999;
-}
-.postentry {
-}
-.permalink {
-margin: 0 1.8em 0 0;
-padding: 0 0 0 14px;
-background: url(img/permalink.gif) no-repeat center left;
-}
-.commentslink {
-padding: 0 0 0 17px;
-background: url(img/commentslink.gif) no-repeat center left;
-}
-
-
-
-/* Comments */
-
-#commentlist {
-margin: 1.2em 0;
-padding: 0;
-border-bottom: 1px solid #E8E7D0;
-list-style-type: none;
-}
-#commentlist li {
-border-top: 1px solid #E8E7D0;
-padding: 1px 20px;
-background-color: #FFF;
-}
-.alt {
-background-color: #FAFAF0 !important;
-}
-.commenttitle {
-margin-bottom: 0;
-font-size: 1.1em;
-}
-.commentmeta {
-margin-top: 0;
-font-size: 0.9em;
-color: #999;
-}
-
-.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;
-}
\ No newline at end of file
Copied: templates/branches/lifetype-1.2/almost-spring/style.css (from rev 6380, templates/branches/lifetype-1.2/unported/almost-spring/style.css)
===================================================================
--- templates/branches/lifetype-1.2/almost-spring/style.css (rev 0)
+++ templates/branches/lifetype-1.2/almost-spring/style.css 2008-04-28 20:34:54 UTC (rev 6381)
@@ -0,0 +1,349 @@
+/*
+ATTENTION:
+This CSSheet is original designed for Wordpress by Becca Wei at http://beccary.com/goodies/wordpress-themes/
+Modify for blog.ysmis.cc by MIT at http://blog.ysmis.cc/mit
+Some rights reserved.
+*/
+
+/*
+Theme Name: Almost Spring
+Theme URI: http://beccary.com/goodies/wordpress-themes/
+Description: A two column theme. Light and simple with greens and oranges.
+Version: 1.0
+Author: Becca Wei
+Author URI: http://beccary.com
+
+Theme last updated: 22.03.05
+*/
+
+
+
+/* Basics and Typography */
+
+body {
+margin: 0;
+padding: 0;
+background: #E8E8CE url(img/bg.gif) repeat-x fixed;
+font-size: 78%;
+font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, sans-serif;
+color: #333;
+text-align: center;
+}
+p {
+font-size: 1em;
+line-height: 1.5em;
+margin: 1.2em 0;
+}
+ol, ul {
+font-size: 1em;
+line-height: 1.5em;
+margin: 1.2em 0 1.2em 2em;
+padding: 0;
+}
+h1, h2, h3, h4, h5, h6 {
+margin: 1.2em 0;
+font-family: "Lucida Grande", Tahoma, Arial, sans-serif;
+color: #9BBB38;
+}
+h1, h2 {
+font-size: 1.4em;
+}
+h3 {
+font-size: 1.3em;
+}
+h4 {
+font-size: 1.2em;
+}
+a {
+text-decoration: none;
+}
+a:link {
+color: #E58712;
+}
+a:visited {
+color: #B96F17;
+}
+a:hover, a:active {
+color: #9BBB38;
+}
+input, textarea, select {
+border: 1px solid #C1C0B5;
+background-color: #FAFAF0;
+color: #333;
+font-size: 1em;
+font-family: "Lucida Sans Unicode", Tahoma, Arial, sans-serif;
+}
+blockquote {
+margin: 0 20px;
+padding: 0 20px;
+border-left: 4px solid #E8E7D0;
+font-size: 0.9em;
+}
+code {
+font-family: monospace;
+color: #666;
+}
+form, img {
+margin: 0;
+padding: 0;
+border: 0;
+}
+.small {
+font-size: 0.9em;
+color: #999;
+}
+
+
+
+/* Layout */
+
+#wrapper {
+margin: 0 auto;
+width: 750px;
+background-color: #FFF;
+text-align: left;
+}
+#topnav{
+text-align: right;
+letter-spacing:0.1em;
+margin-right: 30px;
+margin-bottom: 20px;
+border-bottom: 1px dashed #999999;
+}
+#topnav li{
+list-style: none;
+display: inline;
+}
+#header {
+padding: 30px 0 0 0;
+background-color: #F5F5E7;
+border-bottom: 10px solid #9BBB38;
+}
+
+/* Header Styles */
+#header h1 {
+margin: 0;
+font-size: 1.8em;
+}
+#header h1 a {
+text-decoration: none;
+color: #80904F;
+}
+
+
+#content {
+float: left;
+padding: 0 20px;
+width: 520px;
+voice-family: "\"}\"";
+voice-family: inherit;
+width: 480px;
+}
+html>body #content {
+width: 480px;
+}
+html #content {
+overflow: hidden;
+/* So IE won't break things */
+}
+#sidebar {
+float: right;
+padding: 1.8em 20px 0 20px;
+width: 230px;
+font-size: 0.9em;
+voice-family: "\"}\"";
+voice-family: inherit;
+width: 190px;
+}
+html>body #sidebar {
+width: 190px;
+}
+
+/* Lots of sidebar styles, so they're below */
+
+#footer {
+clear: both;
+font-size: 0.9em;
+text-align: center;
+}
+
+/* Footer Styles */
+#footer p {
+margin: 0;
+padding: 10px 0 20px 0;
+background-color: #E8E8CE;
+border-top: 10px solid #9BBB38;
+font-size: 0.9em;
+text-align: right;
+}
+
+
+
+/* Sidebar Styles */
+
+#sidebar h2 {
+ display: inline;
+ margin: 1.2em 0 0.6em 0;
+ padding: 0 10px 0 0;
+ background: url(img/arrow.gif) no-repeat center right;
+ font-size: 1.1em;
+}
+#sidebar ul {
+ margin: 0;
+ padding: 0;
+ list-style-type: none;
+}
+#sidebar ul li {
+}
+#sidebar ul ul {
+ margin: 1.2em 0;
+ border-top: 1px solid #E8E7D0;
+ background-color: #FAFAF0;
+}
+#sidebar ul ul li {
+ padding: 0 0 0 10px;
+ border-bottom: 1px solid #E8E7D0;
+}
+#sidebar ul ul li a {
+ display: block;
+ margin: 0 0 0 -10px;
+ padding: 2px 10px 0 10px;
+ width: 190px;
+ voice-family: "\"}\"";
+ voice-family: inherit;
+ width: 170px;
+}
+html>body #sidebar ul ul li a {
+ width: 170px;
+}
+#sidebar ul ul li a:hover {
+ background-color: #FFF;
+}
+/* Nested lists? */
+#sidebar ul ul ul {
+ margin: 0;
+ border: none;
+}
+#sidebar ul ul ul li {
+ margin: 0 0 0 -10px;
+ padding: 0 0 0 25px;
+ border-bottom: none;
+ border-top: 1px solid #E8E7D0;
+}
+#sidebar ul ul ul li a {
+ margin: 0 0 0 -25px;
+ padding: 2px 10px 0 25px;
+ width: 190px;
+ voice-family: "\"}\"";
+ voice-family: inherit;
+ width: 155px;
+}
+html>body #sidebar ul ul ul li a {
+ width: 155px;
+}
+
+
+/* Blog */
+
+.post {
+}
+.posttitle {
+margin-bottom: 0;
+width: 100%;
+color: #FFF;
+overflow: auto;
+/* Width and overflow to clear '.posttitle a' */
+}
+.posttitle a {
+float: left;
+padding: 0 10px;
+background: #9BBB38 url(img/posttitle.gif) no-repeat top right;
+}
+.posttitle a:link, .posttitle a:visited {
+color: #FFF;
+}
+.posttitle a:hover, .posttitle a:active {
+background: #E8E7D0 url(img/posttitle.gif) no-repeat 100% -91px;
+color: #80904F;
+}
+.postmeta {
+margin-top: 0;
+padding-top: 1px;
+background: url(img/postmeta.gif) no-repeat top left;
+font-size: 0.9em;
+color: #999;
+}
+.postentry {
+}
+.permalink {
+margin: 0 1.8em 0 0;
+padding: 0 0 0 14px;
+background: url(img/permalink.gif) no-repeat center left;
+}
+.commentslink {
+padding: 0 0 0 17px;
+background: url(img/commentslink.gif) no-repeat center left;
+}
+
+
+
+/* Comments */
+
+#commentlist {
+margin: 1.2em 0;
+padding: 0;
+border-bottom: 1px solid #E8E7D0;
+list-style-type: none;
+}
+#commentlist li {
+border-top: 1px solid #E8E7D0;
+padding: 1px 20px;
+background-color: #FFF;
+}
+.alt {
+background-color: #FAFAF0 !important;
+}
+.commenttitle {
+margin-bottom: 0;
+font-size: 1.1em;
+}
+.commentmeta {
+margin-top: 0;
+font-size: 0.9em;
+color: #999;
+}
+
+.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;
+}
\ No newline at end of file
Copied: templates/branches/lifetype-1.2/andreas-2-columns (from rev 6380, templates/branches/lifetype-1.2/unported/andreas-2-columns)
More information about the pLog-svn
mailing list