[pLog-svn] r1312 - in templates/trunk: minitemplate pastel-blocks
roof splat standard standard_green standard_happy
standard_red toto tribal white zen
jondaley at devel.plogworld.net
jondaley at devel.plogworld.net
Fri Mar 4 16:44:57 GMT 2005
Author: jondaley
Date: 2005-03-04 16:44:57 +0000 (Fri, 04 Mar 2005)
New Revision: 1312
Added:
templates/trunk/pastel-blocks/block-search.template
templates/trunk/pastel-blocks/searchresults.template
templates/trunk/roof/searchresults.template
templates/trunk/splat/searchresults.template
templates/trunk/standard_green/searchresults.template
templates/trunk/standard_happy/searchresults.template
templates/trunk/standard_red/searchresults.template
templates/trunk/toto/searchresults.template
templates/trunk/tribal/searchresults.template
templates/trunk/white/searchresults.template
templates/trunk/zen/searchresults.template
Modified:
templates/trunk/minitemplate/commentform.template
templates/trunk/minitemplate/error.template
templates/trunk/minitemplate/post.template
templates/trunk/minitemplate/postandcomments.template
templates/trunk/minitemplate/searchresults.template
templates/trunk/minitemplate/sidebar.template
templates/trunk/pastel-blocks/error.template
templates/trunk/pastel-blocks/header.template
templates/trunk/pastel-blocks/postandcomments.template
templates/trunk/pastel-blocks/style-common.css
templates/trunk/roof/error.template
templates/trunk/roof/footer.template
templates/trunk/roof/post.template
templates/trunk/splat/albums.template
templates/trunk/splat/error.template
templates/trunk/splat/panel.template
templates/trunk/splat/post.template
templates/trunk/standard/album.template
templates/trunk/standard/archives.template
templates/trunk/standard/commentarticle.template
templates/trunk/standard/error.template
templates/trunk/standard/footer.template
templates/trunk/standard/header.template
templates/trunk/standard/links.template
templates/trunk/standard/main.template
templates/trunk/standard/post.template
templates/trunk/standard/postandcomments.template
templates/trunk/standard/posttrackbacks.template
templates/trunk/standard/resource.template
templates/trunk/standard/screenshot.jpg
templates/trunk/standard/searchresults.template
templates/trunk/standard_green/album.template
templates/trunk/standard_green/albums.template
templates/trunk/standard_green/error.template
templates/trunk/standard_green/footer.template
templates/trunk/standard_green/main.template
templates/trunk/standard_green/post.template
templates/trunk/standard_green/postandcomments.template
templates/trunk/standard_green/standard_green.css
templates/trunk/standard_happy/album.template
templates/trunk/standard_happy/albums.template
templates/trunk/standard_happy/error.template
templates/trunk/standard_happy/footer.template
templates/trunk/standard_happy/main.template
templates/trunk/standard_happy/post.template
templates/trunk/standard_happy/postandcomments.template
templates/trunk/standard_happy/resource.template
templates/trunk/standard_happy/standard_happy.css
templates/trunk/standard_red/album.template
templates/trunk/standard_red/albums.template
templates/trunk/standard_red/error.template
templates/trunk/standard_red/footer.template
templates/trunk/standard_red/main.template
templates/trunk/standard_red/post.template
templates/trunk/standard_red/postandcomments.template
templates/trunk/standard_red/standard_red.css
templates/trunk/toto/error.template
templates/trunk/toto/panel.template
templates/trunk/toto/panel_with_comments.template
templates/trunk/toto/post.template
templates/trunk/tribal/error.template
templates/trunk/tribal/footer.template
templates/trunk/tribal/header.template
templates/trunk/tribal/post.template
templates/trunk/white/error.template
templates/trunk/white/footer.template
templates/trunk/white/post.template
templates/trunk/zen/albums.template
templates/trunk/zen/error.template
templates/trunk/zen/panel.template
templates/trunk/zen/post.template
Log:
BCSEEATI's changes, modulo some fixes by me. I will test all this next week
Modified: templates/trunk/minitemplate/commentform.template
===================================================================
--- templates/trunk/minitemplate/commentform.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/minitemplate/commentform.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -3,7 +3,7 @@
<div class="BlockFormTitle"> {$locale->pr("comment_topic")}</div>
<div class="BlockForminput"><input class="Forminput" type="text" size="50" name="commentTopic" value=""/></div>
<div class="BlockFormTitle"> {$locale->pr("comment_text")} </div>
- <div class="BlockForminput"><textarea class="FormTextarea" rows="10" cols="40" name="commentText"></textrarea></div>
+ <div class="BlockForminput"><textarea class="FormTextarea" rows="10" cols="40" name="commentText"></textarea></div>
<div class="BlockFormTitle">{$locale->pr("comment_username")}</div>
<div class="BlockForminput"><input class="Forminput" type="text" name="userName" value=""/></div>
<div class="BlockFormTitle">{$locale->pr("comment_email")}</div>
@@ -16,5 +16,5 @@
<input type="hidden" name="articleId" value="{$post->getId()}"/>
<input type="hidden" name="blogId" value="{$blog->getId()}"/>
<input type="hidden" name="parentId" value="{$parentId}"/>
- </div>
+ </div>
</form>
\ No newline at end of file
Modified: templates/trunk/minitemplate/error.template
===================================================================
--- templates/trunk/minitemplate/error.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/minitemplate/error.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,4 +1,4 @@
{include file="$blogtemplate/header.template"}
<div id="ErrorTopic">{$locale->tr("error")}</div>
-<div id="ErrorMessage">{$locale->tr($message)}</div>
+<div id="ErrorMessage">{$locale->tr($message)} <br /><a href="javascript:history.go(-1)">{$locale->tr("back")}</a></div>
{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/minitemplate/post.template
===================================================================
--- templates/trunk/minitemplate/post.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/minitemplate/post.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,33 +1,18 @@
-{* ------
+<!--
{$url->postTrackbackLink($post)}
------- *}
-{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()}">«««</a> |
-{/if}
-{if $prevpost == true}
-|<a href="{$url->postPermalink($prevpost)}" title="Previous post: {$prevpost->getTopic()}">»»»</a>
-{/if}
<div class="PostHeader">
[{foreach name=categories from=$post->getCategories() item=postCategory}
- <a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>
- {if !$smarty.foreach.categories.last}, {/if}
- {/foreach}]{$post->getTopic()}
+<a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+{/foreach}]{$post->getTopic()}
<div class="PostInfo">
{assign var="postOwner" value=$post->getUserInfo()}
{$postOwner->getUsername()}
@
{assign var="postDate" value=$post->getDateObject()}
- {* ------ Show date in locale format
- {$locale->formatDate($postDate,"%d %B, %Y %H:%M")}
- ------ *}
- {* ------ show date in simple format ------*}
{$locale->formatDate($postDate, "%d/%m/%Y-%H:%M")}
-
- <!--No Display Begain//><// No Display End-->
</div>
</div>
<div class="PostText">
Modified: templates/trunk/minitemplate/postandcomments.template
===================================================================
--- templates/trunk/minitemplate/postandcomments.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/minitemplate/postandcomments.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,4 +1,12 @@
{include file="$blogtemplate/header.template"}
+{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()}">«««</a> |
+{/if}
+{if $prevpost == true}
+|<a href="{$url->postPermalink($prevpost)}" title="Previous post: {$prevpost->getTopic()}">»»»</a>
+{/if}
{include file="$blogtemplate/post.template"}
{foreach name=comment from=$comments item=comment}
Modified: templates/trunk/minitemplate/searchresults.template
===================================================================
--- templates/trunk/minitemplate/searchresults.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/minitemplate/searchresults.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,5 +1,4 @@
{include file="$blogtemplate/header.template"}
-{$searchhighlight->start()}
<div class="BlockTitle">
{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}
</div>
@@ -20,5 +19,4 @@
</div>
</div>
{/foreach}
-{$searchhighlight->end()}
{include file="$blogtemplate/footersimple.template"}
Modified: templates/trunk/minitemplate/sidebar.template
===================================================================
--- templates/trunk/minitemplate/sidebar.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/minitemplate/sidebar.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,4 +1,19 @@
<div id="Sidebar">
+<!--// Block Search //-->
+ <div class="SideBlock">
+ <fieldset class="SideDim">
+ <legend class="SideDimTitle">{$locale->tr("search")}</legend>
+ <form id="search_form" method="post" action="{$url->getIndexUrl()}">
+ <div>
+ <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()}" />
+ </div>
+ </form>
+ </fieldset>
+ </div>
+
<!--// Block Calendar //-->
<div class="SideBlock">
<fieldset class="SideDim">
@@ -119,7 +134,7 @@
<!--// Manage pLog; //-->
<br />
- <a href="{$url->getUrl("admin.php")}" target="_blank">
- {$url->getTemplateFile("/img/manage.gif")}" alt="manage blog" /></a>
+ <a href="{$url->getUrl("/admin.php")}" target="_blank">
+ <img src="{$url->getTemplateFile("img/manage.gif")}" alt="manage blog" /></a>
</div>
\ No newline at end of file
Added: templates/trunk/pastel-blocks/block-search.template
===================================================================
--- templates/trunk/pastel-blocks/block-search.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/pastel-blocks/block-search.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -0,0 +1,19 @@
+ <div class="block-shadow">
+ <div class="block-main">
+ <div class="box-green">
+ <div class="block-search">
+ <div class="block-title">
+ <div class="block-header">{$locale->tr("search")}</div>
+ </div>
+ <form id="search_form" method="post" action="{$url->getIndexUrl()}">
+ <div>
+ <label for="searchTerms"><input type="text" id="searchTerms" name="searchTerms" value="" size="14" /></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()}" />
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
\ No newline at end of file
Modified: templates/trunk/pastel-blocks/error.template
===================================================================
--- templates/trunk/pastel-blocks/error.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/pastel-blocks/error.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -8,6 +8,7 @@
<br/>
<span class="error">{$locale->tr("error")}</span><br/><br/>
{$locale->tr($message)}<br/><br/>
+<a href="javascript:history.go(-1)">{$locale->tr("back")}</a>
</div>
</div>
Modified: templates/trunk/pastel-blocks/header.template
===================================================================
--- templates/trunk/pastel-blocks/header.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/pastel-blocks/header.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -49,6 +49,7 @@
<div class="column"
id="left">
+{include file="$blogtemplate/block-search.template"}
{include file="$blogtemplate/block-calendar.template"}
{include file="$blogtemplate/block-links.template"}
{include file="$blogtemplate/block-categories.template"}
Modified: templates/trunk/pastel-blocks/postandcomments.template
===================================================================
--- templates/trunk/pastel-blocks/postandcomments.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/pastel-blocks/postandcomments.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -9,11 +9,11 @@
<span class="prevnext">
<br/>
- {assign var=prevpost value=$post->getPrevArticle()}
- {assign var=nextpost value=$post->getNextArticle()}
+{assign var=nextpost value=$post->getNextArticle()}
+{assign var=prevpost value=$post->getPrevArticle()}
{if $prevpost == true}
<a href="{$url->postPermalink($prevpost)}" title="Previous post: {$prevpost->getTopic()}">← Previous Entry</a>
- {if $nextpost == true} <img alt="|" class="seperator" src="{$url->getTemplateFile("sp.gif")}"/> {/if}
+ {if $nextpost == true} <img alt="|" class="seperator" src="{$url->getTemplateFile("/sp.gif")}"/> {/if}
{/if}
{if $nextpost == true}
<a href="{$url->postPermalink($nextpost)}" title="Next post: {$nextpost->getTopic()}">Next Entry →</a>
Added: templates/trunk/pastel-blocks/searchresults.template
===================================================================
--- templates/trunk/pastel-blocks/searchresults.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/pastel-blocks/searchresults.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -0,0 +1,52 @@
+{include file="$blogtemplate/header.template"}
+ <div class="block-shadow">
+ <div class="block-main">
+ <div class="box-blue">
+ <div class="block-prevnext">
+ <span class="prevnext">
+ <br />{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}
+ <br /><br />
+ </span>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div id="SearchResults">
+ {foreach from=$searchresults item=result}
+ <div class="block-shadow">
+ <div class="block-main">
+ <div class="{cycle values="box-teal,box-purple,box-red,box-green,box-blue"}">
+ {assign var=article value=$result->getArticle()}
+ <div class="entry-headpad">
+ <div class="entry-headboard">
+ <div class="entry-header">
+ <img alt="star" src="{$url->getTemplateFile("/star.gif")}"/>
+ {if $urlmode == 2}
+ <a href="{$url->postPermalink($article)}?searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a>
+ {else}
+ <a href="{$url->postPermalink($article)}&searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a>
+ {/if}
+ </div>
+ <div class="entry-date">
+ {assign var="postDate" value=$article->getDateObject()}
+ {assign var="postOwner" value=$article->getUserInfo()}
+ {$postOwner->getUsername()} - {$locale->formatDate($postDate,"%Y %b %d (%A) - %H:%M")}
+ </div>
+ </div>
+ </div>
+ <div class="entry-content">
+ {$article->getText()|strip_tags|truncate:300:"...":false}
+ </div>
+ <div class="entry-footer">
+ {foreach name=categories from=$article->getCategories() item=postCategory}
+ <a href="{$url->postCategoryLink($article)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+ {/foreach}
+ </div>
+ </div>
+ </div>
+ </div>
+ {/foreach}
+ </div>
+
+{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/pastel-blocks/style-common.css
===================================================================
--- templates/trunk/pastel-blocks/style-common.css 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/pastel-blocks/style-common.css 2005-03-04 16:44:57 UTC (rev 1312)
@@ -79,6 +79,9 @@
.block-calendar { margin: auto;
overflow: hidden;}
+.block-search { margin: auto;
+ text-align: center;
+ overflow: hidden;}
.block-links { margin-left: 10px;
margin-right: 10px;
font: 8pt arial, times new roman, lucida sans unicode, sans-serif;
Modified: templates/trunk/roof/error.template
===================================================================
--- templates/trunk/roof/error.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/roof/error.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,4 +1,5 @@
{include file="$blogtemplate/header.template"}
<h3>{$locale->tr("error")}</h3>
{$locale->tr($message)}
+ <br /><a href="javascript:history.go(-1)">{$locale->tr("back")}</a>
{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/roof/footer.template
===================================================================
--- templates/trunk/roof/footer.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/roof/footer.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -9,6 +9,19 @@
</div>
<br/>
+ <!-- search -->
+ <div id="search">
+ <form id="search_form" method="post" action="{$url->getIndexUrl()}">
+ <div>
+ <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()}" />
+ </div>
+ </form>
+ </div>
+ <br/>
+
<!-- some text about the blog -->
<h3>{$locale->tr("About")}</h3>
<div id="about">
Modified: templates/trunk/roof/post.template
===================================================================
--- templates/trunk/roof/post.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/roof/post.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -4,12 +4,5 @@
<p>
{$post->getText()} (<a title="{$locale->tr("permalink")}" href="{$url->postPermalink($post)}">#</a>)
</p>
-<div class="postinfo">
- {foreach name=categories from=$post->getCategories() item=postCategory}
- <a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>
- {if !$smarty.foreach.categories.last}, {/if}
- {/foreach}
- :: {$locale->tr("posted_by")}
- {$postOwner->getUsername()}
- {$locale->formatDate($postDate,"%H:%M")}
-</div>
+<div class="postinfo">{foreach name=categories from=$post->getCategories() item=postCategory}
+<a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach} :: {$locale->tr("posted_by")} {$postOwner->getUsername()} {$locale->formatDate($postDate,"%H:%M")}</div>
Added: templates/trunk/roof/searchresults.template
===================================================================
--- templates/trunk/roof/searchresults.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/roof/searchresults.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -0,0 +1,21 @@
+{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()}
+ {if $urlmode == 2}
+ <h3><a href="{$url->postPermalink($article)}?searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a></h3>
+ {else}
+ <h3><a href="{$url->postPermalink($article)}&searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a></h3>
+ {/if}
+ <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->postCategoryLink($article)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+ {/foreach}</p>
+ {/foreach}
+ </div>
+{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/splat/albums.template
===================================================================
--- templates/trunk/splat/albums.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/splat/albums.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,6 +1,6 @@
{include file="$blogtemplate/header.template"}
<div id="content">
- <h2>{$locale->tr("resource_albums")|capitalize}</h2>
+ <h2>{$locale->tr("root_album")|capitalize}</h2>
{foreach from=$albums item=album}
{assign var="aDate" value=$album->getTimestamp()}
<div class="post">
Modified: templates/trunk/splat/error.template
===================================================================
--- templates/trunk/splat/error.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/splat/error.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -11,7 +11,7 @@
<div class="storycontent">
<img src="{$url->getUrl("/imgs/error.gif")}" height="32" width="32" alt="Error"/>
- {$locale->tr($message)}
+ {$locale->tr($message)}<br /><a href="javascript:history.go(-1)">{$locale->tr("back")}</a>
</div>
</div>
</div>
Modified: templates/trunk/splat/panel.template
===================================================================
--- templates/trunk/splat/panel.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/splat/panel.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -4,15 +4,36 @@
<li id="wordpress">
{$locale->tr("menu")}
<ul>
+ <li><a href="{$url->blogLink()}">{$locale->tr("main")}</a> </li>
<li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
+ <li><a href="{$url->getAdminUrl()}">{$locale->tr("admin")}</a></li>
</ul>
</li>
+<div class="Sidetitle">
+ <h4>{$locale->tr("search")}</h4>
+</div>
+<p>
+ <form name="search_form" method="post" action="{$url->getIndexUrl()}">
+ <input type="text" name="searchTerms" value="" size="14" /><br/>
+ <input type="hidden" name="op" value="Search" />
+ <input type="hidden" name="blogId" value="{$blog->getId()}"/>
+ <input type="submit" name="Search" value="{$locale->tr("search")|capitalize}" />
+ </form>
+ </p>
+ <li id="recently">
+ {$locale->tr("recently")}
+ <ul>
+ {foreach from=$recentposts item=recentpost}
+ <li><a title="{$recentpost->getText()|truncate:150:"..."|strip_tags|escape}" href="{$url->postLink($recentpost)}">{$recentpost->getTopic()}</a><br/>
+ {/foreach}
+</ul>
+</li>
<li id="categories">
{$locale->tr("categories")}
<ul>
{foreach from=$articlecategories item=articleCategory}
- <li><a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} [{$articleCategory->getNumArticles()}]</a></li>
+ <li><a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} [{$articleCategory->getNumArticles()}]</a><a href="{$url->categoryRssLink($articleCategory)}"><img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" style="border:0px;" alt="RSS 0.90" /></a><br/></li>
{/foreach}
</ul>
</li>
@@ -26,11 +47,12 @@
</ul>
</li>
<li id="calendar">
+ {$locale->tr("calendar")}
{$calendar}
</li>
<li id="meta">
- Meta
+ {$locale->tr("syndicate")}
<ul>
<li><a title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}">RSS 0.90</a></li>
<li><a title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}">RSS 1.0</a></li>
Modified: templates/trunk/splat/post.template
===================================================================
--- templates/trunk/splat/post.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/splat/post.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -3,13 +3,17 @@
<h3 class="storytitle"><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h3>
-{assign var=postCategory value=$post->getCategory()}
-{assign var=postText value=$post->getText()}
<div class="meta">
-<ul class="post-categories"><li><a href="{$url->categoryLink($postCategory)}" title="{$postCategory->getName()}">{$postCategory->getName()}</a></li></ul>
+
+ {foreach name=categories from=$post->getCategories() item=postCategory}
+ <ul class="post-categories"><li><a href="{$url->postCategoryLink($post)}" title="{$postCategory->getName()}">{$postCategory->getName()}</a></li></ul>
+ {if !$smarty.foreach.categories.last}, {/if}
+ {/foreach}
+
— {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
</div>
<div class="storycontent">
+ {assign var=postText value=$post->getText()}
{$postText}
<br style="clear: both;" />
</div>
@@ -21,6 +25,5 @@
<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")}">{$post->getNumTrackbacks()} {$locale->tr("trackbacks")|capitalize}</a>
{else}
{$post->getNumTrackbacks()} {$locale->tr("trackbacks")|capitalize}
- {/if}
-</div>
-
+ {/if}
+</div>
\ No newline at end of file
Added: templates/trunk/splat/searchresults.template
===================================================================
--- templates/trunk/splat/searchresults.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/splat/searchresults.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -0,0 +1,24 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+ <h2>{$locale->tr("search_matching_results")}{foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+ <div id="SearchResults">
+ {foreach from=$searchresults item=result}
+ <div class="post">
+ {assign var=article value=$result->getArticle()}
+ {if $urlmode == 2}
+ <h3><a href="{$url->postPermalink($article)}?searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a></h3>
+ {else}
+ <h3><a href="{$url->postPermalink($article)}&searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a></h3>
+ {/if}
+ <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->postCategoryLink($article)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+ {/foreach}</p>
+ </div>
+ {/foreach}
+ </div>
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/standard/album.template
===================================================================
--- templates/trunk/standard/album.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard/album.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -13,8 +13,8 @@
<div class="album">
<a href="{$url->parentAlbumLink($album)}">
- <img src="{$url->getTemplateFile("imgs/parentfolder.gif")}" alt="{$locale->tr("parent_album")}" /></a>
- <p>{$locale->tr("parent_album")}</p>
+ <img src="{$url->getTemplateFile("imgs/parentfolder.gif")}" alt="{$locale->tr("parent")}" /></a>
+ <p>{$locale->tr("parent")}</p>
</div>
{assign var="counter" value=1}
@@ -75,4 +75,4 @@
</div>
<!-- end of album contents -->
- {include file="$blogtemplate/footer.template"}
\ No newline at end of file
+ {include file="$blogtemplate/footer.template"}
Modified: templates/trunk/standard/archives.template
===================================================================
--- templates/trunk/standard/archives.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard/archives.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,15 +1,13 @@
- {include file="$blogtemplate/header.template"}
+ {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>
+ <li><a href="{$month->getUrl()}">{$month->getName()}</a></li>
{/foreach}
-
-
</ul>
</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/commentarticle.template
===================================================================
--- templates/trunk/standard/commentarticle.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard/commentarticle.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -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/error.template
===================================================================
--- templates/trunk/standard/error.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard/error.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,5 +1,6 @@
- {include file="$blogtemplate/header.template"}
+ {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"}
+ {$locale->tr($message)}
+ <br /><a href="javascript:history.go(-1)">{$locale->tr("back")}</a>
+
+ {include file="$blogtemplate/footer.template"}
Modified: templates/trunk/standard/footer.template
===================================================================
--- templates/trunk/standard/footer.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard/footer.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -11,24 +11,24 @@
<li><a title="{$locale->tr("links")}" href="{$url->templatePage("links")}">{$locale->tr("links")}</a></li>
</ul>
</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()}">
- <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>
+ <form id="search_form" method="post" action="{$url->getIndexUrl()}">
+ <div>
+ <label for="searchTerms" style="display:none;">{$locale->tr("search_this_blog")|capitalize} </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>
- <h2>{$locale->tr("calendar")}</h2>
- <div id="Calendar">
- {$calendar}
- </div>
-
<h2>{$locale->tr("recently")}</h2>
<div id="Recently">
<ul>
@@ -42,7 +42,7 @@
<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>
+ <li><a title="{$articleCategory->getName()}" href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} [{$articleCategory->getNumArticles()}]</a></li>
{/foreach}
</ul>
</div>
@@ -56,6 +56,7 @@
<li><a title="XML" href="{$url->rssLink("xml")}">XML</a></li>
</ul>
</div>
+
</div>
<div class="clearer"> </div>
@@ -69,6 +70,5 @@
<div id="Bottom">Powered by <a href="http://www.plogworld.net">pLog</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a></div>
</div>
-
</body>
</html>
Modified: templates/trunk/standard/header.template
===================================================================
--- templates/trunk/standard/header.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard/header.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,18 +1,14 @@
<!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")}" />
- <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")}" />
+ <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.css")}";</style>
</head>
- <body>
-
+ <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>
+
<div id="Container">
<div id="Title"><h1><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1></div>
@@ -21,4 +17,4 @@
<div id="Subcontainer">
-<div id="Content">
+<div id="Content">
\ No newline at end of file
Modified: templates/trunk/standard/links.template
===================================================================
--- templates/trunk/standard/links.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard/links.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,4 +1,4 @@
- {include file="$blogtemplate/header.template"}
+ {include file="$blogtemplate/header.template"}
<div id="Links">
<h2>{$locale->tr("my_links")}</h2>
@@ -12,4 +12,4 @@
{/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/main.template
===================================================================
--- templates/trunk/standard/main.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard/main.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,27 +1,5 @@
- {include file="$blogtemplate/header.template"}
-
-
- {if $showAll == 1 && $category}<h2>{$locale->tr("posts")}: {$category->getName()}</h2>{/if}
-
-
+{include file="$blogtemplate/header.template"}
{foreach from=$posts item=post}
-{if $showAll}
- <!-- 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"}
\ No newline at end of file
+{include file="$blogtemplate/post.template"}
+{/foreach}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Modified: templates/trunk/standard/post.template
===================================================================
--- templates/trunk/standard/post.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard/post.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -10,9 +10,7 @@
<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}
+<a href="{$url->postCategoryLink($post)}">{$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->getNumTrackbacks()})</a>
</p>
Modified: templates/trunk/standard/postandcomments.template
===================================================================
--- templates/trunk/standard/postandcomments.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard/postandcomments.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,13 +1,11 @@
- {assign var="postPageTitle" value=$post->getTopic()}
- {assign var="postPageTitle" value=" | $postPageTitle"}
- {include file="$blogtemplate/header.template"}
+ {include file="$blogtemplate/header.template"}
<p id="Nextpost">
- {assign var=nextpost value=$post->getNextArticle()}
+{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()}">«</a> |
{/if}
- {assign var=prevpost value=$post->getPrevArticle()}
{if $prevpost == true}
<a href="{$url->postPermalink($prevpost)}" title="Previous post: {$prevpost->getTopic()}">»</a>
{/if}
@@ -16,17 +14,18 @@
{assign var="poster" value=$post->getUserInfo()}
{include file="$blogtemplate/post.template"}
-<h2>{$locale->tr("comments_for_post")}</h2>
+
{foreach from=$comments item=comment}
-<h3 class="commentheader"><img src="{$url->getUrl("/imgs/comment_icon1.gif")}" alt="Comment Icon" /> {$comment->getTopic()}</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">
@@ -38,4 +37,4 @@
{include file="$blogtemplate/commentform.template"}
{/if}
- {include file="$blogtemplate/footer.template"}
+ {include file="$blogtemplate/footer.template"}
Modified: templates/trunk/standard/posttrackbacks.template
===================================================================
--- templates/trunk/standard/posttrackbacks.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard/posttrackbacks.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -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/resource.template
===================================================================
--- templates/trunk/standard/resource.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard/resource.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -51,8 +51,8 @@
</div>
- {assign var=album value=$resource->getAlbum()}
- <p><a href="{$url->albumLink($album)}">{$locale->tr("parent_album")}</a></p>
+ {assign var=album value=$resource->getAlbum()}
+ <p><a href="{$url->albumLink($album)}">{$locale->tr("back")}</a></p>
</div>
@@ -71,4 +71,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: templates/trunk/standard/screenshot.jpg
===================================================================
(Binary files differ)
Modified: templates/trunk/standard/searchresults.template
===================================================================
--- templates/trunk/standard/searchresults.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard/searchresults.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -13,15 +13,9 @@
<p class="searchArticle">
{$article->getText()|strip_tags|truncate:300:"...":false}
</p>
- {assign var="articleCategory" value=$article->getCategory()}
- <p class="footer"">
- {foreach name=categories from=$article->getCategories()
- item=postCategory}
- <a href="{$url->postCategoryLink($article)}">
- {$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->postCategoryLink($article)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+ {/foreach}</p>
{/foreach}
</div>
{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/standard_green/album.template
===================================================================
--- templates/trunk/standard_green/album.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_green/album.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -13,8 +13,8 @@
<div class="album">
<a href="{$url->parentAlbumLink($album)}">
- <img src="{$url->getTemplateFile("parentfolder.gif")}" alt="{$locale->tr("parent_album")}" /></a>
- <p>{$locale->tr("parent_album")}</p>
+ <img src="{$url->getTemplateFile("parentfolder.gif")}" alt="{$locale->tr("parent")}" /></a>
+ <p>{$locale->tr("parent")}</p>
</div>
{assign var="counter" value=1}
@@ -74,6 +74,5 @@
</div>
-<!-- end of album contents -->
-
+<!-- end of album contents -->
{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Modified: templates/trunk/standard_green/albums.template
===================================================================
--- templates/trunk/standard_green/albums.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_green/albums.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -24,6 +24,5 @@
</div>
<!-- end of the albums -->
-
{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/standard_green/error.template
===================================================================
--- templates/trunk/standard_green/error.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_green/error.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,4 +1,6 @@
{include file="$blogtemplate/header.template"}
<h2>{$locale->tr("error")}</h2>
{$locale->tr($message)}
+ <br /><a href="javascript:history.go(-1)">{$locale->tr("back")}</a>
+
{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/standard_green/footer.template
===================================================================
--- templates/trunk/standard_green/footer.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_green/footer.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -16,7 +16,19 @@
<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")|capitalize} </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>
+
<h2>{$locale->tr("recently")}</h2>
<div id="Recently">
<ul>
Modified: templates/trunk/standard_green/main.template
===================================================================
--- templates/trunk/standard_green/main.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_green/main.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,9 +1,5 @@
- {include file="$blogtemplate/header.template"}
-
- {foreach from=$posts item=post}
-
- {include file="$blogtemplate/post.template"}
-
- {/foreach}
-
- {include file="$blogtemplate/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/header.template"}
+{foreach from=$posts item=post}
+{include file="$blogtemplate/post.template"}
+{/foreach}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Modified: templates/trunk/standard_green/post.template
===================================================================
--- templates/trunk/standard_green/post.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_green/post.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -9,14 +9,8 @@
</div>
<p class="footer">
- {foreach name=categories from=$post->getCategories() item=postCategory}
- <a href="{$url->postCategoryLink($post)}">{$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->getNumTrackbacks()})</a>
+{foreach name=categories from=$post->getCategories() item=postCategory}
+<a href="{$url->postCategoryLink($post)}">{$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->getNumTrackbacks()})</a>
</p>
Modified: templates/trunk/standard_green/postandcomments.template
===================================================================
--- templates/trunk/standard_green/postandcomments.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_green/postandcomments.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,11 +1,11 @@
{include file="$blogtemplate/header.template"}
<p id="Nextpost">
- {assign var=nextpost value=$post->getNextArticle()}
+{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()}">«</a> |
{/if}
- {assign var=prevpost value=$post->getPrevArticle()}
{if $prevpost == true}
<a href="{$url->postPermalink($prevpost)}" title="Previous post: {$prevpost->getTopic()}">»</a>
{/if}
Added: templates/trunk/standard_green/searchresults.template
===================================================================
--- templates/trunk/standard_green/searchresults.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_green/searchresults.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -0,0 +1,21 @@
+{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()}
+ {if $urlmode == 2}
+ <h3><a href="{$url->postPermalink($article)}?searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a></h3>
+ {else}
+ <h3><a href="{$url->postPermalink($article)}&searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a></h3>
+ {/if}
+ <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->postCategoryLink($article)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+ {/foreach}</p>
+ {/foreach}
+ </div>
+{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/standard_green/standard_green.css
===================================================================
--- templates/trunk/standard_green/standard_green.css 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_green/standard_green.css 2005-03-04 16:44:57 UTC (rev 1312)
@@ -170,7 +170,11 @@
background-color:#fff;
}
-#Calendar {
+#Search form {
+ margin: 5px 0;
+}
+
+#Calendar, #Search {
border-left-color:#d4d0cd;
border-left-style:solid;
border-left-width:6px;
Modified: templates/trunk/standard_happy/album.template
===================================================================
--- templates/trunk/standard_happy/album.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_happy/album.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -13,8 +13,8 @@
<div class="album">
<a href="{$url->parentAlbumLink($album)}">
- <img src="{$url->getTemplateFile("parentfolder.gif")}" alt="{$locale->tr("parent_album")}" /></a>
- <p>{$locale->tr("parent_album")}</p>
+ <img src="{$url->getTemplateFile("parentfolder.gif")}" alt="{$locale->tr("parent")}" /></a>
+ <p>{$locale->tr("parent")}</p>
</div>
{assign var="counter" value=1}
@@ -74,6 +74,5 @@
</div>
-<!-- end of album contents -->
-
+<!-- end of album contents -->
{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Modified: templates/trunk/standard_happy/albums.template
===================================================================
--- templates/trunk/standard_happy/albums.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_happy/albums.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -24,6 +24,5 @@
</div>
<!-- end of the albums -->
-
{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/standard_happy/error.template
===================================================================
--- templates/trunk/standard_happy/error.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_happy/error.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,4 +1,6 @@
{include file="$blogtemplate/header.template"}
<h2>{$locale->tr("error")}</h2>
{$locale->tr($message)}
+ <br /><a href="javascript:history.go(-1)">{$locale->tr("back")}</a>
+
{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/standard_happy/footer.template
===================================================================
--- templates/trunk/standard_happy/footer.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_happy/footer.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -16,7 +16,19 @@
<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")|capitalize} </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>
+
<h2>{$locale->tr("recently")}</h2>
<div id="Recently">
<ul>
@@ -55,7 +67,7 @@
<!-- 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></div>
+<div id="Bottom">Powered by <a href="http://www.plogworld.net">pLog</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a></div>
</div>
</body>
Modified: templates/trunk/standard_happy/main.template
===================================================================
--- templates/trunk/standard_happy/main.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_happy/main.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,9 +1,5 @@
- {include file="$blogtemplate/header.template"}
-
- {foreach from=$posts item=post}
-
- {include file="$blogtemplate/post.template"}
-
- {/foreach}
-
- {include file="$blogtemplate/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/header.template"}
+{foreach from=$posts item=post}
+{include file="$blogtemplate/post.template"}
+{/foreach}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Modified: templates/trunk/standard_happy/post.template
===================================================================
--- templates/trunk/standard_happy/post.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_happy/post.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -9,14 +9,8 @@
</div>
<p class="footer">
- {foreach name=categories from=$post->getCategories() item=postCategory}
- <a href="{$url->postCategoryLink($post)}">{$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->getNumTrackbacks()})</a>
+{foreach name=categories from=$post->getCategories() item=postCategory}
+<a href="{$url->postCategoryLink($post)}">{$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->getNumTrackbacks()})</a>
</p>
Modified: templates/trunk/standard_happy/postandcomments.template
===================================================================
--- templates/trunk/standard_happy/postandcomments.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_happy/postandcomments.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,11 +1,11 @@
{include file="$blogtemplate/header.template"}
<p id="Nextpost">
- {assign var=nextpost value=$post->getNextArticle()}
+{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()}">«</a> |
{/if}
- {assign var=prevpost value=$post->getPrevArticle()}
{if $prevpost == true}
<a href="{$url->postPermalink($prevpost)}" title="Previous post: {$prevpost->getTopic()}">»</a>
{/if}
Modified: templates/trunk/standard_happy/resource.template
===================================================================
--- templates/trunk/standard_happy/resource.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_happy/resource.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -51,7 +51,7 @@
</div>
- {assign var=album value=$resource->getAlbum()}
+ {assign var=album value=$resource->getAlbum()}
<p><a href="{$url->albumLink($album)}">{$locale->tr("back")}</a></p>
</div>
@@ -67,7 +67,7 @@
<!-- 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></div>
+<div id="Bottom">Powered by <a href="http://www.plogworld.net">pLog</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a></div>
</div>
</body>
Added: templates/trunk/standard_happy/searchresults.template
===================================================================
--- templates/trunk/standard_happy/searchresults.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_happy/searchresults.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -0,0 +1,21 @@
+{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()}
+ {if $urlmode == 2}
+ <h3><a href="{$url->postPermalink($article)}?searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a></h3>
+ {else}
+ <h3><a href="{$url->postPermalink($article)}&searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a></h3>
+ {/if}
+ <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->postCategoryLink($article)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+ {/foreach}</p>
+ {/foreach}
+ </div>
+{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/standard_happy/standard_happy.css
===================================================================
--- templates/trunk/standard_happy/standard_happy.css 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_happy/standard_happy.css 2005-03-04 16:44:57 UTC (rev 1312)
@@ -170,7 +170,11 @@
background-color:#63cece;
}
-#Calendar {
+#Search form {
+ margin: 5px 0;
+}
+
+#Calendar, #Search {
border-left-color:#6fdfde;
border-left-style:solid;
border-left-width:6px;
Modified: templates/trunk/standard_red/album.template
===================================================================
--- templates/trunk/standard_red/album.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_red/album.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -13,8 +13,8 @@
<div class="album">
<a href="{$url->parentAlbumLink($album)}">
- <img src="{$url->getTemplateFile("parentfolder.gif")}" alt="{$locale->tr("parent_album")}" /></a>
- <p>{$locale->tr("parent_album")}</p>
+ <img src="{$url->getTemplateFile("parentfolder.gif")}" alt="{$locale->tr("parent")}" /></a>
+ <p>{$locale->tr("parent")}</p>
</div>
{assign var="counter" value=1}
Modified: templates/trunk/standard_red/albums.template
===================================================================
--- templates/trunk/standard_red/albums.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_red/albums.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -24,6 +24,5 @@
</div>
<!-- end of the albums -->
-
{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/standard_red/error.template
===================================================================
--- templates/trunk/standard_red/error.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_red/error.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,4 +1,6 @@
{include file="$blogtemplate/header.template"}
<h2>{$locale->tr("error")}</h2>
{$locale->tr($message)}
+ <br /><a href="javascript:history.go(-1)">{$locale->tr("back")}</a>
+
{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/standard_red/footer.template
===================================================================
--- templates/trunk/standard_red/footer.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_red/footer.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -16,7 +16,19 @@
<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")|capitalize} </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>
+
<h2>{$locale->tr("recently")}</h2>
<div id="Recently">
<ul>
Modified: templates/trunk/standard_red/main.template
===================================================================
--- templates/trunk/standard_red/main.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_red/main.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,9 +1,5 @@
- {include file="$blogtemplate/header.template"}
-
- {foreach from=$posts item=post}
-
- {include file="$blogtemplate/post.template"}
-
- {/foreach}
-
- {include file="$blogtemplate/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/header.template"}
+{foreach from=$posts item=post}
+{include file="$blogtemplate/post.template"}
+{/foreach}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Modified: templates/trunk/standard_red/post.template
===================================================================
--- templates/trunk/standard_red/post.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_red/post.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -9,14 +9,8 @@
</div>
<p class="footer">
- {foreach name=categories from=$post->getCategories() item=postCategory}
- <a href="{$url->postCategoryLink($post)}">{$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->getNumTrackbacks()})</a>
+{foreach name=categories from=$post->getCategories() item=postCategory}
+<a href="{$url->postCategoryLink($post)}">{$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->getNumTrackbacks()})</a>
</p>
Modified: templates/trunk/standard_red/postandcomments.template
===================================================================
--- templates/trunk/standard_red/postandcomments.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_red/postandcomments.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,11 +1,11 @@
{include file="$blogtemplate/header.template"}
<p id="Nextpost">
- {assign var=nextpost value=$post->getNextArticle()}
+{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()}">«</a> |
{/if}
- {assign var=prevpost value=$post->getPrevArticle()}
{if $prevpost == true}
<a href="{$url->postPermalink($prevpost)}" title="Previous post: {$prevpost->getTopic()}">»</a>
{/if}
Added: templates/trunk/standard_red/searchresults.template
===================================================================
--- templates/trunk/standard_red/searchresults.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_red/searchresults.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -0,0 +1,21 @@
+{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()}
+ {if $urlmode == 2}
+ <h3><a href="{$url->postPermalink($article)}?searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a></h3>
+ {else}
+ <h3><a href="{$url->postPermalink($article)}&searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a></h3>
+ {/if}
+ <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->postCategoryLink($article)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+ {/foreach}</p>
+ {/foreach}
+ </div>
+{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/standard_red/standard_red.css
===================================================================
--- templates/trunk/standard_red/standard_red.css 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/standard_red/standard_red.css 2005-03-04 16:44:57 UTC (rev 1312)
@@ -170,7 +170,11 @@
background-color:#fff;
}
-#Calendar {
+#Search form {
+ margin: 5px 0;
+}
+
+#Calendar, #Search {
border-left-color:#d4d0cd;
border-left-style:solid;
border-left-width:6px;
Modified: templates/trunk/toto/error.template
===================================================================
--- templates/trunk/toto/error.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/toto/error.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -7,10 +7,10 @@
<table>
<tr>
<td>
- <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
+ <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
</td>
<td>
- {$locale->tr($message)}
+ {$locale->tr($message)}<br /><a href="javascript:history.go(-1)">{$locale->tr("back")}</a>
</td>
</tr>
</table>
Modified: templates/trunk/toto/panel.template
===================================================================
--- templates/trunk/toto/panel.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/toto/panel.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -8,6 +8,21 @@
</td>
</tr>
<tr>
+ <td class="catName"> {$locale->tr("search")|capitalize}</td>
+ </tr>
+ <tr>
+ <td>
+ <form id="search_form" method="post" action="{$url->getIndexUrl()}">
+ <div>
+ <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()}" />
+ </div>
+ </form>
+ </td>
+ </tr>
+ <tr>
<td class="catName"> {$locale->tr("recently")|capitalize}</td>
</tr>
<tr>
Modified: templates/trunk/toto/panel_with_comments.template
===================================================================
--- templates/trunk/toto/panel_with_comments.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/toto/panel_with_comments.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -8,6 +8,21 @@
</td>
</tr>
<tr>
+ <td class="catName"> {$locale->tr("search")|capitalize}</td>
+ </tr>
+ <tr>
+ <td>
+ <form id="search_form" method="post" action="{$url->getIndexUrl()}">
+ <div>
+ <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()}" />
+ </div>
+ </form>
+ </td>
+ </tr>
+ <tr>
<td class="catName"> {$locale->tr("recently")|capitalize}</td>
</tr>
<tr>
Modified: templates/trunk/toto/post.template
===================================================================
--- templates/trunk/toto/post.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/toto/post.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -18,16 +18,13 @@
<a href="{$url->postPermalink($post)}" class="post">{$locale->tr("comments")}</a> ({$post->getTotalComments()}) |
<img alt="Trackback" src="{$url->getTemplateFile("trackback.gif")}" width="16" height="11" align="absmiddle" />
<a href="{$url->postTrackbackStatsLink($post)}" class="post">{$locale->tr("trackbacks")}</a> ({$post->getNumTrackbacks()}) |
- {foreach name=categories from=$post->getCategories() item=postCategory}
- <a class="post"
- href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>
- {if !$smarty.foreach.categories.last}, {/if}
- {/foreach}
- </td>
+ {foreach name=categories from=$post->getCategories() item=postCategory}
+ <a href="{$url->postCategoryLink($post)}" class="post">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+ {/foreach}</td>
</tr>
<tr>
<td class="article">
{$post->getText()}
</td>
</tr>
- </table>
+ </table>
\ No newline at end of file
Added: templates/trunk/toto/searchresults.template
===================================================================
--- templates/trunk/toto/searchresults.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/toto/searchresults.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -0,0 +1,43 @@
+{include file="$blogtemplate/header.template"}
+ <tr>
+ <td valign="top">
+ <table width="100%" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td height="3"></td>
+ </tr>
+ </table>
+ <table width="100%" border="0" cellspacing="2" cellpadding="2">
+ <tr>
+ <td class="catList">{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</td>
+ </tr>
+ </table>
+ {foreach from=$searchresults item=result}
+ {assign var=article value=$result->getArticle()}
+ <table width="100%" border="0" cellspacing="0" cellpadding="4">
+ <tr>
+ {if $urlmode == 2}
+ <td class="title"><a href="{$url->postPermalink($article)}?searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a></td>
+ {else}
+ <td class="title"><a href="{$url->postPermalink($article)}&searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a></td>
+ {/if}
+ </tr>
+ <tr>
+ <td class="info">
+ {foreach name=categories from=$article->getCategories() item=postCategory}
+ <a href="{$url->postCategoryLink($article)}" class="post">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+ {/foreach}
+ </td>
+ </tr>
+ <tr>
+ <td class="article">
+ {$article->getText()|strip_tags|truncate:300:"...":false}
+ </td>
+ </tr>
+ </table>
+ {/foreach}
+ </td>
+ <td width="200" valign="top" class="panel">
+ {include file="$blogtemplate/panel.template"}
+ </td>
+ </tr>
+{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/tribal/error.template
===================================================================
--- templates/trunk/tribal/error.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/tribal/error.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,6 +1,6 @@
{include file="$blogtemplate/header.template"}
<h1>{$locale->tr("error")}</h1>
<p>
- <strong>{$locale->tr($message)}</strong>
+ <strong>{$locale->tr($message)}</strong><br /><a href="javascript:history.go(-1)">{$locale->tr("back")}</a>
</p>
{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/tribal/footer.template
===================================================================
--- templates/trunk/tribal/footer.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/tribal/footer.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,7 +1,7 @@
</div> <!-- End [content] -->
<div id="footer">Design by bitxor</div>
</div> <!-- End [main] -->
- <div id="end"> Powered by <a href="http://www.plogworld.org">pLog</a><br />
+ <div id="end"> Powered by <a href="http://www.plogworld.net">pLog</a><br />
<a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0 Strict</a> - <a href="http://jigsaw.w3.org/css-validator/check/referer">Valid CSS</a></div>
</body>
</html>
Modified: templates/trunk/tribal/header.template
===================================================================
--- templates/trunk/tribal/header.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/tribal/header.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -18,6 +18,19 @@
<div id="logo" title="{$blog->getAbout()}">{$blog->getBlog()}</div>
<div id="menu">{$locale->formatDate($now,"%A, %d %B %Y")}</div>
<div id="navigation">
+ <h2>{$locale->tr("search")}</h2>
+ <br />
+ <div>
+ <form id="search_form" method="post" action="{$url->getIndexUrl()}">
+ <div>
+ <label for="searchTerms" style="display:none;">{$locale->tr("search_this_blog")|capitalize} </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>
+ <br />
<h2>{$locale->tr("categories")}</h2>
<ul class="itemsdot">
<li><a href="{$url->blogLink()}">{$locale->tr("main")}</a></li>
Modified: templates/trunk/tribal/post.template
===================================================================
--- templates/trunk/tribal/post.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/tribal/post.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -3,15 +3,5 @@
<p>{$post->getText()}</p>
{assign var="postDate" value=$post->getDateObject()}
{assign var="postOwner" value=$post->getUserInfo()}
- <div class="footerpost">{$locale->tr("posted_by")}
- <strong>{$postOwner->getUsername()}</strong>, {$locale->formatDate($postDate,"%d %B %Y %H:%M")} |
- {foreach name=categories from=$post->getCategories() item=postCategory}
- <a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>
- {if !$smarty.foreach.categories.last}, {/if}
- {/foreach}
- | <a href="{$url->postLink($post)}">{$locale->tr("comment on this")}</a> ({$post->getTotalComments()})
- | <a title="{$locale->tr("permalink_title")}"
- href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a>
- | <a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")}
- ({$post->getNumTrackbacks()})</a></div>
- <br />
+ <div class="footerpost">Por <strong>{$postOwner->getUsername()}</strong>, {$locale->formatDate($postDate,"%d %B %Y %H:%M")} | {foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach} | <a href="{$url->postLink($post)}">{$locale->tr("comment on this")}</a> ({$post->getTotalComments()}) | <a title="{$locale->tr("permalink_title")}" href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> | <a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a></div>
+ <br />
\ No newline at end of file
Added: templates/trunk/tribal/searchresults.template
===================================================================
--- templates/trunk/tribal/searchresults.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/tribal/searchresults.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -0,0 +1,21 @@
+{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()}
+ {if $urlmode == 2}
+ <h3><a href="{$url->postPermalink($article)}?searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a></h3>
+ {else}
+ <h3><a href="{$url->postPermalink($article)}&searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a></h3>
+ {/if}
+ <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->postCategoryLink($article)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+ {/foreach}</p>
+ {/foreach}
+ </div>
+{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/white/error.template
===================================================================
--- templates/trunk/white/error.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/white/error.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,4 +1,4 @@
{include file="$blogtemplate/header.template"}
<h3>{$locale->tr("error")}</h3>
- {$locale->tr($message)}
+ {$locale->tr($message)}<br /><a href="javascript:history.go(-1)">{$locale->tr("back")}</a>
{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/white/footer.template
===================================================================
--- templates/trunk/white/footer.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/white/footer.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -5,6 +5,20 @@
</p></div>
<div id="menu">
+<h4>{$locale->tr("search")|capitalize}</h4>
+<p>
+ <ul><li>
+ <form id="search_form" method="post" action="{$url->getIndexUrl()}">
+ <div>
+ <label for="searchTerms" style="display:none;">{$locale->tr("search_this_blog")|capitalize} </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>
+ </li></ul>
+</p>
+
<h4>{$locale->tr("archives")|capitalize}</h4>
<p>
<ul>
Modified: templates/trunk/white/post.template
===================================================================
--- templates/trunk/white/post.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/white/post.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -7,10 +7,7 @@
<div class="postinfo">
{$locale->tr("posted_by")}
<a href="{$url->postUserLink($postOwner)}">{$postOwner->getUsername()}</a>
-({foreach name=categories from=$post->getCategories() item=postCategory}
- <a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>
- {if !$smarty.foreach.categories.last}, {/if}
- {/foreach})
+({foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach})
:: <a href="{$url->postPermalink($post)}">{$locale->tr("comment")|capitalize}
({$post->getTotalComments()})</a>
</div>
Added: templates/trunk/white/searchresults.template
===================================================================
--- templates/trunk/white/searchresults.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/white/searchresults.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -0,0 +1,21 @@
+{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}
+ <div class="post">
+ {assign var=article value=$result->getArticle()}
+ {if $urlmode == 2}
+ <h3><a href="{$url->postPermalink($article)}?searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a></h3>
+ {else}
+ <h3><a href="{$url->postPermalink($article)}&searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a></h3>
+ {/if}
+ <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->postCategoryLink($article)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+ {/foreach}</p>
+ </div>
+ {/foreach}
+ </div>
+{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/zen/albums.template
===================================================================
--- templates/trunk/zen/albums.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/zen/albums.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -1,6 +1,6 @@
{include file="$blogtemplate/header.template"}
<div id="content">
- <h2>{$locale->tr("resource_albums")|capitalize}</h2>
+ <h2>{$locale->tr("root_album")|capitalize}</h2>
{foreach from=$albums item=album}
{assign var="aDate" value=$album->getTimestamp()}
<div class="post">
Modified: templates/trunk/zen/error.template
===================================================================
--- templates/trunk/zen/error.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/zen/error.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -11,7 +11,7 @@
<div class="storycontent">
<img src="{$url->getUrl("/imgs/error.gif")}" height="32" width="32" alt="Error"/>
- {$locale->tr($message)}
+ {$locale->tr($message)}<br /><a href="javascript:history.go(-1)">{$locale->tr("back")}</a>
</div>
</div>
</div>
Modified: templates/trunk/zen/panel.template
===================================================================
--- templates/trunk/zen/panel.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/zen/panel.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -4,15 +4,36 @@
<li id="wordpress">
{$locale->tr("menu")}
<ul>
+ <li><a href="{$url->blogLink()}">{$locale->tr("main")}</a> </li>
<li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
+ <li><a href="{$url->getAdminUrl()}">{$locale->tr("admin")}</a></li>
</ul>
</li>
+<div class="Sidetitle">
+ <h4>{$locale->tr("search")}</h4>
+</div>
+<p>
+ <form name="search_form" method="post" action="{$url->getIndexUrl()}">
+ <input type="text" name="searchTerms" value="" size="14" /><br/>
+ <input type="hidden" name="op" value="Search" />
+ <input type="hidden" name="blogId" value="{$blog->getId()}"/>
+ <input type="submit" name="Search" value="{$locale->tr("search")|capitalize}" />
+ </form>
+ </p>
+ <li id="recently">
+ {$locale->tr("recently")}
+ <ul>
+ {foreach from=$recentposts item=recentpost}
+ <li><a title="{$recentpost->getText()|truncate:150:"..."|strip_tags|escape}" href="{$url->postLink($recentpost)}">{$recentpost->getTopic()}</a><br/>
+ {/foreach}
+</ul>
+</li>
<li id="categories">
{$locale->tr("categories")}
<ul>
{foreach from=$articlecategories item=articleCategory}
- <li><a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} [{$articleCategory->getNumArticles()}]</a></li>
+ <li><a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} [{$articleCategory->getNumArticles()}]</a><a href="{$url->categoryRssLink($articleCategory)}"><img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" style="border:0px;" alt="RSS 0.90" /></a><br/></li>
{/foreach}
</ul>
</li>
@@ -26,11 +47,12 @@
</ul>
</li>
<li id="calendar">
+ {$locale->tr("calendar")}
{$calendar}
</li>
<li id="meta">
- Meta
+ {$locale->tr("syndicate")}
<ul>
<li><a title="Link to the RSS 0.90 feed." href="{$url->rssLink("rss090")}">RSS 0.90</a></li>
<li><a title="Link to the RSS 1.0 feed." href="{$url->rssLink("rss10")}">RSS 1.0</a></li>
Modified: templates/trunk/zen/post.template
===================================================================
--- templates/trunk/zen/post.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/zen/post.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -4,17 +4,17 @@
<h3 class="storytitle"><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h3>
<div class="meta">
-<ul class="post-categories">
+
{foreach name=categories from=$post->getCategories() item=postCategory}
- <li><a href="{$url->postCategoryLink($post)}"
- title="{$postCategory->getName()}">
- {$postCategory->getName()}</a></li>
+ <ul class="post-categories"><li><a href="{$url->postCategoryLink($post)}" title="{$postCategory->getName()}">{$postCategory->getName()}</a></li></ul>
+ {if !$smarty.foreach.categories.last}, {/if}
{/foreach}
-</ul>
+
— {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
</div>
<div class="storycontent">
- {$post->getText()}
+ {assign var=postText value=$post->getText()}
+ {$postText}
<br style="clear: both;" />
</div>
<div class="feedback">
@@ -25,6 +25,5 @@
<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")}">{$post->getNumTrackbacks()} {$locale->tr("trackbacks")|capitalize}</a>
{else}
{$post->getNumTrackbacks()} {$locale->tr("trackbacks")|capitalize}
- {/if}
-</div>
-
+ {/if}
+</div>
\ No newline at end of file
Added: templates/trunk/zen/searchresults.template
===================================================================
--- templates/trunk/zen/searchresults.template 2005-03-04 16:28:18 UTC (rev 1311)
+++ templates/trunk/zen/searchresults.template 2005-03-04 16:44:57 UTC (rev 1312)
@@ -0,0 +1,24 @@
+{include file="$blogtemplate/header.template"}
+<div id="content">
+ <h2>{$locale->tr("search_matching_results")}{foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+ <div id="SearchResults">
+ {foreach from=$searchresults item=result}
+ <div class="post">
+ {assign var=article value=$result->getArticle()}
+ {if $urlmode == 2}
+ <h3><a href="{$url->postPermalink($article)}?searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a></h3>
+ {else}
+ <h3><a href="{$url->postPermalink($article)}&searchTerms={foreach from=$searchterms item=term}{$term|escape:"hex"}%20{/foreach}">{$article->getTopic()}</a></h3>
+ {/if}
+ <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->postCategoryLink($article)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+ {/foreach}</p>
+ </div>
+ {/foreach}
+ </div>
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
More information about the pLog-svn
mailing list