[pLog-svn] r3845 - in templates/trunk: . standard_green standard_green/imgs standard_happy standard_happy/imgs standard_new standard_new/imgs standard_red standard_red/imgs standard_wine standard_wine/imgs

oscar at devel.lifetype.net oscar at devel.lifetype.net
Sun Aug 6 16:59:25 GMT 2006


Author: oscar
Date: 2006-08-06 16:59:24 +0000 (Sun, 06 Aug 2006)
New Revision: 3845

Added:
   templates/trunk/standard_green/favicon.ico
   templates/trunk/standard_green/imgs/blockquote.gif
   templates/trunk/standard_green/imgs/category.gif
   templates/trunk/standard_green/imgs/comment.gif
   templates/trunk/standard_green/imgs/comments.gif
   templates/trunk/standard_green/imgs/next.gif
   templates/trunk/standard_green/imgs/permalink.gif
   templates/trunk/standard_green/imgs/previous.gif
   templates/trunk/standard_green/imgs/trackback.gif
   templates/trunk/standard_green/style-ie.css
   templates/trunk/standard_green/style.css
   templates/trunk/standard_happy/favicon.ico
   templates/trunk/standard_happy/imgs/blockquote.gif
   templates/trunk/standard_happy/imgs/category.gif
   templates/trunk/standard_happy/imgs/comment.gif
   templates/trunk/standard_happy/imgs/comments.gif
   templates/trunk/standard_happy/imgs/next.gif
   templates/trunk/standard_happy/imgs/permalink.gif
   templates/trunk/standard_happy/imgs/previous.gif
   templates/trunk/standard_happy/imgs/trackback.gif
   templates/trunk/standard_happy/style-ie.css
   templates/trunk/standard_happy/style.css
   templates/trunk/standard_new/album.template
   templates/trunk/standard_new/albums.template
   templates/trunk/standard_new/archives.template
   templates/trunk/standard_new/commentarticle.template
   templates/trunk/standard_new/commentform.template
   templates/trunk/standard_new/error.template
   templates/trunk/standard_new/favicon.ico
   templates/trunk/standard_new/footer.template
   templates/trunk/standard_new/header.template
   templates/trunk/standard_new/imgs/
   templates/trunk/standard_new/imgs/blockquote.gif
   templates/trunk/standard_new/imgs/category.gif
   templates/trunk/standard_new/imgs/comment.gif
   templates/trunk/standard_new/imgs/compressed.gif
   templates/trunk/standard_new/imgs/file.gif
   templates/trunk/standard_new/imgs/folder.gif
   templates/trunk/standard_new/imgs/next.gif
   templates/trunk/standard_new/imgs/parentfolder.gif
   templates/trunk/standard_new/imgs/permalink.gif
   templates/trunk/standard_new/imgs/previous.gif
   templates/trunk/standard_new/imgs/sound.gif
   templates/trunk/standard_new/imgs/trackback.gif
   templates/trunk/standard_new/imgs/video.gif
   templates/trunk/standard_new/linktracker.template
   templates/trunk/standard_new/main.template
   templates/trunk/standard_new/post.template
   templates/trunk/standard_new/postandcomments.template
   templates/trunk/standard_new/posttrackbacks.template
   templates/trunk/standard_new/resource.template
   templates/trunk/standard_new/screenshot.jpg
   templates/trunk/standard_new/searchresults.template
   templates/trunk/standard_new/style-ie.css
   templates/trunk/standard_new/style.css
   templates/trunk/standard_red/favicon.ico
   templates/trunk/standard_red/imgs/blockquote.gif
   templates/trunk/standard_red/imgs/category.gif
   templates/trunk/standard_red/imgs/comment.gif
   templates/trunk/standard_red/imgs/comments.gif
   templates/trunk/standard_red/imgs/next.gif
   templates/trunk/standard_red/imgs/permalink.gif
   templates/trunk/standard_red/imgs/previous.gif
   templates/trunk/standard_red/imgs/trackback.gif
   templates/trunk/standard_red/style-ie.css
   templates/trunk/standard_red/style.css
   templates/trunk/standard_wine/
   templates/trunk/standard_wine/album.template
   templates/trunk/standard_wine/albums.template
   templates/trunk/standard_wine/archives.template
   templates/trunk/standard_wine/commentarticle.template
   templates/trunk/standard_wine/commentform.template
   templates/trunk/standard_wine/error.template
   templates/trunk/standard_wine/favicon.ico
   templates/trunk/standard_wine/footer.template
   templates/trunk/standard_wine/header.template
   templates/trunk/standard_wine/imgs/
   templates/trunk/standard_wine/imgs/blockquote.gif
   templates/trunk/standard_wine/imgs/category.gif
   templates/trunk/standard_wine/imgs/comment.gif
   templates/trunk/standard_wine/imgs/comments.gif
   templates/trunk/standard_wine/imgs/compressed.gif
   templates/trunk/standard_wine/imgs/file.gif
   templates/trunk/standard_wine/imgs/folder.gif
   templates/trunk/standard_wine/imgs/next.gif
   templates/trunk/standard_wine/imgs/parentfolder.gif
   templates/trunk/standard_wine/imgs/permalink.gif
   templates/trunk/standard_wine/imgs/previous.gif
   templates/trunk/standard_wine/imgs/sound.gif
   templates/trunk/standard_wine/imgs/trackback.gif
   templates/trunk/standard_wine/imgs/video.gif
   templates/trunk/standard_wine/links.template
   templates/trunk/standard_wine/main.template
   templates/trunk/standard_wine/post.template
   templates/trunk/standard_wine/postandcomments.template
   templates/trunk/standard_wine/posttrackbacks.template
   templates/trunk/standard_wine/resource.template
   templates/trunk/standard_wine/screenshot.jpg
   templates/trunk/standard_wine/searchresults.template
   templates/trunk/standard_wine/style-ie.css
   templates/trunk/standard_wine/style.css
Removed:
   templates/trunk/standard_new/standard_new/
Modified:
   templates/trunk/standard_green/album.template
   templates/trunk/standard_green/commentarticle.template
   templates/trunk/standard_green/commentform.template
   templates/trunk/standard_green/footer.template
   templates/trunk/standard_green/header.template
   templates/trunk/standard_green/links.template
   templates/trunk/standard_green/main.template
   templates/trunk/standard_green/post.template
   templates/trunk/standard_green/postandcomments.template
   templates/trunk/standard_green/posttrackbacks.template
   templates/trunk/standard_green/screenshot.jpg
   templates/trunk/standard_green/searchresults.template
   templates/trunk/standard_happy/album.template
   templates/trunk/standard_happy/commentarticle.template
   templates/trunk/standard_happy/commentform.template
   templates/trunk/standard_happy/footer.template
   templates/trunk/standard_happy/header.template
   templates/trunk/standard_happy/links.template
   templates/trunk/standard_happy/main.template
   templates/trunk/standard_happy/post.template
   templates/trunk/standard_happy/postandcomments.template
   templates/trunk/standard_happy/posttrackbacks.template
   templates/trunk/standard_happy/screenshot.jpg
   templates/trunk/standard_happy/searchresults.template
   templates/trunk/standard_red/album.template
   templates/trunk/standard_red/commentarticle.template
   templates/trunk/standard_red/commentform.template
   templates/trunk/standard_red/footer.template
   templates/trunk/standard_red/header.template
   templates/trunk/standard_red/links.template
   templates/trunk/standard_red/main.template
   templates/trunk/standard_red/post.template
   templates/trunk/standard_red/postandcomments.template
   templates/trunk/standard_red/posttrackbacks.template
   templates/trunk/standard_red/screenshot.jpg
   templates/trunk/standard_red/searchresults.template
Log:
updated the list of standard_XX templates, added a new one (standard_wine) and fixed the mess I made out of the standard_new (the folder structure was all messed up)


Modified: templates/trunk/standard_green/album.template
===================================================================
--- templates/trunk/standard_green/album.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_green/album.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -17,9 +17,10 @@
     	<p>{$locale->tr("parent")}</p>
 	</div>
 
-   		{assign var="counter" value=1}
-   		{assign var=children value=$album->getChildren()}
-   		{foreach from=$children item=childalbum}
+  {if $pager->getCurrentPage() == 1}
+	{assign var="counter" value=1}
+   	{assign var=children value=$album->getChildren()}
+   	{foreach from=$children item=childalbum}
 	<div class="album">
    	<a href="{$url->albumLink($childalbum)}">
    	<img src="{$url->getTemplateFile("imgs/folder.gif")}" alt="{$childalbum->getName()}" /></a>
@@ -28,12 +29,15 @@
    		{if $counter%3 == 0}
    		{/if}
 	</div>
-   		{/foreach}
+   	{/foreach}
+  {/if}
  
 <!-- show the resources here -->
 
-   		
-   		{foreach from=$resources item=resource}
+ {** assign var=resources value=$album->getResources() **}
+ {** use the code above if you want to display all the resources at once, or leave it commented **}
+ {** if you would like to use the new paged display that was introduced in lifetype 1.1 **} 
+ {foreach from=$resources item=resource}
 	<div class="album">
    		{if $resource->hasPreview()}
    		{*<a target="_blank" href="resserver.php?blogId={$blog->getId()}&amp;resource={$resource->getFileName()}">*}
@@ -47,7 +51,7 @@
    		{elseif $resource->isVideo()}
     	<img alt="Video" src="{$url->getTemplateFile("imgs/video.gif")}" /></a>
    		{elseif $resource->isZip()}
-    	<img alt="Zip" src="{$url->getTemplateFile("imgs/compressed.gif")}" /></a>  
+    	<img alt="Zip" src="{$url->getTemplateFile("imgs/compressed.gif")}" /></a>
    		{else}
    	<img alt="File" src="{$url->getTemplateFile("imgs/file.gif")}" /></a>
    		{/if}  
@@ -69,7 +73,7 @@
    		{/if}
   	</div>
   		{/foreach}
-	 <div class="Pages">{include file="misc/pager.template" style="links"}</div>  
+
 	<div class="clearer">&nbsp;</div>
 
 </div>

Modified: templates/trunk/standard_green/commentarticle.template
===================================================================
--- templates/trunk/standard_green/commentarticle.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_green/commentarticle.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,5 +1,5 @@
-		{include file="$blogtemplate/header.template"}
+		{include file="$blogtemplate/header.template"} 
 		
 		{include file="$blogtemplate/commentform.template"}
 		
-		{include file="$blogtemplate/footer.template"}
+		{include file="$blogtemplate/footer.template"} 

Modified: templates/trunk/standard_green/commentform.template
===================================================================
--- templates/trunk/standard_green/commentform.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_green/commentform.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,19 +1,24 @@
-<div id="CommentForm">
-  
-	<form id="NewComment" action="{$url->getIndexUrl()}" method="post">
-	<fieldset>
- 	<legend>{$locale->tr("add_comment")}</legend>
-   	<div><label for="commentTopic">{$locale->pr("comment_topic")}</label><input type="text" name="commentTopic" id="commentTopic" value="" /></div>
-   	<div><label for="commentText">{$locale->pr("comment_text")}</label><textarea rows="10" cols="30" name="commentText" id="commentText"></textarea></div>
-   	<div><label for="userName">{$locale->pr("comment_username")}</label><input type="text" name="userName" id="userName" value="" /></div>
-   	<div><label for="userEmail">Email</label><input type="text" name="userEmail" id="userEmail" value="" /></div>
-   	<div><label for="userUrl">Web</label><input type="text" name="userUrl" id="userUrl" value="" /></div>
-   	<div id="Submit"><input id="Add" type="submit" value="{$locale->pr("comment_send")}" name="Add" />
-   	<input type="hidden" name="op" value="AddComment" />
-   	<input type="hidden" name="articleId" value="{$post->getId()}" />
-   	<input type="hidden" name="blogId" value="{$blog->getId()}" />
-   	<input type="hidden" name="parentId" value="{$parentId}" /></div>
-	</fieldset>
-  	</form>
-  	
-</div>
+<div id="CommentForm">
+
+<form id="NewComment" action="{$url->getIndexUrl()}" method="post">
+<fieldset>
+<legend>{$locale->tr("add_comment")}</legend>
+<div><label for="commentTopic">{$locale->pr("comment_topic")}</label><input type="text" name="commentTopic" id="commentTopic" value="{$topic}" /></div>
+<div><label for="commentText">{$locale->pr("comment_text")}</label><textarea rows="10" cols="30" name="commentText" id="commentText"></textarea></div>
+<div><label for="userName">{$locale->pr("comment_username")}</label><input type="text" name="userName" id="userName" value="" /></div>
+<div><label for="userEmail">Email</label><input type="text" name="userEmail" id="userEmail" value="" /></div>
+<div><label for="userUrl">Web</label><input type="text" name="userUrl" id="userUrl" value="" /></div>
+{if $authimage}{if $authimage->isEnabled()}
+<div><label for="authImage">Please type the 6-digit code you can see here:</label><br/>
+<input type="text" name="authImage" id="authImage" value="" />&nbsp;{$authimage->show()}</div>
+{/if}{/if}
+
+<div id="Submit"><input id="Add" type="submit" value="{$locale->pr("comment_send")}" name="Add" />
+<input type="hidden" name="op" value="AddComment" />
+<input type="hidden" name="articleId" value="{$post->getId()}" />
+<input type="hidden" name="blogId" value="{$blog->getId()}" />
+<input type="hidden" name="parentId" value="{$parentId}" /></div>
+</fieldset>
+</form>
+
+</div>
\ No newline at end of file

Added: templates/trunk/standard_green/favicon.ico
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_green/favicon.ico
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Modified: templates/trunk/standard_green/footer.template
===================================================================
--- templates/trunk/standard_green/footer.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_green/footer.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,34 +1,58 @@
+<div class="pager">
+ {include file="$misctemplatepath/pager.template" style="links"}
 </div>
 
+</div>
+
 <div id="Menu">
-  	
+
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}
+  
+  	<h2>{$locale->tr("about_myself")}</h2>
+  	<div id="AboutMyself">
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	<img id="UserPicture" src="{$url->resourcePreviewLink($picture)}" alt="{$blogOwner->getUsername()}" />
+  	<p>{$AboutMyself}</p>
+  	<div class="clearer">&nbsp;</div>
+  	</div>
+{/if}
+
+
   	<h2>{$locale->tr("menu")}</h2>
     	<div id="Sections">
     	<ul>
     	<li><a title="{$locale->tr("main")}" href="{$url->blogLink()}">{$locale->tr("main")}</a></li>
     	<li><a title="{$locale->tr("archives")}" href="{$url->templatePage("archives")}">{$locale->tr("archives")}</a></li>
     	<li><a title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
-    	<li><a title="{$locale->tr("links")}" href="{$url->templatePage("links")}">{$locale->tr("links")}</a></li>
+    	
+    	 {foreach name=mylinkscategories from=$mylinkscategories item=panel_linkcategory}
+{if $smarty.foreach.mylinkscategories.first}
+   
+<li><a title="{$locale->tr("links")}" href="{$url->templatePage("links")}">{$locale->tr("links")}</a></li>{/if}
+    	{/foreach}
     	</ul>
     	</div>
-
+    	
+    	<h2>{$locale->tr("search")}</h2>
+	<div id="Search">
+	<form id="search_form" method="post" action="{$url->getIndexUrl()}">
+	<fieldset>
+	<label for="searchTerms"><input type="text" id="searchTerms" name="searchTerms" value="" /></label>
+	<input type="submit" name="Search" value="{$locale->tr("search_s")}" class="button" />
+	<input type="hidden" name="op" value="Search" />
+	<input type="hidden" name="blogId" value="{$blog->getId()}" />   
+	</fieldset>
+	</form>
+	</div> 
+	
 	<h2>{$locale->tr("calendar")}</h2>
     	<div id="Calendar">
     		{$calendar}
-    	</div>
-
-    	<h2>{$locale->tr("search")}</h2>
-	<div id="Search">
-		<form id="search_form" method="post" action="{$url->getIndexUrl()}">
-		<div>
-		<label for="searchTerms" style="display:none;">{$locale->tr("search_this_blog")} </label><input type="text" id="searchTerms" name="searchTerms" value="" />
-		<input type="submit" name="Search" value="{$locale->tr("search_s")}" class="button" />
-		<input type="hidden" name="op" value="Search" />
-		<input type="hidden" name="blogId" value="{$blog->getId()}" />   
-		</div>
-		</form>
-	</div> 
-
+    	</div>	
+  
   	<h2>{$locale->tr("recently")}</h2>
     	<div id="Recently">
     	<ul>
@@ -42,7 +66,7 @@
     	<div id="Categories">
     	<ul>
     		{foreach from=$articlecategories item=articleCategory}
-    	<li><a title="{$articleCategory->getName()}" href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} [{$articleCategory->getNumArticles()}]</a></li>
+    	<li><a title="{$articleCategory->getName()}" href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} <abbr title="{$articleCategory->getNumArticles()} {$locale->tr("posts")}">[{$articleCategory->getNumArticles()}]</abbr></a></li>
    		{/foreach}
   	</ul>
   	</div>
@@ -53,14 +77,15 @@
     	<li><a title="RSS 0.90" href="{$url->rssLink("rss090")}">RSS 0.90</a></li>
     	<li><a title="RSS 1.0" href="{$url->rssLink("rss10")}">RSS 1.0</a></li>
     	<li><a title="RSS 2.0" href="{$url->rssLink("rss20")}">RSS 2.0</a></li>
-    	<li><a title="XML" href="{$url->rssLink("xml")}">XML</a></li>
+    	<li><a title="Atom" href="{$url->rssLink("rss20")}">Atom</a></li>
     	</ul>
     	</div>
- 
 </div>
 
 <div class="clearer">&nbsp;</div> 
 
+
+
 </div>
 
 <div id="Bottommenu"><a href="http://www.w3.org/WAI/">Accessible</a> and Valid <a href="http://validator.w3.org/check/referer">XHTML 1.0 Strict</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></div>
@@ -70,5 +95,6 @@
 <div id="Bottom">Powered by <a href="http://www.lifetype.net">LifeType</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a></div>
 
 </div>
+
 </body>
 </html>

Modified: templates/trunk/standard_green/header.template
===================================================================
--- templates/trunk/standard_green/header.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_green/header.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,18 +1,22 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
  <head>
-  <meta http-equiv="content-type" content="text/html; charset={$locale->getCharset()}" />
-  <title>{$blog->getBlog()}</title>
-  <style type="text/css" media="screen">@import "{$url->getTemplateFile("standard_green.css")}";</style>
- <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")}" />  
+ <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>{$blog->getBlog()}{$postPageTitle}</title>
+ <link rel="stylesheet" type="text/css" title="Style" href="{$url->getTemplateFile("style.css")}" />
+ <!--[if IE ]>
+<link rel="stylesheet" type="text/css" title="Style" href="{$url->getTemplateFile("style-ie.css")}" />
+<![endif] -->
+ <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")}" />
  </head>
- <body> 
- 
-<p class="Upgrade">This page looks plain and unstyled because you're using a non-standard compliant browser. To see it in its best form, please <a href="http://www.webstandards.org/upgrade/" title="The Web Standards Project's Browser Upgrade initiative">upgrade</a> to a browser that supports web standards. It's free and painless.</p>
-  
+  <body> 
+
 <div id="Container">
   
 <div id="Title"><h1><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1></div>
@@ -21,4 +25,4 @@
 
 <div id="Subcontainer">  
 
-<div id="Content">
\ No newline at end of file
+<div id="Content">

Added: templates/trunk/standard_green/imgs/blockquote.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_green/imgs/blockquote.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_green/imgs/category.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_green/imgs/category.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_green/imgs/comment.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_green/imgs/comment.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_green/imgs/comments.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_green/imgs/comments.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_green/imgs/next.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_green/imgs/next.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_green/imgs/permalink.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_green/imgs/permalink.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_green/imgs/previous.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_green/imgs/previous.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_green/imgs/trackback.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_green/imgs/trackback.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Modified: templates/trunk/standard_green/links.template
===================================================================
--- templates/trunk/standard_green/links.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_green/links.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,4 +1,4 @@
-		{include file="$blogtemplate/header.template"}
+		{include file="$blogtemplate/header.template"} 
   
 <div id="Links">
 	<h2>{$locale->tr("my_links")}</h2>
@@ -6,10 +6,12 @@
     	<h3>{$linkcategory->getName()}</h3>
    	<ul>
   		{foreach from=$linkcategory->getLinks() item=link}
-  	<li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a>: {$link->getDescription()}</li>
+  	<li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a>: {$link->getDescription()} {if $link->getRssFeed() != ""}
+      <a href="{$link->getRssFeed()}"><img src="/imgs/rss_logo_small.gif" alt="RSS" /></a>
+    {/if}</li>
     		{/foreach}
   	</ul>
   		{/foreach}
   	</div>
   
-		{include file="$blogtemplate/footer.template"}
\ No newline at end of file
+		{include file="$blogtemplate/footer.template"} 
\ No newline at end of file

Modified: templates/trunk/standard_green/main.template
===================================================================
--- templates/trunk/standard_green/main.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_green/main.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,6 +1,25 @@
-{include file="$blogtemplate/header.template"}
+		{assign var="OnMainPage" value=1}
+		{include file="$blogtemplate/header.template"} 
+		
+{if $category}<h2>{$locale->tr("category")}: {$category->getName()}</h2>{/if} 
+  
 {foreach from=$posts item=post}
-{include file="$blogtemplate/post.template"}
+{if $showAll | 1 && $category}
+  <!-- showing only the topic of the post, in case we have too many! -->
+<h3><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h3>
+<div>
+{$post->getText()|strip_tags|truncate:300:"...":false}
+</div>
+
+<p class="footer">
+{foreach name=categories from=$post->getCategories() item=postCategory}
+  <a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
 {/foreach}
-<div class="Pages">{include file="misc/pager.template" style="links"}</div>  
-{include file="$blogtemplate/footer.template"}
+</p>
+{else}
+  <!-- show the whole post, as we would normally do -->
+   {include file="$blogtemplate/post.template"}
+{/if}
+{/foreach}
+		
+		{include file="$blogtemplate/footer.template"} 

Modified: templates/trunk/standard_green/post.template
===================================================================
--- templates/trunk/standard_green/post.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_green/post.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -7,9 +7,23 @@
 {$post->getText()}
 </div>
 
+{if $OnMainPage}
+
 <p class="footer">
-{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("comment on this")} ({$post->getTotalComments()})</a> :: <a title="{$locale->tr("permalink_title")}" href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> :: <a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getTotalTrackbacks()})</a>
+<img src="{$url->getTemplateFile("imgs/category.gif")}" alt="" />{foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->categoryLink($postCategory)}" title="{$locale->tr("category")}: {$postCategory->getName()}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach} | 
+<img src="{$url->getTemplateFile("imgs/permalink.gif")}" alt="" /><a title="{$locale->tr("permalink_title")} -> {$post->getTopic()}" href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> | 
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $post->getTotalComments() > 0 }<img src="{$url->getTemplateFile("imgs/comment.gif")}" alt="" /><a href="{$url->postPermalink($post)}#comments" title="{$locale->tr("comments")|capitalize} -> {$post->getTopic()}">{if $post->getTotalComments() == 0 }{$locale->tr("add_comment")}{else if}{$locale->tr("comments")|capitalize} ({$post->getTotalComments()}){/if}</a> | {/if} 
+<img src="{$url->getTemplateFile("imgs/trackback.gif")}" alt="" />{if $post->getNumTrackbacks() > 0}<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")} -> {$post->getTopic()}">{$locale->tr("trackbacks")} ({$post->getTotalTrackbacks()})</a>{else}{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()}){/if}
 </p>
+
+{else}
+
+<p class="footer">
+<img src="{$url->getTemplateFile("imgs/category.gif")}" alt="" />{foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->categoryLink($postCategory)}" title="{$locale->tr("category")}: {$postCategory->getName()}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach} | 
+{assign var=nextpost value=$post->getNextArticle()}{if $nextpost == true}<img src="{$url->getTemplateFile("imgs/next.gif")}" alt="" /><a href="{$url->postPermalink($nextpost)}" title="{$locale->tr("next_post")}: {$nextpost->getTopic()}">{$locale->tr("next_post")}</a> | {/if}
+{assign var=prevpost value=$post->getPrevArticle()}{if $prevpost == true}<img src="{$url->getTemplateFile("imgs/previous.gif")}" alt="" /><a href="{$url->postPermalink($prevpost)}" title="{$locale->tr("previous_post")}: {$prevpost->getTopic()}">{$locale->tr("previous_post")}</a> | {/if} 
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $post->getTotalComments() > 0 }<img src="{$url->getTemplateFile("imgs/comment.gif")}" alt="" />{$locale->tr("comments")|capitalize} ({$post->getTotalComments()}) | {/if}
+<img src="{$url->getTemplateFile("imgs/trackback.gif")}" alt="" />{if $post->getNumTrackbacks() > 0}<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")} -> {$post->getTopic()}">{$locale->tr("trackbacks")} ({$post->getTotalTrackbacks()})</a>{else}{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()}){/if}
+</p>
+
+{/if}

Modified: templates/trunk/standard_green/postandcomments.template
===================================================================
--- templates/trunk/standard_green/postandcomments.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_green/postandcomments.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,41 +1,34 @@
-		{include file="$blogtemplate/header.template"}
+		{assign var="postPageTitle" value=$post->getTopic()}
+		{assign var="postPageTitle" value=" | $postPageTitle"}
+		{include file="$blogtemplate/header.template"} 
   
-<p id="Nextpost">
-{assign var=nextpost value=$post->getNextArticle()}
-{assign var=prevpost value=$post->getPrevArticle()}
-		{if $nextpost == true}
-<a href="{$url->postPermalink($nextpost)}" title="Next post: {$nextpost->getTopic()}">&laquo;</a> |
-   		{/if}
-   		{if $prevpost == true}
-<a href="{$url->postPermalink($prevpost)}" title="Previous post: {$prevpost->getTopic()}">&raquo;</a>
-   		{/if}
-</p>
+
    
    		{assign var="poster" value=$post->getUserInfo()}
+   		<!-- {$url->postTrackbackLink($post)} -->
    		
-		<!-- {$url->postTrackbackLink($post)} -->
    		{include file="$blogtemplate/post.template"}
-   		
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $comments }<h2 id="comments">{$locale->tr("comments")|capitalize}</h2>{/if}	
    		{foreach from=$comments item=comment}
+<div class="comment">
+<h3 class="commentheader">{if $comment->getTopic() != null} {$comment->getTopic()|strip_tags}{else}Re: <em>{$post->getTopic()|strip_tags}</em>{/if}</h3>
 
-<h3 class="commentheader">
-<img src="{$url->getUrl("/imgs/comment_icon1.gif")}" alt="Comment Icon" /> {$comment->getTopic()} <span class="reply">[<a href="{$url->replyCommentLink($post,$comment)}">{$locale->tr("reply")}</a>]</span></h3>
-
 <p class="commentposterinfo">
 		{assign var="postDate" value=$comment->getTimestamp()}
 		{if $comment->getUserUrl() != ""}<a href="{$comment->getUserUrl()}">{$comment->getUsername()}</a>
-		{else}
-                {$comment->getUsername()}
-                {/if} | {$locale->formatDate($postDate, "%d/%m/%Y, %H:%M")}
+		{else}
+			{$comment->getUsername()}
+		{/if} | {$locale->formatDate($postDate, "%d/%m/%Y, %H:%M")}
 </p>
 
 <div class="commenttext">
 {$comment->getText()}
 </div>
+</div>
   		{/foreach}
 
 		{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
 		{include file="$blogtemplate/commentform.template"}
 		{/if}
-		
-		{include file="$blogtemplate/footer.template"}
+			
+		{include file="$blogtemplate/footer.template"} 

Modified: templates/trunk/standard_green/posttrackbacks.template
===================================================================
--- templates/trunk/standard_green/posttrackbacks.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_green/posttrackbacks.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,4 +1,4 @@
-		{include file="$blogtemplate/header.template"}
+		{include file="$blogtemplate/header.template"} 
 		
 <h2>{$locale->tr("trackbacks")}</h2>
 		
@@ -18,4 +18,4 @@
 </dl>
   		{/foreach}
 
-{include file="$blogtemplate/footer.template"}
+{include file="$blogtemplate/footer.template"} 

Modified: templates/trunk/standard_green/screenshot.jpg
===================================================================
(Binary files differ)

Modified: templates/trunk/standard_green/searchresults.template
===================================================================
--- templates/trunk/standard_green/searchresults.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_green/searchresults.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,5 +1,6 @@
 {include file="$blogtemplate/header.template"} 
    <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+   <div id="SearchResults">
     {foreach from=$searchresults item=result}
     
     
@@ -8,9 +9,14 @@
       <p class="searchArticle">
       {$article->getText()|strip_tags|truncate:300:"...":false}
       </p>
-      <p class="footer"">{foreach name=categories from=$article->getCategories() item=postCategory}
-          <a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
-      {/foreach}</p>
+      <p class="footer">
+		{foreach name=categories from=$article->getCategories() 
+				 item=postCategory}
+          <a href="{$url->categoryLink($postCategory)}">
+			 {$postCategory->getName()}</a>{if 
+				!$smarty.foreach.categories.last}, {/if}
+        {/foreach}
+      </p>
     {/foreach}
-
+   </div> 
 {include file="$blogtemplate/footer.template"} 

Added: templates/trunk/standard_green/style-ie.css
===================================================================
--- templates/trunk/standard_green/style-ie.css	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_green/style-ie.css	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,3 @@
+#Content {
+	word-wrap: break-word;
+	}
\ No newline at end of file


Property changes on: templates/trunk/standard_green/style-ie.css
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_green/style.css
===================================================================
--- templates/trunk/standard_green/style.css	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_green/style.css	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,411 @@
+/* ******************  general  *************** */
+
+abbr, acronym {
+  cursor: help;
+  border: none;
+}
+
+html, #Bottom, #Title h1 { background:#006666; } 
+
+body {
+	margin:0; 
+	padding:0;
+	font:small lucida sans unicode, arial, times new roman, sans-serif;
+	color:#525150;
+	background: #fff;
+	}
+	
+a:link {
+	color: #006666;
+	}
+	
+a:visited {
+	color: #CE6202;
+	}
+	
+a:hover, a:active, a:focus {
+	color: #fff; text-decoration:none; background-color: #CE6202;
+	}
+
+h2, h3 {
+	margin:0;
+	padding:0;
+	}
+	
+.Upgrade {
+	display: none;
+	font-weight: bold;
+	}
+	
+.clearer {
+	clear : both;
+	height : 1px;
+	font-size : 1px;
+	}
+      
+#Container {
+	width: 100%;
+	}
+
+#Title h1 {
+   color: #fff;
+   margin:0;
+   padding:25px 0 5px 10px;
+   font-size:320%;
+   font-weight: normal;
+   } 
+
+#Title a:active, h1 a:link, h1 a:hover, h1 a:focus, h1 a:visited {
+	text-decoration: none;
+	color: #fff;
+	background-color:transparent; 
+	}
+
+#Subtitle {
+	background-color:#004040;
+	color:#fff;
+	padding:2px 14px 2px 14px;
+	font-size:medium;
+	}
+	
+	
+#Subtitle a:link, #Subtitle a:visited, #Subtitle a:hover {
+	text-decoration: underline;
+	color: #fff;
+	background-color:transparent;
+	}	
+	
+#Subtitle a:active, #Subtitle a:focus {
+	color: #004040; text-decoration:none; background-color: #fff;
+	}
+
+#Subcontainer {
+	text-align:left;
+	background-color:#fff;
+	padding-bottom:10px;
+	padding-top:10px;
+	}
+	
+	
+/* ******************  column a  *************** */
+	
+#Content {
+	width: 58%;
+	float: left;
+	margin-right:3%;
+	margin-left:2%;
+	background-color:#fff;
+	overflow: hidden;
+	line-height:1.5em;
+	text-align:justify;
+	}
+	
+#Content h2 {
+	color:#b8b2ac;
+	margin:20px 0 10px 0;
+	}
+	
+.date {
+	font-weight: bold;
+	}
+
+.footer {
+	padding-bottom:1em;
+	border-bottom: 1px solid #d4d0cd;
+	text-align:left;
+	font-size:90%;
+	}
+	
+.footer img {
+	margin-right:3px;
+	vertical-align:middle;
+	}
+	
+#Nextpost {
+	text-align:center;
+	}	
+	
+div.comment {
+	border-top: 1px dotted #d4d0cd;
+	padding-top:0.5em;
+	background: url('./imgs/comments.gif') no-repeat;
+	background-position: top right;
+	margin-top:1.5em;
+	}
+	
+.commentposterinfo {
+	margin-bottom:1em;
+	font-weight: bold;
+	}
+	
+h3.commentheader {
+	font-size:medium;
+	color:#b8b2ac;
+	font-weight: normal;
+	}
+	
+.reply {font-weight: normal;font-size:small;}
+
+div.commenttext {;
+	margin-bottom:1em;
+	}
+
+
+#CommentForm fieldset {
+	border:2px solid #d4d0cd; 
+	padding-top:10px; 
+	margin-top:10px; 
+	padding-left:10px; 
+	padding-bottom:10px;
+	}
+
+#CommentForm legend {
+	color:#525150;
+	padding:2px 4px 2px 4px;
+	background-color: #ffffff;
+	font-weight : bold;
+	}
+
+#CommentForm label {
+	width:6em;
+	float:left;
+	display:block;
+	clear:both; 
+	float:left;
+	margin-top:8px;
+	margin-bottom:0px;
+	}
+	
+#CommentForm input {
+	margin-top:
+	8px;margin-bottom:8px;
+	}
+	
+#Submit {
+	margin-top:8px;
+	margin-bottom:8px;
+	margin-left:6em;
+	}
+	
+#CommentForm textarea {
+	margin-top:8px;
+	margin-bottom:0px;
+	}
+	
+/* ******************  columnb  *************** */
+	
+#Menu   {
+	width:34%;
+	float: left;
+	text-align:left;
+	background-color:#fff;
+	}
+	
+#Calendar, #Search, #AboutMyself {
+	border-left-color:#d4d0cd;
+	border-left-style:solid;
+	border-left-width:6px;
+	width:86%;
+	padding-top:1px;
+	padding-bottom:1px;
+	padding-right:14px;
+	padding-left:6px;
+	margin-bottom:10px;
+	background-color:#f0efee;
+	margin-top:1px;
+	}
+	
+#Search fieldset {border:0px solid; padding:2px; margin:2px;}
+#Search input {margin:0px;padding:2px;width:7em;}
+#Search input.button {margin:0px;padding:2px;width:5em;}
+#Search form {margin:0px;padding:2px;}
+#Search label {margin:0px;padding:2px;width:8em;}
+
+table.calMonth {
+	width:11em;
+	border-spacing:4px;
+	border:0px;
+	}
+
+th.calMonthCurrent {
+	font-weight:normal;
+	padding: 0px;
+	text-align: center;
+	}
+	
+th.calMonthBackward {
+	font-weight:normal;
+	padding: 0px;
+	text-align:center;
+	}
+	
+th.calMonthForward {
+	font-weight:normal;
+	padding: 0px;
+	text-align:center;
+	}
+	
+.calMonthHeader th {
+	text-align:center;
+	font-weight:normal;
+	padding: 0px;
+	}
+	
+#Calendar td {	
+	padding: 0px;
+	text-align:center
+	}
+
+.calMonthToday {
+ 	background-color: #d4d0cd;
+	}
+
+#Menu h2 {
+  	background-color: #006666;
+  	font-size:small;
+  	width:86%;
+  	display:block;
+        padding:1px 10px 1px 10px;
+  	border-left-style:solid;
+  	border-left-color:#004040;
+  	color:#fff;
+  	margin-top:10px;
+  	border-left-width:6px;
+	text-transform: capitalize;
+	}
+
+#Categories ul, #Syndicate ul, #Recently ul, #Sections ul {
+	margin-left:0; 
+	margin-top:0; 
+	margin-bottom:0px; 
+	padding:0; 
+	list-style:none; 
+	font-size:small;
+	}
+	
+#Syndicate ul, #Sections ul {
+	text-transform: capitalize;
+	}
+
+#Categories a, #Syndicate a, #Recently a, #Sections a {
+	width:86%;
+	display:block;
+	padding-top:1px;
+	padding-bottom:1px;
+	border-left-style:solid;
+	border-left-color:#d4d0cd;
+	text-decoration:none;
+	padding-right:10px;
+	padding-left:10px;
+	background-color:#f0efee;
+	border-left-width:6px;
+	margin-top:1px
+	}
+
+#Categories a:hover, #Syndicate a:hover, #Recently a:hover, 
+#Sections a:hover, #Categories a:focus, #Syndicate a:focus, 
+#Recently a:focus, #Links a:focus, #Categories a:active,  
+#Syndicate a:active, #Recently a:active, #Sections a:active {
+	border-color:#875222;
+	background-color:#CE6202;
+	}
+
+#Links h2 {
+	text-transform: capitalize;
+	}
+
+/* ******************  footer  *************** */
+
+#Bottommenu {
+	clear:both;
+	background-color:#004040;
+	color:#fff;
+	padding:3px 15px 3px 15px;
+	}
+
+
+#Bottom {
+   color:#fff;
+   padding:3px 3px 3px 15px;
+   } 
+	
+#Bottommenu a, #Bottommenu a:link, #Bottommenu a:visited, #Bottom a, 
+#Bottom a:link, #Bottom a:visited {
+	text-decoration: none;
+	color: #fff;
+	border: 0;
+	}
+
+#Bottommenu a:active, #Bottommenu a:focus, #Bottommenu a:hover, 
+#Bottom a:active, #Bottom a:focus, #Bottom a:hover { 
+	text-decoration : underline; 
+	color : #fff;background-color:transparent; 
+	}
+
+
+/* ******************  albums  *************** */
+
+div.album {
+	text-align: center;
+        float: left;
+        width:150px;
+        margin-bottom:20px;
+        margin-right:5px;
+  	}
+
+.album p {
+   	text-align: center;
+   	padding: 0;
+   	margin:0;
+   	width:150px;     
+	overflow: hidden;
+   	}
+   
+a img {border:none;}
+#album a:link {color: #006666;}
+#album a:visited {color: #CE6202;}
+#album a:hover, #album a:active, #album a:focus {color: #006666;background:none;}
+
+
+/* ******************  trakbacks  *************** */
+
+h4 {
+	margin:1em 0 0 0;
+	padding:0;font-size:small;
+	}
+	
+dl {	
+	margin:0;
+	padding:0;
+	}
+	
+dt {
+	font-weight: bold;
+	float:left;
+	}
+	
+dd {
+	padding-left:4em;
+	}
+	
+	
+blockquote {background:url('imgs/blockquote.gif') no-repeat; padding:10px 10px 2px 41px;border: dotted #d4d0cd 1px; 
+}
+	
+/* ******************  to align elements  *************** */
+.left {text-align: left;display:block}
+.right {text-align: right;display:block}
+.center {text-align: center;display:block}
+
+/* ******************  to float elements  *************** */
+.floatleft {float: left;padding:2px 10px 10px 0px}
+.floatright {float: right;padding:2px 0px 10px 10px;}
+
+/* ******************  to highlight text  *************** */
+.bold {font-weight: bold;}
+.italic {font-style:italic;}
+.underline {text-decoration:underline}
+
+/* ****************** aboutmyself  *************** */
+#UserPicture {float:left;margin:10px 10px 10px 6px;border:solid #D4D0CD 1px;padding:3px;background-color:#fff}
+#AboutMyself p {padding:10px 0;margin:0}
\ No newline at end of file


Property changes on: templates/trunk/standard_green/style.css
___________________________________________________________________
Name: svn:executable
   + *

Modified: templates/trunk/standard_happy/album.template
===================================================================
--- templates/trunk/standard_happy/album.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_happy/album.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -17,9 +17,10 @@
     	<p>{$locale->tr("parent")}</p>
 	</div>
 
-   		{assign var="counter" value=1}
-   		{assign var=children value=$album->getChildren()}
-   		{foreach from=$children item=childalbum}
+  {if $pager->getCurrentPage() == 1}
+	{assign var="counter" value=1}
+   	{assign var=children value=$album->getChildren()}
+   	{foreach from=$children item=childalbum}
 	<div class="album">
    	<a href="{$url->albumLink($childalbum)}">
    	<img src="{$url->getTemplateFile("imgs/folder.gif")}" alt="{$childalbum->getName()}" /></a>
@@ -28,12 +29,15 @@
    		{if $counter%3 == 0}
    		{/if}
 	</div>
-   		{/foreach}
+   	{/foreach}
+  {/if}
  
 <!-- show the resources here -->
 
-   		
-   		{foreach from=$resources item=resource}
+ {** assign var=resources value=$album->getResources() **}
+ {** use the code above if you want to display all the resources at once, or leave it commented **}
+ {** if you would like to use the new paged display that was introduced in lifetype 1.1 **} 
+ {foreach from=$resources item=resource}
 	<div class="album">
    		{if $resource->hasPreview()}
    		{*<a target="_blank" href="resserver.php?blogId={$blog->getId()}&amp;resource={$resource->getFileName()}">*}
@@ -47,7 +51,7 @@
    		{elseif $resource->isVideo()}
     	<img alt="Video" src="{$url->getTemplateFile("imgs/video.gif")}" /></a>
    		{elseif $resource->isZip()}
-    	<img alt="Zip" src="{$url->getTemplateFile("imgs/compressed.gif")}" /></a>  
+    	<img alt="Zip" src="{$url->getTemplateFile("imgs/compressed.gif")}" /></a>
    		{else}
    	<img alt="File" src="{$url->getTemplateFile("imgs/file.gif")}" /></a>
    		{/if}  
@@ -69,7 +73,7 @@
    		{/if}
   	</div>
   		{/foreach}
-	 <div class="Pages">{include file="misc/pager.template" style="links"}</div>  
+
 	<div class="clearer">&nbsp;</div>
 
 </div>

Modified: templates/trunk/standard_happy/commentarticle.template
===================================================================
--- templates/trunk/standard_happy/commentarticle.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_happy/commentarticle.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,5 +1,5 @@
-		{include file="$blogtemplate/header.template"}
+		{include file="$blogtemplate/header.template"} 
 		
 		{include file="$blogtemplate/commentform.template"}
 		
-		{include file="$blogtemplate/footer.template"}
+		{include file="$blogtemplate/footer.template"} 

Modified: templates/trunk/standard_happy/commentform.template
===================================================================
--- templates/trunk/standard_happy/commentform.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_happy/commentform.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,19 +1,24 @@
-<div id="CommentForm">
-  
-	<form id="NewComment" action="{$url->getIndexUrl()}" method="post">
-	<fieldset>
- 	<legend>{$locale->tr("add_comment")}</legend>
-   	<div><label for="commentTopic">{$locale->pr("comment_topic")}</label><input type="text" name="commentTopic" id="commentTopic" value="" /></div>
-   	<div><label for="commentText">{$locale->pr("comment_text")}</label><textarea rows="10" cols="30" name="commentText" id="commentText"></textarea></div>
-   	<div><label for="userName">{$locale->pr("comment_username")}</label><input type="text" name="userName" id="userName" value="" /></div>
-   	<div><label for="userEmail">Email</label><input type="text" name="userEmail" id="userEmail" value="" /></div>
-   	<div><label for="userUrl">Web</label><input type="text" name="userUrl" id="userUrl" value="" /></div>
-   	<div id="Submit"><input id="Add" type="submit" value="{$locale->pr("comment_send")}" name="Add" />
-   	<input type="hidden" name="op" value="AddComment" />
-   	<input type="hidden" name="articleId" value="{$post->getId()}" />
-   	<input type="hidden" name="blogId" value="{$blog->getId()}" />
-   	<input type="hidden" name="parentId" value="{$parentId}" /></div>
-	</fieldset>
-  	</form>
-  	
-</div>
+<div id="CommentForm">
+
+<form id="NewComment" action="{$url->getIndexUrl()}" method="post">
+<fieldset>
+<legend>{$locale->tr("add_comment")}</legend>
+<div><label for="commentTopic">{$locale->pr("comment_topic")}</label><input type="text" name="commentTopic" id="commentTopic" value="{$topic}" /></div>
+<div><label for="commentText">{$locale->pr("comment_text")}</label><textarea rows="10" cols="30" name="commentText" id="commentText"></textarea></div>
+<div><label for="userName">{$locale->pr("comment_username")}</label><input type="text" name="userName" id="userName" value="" /></div>
+<div><label for="userEmail">Email</label><input type="text" name="userEmail" id="userEmail" value="" /></div>
+<div><label for="userUrl">Web</label><input type="text" name="userUrl" id="userUrl" value="" /></div>
+{if $authimage}{if $authimage->isEnabled()}
+<div><label for="authImage">Please type the 6-digit code you can see here:</label><br/>
+<input type="text" name="authImage" id="authImage" value="" />&nbsp;{$authimage->show()}</div>
+{/if}{/if}
+
+<div id="Submit"><input id="Add" type="submit" value="{$locale->pr("comment_send")}" name="Add" />
+<input type="hidden" name="op" value="AddComment" />
+<input type="hidden" name="articleId" value="{$post->getId()}" />
+<input type="hidden" name="blogId" value="{$blog->getId()}" />
+<input type="hidden" name="parentId" value="{$parentId}" /></div>
+</fieldset>
+</form>
+
+</div>
\ No newline at end of file

Added: templates/trunk/standard_happy/favicon.ico
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_happy/favicon.ico
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Modified: templates/trunk/standard_happy/footer.template
===================================================================
--- templates/trunk/standard_happy/footer.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_happy/footer.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,34 +1,58 @@
+<div class="pager">
+ {include file="$misctemplatepath/pager.template" style="links"}
 </div>
 
+</div>
+
 <div id="Menu">
-  	
+
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}
+  
+  	<h2>{$locale->tr("about_myself")}</h2>
+  	<div id="AboutMyself">
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	<img id="UserPicture" src="{$url->resourcePreviewLink($picture)}" alt="{$blogOwner->getUsername()}" />
+  	<p>{$AboutMyself}</p>
+  	<div class="clearer">&nbsp;</div>
+  	</div>
+{/if}
+
+
   	<h2>{$locale->tr("menu")}</h2>
     	<div id="Sections">
     	<ul>
     	<li><a title="{$locale->tr("main")}" href="{$url->blogLink()}">{$locale->tr("main")}</a></li>
     	<li><a title="{$locale->tr("archives")}" href="{$url->templatePage("archives")}">{$locale->tr("archives")}</a></li>
     	<li><a title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
-    	<li><a title="{$locale->tr("links")}" href="{$url->templatePage("links")}">{$locale->tr("links")}</a></li>
+    	
+    	 {foreach name=mylinkscategories from=$mylinkscategories item=panel_linkcategory}
+{if $smarty.foreach.mylinkscategories.first}
+   
+<li><a title="{$locale->tr("links")}" href="{$url->templatePage("links")}">{$locale->tr("links")}</a></li>{/if}
+    	{/foreach}
     	</ul>
     	</div>
-
+    	
+    	<h2>{$locale->tr("search")}</h2>
+	<div id="Search">
+	<form id="search_form" method="post" action="{$url->getIndexUrl()}">
+	<fieldset>
+	<label for="searchTerms"><input type="text" id="searchTerms" name="searchTerms" value="" /></label>
+	<input type="submit" name="Search" value="{$locale->tr("search_s")}" class="button" />
+	<input type="hidden" name="op" value="Search" />
+	<input type="hidden" name="blogId" value="{$blog->getId()}" />   
+	</fieldset>
+	</form>
+	</div> 
+	
 	<h2>{$locale->tr("calendar")}</h2>
     	<div id="Calendar">
     		{$calendar}
-    	</div>
-
-    	<h2>{$locale->tr("search")}</h2>
-	<div id="Search">
-		<form id="search_form" method="post" action="{$url->getIndexUrl()}">
-		<div>
-		<label for="searchTerms" style="display:none;">{$locale->tr("search_this_blog")} </label><input type="text" id="searchTerms" name="searchTerms" value="" />
-		<input type="submit" name="Search" value="{$locale->tr("search_s")}" class="button" />
-		<input type="hidden" name="op" value="Search" />
-		<input type="hidden" name="blogId" value="{$blog->getId()}" />   
-		</div>
-		</form>
-	</div> 
-
+    	</div>	
+  
   	<h2>{$locale->tr("recently")}</h2>
     	<div id="Recently">
     	<ul>
@@ -42,7 +66,7 @@
     	<div id="Categories">
     	<ul>
     		{foreach from=$articlecategories item=articleCategory}
-    	<li><a title="{$articleCategory->getName()}" href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} [{$articleCategory->getNumArticles()}]</a></li>
+    	<li><a title="{$articleCategory->getName()}" href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} <abbr title="{$articleCategory->getNumArticles()} {$locale->tr("posts")}">[{$articleCategory->getNumArticles()}]</abbr></a></li>
    		{/foreach}
   	</ul>
   	</div>
@@ -53,14 +77,15 @@
     	<li><a title="RSS 0.90" href="{$url->rssLink("rss090")}">RSS 0.90</a></li>
     	<li><a title="RSS 1.0" href="{$url->rssLink("rss10")}">RSS 1.0</a></li>
     	<li><a title="RSS 2.0" href="{$url->rssLink("rss20")}">RSS 2.0</a></li>
-    	<li><a title="XML" href="{$url->rssLink("xml")}">XML</a></li>
+    	<li><a title="Atom" href="{$url->rssLink("rss20")}">Atom</a></li>
     	</ul>
     	</div>
- 
 </div>
 
 <div class="clearer">&nbsp;</div> 
 
+
+
 </div>
 
 <div id="Bottommenu"><a href="http://www.w3.org/WAI/">Accessible</a> and Valid <a href="http://validator.w3.org/check/referer">XHTML 1.0 Strict</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></div>
@@ -70,5 +95,6 @@
 <div id="Bottom">Powered by <a href="http://www.lifetype.net">LifeType</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a></div>
 
 </div>
+
 </body>
 </html>

Modified: templates/trunk/standard_happy/header.template
===================================================================
--- templates/trunk/standard_happy/header.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_happy/header.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,18 +1,22 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
  <head>
-  <meta http-equiv="content-type" content="text/html; charset={$locale->getCharset()}" />
-  <title>{$blog->getBlog()}</title>
-  <style type="text/css" media="screen">@import "{$url->getTemplateFile("standard_happy.css")}";</style>
- <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")}" />
+ <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>{$blog->getBlog()}{$postPageTitle}</title>
+ <link rel="stylesheet" type="text/css" title="Style" href="{$url->getTemplateFile("style.css")}" />
+ <!--[if IE ]>
+<link rel="stylesheet" type="text/css" title="Style" href="{$url->getTemplateFile("style-ie.css")}" />
+<![endif] -->
+ <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")}" />
  </head>
- <body> 
- 
-<p class="Upgrade">This page looks plain and unstyled because you're using a non-standard compliant browser. To see it in its best form, please <a href="http://www.webstandards.org/upgrade/" title="The Web Standards Project's Browser Upgrade initiative">upgrade</a> to a browser that supports web standards. It's free and painless.</p>
-  
+  <body> 
+
 <div id="Container">
   
 <div id="Title"><h1><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1></div>

Added: templates/trunk/standard_happy/imgs/blockquote.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_happy/imgs/blockquote.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_happy/imgs/category.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_happy/imgs/category.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_happy/imgs/comment.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_happy/imgs/comment.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_happy/imgs/comments.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_happy/imgs/comments.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_happy/imgs/next.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_happy/imgs/next.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_happy/imgs/permalink.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_happy/imgs/permalink.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_happy/imgs/previous.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_happy/imgs/previous.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_happy/imgs/trackback.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_happy/imgs/trackback.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Modified: templates/trunk/standard_happy/links.template
===================================================================
--- templates/trunk/standard_happy/links.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_happy/links.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,4 +1,4 @@
-		{include file="$blogtemplate/header.template"}
+		{include file="$blogtemplate/header.template"} 
   
 <div id="Links">
 	<h2>{$locale->tr("my_links")}</h2>
@@ -6,10 +6,12 @@
     	<h3>{$linkcategory->getName()}</h3>
    	<ul>
   		{foreach from=$linkcategory->getLinks() item=link}
-  	<li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a>: {$link->getDescription()}</li>
+  	<li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a>: {$link->getDescription()} {if $link->getRssFeed() != ""}
+      <a href="{$link->getRssFeed()}"><img src="/imgs/rss_logo_small.gif" alt="RSS" /></a>
+    {/if}</li>
     		{/foreach}
   	</ul>
   		{/foreach}
   	</div>
   
-		{include file="$blogtemplate/footer.template"}
\ No newline at end of file
+		{include file="$blogtemplate/footer.template"} 
\ No newline at end of file

Modified: templates/trunk/standard_happy/main.template
===================================================================
--- templates/trunk/standard_happy/main.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_happy/main.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,6 +1,25 @@
-{include file="$blogtemplate/header.template"}
+		{assign var="OnMainPage" value=1}
+		{include file="$blogtemplate/header.template"} 
+		
+{if $category}<h2>{$locale->tr("category")}: {$category->getName()}</h2>{/if} 
+  
 {foreach from=$posts item=post}
-{include file="$blogtemplate/post.template"}
+{if $showAll | 1 && $category}
+  <!-- showing only the topic of the post, in case we have too many! -->
+<h3><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h3>
+<div>
+{$post->getText()|strip_tags|truncate:300:"...":false}
+</div>
+
+<p class="footer">
+{foreach name=categories from=$post->getCategories() item=postCategory}
+  <a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
 {/foreach}
-<div class="Pages">{include file="misc/pager.template" style="links"}</div>  
-{include file="$blogtemplate/footer.template"}
+</p>
+{else}
+  <!-- show the whole post, as we would normally do -->
+   {include file="$blogtemplate/post.template"}
+{/if}
+{/foreach}
+		
+		{include file="$blogtemplate/footer.template"} 

Modified: templates/trunk/standard_happy/post.template
===================================================================
--- templates/trunk/standard_happy/post.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_happy/post.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -7,9 +7,23 @@
 {$post->getText()}
 </div>
 
+{if $OnMainPage}
+
 <p class="footer">
-{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("comment on this")} ({$post->getTotalComments()})</a> :: <a title="{$locale->tr("permalink_title")}" href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> :: <a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getTotalTrackbacks()})</a>
+<img src="{$url->getTemplateFile("imgs/category.gif")}" alt="" />{foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->categoryLink($postCategory)}" title="{$locale->tr("category")}: {$postCategory->getName()}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach} | 
+<img src="{$url->getTemplateFile("imgs/permalink.gif")}" alt="" /><a title="{$locale->tr("permalink_title")} -> {$post->getTopic()}" href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> | 
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $post->getTotalComments() > 0 }<img src="{$url->getTemplateFile("imgs/comment.gif")}" alt="" /><a href="{$url->postPermalink($post)}#comments" title="{$locale->tr("comments")|capitalize} -> {$post->getTopic()}">{if $post->getTotalComments() == 0 }{$locale->tr("add_comment")}{else if}{$locale->tr("comments")|capitalize} ({$post->getTotalComments()}){/if}</a> | {/if} 
+<img src="{$url->getTemplateFile("imgs/trackback.gif")}" alt="" />{if $post->getNumTrackbacks() > 0}<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")} -> {$post->getTopic()}">{$locale->tr("trackbacks")} ({$post->getTotalTrackbacks()})</a>{else}{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()}){/if}
 </p>
+
+{else}
+
+<p class="footer">
+<img src="{$url->getTemplateFile("imgs/category.gif")}" alt="" />{foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->categoryLink($postCategory)}" title="{$locale->tr("category")}: {$postCategory->getName()}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach} | 
+{assign var=nextpost value=$post->getNextArticle()}{if $nextpost == true}<img src="{$url->getTemplateFile("imgs/next.gif")}" alt="" /><a href="{$url->postPermalink($nextpost)}" title="{$locale->tr("next_post")}: {$nextpost->getTopic()}">{$locale->tr("next_post")}</a> | {/if}
+{assign var=prevpost value=$post->getPrevArticle()}{if $prevpost == true}<img src="{$url->getTemplateFile("imgs/previous.gif")}" alt="" /><a href="{$url->postPermalink($prevpost)}" title="{$locale->tr("previous_post")}: {$prevpost->getTopic()}">{$locale->tr("previous_post")}</a> | {/if} 
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $post->getTotalComments() > 0 }<img src="{$url->getTemplateFile("imgs/comment.gif")}" alt="" />{$locale->tr("comments")|capitalize} ({$post->getTotalComments()}) | {/if}
+<img src="{$url->getTemplateFile("imgs/trackback.gif")}" alt="" />{if $post->getNumTrackbacks() > 0}<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")} -> {$post->getTopic()}">{$locale->tr("trackbacks")} ({$post->getTotalTrackbacks()})</a>{else}{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()}){/if}
+</p>
+
+{/if}

Modified: templates/trunk/standard_happy/postandcomments.template
===================================================================
--- templates/trunk/standard_happy/postandcomments.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_happy/postandcomments.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,41 +1,34 @@
-		{include file="$blogtemplate/header.template"}
+		{assign var="postPageTitle" value=$post->getTopic()}
+		{assign var="postPageTitle" value=" | $postPageTitle"}
+		{include file="$blogtemplate/header.template"} 
   
-<p id="Nextpost">
-{assign var=nextpost value=$post->getNextArticle()}
-{assign var=prevpost value=$post->getPrevArticle()}
-		{if $nextpost == true}
-<a href="{$url->postPermalink($nextpost)}" title="Next post: {$nextpost->getTopic()}">&laquo;</a> |
-   		{/if}
-   		{if $prevpost == true}
-<a href="{$url->postPermalink($prevpost)}" title="Previous post: {$prevpost->getTopic()}">&raquo;</a>
-   		{/if}
-</p>
+
    
    		{assign var="poster" value=$post->getUserInfo()}
+   		<!-- {$url->postTrackbackLink($post)} -->
    		
-		<!-- {$url->postTrackbackLink($post)} -->
    		{include file="$blogtemplate/post.template"}
-   		
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $comments }<h2 id="comments">{$locale->tr("comments")|capitalize}</h2>{/if}	
    		{foreach from=$comments item=comment}
+<div class="comment">
+<h3 class="commentheader">{if $comment->getTopic() != null} {$comment->getTopic()|strip_tags}{else}Re: <em>{$post->getTopic()|strip_tags}</em>{/if}</h3>
 
-<h3 class="commentheader">
-<img src="{$url->getUrl("/imgs/comment_icon1.gif")}" alt="Comment Icon" /> {$comment->getTopic()} <span class="reply">[<a href="{$url->replyCommentLink($post,$comment)}">{$locale->tr("reply")}</a>]</span></h3>
-
 <p class="commentposterinfo">
 		{assign var="postDate" value=$comment->getTimestamp()}
 		{if $comment->getUserUrl() != ""}<a href="{$comment->getUserUrl()}">{$comment->getUsername()}</a>
-		{else}
-                {$comment->getUsername()}
-                {/if} | {$locale->formatDate($postDate, "%d/%m/%Y, %H:%M")}
+		{else}
+			{$comment->getUsername()}
+		{/if} | {$locale->formatDate($postDate, "%d/%m/%Y, %H:%M")}
 </p>
 
 <div class="commenttext">
 {$comment->getText()}
 </div>
+</div>
   		{/foreach}
 
 		{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
 		{include file="$blogtemplate/commentform.template"}
 		{/if}
-		
-		{include file="$blogtemplate/footer.template"}
+			
+		{include file="$blogtemplate/footer.template"} 

Modified: templates/trunk/standard_happy/posttrackbacks.template
===================================================================
--- templates/trunk/standard_happy/posttrackbacks.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_happy/posttrackbacks.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,4 +1,4 @@
-		{include file="$blogtemplate/header.template"}
+		{include file="$blogtemplate/header.template"} 
 		
 <h2>{$locale->tr("trackbacks")}</h2>
 		
@@ -18,4 +18,4 @@
 </dl>
   		{/foreach}
 
-{include file="$blogtemplate/footer.template"}
+{include file="$blogtemplate/footer.template"} 

Modified: templates/trunk/standard_happy/screenshot.jpg
===================================================================
(Binary files differ)

Modified: templates/trunk/standard_happy/searchresults.template
===================================================================
--- templates/trunk/standard_happy/searchresults.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_happy/searchresults.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,5 +1,6 @@
 {include file="$blogtemplate/header.template"} 
    <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+   <div id="SearchResults">
     {foreach from=$searchresults item=result}
     
     
@@ -8,9 +9,14 @@
       <p class="searchArticle">
       {$article->getText()|strip_tags|truncate:300:"...":false}
       </p>
-      <p class="footer"">{foreach name=categories from=$article->getCategories() item=postCategory}
-          <a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
-      {/foreach}</p>
+      <p class="footer">
+		{foreach name=categories from=$article->getCategories() 
+				 item=postCategory}
+          <a href="{$url->categoryLink($postCategory)}">
+			 {$postCategory->getName()}</a>{if 
+				!$smarty.foreach.categories.last}, {/if}
+        {/foreach}
+      </p>
     {/foreach}
-
+   </div> 
 {include file="$blogtemplate/footer.template"} 

Added: templates/trunk/standard_happy/style-ie.css
===================================================================
--- templates/trunk/standard_happy/style-ie.css	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_happy/style-ie.css	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,3 @@
+#Content {
+	word-wrap: break-word;
+	}
\ No newline at end of file


Property changes on: templates/trunk/standard_happy/style-ie.css
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_happy/style.css
===================================================================
--- templates/trunk/standard_happy/style.css	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_happy/style.css	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,417 @@
+/* ******************  general  *************** */
+
+abbr, acronym {
+  cursor: help;
+  border: none;
+}
+
+html, #Bottom, #Title h1 { background:#f76b17; } 
+
+body {
+	margin:0; 
+	padding:0;
+	font:small lucida sans unicode, arial, times new roman, sans-serif;
+	color:#000;
+	background: #63cece;
+	}
+	
+a:link {
+	color: #0085a2;
+	}
+	
+a:visited {
+	color: #015d6d;
+	}
+	
+a:hover, a:active, a:focus {
+	color: #fff; text-decoration:none; background-color: #0085a2;
+	}
+
+h2, h3 {
+	margin:0;
+	padding:0;
+	}
+	
+.Upgrade {
+	display: none;
+	font-weight: bold;
+	}
+	
+.clearer {
+	clear : both;
+	height : 1px;
+	font-size : 1px;
+	}
+      
+#Container {
+	width: 100%;
+	}
+
+#Title h1 {
+   	color: #fff;
+   	margin:0;
+   	padding:25px 0 5px 10px;
+   	font-size:320%;
+   	font-weight: normal;
+   	} 
+
+#Title a:active, h1 a:link, h1 a:hover, h1 a:focus, h1 a:visited {
+	text-decoration: none;
+	color: #fff;
+	border: 0;
+	background-color:transparent; 
+	}
+
+#Subtitle {
+	background-color:#f73c17;
+	color:#fff;
+	padding:2px 14px 2px 14px;
+	font-size:medium;
+	}
+	
+	
+#Subtitle a:link, #Subtitle a:visited, #Subtitle a:hover {
+	text-decoration: underline;
+	color: #fff;
+	background-color:transparent;
+	}	
+	
+#Subtitle a:active, #Subtitle a:focus {
+	color: #f73c17; 
+	text-decoration:none; 
+	background-color: #fff;
+	}
+
+#Subcontainer {
+	text-align:left;
+	background-color:#63cece;
+	padding-bottom:10px;
+	padding-top:10px;
+	}
+	
+	
+/* ******************  column a  *************** */
+	
+#Content {
+	width: 58%;
+	float: left;
+	margin-right:3%;
+	margin-left:2%;
+	background-color:#63cece;
+	overflow: hidden;
+	line-height:1.5em;
+	text-align:justify;
+	}
+	
+#Content h2 {
+	color:#fff;
+	margin:20px 0 10px 0;
+	}
+	
+.date {
+	font-weight: bold;
+	}
+
+.footer {
+	padding-bottom:1em;
+	border-bottom: 1px solid #a7efee;
+	text-align:left;
+	font-size:90%;
+	}
+	
+.footer img {
+	margin-right:3px;
+	vertical-align:middle;
+	}
+	
+#Nextpost {
+	text-align:center;
+	}	
+	
+div.comment {
+	border-top: 1px dotted #a7efee;
+	padding-top:0.5em;
+	background: url('./imgs/comments.gif') no-repeat;
+	background-position: top right;
+	margin-top:1.5em;
+	}
+	
+.commentposterinfo {
+	margin-bottom:1em;
+	font-weight: bold;
+	}
+	
+h3.commentheader {
+	font-size:medium;
+	color:#fff;
+	font-weight: normal;
+	}
+	
+.reply {font-weight: normal;font-size:small;}
+
+div.commenttext {;
+	margin-bottom:1em;
+	}
+
+#CommentForm fieldset {
+	border:2px solid #a7efee; 
+	padding-top:10px; 
+	margin-top:10px; 
+	padding-left:10px; 
+	padding-bottom:10px;
+	}
+
+#CommentForm legend {
+	color:#000000;
+	padding:2px 4px 2px 4px;
+	background-color: #63cece;
+	font-weight : bold;
+	}
+
+#CommentForm label {
+	width:6em;
+	float:left;
+	display:block;
+	clear:both; 
+	float:left;
+	margin-top:8px;
+	margin-bottom:0px;
+	}
+	
+#CommentForm input {
+	margin-top:
+	8px;margin-bottom:8px;
+	}
+	
+#Submit {
+	margin-top:8px;
+	margin-bottom:8px;
+	margin-left:6em;
+	}
+	
+#CommentForm textarea {
+	margin-top:8px;
+	margin-bottom:0px;
+	}
+	
+/* ******************  columnb  *************** */
+	
+#Menu   {
+	width:34%;
+	float: left;
+	text-align:left;
+	background-color:#63cece;
+	}
+	
+#Calendar, #Search, #AboutMyself {
+	border-left-color:#6fdfde;
+	border-left-style:solid;
+	border-left-width:6px;
+	width:86%;
+	padding-top:1px;
+	padding-bottom:1px;
+	padding-right:14px;
+	padding-left:6px;
+	margin-bottom:10px;
+	background-color:#a7efee;
+	margin-top:1px;
+	}
+	
+#Search fieldset {border:0px solid; padding:2px; margin:2px;}
+#Search input {margin:0px;padding:2px;width:7em;}
+#Search input.button {margin:0px;padding:2px;width:5em;}
+#Search form {margin:0px;padding:2px;}
+#Search label {margin:0px;padding:2px;width:8em;}
+
+table.calMonth {
+	width:11em;
+	border-spacing:4px;
+	border:0px;
+	}
+
+th.calMonthCurrent {
+	font-weight:normal;
+	padding: 0px;
+	text-align: center;
+	}
+	
+th.calMonthBackward {
+	font-weight:normal;
+	padding: 0px;
+	text-align:center;
+	}
+	
+th.calMonthForward {
+	font-weight:normal;
+	padding: 0px;
+	text-align:center;
+	}
+	
+.calMonthHeader th {
+	text-align:center;
+	font-weight:normal;
+	padding: 0px;
+	}
+	
+#Calendar td {	
+	padding: 0px;
+	text-align:center
+	}
+
+.calMonthToday {
+ 	background-color: #6fdfde;
+	}
+
+#Menu h2 {
+  	background-color: #f76b17;
+  	font-size:small;
+  	width:86%;
+  	display:block;
+        padding:1px 10px 1px 10px;
+  	border-left-style:solid;
+  	border-left-color:#f73c17;
+  	color:#fff;
+  	margin-top:10px;
+  	border-left-width:6px;
+	text-transform: capitalize;
+	}
+
+#Categories ul, #Syndicate ul, #Recently ul, #Sections ul {
+	margin-left:0; 
+	margin-top:0; 
+	margin-bottom:0px; 
+	padding:0; 
+	list-style:none; 
+	font-size:small;
+	}
+	
+#Syndicate ul, #Sections ul {
+	text-transform: capitalize;
+	}
+
+#Categories a, #Syndicate a, #Recently a, #Sections a {
+	width:86%;
+	display:block;
+	padding-top:1px;
+	padding-bottom:1px;
+	border-left-style:solid;
+	border-left-color:#6fdfde;
+	text-decoration:none;
+	padding-right:10px;
+	padding-left:10px;
+	background-color:#a7efee;
+	border-left-width:6px;
+	margin-top:1px
+	}
+
+#Categories a:hover, #Syndicate a:hover, #Recently a:hover, 
+#Sections a:hover, #Categories a:focus, #Syndicate a:focus, 
+#Recently a:focus, #Links a:focus, #Categories a:active,  
+#Syndicate a:active, #Recently a:active, #Sections a:active {
+	border-color:#015d6d;
+	background-color:#0085a2;
+	}
+
+#Links h2 {
+	text-transform: capitalize;
+	}
+
+/* ******************  footer  *************** */
+
+#Bottommenu {
+	clear:both;
+	background-color:#f73c17;
+	color:#fff;
+	padding:3px 15px 3px 15px;
+	}
+
+
+#Bottom {
+   color:#fff;
+   padding:3px 3px 3px 15px;
+   } 
+	
+#Bottommenu a, #Bottommenu a:link, #Bottommenu a:visited, #Bottom a, 
+#Bottom a:link, #Bottom a:visited {
+	text-decoration: none;
+	color: #fff;
+	border: 0;
+	}
+
+#Bottommenu a:active, #Bottommenu a:focus, #Bottommenu a:hover, 
+#Bottom a:active, #Bottom a:focus, #Bottom a:hover { 
+	text-decoration : underline; 
+	color : #fff;
+	background-color:transparent; 
+	}
+
+
+/* ******************  albums  *************** */
+
+div.album {
+	text-align: center;
+        float: left;
+        width:150px;
+        margin-bottom:20px;
+        margin-right:5px;
+  	}
+
+.album p {
+   	text-align: center;
+   	padding: 0;
+   	margin:0;
+   	width:150px;     
+	overflow: hidden;
+   	}
+   
+a img {border:none;}
+#album a:link {color: #0085a2;}
+#album a:visited {color: #015d6d;}
+#album a:hover, #album a:active, #album a:focus {
+	color: #0085a2;
+	background:none;
+	}
+
+
+/* ******************  trakbacks  *************** */
+
+h4 {
+	margin:1em 0 0 0;
+	padding:0;font-size:small;
+	}
+	
+dl {	
+	margin:0;
+	padding:0;
+	}
+	
+dt {
+	font-weight: bold;
+	float:left;
+	}
+	
+dd {
+	padding-left:4em;
+	}
+	
+	
+blockquote {background:url('imgs/blockquote.gif') no-repeat; padding:10px 10px 2px 41px;border: dotted #a7efee 1px; 
+}
+	
+/* ******************  to align elements  *************** */
+.left {text-align: left;display:block}
+.right {text-align: right;display:block}
+.center {text-align: center;display:block}
+
+/* ******************  to float elements  *************** */
+.floatleft {float: left;padding:2px 10px 10px 0px}
+.floatright {float: right;padding:2px 0px 10px 10px;}
+
+/* ******************  to highlight text  *************** */
+.bold {font-weight: bold;}
+.italic {font-style:italic;}
+.underline {text-decoration:underline}
+
+/* ****************** aboutmyself  *************** */
+#UserPicture {float:left;margin:10px 10px 10px 6px;border:solid #63CECE 1px;padding:4px;background-color:#A7EFEE}
+#AboutMyself p {padding:10px 0;margin:0}
\ No newline at end of file


Property changes on: templates/trunk/standard_happy/style.css
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_new/album.template
===================================================================
--- templates/trunk/standard_new/album.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_new/album.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,80 @@
+   		{include file="$blogtemplate/header.template"} 
+
+<h2>{$locale->tr("albums")}</h2>
+
+<div id="albums">
+<h3>{$album->getName()}</h3>
+<p>{$album->getDescription()}</p>
+</div>
+
+<!-- album contents go here -->
+ 
+<div id="album">
+
+	<div class="clearer">&nbsp;</div>
+ 
+	<div class="album">
+	<a href="{$url->parentAlbumLink($album)}">
+    	<img src="{$url->getTemplateFile("imgs/parentfolder.gif")}" alt="{$locale->tr("parent")}" /></a>
+    	<p>{$locale->tr("parent")}</p>
+	</div>
+
+   		{assign var="counter" value=1}
+   		{assign var=children value=$album->getChildren()}
+   		{foreach from=$children item=childalbum}
+	<div class="album">
+   	<a href="{$url->albumLink($childalbum)}">
+   	<img src="{$url->getTemplateFile("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}
+ 
+<!-- show the resources here -->
+
+   		{assign var=resources value=$album->getResources()}
+   		{foreach from=$resources item=resource}
+	<div class="album">
+   		{if $resource->hasPreview()}
+   		{*<a target="_blank" href="resserver.php?blogId={$blog->getId()}&amp;resource={$resource->getFileName()}">*}
+   	<a href="{$url->resourceLink($resource)}">
+    	<img alt="{$resource->getDescription()}" src="{$url->resourcePreviewLink($resource)}" /></a>
+    	<p>{$resource->getFileName()}</p>
+   		{else}
+   	<a href="{$url->resourceLink($resource)}">
+   		{if $resource->isSound()}
+    	<img alt="Sound" src="{$url->getTemplateFile("imgs/sound.gif")}" /></a>
+   		{elseif $resource->isVideo()}
+    	<img alt="Video" src="{$url->getTemplateFile("imgs/video.gif")}" /></a>
+   		{elseif $resource->isZip()}
+    	<img alt="Zip" src="{$url->getTemplateFile("imgs/compressed.gif")}" /></a>  
+   		{else}
+   	<img alt="File" src="{$url->getTemplateFile("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 class="clearer">&nbsp;</div>
+
+</div>
+
+<!-- end of album contents --> 
+		{include file="$blogtemplate/footer.template"} 
\ No newline at end of file


Property changes on: templates/trunk/standard_new/album.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_new/albums.template
===================================================================
--- templates/trunk/standard_new/albums.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_new/albums.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,28 @@
+		{include file="$blogtemplate/header.template"} 
+
+<h2>{$locale->tr("albums")}</h2>
+
+ <!-- album contents go here -->
+ 
+<div id="album">
+	
+	<div class="clearer">&nbsp;</div>
+
+		{assign var="counter" value=0}
+  		{foreach from=$albums item=album}
+	<div class="album">
+	<a href="{$url->albumLink($album)}"><img src="{$url->getTemplateFile("imgs/folder.gif")}" alt="{$album->getName()}" /></a>
+  	<p>{$album->getName()} ({$album->getNumResources()})</p>
+  		{assign var="counter" value="`$counter+1`"}
+		{if $counter%3 == 0}
+		{/if}
+	</div>
+		{/foreach}
+
+	<div class="clearer">&nbsp;</div>
+
+</div>
+
+<!-- end of the albums -->
+		
+		{include file="$blogtemplate/footer.template"} 


Property changes on: templates/trunk/standard_new/albums.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_new/archives.template
===================================================================
--- templates/trunk/standard_new/archives.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_new/archives.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,15 @@
+		{include file="$blogtemplate/header.template"} 
+<h2>{$locale->tr("archives")}</h2>
+
+<div id="Archives">
+	
+	<ul>
+		{foreach from=$archives item=month}
+    	<li><a href="{$month->getUrl()}">{$month->getName()}</a> [{$month->getNumArticles()}]</li>
+    		{/foreach}
+    		
+    		
+    	</ul>
+</div>
+   	
+   		{include file="$blogtemplate/footer.template"} 
\ No newline at end of file


Property changes on: templates/trunk/standard_new/archives.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_new/commentarticle.template
===================================================================
--- templates/trunk/standard_new/commentarticle.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_new/commentarticle.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,5 @@
+		{include file="$blogtemplate/header.template"} 
+		
+		{include file="$blogtemplate/commentform.template"}
+		
+		{include file="$blogtemplate/footer.template"} 


Property changes on: templates/trunk/standard_new/commentarticle.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_new/commentform.template
===================================================================
--- templates/trunk/standard_new/commentform.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_new/commentform.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,19 @@
+<div id="CommentForm">
+  
+	<form id="NewComment" action="{$url->getBaseUrl()}/index.php" method="post">
+	<fieldset>
+ 	<legend>{$locale->tr("add_comment")}</legend>
+   	<div><label for="commentTopic">{$locale->pr("comment_topic")}</label><input type="text" name="commentTopic" id="commentTopic" value="" /></div>
+   	<div><label for="commentText">{$locale->pr("comment_text")}</label><textarea rows="10" cols="30" name="commentText" id="commentText"></textarea></div>
+   	<div><label for="userName">{$locale->pr("comment_username")}</label><input type="text" name="userName" id="userName" value="" /></div>
+   	<div><label for="userEmail">Email</label><input type="text" name="userEmail" id="userEmail" value="" /></div>
+   	<div><label for="userUrl">Web</label><input type="text" name="userUrl" id="userUrl" value="" /></div>
+   	<div id="Submit"><input id="Add" type="submit" value="{$locale->pr("comment_send")}" name="Add" />
+   	<input type="hidden" name="op" value="AddComment" />
+   	<input type="hidden" name="articleId" value="{$post->getId()}" />
+   	<input type="hidden" name="blogId" value="{$blog->getId()}" />
+   	<input type="hidden" name="parentId" value="{$parentId}" /></div>
+	</fieldset>
+  	</form>
+  	
+</div>


Property changes on: templates/trunk/standard_new/commentform.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_new/error.template
===================================================================
--- templates/trunk/standard_new/error.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_new/error.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,4 @@
+		{include file="$blogtemplate/header.template"} 
+ 	<h2>{$locale->tr("error")}</h2>
+ 		<div class="Post">{$locale->tr($message)}</div>
+		{include file="$blogtemplate/footer.template"} 


Property changes on: templates/trunk/standard_new/error.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_new/favicon.ico
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_new/favicon.ico
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_new/footer.template
===================================================================
--- templates/trunk/standard_new/footer.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_new/footer.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,109 @@
+<div class="pager">
+ {include file="$misctemplatepath/pager.template" style="links"}
+</div>
+</div>
+
+
+<div id="Menu">
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{if $blogOwner->hasPicture()}
+  {assign var=picture value=$blogOwner->getPicture()}
+  <img id="UserPicture" src="{$url->resourceDownloadLink($picture)}" alt="{$blogOwner->getUsername()}" />
+{/if}
+
+
+  {assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+  {if $AboutMyself}
+  <h2>{$locale->tr("about_myself")}</h2>
+  <p>{$AboutMyself}</p>
+  {/if}
+  
+
+
+
+
+  	<h2>{$locale->tr("menu")}</h2>
+    	<div id="Sections">
+    	<ul>
+    	<li><a title="{$locale->tr("main")}" href="{$url->blogLink()}">{$locale->tr("main")}</a></li>
+    	<li><a title="{$locale->tr("archives")}" href="{$url->templatePage("archives")}">{$locale->tr("archives")}</a></li>
+    	<li><a title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
+    	</ul>
+    	</div>
+    	
+    	<h2>{$locale->tr("search")}</h2>
+	<div id="Search">
+	<form id="search_form" method="post" action="{$url->getIndexUrl()}">
+	<fieldset>
+	<label for="searchTerms"><input type="text" id="searchTerms" name="searchTerms" value="" /></label>
+	<input type="submit" name="Search" value="{$locale->tr("search_s")}" class="button" />
+	<input type="hidden" name="op" value="Search" />
+	<input type="hidden" name="blogId" value="{$blog->getId()}" />   
+	</fieldset>
+	</form>
+	</div> 
+
+  	<h2>{$locale->tr("recently")}</h2>
+    	<div id="Recently">
+    	<ul>
+    		{foreach from=$recentposts item=post}
+        <li><a title="{$post->getTopic()}" href="{$url->postLink($post)}">{$post->getTopic()}</a></li>
+    		{/foreach}
+    	</ul>
+   	</div>
+    
+ 	<h2>{$locale->tr("categories")}</h2>
+    	<div id="Categories">
+    	<ul>
+    		{foreach from=$articlecategories item=articleCategory}
+    	<li><a title="{$articleCategory->getName()}" href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} <abbr title="{$articleCategory->getNumArticles()} {$locale->tr("posts")}">[{$articleCategory->getNumArticles()}]</abbr></a></li>
+   		{/foreach}
+  	</ul>
+  	</div>
+  	
+  	
+    	 {foreach name=mylinkscategories from=$mylinkscategories item=panel_linkcategory}
+{if $smarty.foreach.mylinkscategories.first}
+   
+  	<h2>{$locale->tr("my_links")}</h2> 
+<div id="Links">
+
+  		{foreach from=$mylinkscategories item=linkcategory}
+    	<h3>{$linkcategory->getName()}</h3>
+   	<ul>
+  		{foreach from=$linkcategory->getLinks() item=link}
+  	<li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a></li>
+    		{/foreach}
+  	</ul>
+  		{/foreach}
+  	</div>
+  	{/if}
+    	{/foreach}
+  	  
+  	<h2>{$locale->tr("syndicate")}</h2>
+    	<div id="Syndicate">
+    	<ul>
+    	<li><a title="RSS 0.90" href="{$url->rssLink("rss090")}">RSS 0.90</a></li>
+    	<li><a title="RSS 1.0" href="{$url->rssLink("rss10")}">RSS 1.0</a></li>
+    	<li><a title="RSS 2.0" href="{$url->rssLink("rss20")}">RSS 2.0</a></li>
+    	<li><a title="XML" href="{$url->rssLink("xml")}">XML</a></li>
+    	</ul>
+    	</div>
+    	
+    	
+
+ 
+</div>
+
+<div class="clearer">&nbsp;</div> 
+
+</div>
+
+
+
+<!-- Please leave the credit intact. Thank you. -->
+<div id="Bottom">Powered by <a href="http://www.lifetype.net">Life Type</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a> - <a href="http://www.w3.org/WAI/">Accessible</a> and Valid <a href="http://validator.w3.org/check/referer">XHTML 1.0 Strict</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></div>
+
+
+</body>
+</html>


Property changes on: templates/trunk/standard_new/footer.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_new/header.template
===================================================================
--- templates/trunk/standard_new/header.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_new/header.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,28 @@
+<!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>{$blog->getBlog()}{$postPageTitle}</title>
+  <meta http-equiv="content-type" content="text/html; charset={$locale->getCharset()}" />
+ <meta name="generator" content="{$version}" />
+ <meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
+ <link rel="stylesheet" type="text/css" title="Style" href="{$url->getTemplateFile("style.css")}" />
+  <!--[if IE ]>
+<link rel="stylesheet" type="text/css" title="Style" href="{$url->getTemplateFile("style-ie.css")}" />
+<![endif] -->
+ <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")}" />  
+ </head>
+  <body> 
+
+<div id="Admin"><a href="/admin.php">Administrar</a></div>
+
+<div id="Container">
+
+<div id="Content">
+
+<div id="Title"><h1><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1></div>
+  
+<p id="Subtitle">{$blog->getAbout()}</p>


Property changes on: templates/trunk/standard_new/header.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_new/imgs/blockquote.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_new/imgs/blockquote.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_new/imgs/category.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_new/imgs/category.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_new/imgs/comment.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_new/imgs/comment.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_new/imgs/compressed.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_new/imgs/compressed.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_new/imgs/file.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_new/imgs/file.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_new/imgs/folder.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_new/imgs/folder.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_new/imgs/next.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_new/imgs/next.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_new/imgs/parentfolder.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_new/imgs/parentfolder.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_new/imgs/permalink.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_new/imgs/permalink.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_new/imgs/previous.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_new/imgs/previous.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_new/imgs/sound.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_new/imgs/sound.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_new/imgs/trackback.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_new/imgs/trackback.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_new/imgs/video.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_new/imgs/video.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_new/linktracker.template
===================================================================
--- templates/trunk/standard_new/linktracker.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_new/linktracker.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,13 @@
+		{include file="$blogtemplate/header.template"} 
+ 
+ <h2>{$locale->tr("link_tracker_results")}</h2>
+ <div>
+ 		{foreach from=$links item=link}
+ 	<ul>
+ 	<li>
+  	<a target="_blank" href="{$link->getUrl()}">{$link->getUrl()}</a></li>
+  	</ul>
+ 		{/foreach}
+</div>
+
+		{include file="$blogtemplate/footer.template"} 


Property changes on: templates/trunk/standard_new/linktracker.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_new/main.template
===================================================================
--- templates/trunk/standard_new/main.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_new/main.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,27 @@
+		{assign var="OnMainPage" value=1}
+		{include file="$blogtemplate/header.template"} 
+		
+{if $category}<h2 class="category">{$locale->tr("category")}: {$category->getName()}</h2>{/if} 
+ 
+{foreach from=$posts item=post}
+{if $showAll | 1 && $category}
+  <!-- showing only the topic of the post, in case we have too many! -->
+<h3 class="truncate"><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h3>
+<div class="Post">
+{$post->getText()|strip_tags|truncate:300:"...":false}
+</div>
+
+<p class="footer">
+{foreach name=categories from=$post->getCategories() item=postCategory}
+    <a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+  {/foreach}
+</p>
+{else}
+  <!-- show the whole post, as we would normally do -->
+   {include file="$blogtemplate/post.template"}
+{/if}
+{/foreach}
+
+
+		
+		{include file="$blogtemplate/footer.template"} 
\ No newline at end of file


Property changes on: templates/trunk/standard_new/main.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_new/post.template
===================================================================
--- templates/trunk/standard_new/post.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_new/post.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,29 @@
+<h2>{$post->getTopic()}</h2>
+		{assign var="postDate" value=$post->getDateObject()}
+		{assign var="postOwner" value=$post->getUserInfo()}
+<p class="date">{$postOwner->getUsername()} | {$locale->formatDate($postDate,"%d %B, %Y %H:%M")}</p>
+
+<div class="Post">
+{$post->getText()}
+</div>
+
+{if $OnMainPage}
+
+<p class="footer">
+<img src="{$url->getTemplateFile("imgs/category.gif")}" alt="" />{foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->categoryLink($postCategory)}" title="{$locale->tr("category")}: {$postCategory->getName()}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach} | 
+<img src="{$url->getTemplateFile("imgs/permalink.gif")}" alt="" /><a title="{$locale->tr("permalink_title")} -> {$post->getTopic()}" href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> | 
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $post->getTotalComments() > 0 }<img src="{$url->getTemplateFile("imgs/comment.gif")}" alt="" /><a href="{$url->postPermalink($post)}#comments" title="{$locale->tr("comments")|capitalize} -> {$post->getTopic()}">{if $post->getTotalComments() == 0 }{$locale->tr("add_comment")}{else if}{$locale->tr("comments")|capitalize} ({$post->getTotalComments()}){/if}</a> | {/if} 
+<img src="{$url->getTemplateFile("imgs/trackback.gif")}" alt="" />{if $post->getNumTrackbacks() > 0}<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")} -> {$post->getTopic()}">{$locale->tr("trackbacks")} ({$post->getTotalTrackbacks()})</a>{else}{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()}){/if}
+</p>
+
+{else}
+
+<p class="footer">
+<img src="{$url->getTemplateFile("imgs/category.gif")}" alt="" />{foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->categoryLink($postCategory)}" title="{$locale->tr("category")}: {$postCategory->getName()}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach} | 
+{assign var=nextpost value=$post->getNextArticle()}{if $nextpost == true}<img src="{$url->getTemplateFile("imgs/next.gif")}" alt="" /><a href="{$url->postPermalink($nextpost)}" title="{$locale->tr("next_post")}: {$nextpost->getTopic()}">{$locale->tr("next_post")}</a> | {/if}
+{assign var=prevpost value=$post->getPrevArticle()}{if $prevpost == true}<img src="{$url->getTemplateFile("imgs/previous.gif")}" alt="" /><a href="{$url->postPermalink($prevpost)}" title="{$locale->tr("previous_post")}: {$prevpost->getTopic()}">{$locale->tr("previous_post")}</a> | {/if} 
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $post->getTotalComments() > 0 }<img src="{$url->getTemplateFile("imgs/comment.gif")}" alt="" />{$locale->tr("comments")|capitalize} ({$post->getTotalComments()}) | {/if}
+<img src="{$url->getTemplateFile("imgs/trackback.gif")}" alt="" />{if $post->getNumTrackbacks() > 0}<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")} -> {$post->getTopic()}">{$locale->tr("trackbacks")} ({$post->getTotalTrackbacks()})</a>{else}{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()}){/if}
+</p>
+
+{/if}


Property changes on: templates/trunk/standard_new/post.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_new/postandcomments.template
===================================================================
--- templates/trunk/standard_new/postandcomments.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_new/postandcomments.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,33 @@
+		{assign var="postPageTitle" value=$post->getTopic()}
+		{assign var="postPageTitle" value=" | $postPageTitle"}
+		{include file="$blogtemplate/header.template"} 
+  
+
+   
+   		{assign var="poster" value=$post->getUserInfo()}
+   		<!-- {$url->postTrackbackLink($post)} -->
+   		
+   		{include file="$blogtemplate/post.template"}
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $comments }<h2 class="comments">{$locale->tr("comments")}</h2>{/if}	
+{if $comments}<ol id="comments">
+   		{foreach from=$comments item=comment}
+
+
+<li><div class="commentheader">{if $comment->getTopic() != null} {$comment->getTopic()|strip_tags}{else}Re: <em>{$post->getTopic()|strip_tags}</em>{/if}</div>
+<div class="commenttext">{$comment->getText()}</div>
+<div class="commentposterinfo">
+		{assign var="postDate" value=$comment->getTimestamp()}
+		{if $comment->getUserUrl() != ""}<a href="{$comment->getUserUrl()}">{$comment->getUsername()}</a>
+		{else}
+			{$comment->getUsername()}
+		{/if} | {$locale->formatDate($postDate, "%d/%m/%Y, %H:%M")}
+</div>
+</li>
+  		{/foreach}
+</ol>
+{/if}
+		{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
+		{include file="$blogtemplate/commentform.template"}
+		{/if}
+				
+		{include file="$blogtemplate/footer.template"} 


Property changes on: templates/trunk/standard_new/postandcomments.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_new/posttrackbacks.template
===================================================================
--- templates/trunk/standard_new/posttrackbacks.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_new/posttrackbacks.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,25 @@
+		{include file="$blogtemplate/header.template"} 
+
+
+<h2>{$locale->tr("trackbacks")}</h2>
+
+<div id="trackbacks_container">
+		
+<h3>{$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>":</h3>
+
+		{foreach from=$trackbacks item=trackback}
+<h4><a href="{$trackback->getUrl()}">{$trackback->getTitle()}</a></h4>
+
+<dl>
+<dt>{$locale->tr("trackback_excerpt")}:</dt>
+<dd>{$trackback->getExcerpt()}</dd>
+<dt>{$locale->tr("trackback_weblog")}:</dt>
+<dd>{$trackback->getBlogName()}</dd>
+   		{assign var="trackbackDate" value=$trackback->getDateObject()}
+<dt>{$locale->tr("date")}:</dt>
+<dd>{$locale->formatDate($trackbackDate, "%d/%m/%Y %H:%M")}</dd>
+</dl>
+  		{/foreach}
+</div>
+
+{include file="$blogtemplate/footer.template"} 


Property changes on: templates/trunk/standard_new/posttrackbacks.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_new/resource.template
===================================================================
--- templates/trunk/standard_new/resource.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_new/resource.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,71 @@
+		{include file="$blogtemplate/header.template"} 
+
+<h2>{$locale->tr("albums")}</h2>
+
+		{assign var=metadata value=$resource->getMetadataReader()}
+		{assign var=updated value=$resource->getTimestamp()}
+<div id="album">
+	<h3>{$resource->getFileName()}</h3>
+
+	<div id="Resource-Desc">
+    	<a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a> 
+    	({$metadata->getRoundedSize()}) | {$locale->tr("created")} {$locale->formatDate($updated,"%d %b, %Y")}</div>
+ 
+ 	<div id="Resource">    
+  	<p>{$resource->getDescription()}</p>
+  		{if $resource->isImage()}
+   	<img src="{$url->resourceDownloadLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
+  
+  		{else}
+     	<a href="{$url->resourceDownloadLink($resource)}">
+   		{* show some information about the file *}
+   
+   		{if $resource->isSound()}
+     	<img alt="Sound" src="{$url->getTemplateFile("sound.gif")}" /></a>
+     	<p>{$resource->getFileName()}</p>
+     	<p>{$locale->tr("format")}: {$metadata->getFormat()|upper}</p>
+     	<p>{$locale->tr("length")}: {$metadata->getLengthString()}</p>
+     	<p>{$locale->tr("sample_rate")}: {$metadata->getSampleRate()} Khz</p>
+   
+   		{elseif $resource->isVideo()}
+     	<img alt="Sound" src="{$url->getTemplateFile("video.gif")}" /></a>
+     	<p>{$resource->getFileName()}</p>
+     	<p>{$locale->tr("format")}: {$metadata->getFormat()|upper}</p>
+    	<p>{$locale->tr("size")}: {$metadata->getHeight()} x {$metadata->getWidth()}</p>
+    	<p>{$locale->tr("length")}: {$metadata->getLengthString()}</p>
+    	<p>{$locale->tr("video_codec")}: {$metadata->getVideoCodec()}</p>
+    	<p>{$locale->tr("audio_codec")}: {$metadata->getAudioCodec()}</p>
+   
+   		{elseif $resource->isZip()}
+     	<img alt="Zip" src="{$url->getTemplateFile("compressed.gif")}" /></a>
+     	<p>{$resource->getFileName()}</p> 
+    	<p>{$metadata->getTotalFiles()} {$locale->tr("files")}</p>
+    	<p>{$locale->tr("uncompressed_size")}: {$metadata->getRoundedUncompressedSize()}</p>
+   
+   		{else}
+     	<img alt="File" src="{$url->getTemplateFile("file.gif")}" /></a>
+     	<p>{$resource->getFileName()}</p>
+         
+   		{/if}   
+  		{/if}
+ 	</div>
+ 
+ 
+		{assign var=album value=$resource->getAlbum()} 
+	<p><a href="{$url->albumLink($album)}">{$locale->tr("parent_album")}</a></p>
+
+</div>
+
+</div>
+
+
+<div class="clearer">&nbsp;</div> 
+
+</div>
+
+<!-- Please leave the credit intact. Thank you. -->
+<div id="Bottom">Powered by <a href="http://www.plogworld.org">pLog</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a> - <a href="http://www.w3.org/WAI/">Accessible</a> and Valid <a href="http://validator.w3.org/check/referer">XHTML 1.0 Strict</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></div>
+
+</div>
+</body>
+</html>
\ No newline at end of file


Property changes on: templates/trunk/standard_new/resource.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_new/screenshot.jpg
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_new/screenshot.jpg
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_new/searchresults.template
===================================================================
--- templates/trunk/standard_new/searchresults.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_new/searchresults.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,22 @@
+{include file="$blogtemplate/header.template"} 
+   <div id="SearchResults">
+   <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+       {foreach from=$searchresults item=result}
+    
+    
+      {assign var=article value=$result->getArticle()}
+      <h3><a href="{$url->postPermalink($article)}">{$article->getTopic()}</a></h3>
+      <p class="searchArticle">
+      {$article->getText()|strip_tags|truncate:300:"...":false}
+      </p>
+      <p class="footer">
+		{foreach name=categories from=$article->getCategories() 
+				 item=postCategory}
+          <a href="{$url->categoryLink($postCategory)}">
+			 {$postCategory->getName()}</a>{if 
+				!$smarty.foreach.categories.last}, {/if}
+        {/foreach}
+      </p>
+    {/foreach}
+   </div> 
+{include file="$blogtemplate/footer.template"} 


Property changes on: templates/trunk/standard_new/searchresults.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_new/style-ie.css
===================================================================
--- templates/trunk/standard_new/style-ie.css	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_new/style-ie.css	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,3 @@
+#Content {
+	word-wrap: break-word;
+	}
\ No newline at end of file


Property changes on: templates/trunk/standard_new/style-ie.css
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_new/style.css
===================================================================
--- templates/trunk/standard_new/style.css	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_new/style.css	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,521 @@
+/* ****************** General  *************** */
+
+a:link {
+	color			: #034A81;
+	}
+
+a:visited {
+	color			: #A31418;
+	}
+	
+a:hover, a:active, a:hover {
+	text-decoration		: none;
+	border-bottom		: solid 2px;
+	}
+
+abbr, acronym {
+	cursor			: help;
+  	border			: none;
+	}
+
+html, #Bottom, #Admin { 
+	background		: #000; 
+	} 
+
+#Admin a {
+	color			: #fff;
+	} 
+
+#Admin { 
+	text-align		: right; 
+	font-size		: small;
+	padding			: 0.3em 15px;
+	} 
+
+body {
+	margin			: 0; 
+	padding			: 0;
+	font			: small 'lucida sans unicode', arial, times new roman, sans-serif;
+	color			: #000;
+	background		: #fff;
+	}
+	
+.clearer {
+	clear 			: both;
+	height			: 0px;
+	font-size			: 0px;
+	line-height		: 0px;
+	}
+      
+#Container {
+	width			: 100%;
+	text-align		: left;
+	background-color	: #fff;
+	padding-bottom		: 10px;
+	padding-top		: 10px;
+	}
+	
+	
+/* ******************  column a  *************** */
+	
+#Content {
+	width			: 56%;
+	float			: left;
+	margin-right		: 20px;
+	margin-left		: 20px;
+	background		: #F4F2E6;
+	word-wrap		: break-word;
+	overflow		: hidden;
+	}
+	
+h1 {
+   	margin			: 0;
+   	padding			: 1em 0 0.2em 0;
+	background-color	: #fff; 
+  	} 
+
+h1 a {
+	text-decoration		: none;
+	color			: #000 !important;
+	border-bottom		: solid 0px !important;
+	font-size		: xx-large;
+	}
+
+#Subtitle {
+	color			: #000;
+	font-size		: large;
+	margin			: 0;
+	border-bottom		: solid 20px #fff;
+	background-color	: #fff;
+	}
+
+
+#Content h2 {
+	margin			: 0;
+	padding			: 10px;
+	color			: #A31418;
+	}
+	
+
+	
+#SearchResults h3 {
+	margin			: 0;
+	padding			: 10px;	
+	}
+	
+#SearchResults p {
+	margin			: 0;
+	padding			: 10px;
+	}
+	
+#Content h2.category, #SearchResults h2 {
+	border-bottom		: 10px solid #fff;
+	background-color	: #fff;
+	padding			: 0.4em 0 0.3em 0;
+	margin			: 0;
+	color			: #85826F;
+	}
+	
+h3.truncate {
+	margin			: 0;
+	padding			: 10px;	
+	}
+	
+.pager {
+	background-color	: #fff;
+	}
+	
+.date {
+	font-weight		: bold;	
+	margin			: 10px 10px 1em 10px;
+	padding			: 0;
+	}
+	
+.Post { 
+	padding			: 0 10px 0 10px;
+	line-height		: 1.5em;
+	text-align		: justify;
+	}
+	
+.Post p { 
+	line-height		: 1.5em;
+	text-align		: justify;
+	padding			: 0;
+	margin			: 1em 0 1em 0;
+	}
+
+.Post img {
+	padding-top		: 1.2em;
+	}
+	
+br { 
+	line-height		: 0em;
+	font-size		: 0;
+	}
+
+p.footer {
+	border-bottom		: solid #fff 1em;
+	margin			: 1em 0 0 0;
+	padding			: 0 10px 10px 10px;
+	text-align		: left;
+	font-size:90%;
+	}
+	
+p.footer img {
+	margin-right		: 3px;
+	vertical-align		: middle;
+	}
+	
+p#Nextpost {
+	text-align		: center;
+	margin			: 0;
+	padding			: 0.5em 10px 0px 10px;
+	background		: #fff;
+	}
+	
+#Content h2.comments {
+	color			: #85826F;
+	text-transform		: capitalize;
+	background		: #fff;
+	margin-bottom		: 0;
+	padding-bottom		: 0.4em;
+	}
+	
+ol#comments {
+	background		: #F4F2E6;
+	margin-top		: 0;
+	margin-bottom		: 0;
+	}
+	
+ol#comments li {
+	margin			: 10px 10px 10px 0;
+	padding			: 10px;	
+	list-style-type		: decimal-leading-zero;
+	background		: #fff;
+	color			: #85826F;
+	font-weight		: bold;	
+	}
+	
+div.commentheader {
+	font-size		: small;	
+	line-height		: 1.5em;
+	padding			: 0 0 1em 0;
+	color			: #000;	
+	overflow		: hidden;
+	}
+	
+.commenttext p {
+	line-height		: 1.5em;
+	padding			: 0;
+	margin			: 0 0 1em 0;
+	color			: #000;	
+	font-weight		: normal;	
+	overflow		: hidden;
+	}
+	
+div.commenttext {
+	line-height		: 1.5em;
+	margin			: 0;
+	color			: #000;	
+	font-weight		: normal;
+	}
+	
+.commentposterinfo {
+	margin			: 1em 0 0 0;
+	line-height		: 1.5em;
+	color			: #85826F;
+	font-weight		: normal;	
+	}
+
+#CommentForm {
+	background		: #fff;
+	border-bottom		: 10px solid #fff;
+	border-top		: 10px solid #fff;
+	}
+	
+form#NewComment {
+	margin			: 0;
+	padding			: 0;
+	}
+	
+#CommentForm fieldset {
+	border			: 2px solid #F4F2E6; 
+	padding-left		: 10px; 
+	margin-top		: 0px;
+	padding-top		: 0px;
+	}
+
+#CommentForm legend {
+	padding			: 2px 4px 2px 4px;
+	background-color	: #ffffff;
+	font-weight		: bold;
+	}
+
+#CommentForm label {
+	width			: 6em;
+	float			: left;
+	display			: block;
+	clear			: both; 
+	float			: left;
+	margin-top		: 8px;
+	margin-bottom		: 0px;
+	}
+	
+#CommentForm input {
+	margin-top		: 8px;
+	margin-bottom		: 8px;
+	}
+	
+#Submit {
+	margin-top		: 8px;
+	margin-bottom		: 8px;
+	margin-left		: 6em;
+	}
+	
+#CommentForm textarea {
+	margin-top		: 8px;
+	margin-bottom		: 0px;
+	}
+	
+/* ******************  column b  *************** */
+	
+#Menu   {
+	width			: 28%;
+	float			: left;
+	text-align		: left;
+	border-left		: solid #000 0.3em;
+	padding-left		: 15px;
+	}
+	
+#Calendar, #Search {
+	width			: 86%;
+	margin			: 0 0 1.2em 0;
+	}
+
+#UserPicture {
+	margin			: 0 0 1.2em 0;
+	display			: block;
+	}
+	
+#Search fieldset {
+	border			: 0px solid;
+	padding			: 2px; margin:2px;
+	}
+	
+#Search input {
+	margin			: 0px;
+	padding			: 2px;
+	width			: 7em;
+	}
+	
+#Search input.button {
+	margin			: 0px;
+	padding			: 2px;
+	width			: 5em;
+	}
+	
+#Search form {
+	margin			: 0px;
+	padding			: 2px;
+	}
+	
+#Search label {
+	margin			: 0px;
+	padding			: 2px;
+	width			: 8em;
+	}
+
+table.calMonth {
+	width			: 11em;
+	border-spacing		: 4px;
+	border			: 0px;
+	}
+
+th.calMonthCurrent {
+	font-weight		: normal;
+	padding			: 0px;
+	text-align		: center;
+	}
+	
+th.calMonthBackward {
+	font-weight		: normal;
+	padding			: 0px;
+	text-align		: center;
+	}
+	
+th.calMonthForward {
+	font-weight		: normal;
+	padding			: 0px;
+	text-align		: center;
+	}
+	
+.calMonthHeader th {
+	text-align		: center;
+	font-weight		: normal;
+	padding			: 0px;
+	}
+	
+#Calendar td {	
+	padding			: 0px;
+	text-align		: center
+	}
+
+.calendarToday {
+ 	background-color	: #F4F2E6;
+	}	
+
+#Menu h2 {
+  	font-size		: small;
+  	width			: 86%;
+  	margin-top		: 0;
+  	margin-bottom		: 0;  	
+	text-transform		: capitalize;
+	}
+	
+#Menu h3 {
+  	font-size		: small;
+  	width			: 86%;
+  	margin-bottom		: 0;
+  	font-weight		: normal;
+	}
+
+#Categories ul, #Syndicate ul, #Recently ul, #Sections ul, #Links ul {
+	font-size		: small;
+	line-height		: 1.5em;
+	margin-top		: 0.5em;
+	margin-bottom		: 1.5em;
+	}
+	
+#Syndicate ul, #Sections ul {
+	text-transform		: capitalize;
+	}
+
+
+/* ******************  footer  *************** */
+
+#Bottom {
+   	color			: #fff;
+   	padding			: 3px 3px 6px 15px;
+   	clear			: both;
+   } 
+	
+#Bottom a {
+	color			: #fff;
+	}
+
+
+/* ******************  links  *************** */
+
+div#Links {
+	margin			: 0 0 0 1em;
+  	}
+  
+  	
+/* ******************  albums  *************** */
+
+div#album, div#albums {
+	margin			: 0 10px;
+  	}
+
+div.album {
+	text-align		: center;
+        float			: left;
+        width			: 150px;
+        margin-bottom		: 20px;
+        margin-right:5px;
+  	}
+
+.album p {
+   	text-align		: center;
+   	padding			: 0;
+   	margin			: 0;
+   	width			: 150px;
+   	overflow		: hidden;
+   	}
+   
+a img {
+	border			: none;
+	}
+
+#album a {
+	border-bottom		: solid 0px;
+	}
+
+
+/* ******************  trakbacks  *************** */
+
+
+#trackbacks_container {
+	padding			: 0 10px 10px 10px;
+	}
+
+#trackbacks_container h4 {
+	margin			: 1em 0 0 0;
+	padding			: 0;
+	font-size		: small;
+	}
+	
+#trackbacks_container dl {	
+	margin			: 0;
+	padding			: 0;
+	}
+	
+#trackbacks_container dt {
+	font-weight		: bold;
+	float			: left;
+	}
+	
+#trackbacks_container dd {
+	padding-left		: 4em;
+	}
+	
+blockquote {
+	background		: url('blockquote.gif') no-repeat; 
+	padding			: 10px 10px 2px 41px;
+	border			: dotted #85826F 2px; 
+	}
+	
+	
+/* ******************  to align elements  *************** */
+
+.left {
+	text-align		: left;
+	display			: block;
+	}
+
+.right {
+	text-align		: right;
+	display			: block;
+	}
+
+.center {
+	text-align		: center;
+	display			: block;
+	}
+
+
+/* ******************  to float elements  *************** */
+
+.floatleft {
+	float			: left;
+	padding			: 1.2em 1em 1em 0px
+	}
+	
+.floatright {
+	float			: right;
+	padding			: 1.2em 0px 1em 1em;
+	}
+
+
+/* ******************  to highlight text  *************** */
+.bold {
+	font-weight		: bold;
+	}
+	
+.italic {
+	font-style		: italic;
+	}
+
+.underline {
+	text-decoration		: underline;
+	}
\ No newline at end of file


Property changes on: templates/trunk/standard_new/style.css
___________________________________________________________________
Name: svn:executable
   + *

Modified: templates/trunk/standard_red/album.template
===================================================================
--- templates/trunk/standard_red/album.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_red/album.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -17,9 +17,10 @@
     	<p>{$locale->tr("parent")}</p>
 	</div>
 
-   		{assign var="counter" value=1}
-   		{assign var=children value=$album->getChildren()}
-   		{foreach from=$children item=childalbum}
+  {if $pager->getCurrentPage() == 1}
+	{assign var="counter" value=1}
+   	{assign var=children value=$album->getChildren()}
+   	{foreach from=$children item=childalbum}
 	<div class="album">
    	<a href="{$url->albumLink($childalbum)}">
    	<img src="{$url->getTemplateFile("imgs/folder.gif")}" alt="{$childalbum->getName()}" /></a>
@@ -28,12 +29,15 @@
    		{if $counter%3 == 0}
    		{/if}
 	</div>
-   		{/foreach}
+   	{/foreach}
+  {/if}
  
 <!-- show the resources here -->
 
-   		
-   		{foreach from=$resources item=resource}
+ {** assign var=resources value=$album->getResources() **}
+ {** use the code above if you want to display all the resources at once, or leave it commented **}
+ {** if you would like to use the new paged display that was introduced in lifetype 1.1 **} 
+ {foreach from=$resources item=resource}
 	<div class="album">
    		{if $resource->hasPreview()}
    		{*<a target="_blank" href="resserver.php?blogId={$blog->getId()}&amp;resource={$resource->getFileName()}">*}
@@ -47,7 +51,7 @@
    		{elseif $resource->isVideo()}
     	<img alt="Video" src="{$url->getTemplateFile("imgs/video.gif")}" /></a>
    		{elseif $resource->isZip()}
-    	<img alt="Zip" src="{$url->getTemplateFile("imgs/compressed.gif")}" /></a>  
+    	<img alt="Zip" src="{$url->getTemplateFile("imgs/compressed.gif")}" /></a>
    		{else}
    	<img alt="File" src="{$url->getTemplateFile("imgs/file.gif")}" /></a>
    		{/if}  
@@ -69,7 +73,7 @@
    		{/if}
   	</div>
   		{/foreach}
-	 <div class="Pages">{include file="misc/pager.template" style="links"}</div>  
+
 	<div class="clearer">&nbsp;</div>
 
 </div>

Modified: templates/trunk/standard_red/commentarticle.template
===================================================================
--- templates/trunk/standard_red/commentarticle.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_red/commentarticle.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,5 +1,5 @@
-		{include file="$blogtemplate/header.template"}
+		{include file="$blogtemplate/header.template"} 
 		
 		{include file="$blogtemplate/commentform.template"}
 		
-		{include file="$blogtemplate/footer.template"}
+		{include file="$blogtemplate/footer.template"} 

Modified: templates/trunk/standard_red/commentform.template
===================================================================
--- templates/trunk/standard_red/commentform.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_red/commentform.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,19 +1,24 @@
-<div id="CommentForm">
-  
-	<form id="NewComment" action="{$url->getIndexUrl()}" method="post">
-	<fieldset>
- 	<legend>{$locale->tr("add_comment")}</legend>
-   	<div><label for="commentTopic">{$locale->pr("comment_topic")}</label><input type="text" name="commentTopic" id="commentTopic" value="" /></div>
-   	<div><label for="commentText">{$locale->pr("comment_text")}</label><textarea rows="10" cols="30" name="commentText" id="commentText"></textarea></div>
-   	<div><label for="userName">{$locale->pr("comment_username")}</label><input type="text" name="userName" id="userName" value="" /></div>
-   	<div><label for="userEmail">Email</label><input type="text" name="userEmail" id="userEmail" value="" /></div>
-   	<div><label for="userUrl">Web</label><input type="text" name="userUrl" id="userUrl" value="" /></div>
-   	<div id="Submit"><input id="Add" type="submit" value="{$locale->pr("comment_send")}" name="Add" />
-   	<input type="hidden" name="op" value="AddComment" />
-   	<input type="hidden" name="articleId" value="{$post->getId()}" />
-   	<input type="hidden" name="blogId" value="{$blog->getId()}" />
-   	<input type="hidden" name="parentId" value="{$parentId}" /></div>
-	</fieldset>
-  	</form>
-  	
-</div>
+<div id="CommentForm">
+
+<form id="NewComment" action="{$url->getIndexUrl()}" method="post">
+<fieldset>
+<legend>{$locale->tr("add_comment")}</legend>
+<div><label for="commentTopic">{$locale->pr("comment_topic")}</label><input type="text" name="commentTopic" id="commentTopic" value="{$topic}" /></div>
+<div><label for="commentText">{$locale->pr("comment_text")}</label><textarea rows="10" cols="30" name="commentText" id="commentText"></textarea></div>
+<div><label for="userName">{$locale->pr("comment_username")}</label><input type="text" name="userName" id="userName" value="" /></div>
+<div><label for="userEmail">Email</label><input type="text" name="userEmail" id="userEmail" value="" /></div>
+<div><label for="userUrl">Web</label><input type="text" name="userUrl" id="userUrl" value="" /></div>
+{if $authimage}{if $authimage->isEnabled()}
+<div><label for="authImage">Please type the 6-digit code you can see here:</label><br/>
+<input type="text" name="authImage" id="authImage" value="" />&nbsp;{$authimage->show()}</div>
+{/if}{/if}
+
+<div id="Submit"><input id="Add" type="submit" value="{$locale->pr("comment_send")}" name="Add" />
+<input type="hidden" name="op" value="AddComment" />
+<input type="hidden" name="articleId" value="{$post->getId()}" />
+<input type="hidden" name="blogId" value="{$blog->getId()}" />
+<input type="hidden" name="parentId" value="{$parentId}" /></div>
+</fieldset>
+</form>
+
+</div>
\ No newline at end of file

Added: templates/trunk/standard_red/favicon.ico
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_red/favicon.ico
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Modified: templates/trunk/standard_red/footer.template
===================================================================
--- templates/trunk/standard_red/footer.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_red/footer.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,34 +1,58 @@
+<div class="pager">
+ {include file="$misctemplatepath/pager.template" style="links"}
 </div>
 
+</div>
+
 <div id="Menu">
-  	
+
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}
+  
+  	<h2>{$locale->tr("about_myself")}</h2>
+  	<div id="AboutMyself">
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	<img id="UserPicture" src="{$url->resourcePreviewLink($picture)}" alt="{$blogOwner->getUsername()}" />
+  	<p>{$AboutMyself}</p>
+  	<div class="clearer">&nbsp;</div>
+  	</div>
+{/if}
+
+
   	<h2>{$locale->tr("menu")}</h2>
     	<div id="Sections">
     	<ul>
     	<li><a title="{$locale->tr("main")}" href="{$url->blogLink()}">{$locale->tr("main")}</a></li>
     	<li><a title="{$locale->tr("archives")}" href="{$url->templatePage("archives")}">{$locale->tr("archives")}</a></li>
     	<li><a title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
-    	<li><a title="{$locale->tr("links")}" href="{$url->templatePage("links")}">{$locale->tr("links")}</a></li>
+    	
+    	 {foreach name=mylinkscategories from=$mylinkscategories item=panel_linkcategory}
+{if $smarty.foreach.mylinkscategories.first}
+   
+<li><a title="{$locale->tr("links")}" href="{$url->templatePage("links")}">{$locale->tr("links")}</a></li>{/if}
+    	{/foreach}
     	</ul>
     	</div>
-
+    	
+    	<h2>{$locale->tr("search")}</h2>
+	<div id="Search">
+	<form id="search_form" method="post" action="{$url->getIndexUrl()}">
+	<fieldset>
+	<label for="searchTerms"><input type="text" id="searchTerms" name="searchTerms" value="" /></label>
+	<input type="submit" name="Search" value="{$locale->tr("search_s")}" class="button" />
+	<input type="hidden" name="op" value="Search" />
+	<input type="hidden" name="blogId" value="{$blog->getId()}" />   
+	</fieldset>
+	</form>
+	</div> 
+	
 	<h2>{$locale->tr("calendar")}</h2>
     	<div id="Calendar">
     		{$calendar}
-    	</div>
-
-    	<h2>{$locale->tr("search")}</h2>
-	<div id="Search">
-		<form id="search_form" method="post" action="{$url->getIndexUrl()}">
-		<div>
-		<label for="searchTerms" style="display:none;">{$locale->tr("search_this_blog")} </label><input type="text" id="searchTerms" name="searchTerms" value="" />
-		<input type="submit" name="Search" value="{$locale->tr("search_s")}" class="button" />
-		<input type="hidden" name="op" value="Search" />
-		<input type="hidden" name="blogId" value="{$blog->getId()}" />   
-		</div>
-		</form>
-	</div> 
-
+    	</div>	
+  
   	<h2>{$locale->tr("recently")}</h2>
     	<div id="Recently">
     	<ul>
@@ -42,7 +66,7 @@
     	<div id="Categories">
     	<ul>
     		{foreach from=$articlecategories item=articleCategory}
-    	<li><a title="{$articleCategory->getName()}" href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} [{$articleCategory->getNumArticles()}]</a></li>
+    	<li><a title="{$articleCategory->getName()}" href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} <abbr title="{$articleCategory->getNumArticles()} {$locale->tr("posts")}">[{$articleCategory->getNumArticles()}]</abbr></a></li>
    		{/foreach}
   	</ul>
   	</div>
@@ -53,14 +77,15 @@
     	<li><a title="RSS 0.90" href="{$url->rssLink("rss090")}">RSS 0.90</a></li>
     	<li><a title="RSS 1.0" href="{$url->rssLink("rss10")}">RSS 1.0</a></li>
     	<li><a title="RSS 2.0" href="{$url->rssLink("rss20")}">RSS 2.0</a></li>
-    	<li><a title="XML" href="{$url->rssLink("xml")}">XML</a></li>
+    	<li><a title="Atom" href="{$url->rssLink("rss20")}">Atom</a></li>
     	</ul>
     	</div>
- 
 </div>
 
 <div class="clearer">&nbsp;</div> 
 
+
+
 </div>
 
 <div id="Bottommenu"><a href="http://www.w3.org/WAI/">Accessible</a> and Valid <a href="http://validator.w3.org/check/referer">XHTML 1.0 Strict</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></div>
@@ -70,5 +95,6 @@
 <div id="Bottom">Powered by <a href="http://www.lifetype.net">LifeType</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a></div>
 
 </div>
+
 </body>
 </html>

Modified: templates/trunk/standard_red/header.template
===================================================================
--- templates/trunk/standard_red/header.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_red/header.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,18 +1,22 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
  <head>
-  <meta http-equiv="content-type" content="text/html; charset={$locale->getCharset()}" />
-  <title>{$blog->getBlog()}</title>
-  <style type="text/css" media="screen">@import "{$url->getTemplateFile("standard_red.css")}";</style>
+ <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>{$blog->getBlog()}{$postPageTitle}</title>
+ <link rel="stylesheet" type="text/css" title="Style" href="{$url->getTemplateFile("style.css")}" />
+ <!--[if IE ]>
+<link rel="stylesheet" type="text/css" title="Style" href="{$url->getTemplateFile("style-ie.css")}" />
+<![endif] -->
+ <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")}" />  
  </head>
- <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")}" /> 
- <body> 
- 
-<p class="Upgrade">This page looks plain and unstyled because you're using a non-standard compliant browser. To see it in its best form, please <a href="http://www.webstandards.org/upgrade/" title="The Web Standards Project's Browser Upgrade initiative">upgrade</a> to a browser that supports web standards. It's free and painless.</p>
-  
+  <body> 
+
 <div id="Container">
   
 <div id="Title"><h1><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1></div>

Added: templates/trunk/standard_red/imgs/blockquote.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_red/imgs/blockquote.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_red/imgs/category.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_red/imgs/category.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_red/imgs/comment.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_red/imgs/comment.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_red/imgs/comments.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_red/imgs/comments.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_red/imgs/next.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_red/imgs/next.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_red/imgs/permalink.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_red/imgs/permalink.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_red/imgs/previous.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_red/imgs/previous.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_red/imgs/trackback.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_red/imgs/trackback.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Modified: templates/trunk/standard_red/links.template
===================================================================
--- templates/trunk/standard_red/links.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_red/links.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,4 +1,4 @@
-		{include file="$blogtemplate/header.template"}
+		{include file="$blogtemplate/header.template"} 
   
 <div id="Links">
 	<h2>{$locale->tr("my_links")}</h2>
@@ -6,10 +6,12 @@
     	<h3>{$linkcategory->getName()}</h3>
    	<ul>
   		{foreach from=$linkcategory->getLinks() item=link}
-  	<li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a>: {$link->getDescription()}</li>
+  	<li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a>: {$link->getDescription()} {if $link->getRssFeed() != ""}
+      <a href="{$link->getRssFeed()}"><img src="/imgs/rss_logo_small.gif" alt="RSS" /></a>
+    {/if}</li>
     		{/foreach}
   	</ul>
   		{/foreach}
   	</div>
   
-		{include file="$blogtemplate/footer.template"}
\ No newline at end of file
+		{include file="$blogtemplate/footer.template"} 
\ No newline at end of file

Modified: templates/trunk/standard_red/main.template
===================================================================
--- templates/trunk/standard_red/main.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_red/main.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,6 +1,25 @@
-{include file="$blogtemplate/header.template"}
+		{assign var="OnMainPage" value=1}
+		{include file="$blogtemplate/header.template"} 
+		
+{if $category}<h2>{$locale->tr("category")}: {$category->getName()}</h2>{/if} 
+  
 {foreach from=$posts item=post}
-{include file="$blogtemplate/post.template"}
+{if $showAll | 1 && $category}
+  <!-- showing only the topic of the post, in case we have too many! -->
+<h3><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h3>
+<div>
+{$post->getText()|strip_tags|truncate:300:"...":false}
+</div>
+
+<p class="footer">
+{foreach name=categories from=$post->getCategories() item=postCategory}
+  <a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
 {/foreach}
-<div class="Pages">{include file="misc/pager.template" style="links"}</div>  
-{include file="$blogtemplate/footer.template"}
+</p>
+{else}
+  <!-- show the whole post, as we would normally do -->
+   {include file="$blogtemplate/post.template"}
+{/if}
+{/foreach}
+		
+		{include file="$blogtemplate/footer.template"} 

Modified: templates/trunk/standard_red/post.template
===================================================================
--- templates/trunk/standard_red/post.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_red/post.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -7,9 +7,23 @@
 {$post->getText()}
 </div>
 
+{if $OnMainPage}
+
 <p class="footer">
-{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("comment on this")} ({$post->getTotalComments()})</a> :: <a title="{$locale->tr("permalink_title")}" href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> :: <a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getTotalTrackbacks()})</a>
+<img src="{$url->getTemplateFile("imgs/category.gif")}" alt="" />{foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->categoryLink($postCategory)}" title="{$locale->tr("category")}: {$postCategory->getName()}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach} | 
+<img src="{$url->getTemplateFile("imgs/permalink.gif")}" alt="" /><a title="{$locale->tr("permalink_title")} -> {$post->getTopic()}" href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> | 
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $post->getTotalComments() > 0 }<img src="{$url->getTemplateFile("imgs/comment.gif")}" alt="" /><a href="{$url->postPermalink($post)}#comments" title="{$locale->tr("comments")|capitalize} -> {$post->getTopic()}">{if $post->getTotalComments() == 0 }{$locale->tr("add_comment")}{else if}{$locale->tr("comments")|capitalize} ({$post->getTotalComments()}){/if}</a> | {/if} 
+<img src="{$url->getTemplateFile("imgs/trackback.gif")}" alt="" />{if $post->getNumTrackbacks() > 0}<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")} -> {$post->getTopic()}">{$locale->tr("trackbacks")} ({$post->getTotalTrackbacks()})</a>{else}{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()}){/if}
 </p>
+
+{else}
+
+<p class="footer">
+<img src="{$url->getTemplateFile("imgs/category.gif")}" alt="" />{foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->categoryLink($postCategory)}" title="{$locale->tr("category")}: {$postCategory->getName()}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach} | 
+{assign var=nextpost value=$post->getNextArticle()}{if $nextpost == true}<img src="{$url->getTemplateFile("imgs/next.gif")}" alt="" /><a href="{$url->postPermalink($nextpost)}" title="{$locale->tr("next_post")}: {$nextpost->getTopic()}">{$locale->tr("next_post")}</a> | {/if}
+{assign var=prevpost value=$post->getPrevArticle()}{if $prevpost == true}<img src="{$url->getTemplateFile("imgs/previous.gif")}" alt="" /><a href="{$url->postPermalink($prevpost)}" title="{$locale->tr("previous_post")}: {$prevpost->getTopic()}">{$locale->tr("previous_post")}</a> | {/if} 
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $post->getTotalComments() > 0 }<img src="{$url->getTemplateFile("imgs/comment.gif")}" alt="" />{$locale->tr("comments")|capitalize} ({$post->getTotalComments()}) | {/if}
+<img src="{$url->getTemplateFile("imgs/trackback.gif")}" alt="" />{if $post->getNumTrackbacks() > 0}<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")} -> {$post->getTopic()}">{$locale->tr("trackbacks")} ({$post->getTotalTrackbacks()})</a>{else}{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()}){/if}
+</p>
+
+{/if}

Modified: templates/trunk/standard_red/postandcomments.template
===================================================================
--- templates/trunk/standard_red/postandcomments.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_red/postandcomments.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,41 +1,34 @@
-		{include file="$blogtemplate/header.template"}
+		{assign var="postPageTitle" value=$post->getTopic()}
+		{assign var="postPageTitle" value=" | $postPageTitle"}
+		{include file="$blogtemplate/header.template"} 
   
-<p id="Nextpost">
-{assign var=nextpost value=$post->getNextArticle()}
-{assign var=prevpost value=$post->getPrevArticle()}
-		{if $nextpost == true}
-<a href="{$url->postPermalink($nextpost)}" title="Next post: {$nextpost->getTopic()}">&laquo;</a> |
-   		{/if}
-   		{if $prevpost == true}
-<a href="{$url->postPermalink($prevpost)}" title="Previous post: {$prevpost->getTopic()}">&raquo;</a>
-   		{/if}
-</p>
+
    
    		{assign var="poster" value=$post->getUserInfo()}
+   		<!-- {$url->postTrackbackLink($post)} -->
    		
-		<!-- {$url->postTrackbackLink($post)} -->
    		{include file="$blogtemplate/post.template"}
-   		
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $comments }<h2 id="comments">{$locale->tr("comments")|capitalize}</h2>{/if}	
    		{foreach from=$comments item=comment}
+<div class="comment">
+<h3 class="commentheader">{if $comment->getTopic() != null} {$comment->getTopic()|strip_tags}{else}Re: <em>{$post->getTopic()|strip_tags}</em>{/if}</h3>
 
-<h3 class="commentheader">
-<img src="{$url->getUrl("/imgs/comment_icon1.gif")}" alt="Comment Icon" /> {$comment->getTopic()} <span class="reply">[<a href="{$url->replyCommentLink($post,$comment)}">{$locale->tr("reply")}</a>]</span></h3>
-
 <p class="commentposterinfo">
 		{assign var="postDate" value=$comment->getTimestamp()}
 		{if $comment->getUserUrl() != ""}<a href="{$comment->getUserUrl()}">{$comment->getUsername()}</a>
-		{else}
-                {$comment->getUsername()}
-                {/if} | {$locale->formatDate($postDate, "%d/%m/%Y, %H:%M")}
+		{else}
+			{$comment->getUsername()}
+		{/if} | {$locale->formatDate($postDate, "%d/%m/%Y, %H:%M")}
 </p>
 
 <div class="commenttext">
 {$comment->getText()}
 </div>
+</div>
   		{/foreach}
 
 		{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
 		{include file="$blogtemplate/commentform.template"}
 		{/if}
-		
-		{include file="$blogtemplate/footer.template"}
+			
+		{include file="$blogtemplate/footer.template"} 

Modified: templates/trunk/standard_red/posttrackbacks.template
===================================================================
--- templates/trunk/standard_red/posttrackbacks.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_red/posttrackbacks.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,4 +1,4 @@
-		{include file="$blogtemplate/header.template"}
+		{include file="$blogtemplate/header.template"} 
 		
 <h2>{$locale->tr("trackbacks")}</h2>
 		
@@ -18,4 +18,4 @@
 </dl>
   		{/foreach}
 
-{include file="$blogtemplate/footer.template"}
+{include file="$blogtemplate/footer.template"} 

Modified: templates/trunk/standard_red/screenshot.jpg
===================================================================
(Binary files differ)

Modified: templates/trunk/standard_red/searchresults.template
===================================================================
--- templates/trunk/standard_red/searchresults.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_red/searchresults.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -1,5 +1,6 @@
 {include file="$blogtemplate/header.template"} 
    <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+   <div id="SearchResults">
     {foreach from=$searchresults item=result}
     
     
@@ -8,9 +9,14 @@
       <p class="searchArticle">
       {$article->getText()|strip_tags|truncate:300:"...":false}
       </p>
-      <p class="footer"">{foreach name=categories from=$article->getCategories() item=postCategory}
-          <a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
-      {/foreach}</p>
+      <p class="footer">
+		{foreach name=categories from=$article->getCategories() 
+				 item=postCategory}
+          <a href="{$url->categoryLink($postCategory)}">
+			 {$postCategory->getName()}</a>{if 
+				!$smarty.foreach.categories.last}, {/if}
+        {/foreach}
+      </p>
     {/foreach}
-
+   </div> 
 {include file="$blogtemplate/footer.template"} 

Added: templates/trunk/standard_red/style-ie.css
===================================================================
--- templates/trunk/standard_red/style-ie.css	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_red/style-ie.css	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,3 @@
+#Content {
+	word-wrap: break-word;
+	}
\ No newline at end of file


Property changes on: templates/trunk/standard_red/style-ie.css
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_red/style.css
===================================================================
--- templates/trunk/standard_red/style.css	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_red/style.css	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,409 @@
+/* ******************  general  *************** */
+
+abbr, acronym {
+  cursor: help;
+  border: none;
+}
+
+html, #Bottom, #Title h1 { background:#C00000; } 
+
+body {
+	margin:0; 
+	padding:0;
+	font:small lucida sans unicode, arial, times new roman, sans-serif;
+	color:#525150;
+	background: #fff;
+	}
+	
+a:link {
+	color: #004ca1;
+	}
+	
+a:visited {
+	color: #c00000;
+	}
+	
+a:hover, a:active, a:focus {
+	color: #fff; text-decoration:none; background-color: #0373b3;
+	}
+
+h2, h3 {
+	margin:0;
+	padding:0;
+	}
+	
+.Upgrade {
+	display: none;
+	font-weight: bold;
+	}
+	
+.clearer {
+	clear : both;
+	height : 1px;
+	font-size : 1px;
+	}
+      
+#Container {
+	width: 100%;
+	}
+
+#Title h1 {
+   color: #fff;
+   margin:0;
+   padding:25px 0 5px 10px;
+   font-size:320%;
+   font-weight: normal;
+   } 
+
+#Title a:active, h1 a:link, h1 a:hover, h1 a:focus, h1 a:visited {
+	text-decoration: none;
+	color: #fff;
+	background-color:transparent; 
+	}
+
+#Subtitle {
+	background-color:#800000;
+	color:#fff;
+	padding:2px 14px 2px 14px;
+	font-size:medium;
+	}
+	
+	
+#Subtitle a:link, #Subtitle a:visited, #Subtitle a:hover {
+	text-decoration: underline;
+	color: #fff;
+	background-color:transparent;
+	}	
+	
+#Subtitle a:active, #Subtitle a:focus {
+	color: #800000; text-decoration:none; background-color: #fff;
+	}
+
+#Subcontainer {
+	text-align:left;
+	background-color:#fff;
+	padding-bottom:10px;
+	padding-top:10px;
+	}
+	
+	
+/* ******************  column a  *************** */
+	
+#Content {
+	width: 58%;
+	float: left;
+	margin-right:3%;
+	margin-left:2%;
+	background-color:#fff;	
+	overflow: hidden;
+	line-height:1.5em;
+	text-align:justify;
+	}
+	
+#Content h2 {
+	color:#b8b2ac;
+	margin:20px 0 10px 0;
+	}
+	
+.date {
+	font-weight: bold;
+	}
+
+.footer {
+	padding-bottom:1em;
+	border-bottom: 1px solid #d4d0cd;
+	text-align:left;
+	font-size:90%;
+	}
+	
+.footer img {
+	margin-right:3px;
+	vertical-align:middle;
+	}
+	
+#Nextpost {
+	text-align:center;
+	}
+	
+div.comment {
+	border-top: 1px dotted #d4d0cd;
+	padding-top:0.5em;
+	background: url('./imgs/comments.gif') no-repeat;
+	background-position: top right;
+	margin-top:1.5em;
+	}	
+	
+.commentposterinfo {
+	margin-bottom:1em;
+	font-weight: bold;
+	}
+	
+h3.commentheader {
+	font-size:medium;
+	color:#b8b2ac;
+	font-weight: normal;
+	}
+	
+.reply {font-weight: normal;font-size:small;}
+
+div.commenttext {
+	margin-bottom:1em;
+	}
+
+#CommentForm fieldset {
+	border:2px solid #d4d0cd; 
+	padding-top:10px; 
+	margin-top:10px; 
+	padding-left:10px; 
+	padding-bottom:10px;
+	}
+
+#CommentForm legend {
+	color:#525150;
+	padding:2px 4px 2px 4px;
+	background-color: #ffffff;
+	font-weight : bold;
+	}
+
+#CommentForm label {
+	width:6em;
+	float:left;
+	display:block;
+	clear:both; 
+	float:left;
+	margin-top:8px;
+	margin-bottom:0px;
+	}
+	
+#CommentForm input {
+	margin-top:
+	8px;margin-bottom:8px;
+	}
+	
+#Submit {
+	margin-top:8px;
+	margin-bottom:8px;
+	margin-left:6em;
+	}
+	
+#CommentForm textarea {
+	margin-top:8px;
+	margin-bottom:0px;
+	}
+	
+/* ******************  columnb  *************** */
+	
+#Menu   {
+	width:34%;
+	float: left;
+	text-align:left;
+	background-color:#fff;
+	}
+	
+#Calendar, #Search, #AboutMyself {
+	border-left-color:#d4d0cd;
+	border-left-style:solid;
+	border-left-width:6px;
+	width:86%;
+	padding-top:1px;
+	padding-bottom:1px;
+	padding-right:14px;
+	padding-left:6px;
+	margin-bottom:10px;
+	background-color:#f0efee;
+	margin-top:1px;
+	}
+	
+#Search fieldset {border:0px solid; padding:2px; margin:2px;}
+#Search input {margin:0px;padding:2px;width:7em;}
+#Search input.button {margin:0px;padding:2px;width:5em;}
+#Search form {margin:0px;padding:2px;}
+#Search label {margin:0px;padding:2px;width:8em;}
+
+table.calMonth {
+	width:11em;
+	border-spacing:4px;
+	border:0px;
+	}
+
+th.calMonthCurrent {
+	font-weight:normal;
+	padding: 0px;
+	text-align: center;
+	}
+	
+th.calMonthBackward {
+	font-weight:normal;
+	padding: 0px;
+	text-align:center;
+	}
+	
+th.calMonthForward {
+	font-weight:normal;
+	padding: 0px;
+	text-align:center;
+	}
+	
+.calMonthHeader th {
+	text-align:center;
+	font-weight:normal;
+	padding: 0px;
+	}
+	
+#Calendar td {	
+	padding: 0px;
+	text-align:center
+	}
+
+.calMonthToday {
+ 	background-color: #d4d0cd;
+	}	
+
+#Menu h2 {
+  	background-color: #c00000;
+  	font-size:small;
+  	width:86%;
+  	display:block;
+        padding:1px 10px 1px 10px;
+  	border-left-style:solid;
+  	border-left-color:#800000;
+  	color:#fff;
+  	margin-top:10px;
+  	border-left-width:6px;
+	text-transform: capitalize;
+	}
+
+#Categories ul, #Syndicate ul, #Recently ul, #Sections ul {
+	margin-left:0; 
+	margin-top:0; 
+	margin-bottom:0px; 
+	padding:0; 
+	list-style:none; 
+	font-size:small;
+	}
+	
+#Syndicate ul, #Sections ul {
+	text-transform: capitalize;
+	}
+
+#Categories a, #Syndicate a, #Recently a, #Sections a {
+	width:86%;
+	display:block;
+	padding-top:1px;
+	padding-bottom:1px;
+	border-left-style:solid;
+	border-left-color:#d4d0cd;
+	text-decoration:none;
+	padding-right:10px;
+	padding-left:10px;
+	background-color:#f0efee;
+	border-left-width:6px;
+	margin-top:1px
+	}
+
+#Categories a:hover, #Syndicate a:hover, #Recently a:hover, 
+#Sections a:hover, #Categories a:focus, #Syndicate a:focus, 
+#Recently a:focus, #Links a:focus, #Categories a:active,  
+#Syndicate a:active, #Recently a:active, #Sections a:active {
+	border-color:#003c5e;
+	background-color:#0373b3;
+	}
+
+#Links h2 {
+	text-transform: capitalize;
+	}
+
+/* ******************  footer  *************** */
+
+#Bottommenu {
+	clear:both;
+	background-color:#800000;
+	color:#fff;
+	padding:3px 15px 3px 15px;
+	}
+
+
+#Bottom {
+   color:#fff;
+   padding:3px 3px 3px 15px;
+   } 
+	
+#Bottommenu a, #Bottommenu a:link, #Bottommenu a:visited, #Bottom a, 
+#Bottom a:link, #Bottom a:visited {
+	text-decoration: none;
+	color: #fff;
+	border: 0;
+	}
+
+#Bottommenu a:active, #Bottommenu a:focus, #Bottommenu a:hover, 
+#Bottom a:active, #Bottom a:focus, #Bottom a:hover { 
+	text-decoration : underline; 
+	color : #fff;background-color:transparent; 
+	}
+
+
+/* ******************  albums  *************** */
+
+div.album {
+	text-align: center;
+        float: left;
+        width:150px;
+        margin-bottom:20px;
+        margin-right:5px;
+  	}
+
+.album p {
+   	text-align: center;
+   	padding: 0;
+   	margin:0;
+   	width:150px;     
+	overflow: hidden;
+   	}
+   
+a img {border:none;}
+#album a:link {color: #c00000;}
+#album a:visited {color: #0373b3;}
+#album a:hover, #album a:active, #album a:focus {color: #c00000;background:none;}
+
+
+/* ******************  trakbacks  *************** */
+
+h4 {
+	margin:1em 0 0 0;
+	padding:0;font-size:small;
+	}
+	
+dl {	
+	margin:0;
+	padding:0;
+	}
+	
+dt {
+	font-weight: bold;
+	float:left;
+	}
+	
+dd {
+	padding-left:4em;
+	}
+	
+blockquote {background:url('imgs/blockquote.gif') no-repeat; padding:10px 10px 2px 41px;border: dotted #d4d0cd 1px; 
+}
+	
+/* ******************  to align elements  *************** */
+.left {text-align: left;display:block}
+.right {text-align: right;display:block}
+.center {text-align: center;display:block}
+
+/* ******************  to float elements  *************** */
+.floatleft {float: left;padding:2px 10px 10px 0px}
+.floatright {float: right;padding:2px 0px 10px 10px;}
+
+/* ******************  to highlight text  *************** */
+.bold {font-weight: bold;}
+.italic {font-style:italic;}
+.underline {text-decoration:underline}
+
+/* ****************** aboutmyself  *************** */
+#UserPicture {float:left;margin:10px 10px 10px 6px;border:solid #D4D0CD 1px;padding:3px;background-color:#fff}
+#AboutMyself p {padding:10px 0;margin:0}
\ No newline at end of file


Property changes on: templates/trunk/standard_red/style.css
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_wine/album.template
===================================================================
--- templates/trunk/standard_wine/album.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_wine/album.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,82 @@
+   		{include file="$blogtemplate/header.template"} 
+
+<h2>{$locale->tr("albums")}</h2>
+
+<h3>{$album->getName()}</h3>
+<p>{$album->getDescription()}</p>
+
+<!-- album contents go here -->
+ 
+<div id="album">
+
+	<div class="clearer">&nbsp;</div>
+ 
+	<div class="album">
+	<a href="{$url->parentAlbumLink($album)}">
+    	<img src="{$url->getTemplateFile("imgs/parentfolder.gif")}" alt="{$locale->tr("parent")}" /></a>
+    	<p>{$locale->tr("parent")}</p>
+	</div>
+
+  {if $pager->getCurrentPage() == 1}
+	{assign var="counter" value=1}
+   	{assign var=children value=$album->getChildren()}
+   	{foreach from=$children item=childalbum}
+	<div class="album">
+   	<a href="{$url->albumLink($childalbum)}">
+   	<img src="{$url->getTemplateFile("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 -->
+
+ {** assign var=resources value=$album->getResources() **}
+ {** use the code above if you want to display all the resources at once, or leave it commented **}
+ {** if you would like to use the new paged display that was introduced in lifetype 1.1 **} 
+ {foreach from=$resources item=resource}
+	<div class="album">
+   		{if $resource->hasPreview()}
+   		{*<a target="_blank" href="resserver.php?blogId={$blog->getId()}&amp;resource={$resource->getFileName()}">*}
+   	<a href="{$url->resourceLink($resource)}">
+    	<img alt="{$resource->getDescription()}" src="{$url->resourcePreviewLink($resource)}" /></a>
+    	<p>{$resource->getFileName()}</p>
+   		{else}
+   	<a href="{$url->resourceLink($resource)}">
+   		{if $resource->isSound()}
+    	<img alt="Sound" src="{$url->getTemplateFile("imgs/sound.gif")}" /></a>
+   		{elseif $resource->isVideo()}
+    	<img alt="Video" src="{$url->getTemplateFile("imgs/video.gif")}" /></a>
+   		{elseif $resource->isZip()}
+    	<img alt="Zip" src="{$url->getTemplateFile("imgs/compressed.gif")}" /></a>
+   		{else}
+   	<img alt="File" src="{$url->getTemplateFile("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 class="clearer">&nbsp;</div>
+
+</div>
+
+<!-- end of album contents --> 
+		{include file="$blogtemplate/footer.template"} 
\ No newline at end of file


Property changes on: templates/trunk/standard_wine/album.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_wine/albums.template
===================================================================
--- templates/trunk/standard_wine/albums.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_wine/albums.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,28 @@
+		{include file="$blogtemplate/header.template"} 
+
+<h2>{$locale->tr("albums")}</h2>
+
+ <!-- album contents go here -->
+ 
+<div id="album">
+	
+	<div class="clearer">&nbsp;</div>
+
+		{assign var="counter" value=0}
+  		{foreach from=$albums item=album}
+	<div class="album">
+	<a href="{$url->albumLink($album)}"><img src="{$url->getTemplateFile("imgs/folder.gif")}" alt="{$album->getName()}" /></a>
+  	<p>{$album->getName()} ({$album->getNumResources()})</p>
+  		{assign var="counter" value="`$counter+1`"}
+		{if $counter%3 == 0}
+		{/if}
+	</div>
+		{/foreach}
+
+	<div class="clearer">&nbsp;</div>
+
+</div>
+
+<!-- end of the albums -->
+		
+		{include file="$blogtemplate/footer.template"} 


Property changes on: templates/trunk/standard_wine/albums.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_wine/archives.template
===================================================================
--- templates/trunk/standard_wine/archives.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_wine/archives.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,15 @@
+		{include file="$blogtemplate/header.template"} 
+<h2>{$locale->tr("archives")}</h2>
+
+<div id="Archives">
+	
+	<ul>
+		{foreach from=$archives item=month}
+    	<li><a href="{$month->getUrl()}">{$month->getName()}</a> [{$month->getNumArticles()}]</li>
+    		{/foreach}
+    		
+    		
+    	</ul>
+</div>
+   	
+   		{include file="$blogtemplate/footer.template"} 
\ No newline at end of file


Property changes on: templates/trunk/standard_wine/archives.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_wine/commentarticle.template
===================================================================
--- templates/trunk/standard_wine/commentarticle.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_wine/commentarticle.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,5 @@
+		{include file="$blogtemplate/header.template"} 
+		
+		{include file="$blogtemplate/commentform.template"}
+		
+		{include file="$blogtemplate/footer.template"} 


Property changes on: templates/trunk/standard_wine/commentarticle.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_wine/commentform.template
===================================================================
--- templates/trunk/standard_wine/commentform.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_wine/commentform.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,24 @@
+<div id="CommentForm">
+
+<form id="NewComment" action="{$url->getIndexUrl()}" method="post">
+<fieldset>
+<legend>{$locale->tr("add_comment")}</legend>
+<div><label for="commentTopic">{$locale->pr("comment_topic")}</label><input type="text" name="commentTopic" id="commentTopic" value="{$topic}" /></div>
+<div><label for="commentText">{$locale->pr("comment_text")}</label><textarea rows="10" cols="30" name="commentText" id="commentText"></textarea></div>
+<div><label for="userName">{$locale->pr("comment_username")}</label><input type="text" name="userName" id="userName" value="" /></div>
+<div><label for="userEmail">Email</label><input type="text" name="userEmail" id="userEmail" value="" /></div>
+<div><label for="userUrl">Web</label><input type="text" name="userUrl" id="userUrl" value="" /></div>
+{if $authimage}{if $authimage->isEnabled()}
+<div><label for="authImage">Please type the 6-digit code you can see here:</label><br/>
+<input type="text" name="authImage" id="authImage" value="" />&nbsp;{$authimage->show()}</div>
+{/if}{/if}
+
+<div id="Submit"><input id="Add" type="submit" value="{$locale->pr("comment_send")}" name="Add" />
+<input type="hidden" name="op" value="AddComment" />
+<input type="hidden" name="articleId" value="{$post->getId()}" />
+<input type="hidden" name="blogId" value="{$blog->getId()}" />
+<input type="hidden" name="parentId" value="{$parentId}" /></div>
+</fieldset>
+</form>
+
+</div>
\ No newline at end of file


Property changes on: templates/trunk/standard_wine/commentform.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_wine/error.template
===================================================================
--- templates/trunk/standard_wine/error.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_wine/error.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,5 @@
+		{include file="$blogtemplate/header.template"} 
+ 	<h2>{$locale->tr("error")}</h2>
+ 		<p>{$locale->tr($message)}</p>
+		<p><a href="javascript:history.go(-1)">{$locale->tr("back")}</a></p>
+		{include file="$blogtemplate/footer.template"} 


Property changes on: templates/trunk/standard_wine/error.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_wine/favicon.ico
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_wine/favicon.ico
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_wine/footer.template
===================================================================
--- templates/trunk/standard_wine/footer.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_wine/footer.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,100 @@
+<div class="pager">
+ {include file="$misctemplatepath/pager.template" style="links"}
+</div>
+
+</div>
+
+<div id="Menu">
+
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}
+  
+  	<h2>{$locale->tr("about_myself")}</h2>
+  	<div id="AboutMyself">
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	<img id="UserPicture" src="{$url->resourcePreviewLink($picture)}" alt="{$blogOwner->getUsername()}" />
+  	<p>{$AboutMyself}</p>
+  	<div class="clearer">&nbsp;</div>
+  	</div>
+{/if}
+
+
+  	<h2>{$locale->tr("menu")}</h2>
+    	<div id="Sections">
+    	<ul>
+    	<li><a title="{$locale->tr("main")}" href="{$url->blogLink()}">{$locale->tr("main")}</a></li>
+    	<li><a title="{$locale->tr("archives")}" href="{$url->templatePage("archives")}">{$locale->tr("archives")}</a></li>
+    	<li><a title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
+    	
+    	 {foreach name=mylinkscategories from=$mylinkscategories item=panel_linkcategory}
+{if $smarty.foreach.mylinkscategories.first}
+   
+<li><a title="{$locale->tr("links")}" href="{$url->templatePage("links")}">{$locale->tr("links")}</a></li>{/if}
+    	{/foreach}
+    	</ul>
+    	</div>
+    	
+    	<h2>{$locale->tr("search")}</h2>
+	<div id="Search">
+	<form id="search_form" method="post" action="{$url->getIndexUrl()}">
+	<fieldset>
+	<label for="searchTerms"><input type="text" id="searchTerms" name="searchTerms" value="" /></label>
+	<input type="submit" name="Search" value="{$locale->tr("search_s")}" class="button" />
+	<input type="hidden" name="op" value="Search" />
+	<input type="hidden" name="blogId" value="{$blog->getId()}" />   
+	</fieldset>
+	</form>
+	</div> 
+	
+	<h2>{$locale->tr("calendar")}</h2>
+    	<div id="Calendar">
+    		{$calendar}
+    	</div>	
+  
+  	<h2>{$locale->tr("recently")}</h2>
+    	<div id="Recently">
+    	<ul>
+    		{foreach from=$recentposts item=post}
+        <li><a title="{$post->getTopic()}" href="{$url->postLink($post)}">{$post->getTopic()}</a></li>
+    		{/foreach}
+    	</ul>
+   	</div>
+    
+ 	<h2>{$locale->tr("categories")}</h2>
+    	<div id="Categories">
+    	<ul>
+    		{foreach from=$articlecategories item=articleCategory}
+    	<li><a title="{$articleCategory->getName()}" href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} <abbr title="{$articleCategory->getNumArticles()} {$locale->tr("posts")}">[{$articleCategory->getNumArticles()}]</abbr></a></li>
+   		{/foreach}
+  	</ul>
+  	</div>
+  
+  	<h2>{$locale->tr("syndicate")}</h2>
+    	<div id="Syndicate">
+    	<ul>
+    	<li><a title="RSS 0.90" href="{$url->rssLink("rss090")}">RSS 0.90</a></li>
+    	<li><a title="RSS 1.0" href="{$url->rssLink("rss10")}">RSS 1.0</a></li>
+    	<li><a title="RSS 2.0" href="{$url->rssLink("rss20")}">RSS 2.0</a></li>
+    	<li><a title="Atom" href="{$url->rssLink("rss20")}">Atom</a></li>
+    	</ul>
+    	</div>
+</div>
+
+<div class="clearer">&nbsp;</div> 
+
+
+
+</div>
+
+<div id="Bottommenu"><a href="http://www.w3.org/WAI/">Accessible</a> and Valid <a href="http://validator.w3.org/check/referer">XHTML 1.0 Strict</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></div>
+
+
+<!-- Please leave the credit intact. Thank you. -->
+<div id="Bottom">Powered by <a href="http://www.lifetype.net">LifeType</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a></div>
+
+</div>
+
+</body>
+</html>


Property changes on: templates/trunk/standard_wine/footer.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_wine/header.template
===================================================================
--- templates/trunk/standard_wine/header.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_wine/header.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
+ <head>
+ <meta http-equiv="content-type" content="text/html; charset={$locale->getCharset()}" />
+ <meta name="generator" content="{$version}" />
+ <meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
+ <title>{$blog->getBlog()}{$postPageTitle}</title>
+ <link rel="stylesheet" type="text/css" title="Style" href="{$url->getTemplateFile("style.css")}" />
+ <!--[if IE ]>
+<link rel="stylesheet" type="text/css" title="Style" href="{$url->getTemplateFile("style-ie.css")}" />
+<![endif] -->
+ <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")}" />
+ </head>
+  <body> 
+
+<div id="Container">
+  
+<div id="Title"><h1><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1></div>
+  
+<div id="Subtitle">{$blog->getAbout()}</div>
+
+<div id="Subcontainer">  
+
+<div id="Content">


Property changes on: templates/trunk/standard_wine/header.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_wine/imgs/blockquote.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_wine/imgs/blockquote.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_wine/imgs/category.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_wine/imgs/category.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_wine/imgs/comment.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_wine/imgs/comment.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_wine/imgs/comments.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_wine/imgs/comments.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_wine/imgs/compressed.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_wine/imgs/compressed.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_wine/imgs/file.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_wine/imgs/file.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_wine/imgs/folder.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_wine/imgs/folder.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_wine/imgs/next.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_wine/imgs/next.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_wine/imgs/parentfolder.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_wine/imgs/parentfolder.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_wine/imgs/permalink.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_wine/imgs/permalink.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_wine/imgs/previous.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_wine/imgs/previous.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_wine/imgs/sound.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_wine/imgs/sound.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_wine/imgs/trackback.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_wine/imgs/trackback.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_wine/imgs/video.gif
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_wine/imgs/video.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_wine/links.template
===================================================================
--- templates/trunk/standard_wine/links.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_wine/links.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,17 @@
+		{include file="$blogtemplate/header.template"} 
+  
+<div id="Links">
+	<h2>{$locale->tr("my_links")}</h2>
+  		{foreach from=$mylinkscategories item=linkcategory}
+    	<h3>{$linkcategory->getName()}</h3>
+   	<ul>
+  		{foreach from=$linkcategory->getLinks() item=link}
+  	<li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a>: {$link->getDescription()} {if $link->getRssFeed() != ""}
+      <a href="{$link->getRssFeed()}"><img src="/imgs/rss_logo_small.gif" alt="RSS" /></a>
+    {/if}</li>
+    		{/foreach}
+  	</ul>
+  		{/foreach}
+  	</div>
+  
+		{include file="$blogtemplate/footer.template"} 
\ No newline at end of file


Property changes on: templates/trunk/standard_wine/links.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_wine/main.template
===================================================================
--- templates/trunk/standard_wine/main.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_wine/main.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,25 @@
+		{assign var="OnMainPage" value=1}
+		{include file="$blogtemplate/header.template"} 
+		
+{if $category}<h2>{$locale->tr("category")}: {$category->getName()}</h2>{/if} 
+  
+{foreach from=$posts item=post}
+{if $showAll | 1 && $category}
+  <!-- showing only the topic of the post, in case we have too many! -->
+<h3><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h3>
+<div>
+{$post->getText()|strip_tags|truncate:300:"...":false}
+</div>
+
+<p class="footer">
+{foreach name=categories from=$post->getCategories() item=postCategory}
+  <a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+{/foreach}
+</p>
+{else}
+  <!-- show the whole post, as we would normally do -->
+   {include file="$blogtemplate/post.template"}
+{/if}
+{/foreach}
+		
+		{include file="$blogtemplate/footer.template"} 


Property changes on: templates/trunk/standard_wine/main.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_wine/post.template
===================================================================
--- templates/trunk/standard_wine/post.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_wine/post.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,29 @@
+<h2>{$post->getTopic()}</h2>
+		{assign var="postDate" value=$post->getDateObject()}
+		{assign var="postOwner" value=$post->getUserInfo()}
+<p class="date">{$postOwner->getUsername()} | {$locale->formatDate($postDate,"%d %B, %Y %H:%M")}</p>
+
+<div>
+{$post->getText()}
+</div>
+
+{if $OnMainPage}
+
+<p class="footer">
+<img src="{$url->getTemplateFile("imgs/category.gif")}" alt="" />{foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->categoryLink($postCategory)}" title="{$locale->tr("category")}: {$postCategory->getName()}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach} | 
+<img src="{$url->getTemplateFile("imgs/permalink.gif")}" alt="" /><a title="{$locale->tr("permalink_title")} -> {$post->getTopic()}" href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> | 
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $post->getTotalComments() > 0 }<img src="{$url->getTemplateFile("imgs/comment.gif")}" alt="" /><a href="{$url->postPermalink($post)}#comments" title="{$locale->tr("comments")|capitalize} -> {$post->getTopic()}">{if $post->getTotalComments() == 0 }{$locale->tr("add_comment")}{else if}{$locale->tr("comments")|capitalize} ({$post->getTotalComments()}){/if}</a> | {/if} 
+<img src="{$url->getTemplateFile("imgs/trackback.gif")}" alt="" />{if $post->getNumTrackbacks() > 0}<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")} -> {$post->getTopic()}">{$locale->tr("trackbacks")} ({$post->getTotalTrackbacks()})</a>{else}{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()}){/if}
+</p>
+
+{else}
+
+<p class="footer">
+<img src="{$url->getTemplateFile("imgs/category.gif")}" alt="" />{foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->categoryLink($postCategory)}" title="{$locale->tr("category")}: {$postCategory->getName()}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach} | 
+{assign var=nextpost value=$post->getNextArticle()}{if $nextpost == true}<img src="{$url->getTemplateFile("imgs/next.gif")}" alt="" /><a href="{$url->postPermalink($nextpost)}" title="{$locale->tr("next_post")}: {$nextpost->getTopic()}">{$locale->tr("next_post")}</a> | {/if}
+{assign var=prevpost value=$post->getPrevArticle()}{if $prevpost == true}<img src="{$url->getTemplateFile("imgs/previous.gif")}" alt="" /><a href="{$url->postPermalink($prevpost)}" title="{$locale->tr("previous_post")}: {$prevpost->getTopic()}">{$locale->tr("previous_post")}</a> | {/if} 
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $post->getTotalComments() > 0 }<img src="{$url->getTemplateFile("imgs/comment.gif")}" alt="" />{$locale->tr("comments")|capitalize} ({$post->getTotalComments()}) | {/if}
+<img src="{$url->getTemplateFile("imgs/trackback.gif")}" alt="" />{if $post->getNumTrackbacks() > 0}<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")} -> {$post->getTopic()}">{$locale->tr("trackbacks")} ({$post->getTotalTrackbacks()})</a>{else}{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()}){/if}
+</p>
+
+{/if}


Property changes on: templates/trunk/standard_wine/post.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_wine/postandcomments.template
===================================================================
--- templates/trunk/standard_wine/postandcomments.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_wine/postandcomments.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,34 @@
+		{assign var="postPageTitle" value=$post->getTopic()}
+		{assign var="postPageTitle" value=" | $postPageTitle"}
+		{include file="$blogtemplate/header.template"} 
+  
+
+   
+   		{assign var="poster" value=$post->getUserInfo()}
+   		<!-- {$url->postTrackbackLink($post)} -->
+   		
+   		{include file="$blogtemplate/post.template"}
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $comments }<h2 id="comments">{$locale->tr("comments")|capitalize}</h2>{/if}	
+   		{foreach from=$comments item=comment}
+<div class="comment">
+<h3 class="commentheader">{if $comment->getTopic() != null} {$comment->getTopic()|strip_tags}{else}Re: <em>{$post->getTopic()|strip_tags}</em>{/if}</h3>
+
+<p class="commentposterinfo">
+		{assign var="postDate" value=$comment->getTimestamp()}
+		{if $comment->getUserUrl() != ""}<a href="{$comment->getUserUrl()}">{$comment->getUsername()}</a>
+		{else}
+			{$comment->getUsername()}
+		{/if} | {$locale->formatDate($postDate, "%d/%m/%Y, %H:%M")}
+</p>
+
+<div class="commenttext">
+{$comment->getText()}
+</div>
+</div>
+  		{/foreach}
+
+		{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
+		{include file="$blogtemplate/commentform.template"}
+		{/if}
+			
+		{include file="$blogtemplate/footer.template"} 


Property changes on: templates/trunk/standard_wine/postandcomments.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_wine/posttrackbacks.template
===================================================================
--- templates/trunk/standard_wine/posttrackbacks.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_wine/posttrackbacks.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,21 @@
+		{include file="$blogtemplate/header.template"} 
+		
+<h2>{$locale->tr("trackbacks")}</h2>
+		
+<h3>{$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>":</h3>
+
+		{foreach from=$trackbacks item=trackback}
+<h4><a href="{$trackback->getUrl()}">{$trackback->getTitle()}</a></h4>
+
+<dl>
+<dt>{$locale->tr("trackback_excerpt")}:</dt>
+<dd>{$trackback->getExcerpt()}</dd>
+<dt>{$locale->tr("trackback_weblog")}:</dt>
+<dd>{$trackback->getBlogName()}</dd>
+   		{assign var="trackbackDate" value=$trackback->getDateObject()}
+<dt>{$locale->tr("date")}:</dt>
+<dd>{$locale->formatDate($trackbackDate, "%d/%m/%Y %H:%M")}</dd>
+</dl>
+  		{/foreach}
+
+{include file="$blogtemplate/footer.template"} 


Property changes on: templates/trunk/standard_wine/posttrackbacks.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_wine/resource.template
===================================================================
--- templates/trunk/standard_wine/resource.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_wine/resource.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,74 @@
+		{include file="$blogtemplate/header.template"} 
+
+<h2>{$locale->tr("albums")}</h2>
+
+		{assign var=metadata value=$resource->getMetadataReader()}
+		{assign var=updated value=$resource->getTimestamp()}
+<div id="album">
+	<h3>{$resource->getFileName()}</h3>
+
+	<div id="Resource-Desc">
+    	<a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a> 
+    	({$metadata->getRoundedSize()}) | {$locale->tr("created")} {$locale->formatDate($updated,"%d %b, %Y")}</div>
+ 
+ 	<div id="Resource">    
+  	<p>{$resource->getDescription()}</p>
+  		{if $resource->isImage()}
+   	<img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
+  
+  		{else}
+     	<a href="{$url->resourceDownloadLink($resource)}">
+   		{* show some information about the file *}
+   
+   		{if $resource->isSound()}
+     	<img alt="Sound" src="{$url->getTemplateFile("imgs/sound.gif")}" /></a>
+     	<p>{$resource->getFileName()}</p>
+     	<p>{$locale->tr("format")}: {$metadata->getFormat()|upper}</p>
+     	<p>{$locale->tr("length")}: {$metadata->getLengthString()}</p>
+     	<p>{$locale->tr("sample_rate")}: {$metadata->getSampleRate()} Khz</p>
+   
+   		{elseif $resource->isVideo()}
+     	<img alt="Sound" src="{$url->getTemplateFile("imgs/video.gif")}" /></a>
+     	<p>{$resource->getFileName()}</p>
+     	<p>{$locale->tr("format")}: {$metadata->getFormat()|upper}</p>
+    	<p>{$locale->tr("size")}: {$metadata->getHeight()} x {$metadata->getWidth()}</p>
+    	<p>{$locale->tr("length")}: {$metadata->getLengthString()}</p>
+    	<p>{$locale->tr("video_codec")}: {$metadata->getVideoCodec()}</p>
+    	<p>{$locale->tr("audio_codec")}: {$metadata->getAudioCodec()}</p>
+   
+   		{elseif $resource->isZip()}
+     	<img alt="Zip" src="{$url->getTemplateFile("imgs/compressed.gif")}" /></a>
+     	<p>{$resource->getFileName()}</p> 
+    	<p>{$metadata->getTotalFiles()} {$locale->tr("files")}</p>
+    	<p>{$locale->tr("uncompressed_size")}: {$metadata->getRoundedUncompressedSize()}</p>
+   
+   		{else}
+     	<img alt="File" src="{$url->getTemplateFile("imgs/file.gif")}" /></a>
+     	<p>{$resource->getFileName()}</p>
+         
+   		{/if}   
+  		{/if}
+ 	</div>
+ 
+ 
+		{assign var=album value=$resource->getAlbum()} 
+	<p><a href="{$url->albumLink($album)}">{$locale->tr("parent")}</a></p>
+
+</div>
+
+</div>
+
+
+<div class="clearer">&nbsp;</div> 
+
+</div>
+
+<div id="Bottommenu"><a href="http://www.w3.org/WAI/">Accessible</a> and Valid <a href="http://validator.w3.org/check/referer">XHTML 1.0 Strict</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></div>
+
+
+<!-- Please leave the credit intact. Thank you. -->
+<div id="Bottom">Powered by <a href="http://www.lifetype.net">LifeType</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a></div>
+
+</div>
+</body>
+</html>
\ No newline at end of file


Property changes on: templates/trunk/standard_wine/resource.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_wine/screenshot.jpg
===================================================================
(Binary files differ)


Property changes on: templates/trunk/standard_wine/screenshot.jpg
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: templates/trunk/standard_wine/searchresults.template
===================================================================
--- templates/trunk/standard_wine/searchresults.template	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_wine/searchresults.template	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,22 @@
+{include file="$blogtemplate/header.template"} 
+   <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+   <div id="SearchResults">
+    {foreach from=$searchresults item=result}
+    
+    
+      {assign var=article value=$result->getArticle()}
+      <h3><a href="{$url->postPermalink($article)}">{$article->getTopic()}</a></h3>
+      <p class="searchArticle">
+      {$article->getText()|strip_tags|truncate:300:"...":false}
+      </p>
+      <p class="footer">
+		{foreach name=categories from=$article->getCategories() 
+				 item=postCategory}
+          <a href="{$url->categoryLink($postCategory)}">
+			 {$postCategory->getName()}</a>{if 
+				!$smarty.foreach.categories.last}, {/if}
+        {/foreach}
+      </p>
+    {/foreach}
+   </div> 
+{include file="$blogtemplate/footer.template"} 


Property changes on: templates/trunk/standard_wine/searchresults.template
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_wine/style-ie.css
===================================================================
--- templates/trunk/standard_wine/style-ie.css	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_wine/style-ie.css	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,3 @@
+#Content {
+	word-wrap: break-word;
+	}
\ No newline at end of file


Property changes on: templates/trunk/standard_wine/style-ie.css
___________________________________________________________________
Name: svn:executable
   + *

Added: templates/trunk/standard_wine/style.css
===================================================================
--- templates/trunk/standard_wine/style.css	2006-08-06 16:43:59 UTC (rev 3844)
+++ templates/trunk/standard_wine/style.css	2006-08-06 16:59:24 UTC (rev 3845)
@@ -0,0 +1,417 @@
+/* ******************  general  *************** */
+
+abbr, acronym {
+  cursor: help;
+  border: none;
+}
+
+html, #Bottom, #Title h1 { background:#9C3131; } 
+
+body {
+	margin:0; 
+	padding:0;
+	font:small lucida sans unicode, arial, times new roman, sans-serif;
+	color:#000;
+	background: #62BCF0;
+	}
+	
+a:link {
+	color: #07659B;
+	}
+	
+a:visited {
+	color: #054265;
+	}
+	
+a:hover, a:active, a:focus {
+	color: #fff; text-decoration:none; background-color: #07659B;
+	}
+
+h2, h3 {
+	margin:0;
+	padding:0;
+	}
+	
+.Upgrade {
+	display: none;
+	font-weight: bold;
+	}
+	
+.clearer {
+	clear : both;
+	height : 1px;
+	font-size : 1px;
+	}
+      
+#Container {
+	width: 100%;
+	}
+
+#Title h1 {
+   	color: #fff;
+   	margin:0;
+   	padding:25px 0 5px 10px;
+   	font-size:320%;
+   	font-weight: normal;
+   	} 
+
+#Title a:active, h1 a:link, h1 a:hover, h1 a:focus, h1 a:visited {
+	text-decoration: none;
+	color: #fff;
+	border: 0;
+	background-color:transparent; 
+	}
+
+#Subtitle {
+	background-color:#581011;
+	color:#fff;
+	padding:2px 14px 2px 14px;
+	font-size:medium;
+	}
+	
+	
+#Subtitle a:link, #Subtitle a:visited, #Subtitle a:hover {
+	text-decoration: underline;
+	color: #fff;
+	background-color:transparent;
+	}	
+	
+#Subtitle a:active, #Subtitle a:focus {
+	color: #581011; 
+	text-decoration:none; 
+	background-color: #fff;
+	}
+
+#Subcontainer {
+	text-align:left;
+	background-color:#62BCF0;
+	padding-bottom:10px;
+	padding-top:10px;
+	}
+	
+	
+/* ******************  column a  *************** */
+	
+#Content {
+	width: 58%;
+	float: left;
+	margin-right:3%;
+	margin-left:2%;
+	background-color:#62BCF0;
+	overflow: hidden;
+	line-height:1.em;
+	text-align:justify;
+	}
+	
+#Content h2 {
+	color:#fff;
+	margin:20px 0 10px 0;
+	}
+	
+.date {
+	font-weight: bold;
+	}
+
+.footer {
+	padding-bottom:1em;
+	border-bottom: 1px solid #9DDAFD;
+	text-align:left;
+	font-size:90%;
+	}
+	
+.footer img {
+	margin-right:3px;
+	vertical-align:middle;
+	}
+	
+#Nextpost {
+	text-align:center;
+	}	
+	
+div.comment {
+	border-top: 1px dotted #9DDAFD;
+	padding-top:0.5em;
+	background: url('./imgs/comments.gif') no-repeat;
+	background-position: top right;
+	margin-top:1.5em;
+	}
+	
+.commentposterinfo {
+	margin-bottom:1em;
+	font-weight: bold;
+	}
+	
+h3.commentheader {
+	font-size:medium;
+	color:#fff;
+	font-weight: normal;
+	}
+	
+.reply {font-weight: normal;font-size:small;}
+
+div.commenttext {;
+	margin-bottom:1em;
+	}
+
+#CommentForm fieldset {
+	border:2px solid #9DDAFD; 
+	padding-top:10px; 
+	margin-top:10px; 
+	padding-left:10px; 
+	padding-bottom:10px;
+	}
+
+#CommentForm legend {
+	color:#000000;
+	padding:2px 4px 2px 4px;
+	background-color: #9DDAFD;
+	font-weight : bold;
+	}
+
+#CommentForm label {
+	width:6em;
+	float:left;
+	display:block;
+	clear:both; 
+	float:left;
+	margin-top:8px;
+	margin-bottom:0px;
+	}
+	
+#CommentForm input {
+	margin-top:
+	8px;margin-bottom:8px;
+	}
+	
+#Submit {
+	margin-top:8px;
+	margin-bottom:8px;
+	margin-left:6em;
+	}
+	
+#CommentForm textarea {
+	margin-top:8px;
+	margin-bottom:0px;
+	}
+	
+/* ******************  columnb  *************** */
+	
+#Menu   {
+	width:34%;
+	float: left;
+	text-align:left;
+	background-color:#62BCF0;
+	}
+	
+#Calendar, #Search, #AboutMyself {
+	border-left-color:#79CDFD;
+	border-left-style:solid;
+	border-left-width:6px;
+	width:86%;
+	padding-top:1px;
+	padding-bottom:1px;
+	padding-right:14px;
+	padding-left:6px;
+	margin-bottom:10px;
+	background-color:#9DDAFD;
+	margin-top:1px;
+	}
+	
+#Search fieldset {border:0px solid; padding:2px; margin:2px;}
+#Search input {margin:0px;padding:2px;width:7em;}
+#Search input.button {margin:0px;padding:2px;width:5em;}
+#Search form {margin:0px;padding:2px;}
+#Search label {margin:0px;padding:2px;width:8em;}
+
+table.calMonth {
+	width:11em;
+	border-spacing:4px;
+	border:0px;
+	}
+
+th.calMonthCurrent {
+	font-weight:normal;
+	padding: 0px;
+	text-align: center;
+	}
+	
+th.calMonthBackward {
+	font-weight:normal;
+	padding: 0px;
+	text-align:center;
+	}
+	
+th.calMonthForward {
+	font-weight:normal;
+	padding: 0px;
+	text-align:center;
+	}
+	
+.calMonthHeader th {
+	text-align:center;
+	font-weight:normal;
+	padding: 0px;
+	}
+	
+#Calendar td {	
+	padding: 0px;
+	text-align:center
+	}
+
+.calMonthToday {
+ 	background-color: #79CDFD;
+	}
+
+#Menu h2 {
+  	background-color: #9C3131;
+  	font-size:small;
+  	width:86%;
+  	display:block;
+        padding:1px 10px 1px 10px;
+  	border-left-style:solid;
+  	border-left-color:#581011;
+  	color:#fff;
+  	margin-top:10px;
+  	border-left-width:6px;
+	text-transform: capitalize;
+	}
+
+#Categories ul, #Syndicate ul, #Recently ul, #Sections ul {
+	margin-left:0; 
+	margin-top:0; 
+	margin-bottom:0px; 
+	padding:0; 
+	list-style:none; 
+	font-size:small;
+	}
+	
+#Syndicate ul, #Sections ul {
+	text-transform: capitalize;
+	}
+
+#Categories a, #Syndicate a, #Recently a, #Sections a {
+	width:86%;
+	display:block;
+	padding-top:1px;
+	padding-bottom:1px;
+	border-left-style:solid;
+	border-left-color:#79CDFD;
+	text-decoration:none;
+	padding-right:10px;
+	padding-left:10px;
+	background-color:#9DDAFD;
+	border-left-width:6px;
+	margin-top:1px
+	}
+
+#Categories a:hover, #Syndicate a:hover, #Recently a:hover, 
+#Sections a:hover, #Categories a:focus, #Syndicate a:focus, 
+#Recently a:focus, #Links a:focus, #Categories a:active,  
+#Syndicate a:active, #Recently a:active, #Sections a:active {
+	border-color:#054265;
+	background-color:#07659B;
+	}
+
+#Links h2 {
+	text-transform: capitalize;
+	}
+
+/* ******************  footer  *************** */
+
+#Bottommenu {
+	clear:both;
+	background-color:#581011;
+	color:#fff;
+	padding:3px 15px 3px 15px;
+	}
+
+
+#Bottom {
+   color:#fff;
+   padding:3px 3px 3px 15px;
+   } 
+	
+#Bottommenu a, #Bottommenu a:link, #Bottommenu a:visited, #Bottom a, 
+#Bottom a:link, #Bottom a:visited {
+	text-decoration: none;
+	color: #fff;
+	border: 0;
+	}
+
+#Bottommenu a:active, #Bottommenu a:focus, #Bottommenu a:hover, 
+#Bottom a:active, #Bottom a:focus, #Bottom a:hover { 
+	text-decoration : underline; 
+	color : #fff;
+	background-color:transparent; 
+	}
+
+
+/* ******************  albums  *************** */
+
+div.album {
+	text-align: center;
+        float: left;
+        width:150px;
+        margin-bottom:20px;
+        margin-right:5px;
+  	}
+
+.album p {
+   	text-align: center;
+   	padding: 0;
+   	margin:0;
+   	width:150px;     
+	overflow: hidden;
+   	}
+   
+a img {border:none;}
+#album a:link {color: #07659B;}
+#album a:visited {color: #054265;}
+#album a:hover, #album a:active, #album a:focus {
+	color: #07659B;
+	background:none;
+	}
+
+
+/* ******************  trakbacks  *************** */
+
+h4 {
+	margin:1em 0 0 0;
+	padding:0;font-size:small;
+	}
+	
+dl {	
+	margin:0;
+	padding:0;
+	}
+	
+dt {
+	font-weight: bold;
+	float:left;
+	}
+	
+dd {
+	padding-left:4em;
+	}
+	
+	
+blockquote {background:url('imgs/blockquote.gif') no-repeat; padding:10px 10px 2px 41px;border: dotted #9DDAFD 1px; 
+}
+	
+/* ******************  to align elements  *************** */
+.left {text-align: left;display:block}
+.right {text-align: right;display:block}
+.center {text-align: center;display:block}
+
+/* ******************  to float elements  *************** */
+.floatleft {float: left;padding:2px 10px 10px 0px}
+.floatright {float: right;padding:2px 0px 10px 10px;}
+
+/* ******************  to highlight text  *************** */
+.bold {font-weight: bold;}
+.italic {font-style:italic;}
+.underline {text-decoration:underline}
+
+/* ****************** aboutmyself  *************** */
+#UserPicture {float:left;margin:10px 10px 10px 6px;border:solid #fff 1px;padding:4px;background-color:#fff}
+#AboutMyself p {padding:10px 0;margin:0}
\ No newline at end of file


Property changes on: templates/trunk/standard_wine/style.css
___________________________________________________________________
Name: svn:executable
   + *



More information about the pLog-svn mailing list