[pLog-svn] r1509 - in templates/trunk/reic: . images
jondaley at devel.plogworld.net
jondaley at devel.plogworld.net
Tue Mar 15 14:34:20 GMT 2005
Author: jondaley
Date: 2005-03-15 14:34:19 +0000 (Tue, 15 Mar 2005)
New Revision: 1509
Added:
templates/trunk/reic/images/compressed.gif
templates/trunk/reic/images/file.gif
templates/trunk/reic/images/folder.gif
templates/trunk/reic/images/footer.gif
templates/trunk/reic/images/parentfolder.gif
templates/trunk/reic/images/sound.gif
templates/trunk/reic/images/video.gif
Removed:
templates/trunk/reic/images/footer.jpg
Modified:
templates/trunk/reic/album.template
templates/trunk/reic/albums.template
templates/trunk/reic/commentform.template
templates/trunk/reic/error.template
templates/trunk/reic/images/header.gif
templates/trunk/reic/postandcomments.template
templates/trunk/reic/reic.css
templates/trunk/reic/reic.psd
templates/trunk/reic/resource.template
templates/trunk/reic/screenshot.jpg
templates/trunk/reic/searchresults.template
Log:
new changes from reic
Modified: templates/trunk/reic/album.template
===================================================================
--- templates/trunk/reic/album.template 2005-03-15 14:31:07 UTC (rev 1508)
+++ templates/trunk/reic/album.template 2005-03-15 14:34:19 UTC (rev 1509)
@@ -2,100 +2,74 @@
<div id="container">
{assign var="postDate" value=$album->getTimestamp()}
<div class="blog">
- <h2 class="date">{$album->getName()}</h2>
+ <h2 class="date">{$locale->tr("albums")}</h2>
<div class="blogbody">
+ <h3 class="title">{$album->getName()}</h3>
<div class="posted">
- <img alt="Album" src="{$url->getTemplateFile("folderblue.gif")}" width="10" height="11" style="border:0px;" />
<a href="{$url->albumLink($album)}">
{$locale->tr("resources")} ({$album->getNumResources()})
</a> | {$locale->tr("created")} {$locale->formatDate($postDate,"%d %b, %Y")}
</div>
- </div>
<p>{$album->getDescription()}</p><br/>
+ </div>
+ <div class="clear"> </div>
-{**
- smarty template gets a bit complicated here since we want to show the contents of the album in a nicely
- arranged table, and that needs some very basic maths... we also need to check after every iteration
- wether we have to close the current row or start a new one, and so on...
- **}
-
- <!-- album contents go here -->
-<table style="border:0px;width:100%;" summary="Album Resources">
- <tr>
- <td style="width:25%;" align="center" >
- <a href="{$url->parentAlbumLink($album)}">
- <img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
- ..
- </a>
- </td>
- {assign var="counter" value=1}
- {assign var=children value=$album->getChildren()}
- {foreach from=$children item=childalbum}
- <td style="width:25%;" align="center" >
- <a href="{$url->albumLink($childalbum)}">
- <img style="border:0px;" src="{$url->getUrl("/imgs/folder.gif")}" alt="Folder" /><br/>
- {$childalbum->getName()} ({$childalbum->getNumResources()})
- </a>
- <br/><br/>
- {assign var="counter" value="`$counter+1`"}
- </td>
- {if $counter%4}
- </tr>
- <tr>
- {/if}
- {/foreach}
+ <div class="album">
+ <a href="{$url->parentAlbumLink($album)}">
+ <img src="{$url->getTemplateFile("images/parentfolder.gif")}" alt="{$locale->tr("parent")}" /></a>
+ <p>{$locale->tr("parent")}</p>
+ </div>
- <!--- show the resources here -->
- {assign var=resources value=$album->getResources()}
- {foreach from=$resources item=resource}
- <td style="width:25%;" align="center" >
- {if $resource->hasPreview()}
- {*<a target="_blank" href="resserver.php?blogId={$blog->getId()}&resource={$resource->getFileName()}">*}
- <a href="{$url->resourceLink($resource)}">
- <img alt="{$resource->getDescription()}" style="border:0px;" src="{$url->resourcePreviewLink($resource)}" />
- <br/>{$resource->getFileName()}
- </a>
- {else}
- <a href="{$url->resourceLink($resource)}">
- {if $resource->isSound()}
- <img alt="Sound" src="{$url->getUrl("/imgs/sound.gif")}" height="64" width="64" style="border:0px;" />
- {elseif $resource->isVideo()}
- <img alt="Video" src="{$url->getUrl("/imgs/video.gif")}" height="64" width="64" style="border:0px;" />
- {elseif $resource->isZip()}
- <img alt="Zip" src="{$url->getUrl("/imgs/compressed.gif")}" height="64" width="64" style="border:0px;" />
- {else}
- <img alt="File" src="{$url->getUrl("/imgs/file.gif")}" height="64" width="64" style="border:0px;" />
- {/if}
- <br/>{$resource->getFileName()}
- </a>
- {/if}
- <br/>
- {assign var=metadata value=$resource->getMetadataReader()}
- {$metadata->getRoundedSize()}<br/>
- {if $resource->isImage()}
- {$metadata->getWidth()} x {$metadata->getHeight()}<br/>
- {elseif $resource->isSound()}
- {$metadata->getFormat()|upper} {$metadata->getSampleRate()} bps<br/>
- {elseif $resource->isVideo()}
- {$metadata->getFormat()|upper}
- {$metadata->getWidth()} x {$metadata->getHeight()},
- {$metadata->getLengthString()}<br/>
- {elseif $resource->isZip()}
- {$metadata->getTotalFiles()} {$locale->tr("files")}<br/>
- {/if}
- {assign var="counter" value="`$counter+1`"}
- </td>
- {if $counter%4 == 0}
- </tr>
- <tr>
- {/if}
- {/foreach}
- <td></td></tr>
-</table>
- <!-- end of album contents -->
+ {assign var=children value=$album->getChildren()}
+ {foreach from=$children item=childalbum}
+ <div class="album">
+ <a href="{$url->albumLink($childalbum)}">
+ <img src="{$url->getTemplateFile("images/folder.gif")}" alt="{$childalbum->getName()}" /></a>
+ <p>{$childalbum->getName()} ({$childalbum->getNumResources()})</p>
+ </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()}&resource={$resource->getFileName()}">*}
+ <a href="{$url->resourceLink($resource)}" title="{$resource->getFileName()}">
+ <img alt="{$resource->getDescription()}" src="{$url->resourcePreviewLink($resource)}" /></a>
+ <p>{$resource->getFileName()}</p>
+ {else}
+ <a href="{$url->resourceLink($resource)}" title="{$resource->getFileName()}">
+ {if $resource->isSound()}
+ <img alt="Sound" src="{$url->getTemplateFile("images/sound.gif")}" /></a>
+ {elseif $resource->isVideo()}
+ <img alt="Video" src="{$url->getTemplateFile("images/video.gif")}" /></a>
+ {elseif $resource->isZip()}
+ <img alt="Zip" src="{$url->getTemplateFile("images/compressed.gif")}" /></a>
+ {else}
+ <img alt="File" src="{$url->getTemplateFile("images/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}
+
+ </div>
+ {/foreach}
+
+ <div class="clearer"> </div>
+
</div>
</div>
-{include file="$blogtemplate/panel.template"}
{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/reic/albums.template
===================================================================
--- templates/trunk/reic/albums.template 2005-03-15 14:31:07 UTC (rev 1508)
+++ templates/trunk/reic/albums.template 2005-03-15 14:34:19 UTC (rev 1509)
@@ -1,20 +1,22 @@
{include file="$blogtemplate/header.template"}
<div id="content">
-{foreach from=$albums item=album}
- {assign var="aDate" value=$album->getTimestamp()}
<div class="blog">
- <h2 class="date">{$album->getName()}</h2>
<div class="blogbody">
- <div class="posted">
- <img alt="Album" src="{$url->getTemplateFile("folderblue.gif")}" width="10" height="11" style="border:0px;" />
- <a href="{$url->albumLink($album)}">
- {$locale->tr("view")} ({$album->getNumResources()})
- </a>| {$locale->tr("created")} {$locale->formatDate($aDate,"%d %b, %Y")}
- </div>
- </div>
-{$album->getDescription()|truncate:255:"..."|escape}
+ <h2 class="date">{$locale->tr("albums")}</h2>
+ <div class="clear"> </div>
+
+
+ {foreach from=$albums item=album}
+ <div class="album">
+ <a href="{$url->albumLink($album)}"><img src="{$url->getTemplateFile("images/folder.gif")}" alt="{$album->getName()}" /></a>
+ <p>{$album->getName()} ({$album->getNumResources()})</p>
+
+ </div>
+ {/foreach}
+
+ <div class="clear"> </div>
+
</div>
-{/foreach}
</div>
-{include file="$blogtemplate/panel.template"}
+</div>
{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/reic/commentform.template
===================================================================
--- templates/trunk/reic/commentform.template 2005-03-15 14:31:07 UTC (rev 1508)
+++ templates/trunk/reic/commentform.template 2005-03-15 14:34:19 UTC (rev 1509)
@@ -1,4 +1,4 @@
- <div class="comments-body">
+<a name="comments_form"></a> <div class="comments-body">
<form name="NewComment" action="{$url->getBaseUrl()}/index.php" method="post">
<div style="width:150px; padding-right:15px; margin-right:15px; float:left; text-align:left; border-right:1px dotted #bbb;">
<label for="subject">{$locale->tr("comment_topic")}:</label><br />
Modified: templates/trunk/reic/error.template
===================================================================
--- templates/trunk/reic/error.template 2005-03-15 14:31:07 UTC (rev 1508)
+++ templates/trunk/reic/error.template 2005-03-15 14:34:19 UTC (rev 1509)
@@ -3,19 +3,7 @@
<div class="blog">
<div class="blogbody">
<h2 class="title">{$locale->tr("error")}</h2>
- <div class="posted">
- {$locale->tr("generated")} {$locale->formatDate($now,"%d %b, %Y")}
- </div>
- <table>
- <tr>
- <td>
- <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
- </td>
- <td>
- {$locale->tr($message)}
- </td>
- </tr>
- </table>
+ <p>{$locale->tr($message)}</p>
</div>
</div>
</div>
Added: templates/trunk/reic/images/compressed.gif
===================================================================
(Binary files differ)
Property changes on: templates/trunk/reic/images/compressed.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: templates/trunk/reic/images/file.gif
===================================================================
(Binary files differ)
Property changes on: templates/trunk/reic/images/file.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: templates/trunk/reic/images/folder.gif
===================================================================
(Binary files differ)
Property changes on: templates/trunk/reic/images/folder.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: templates/trunk/reic/images/footer.gif
===================================================================
(Binary files differ)
Property changes on: templates/trunk/reic/images/footer.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: templates/trunk/reic/images/footer.jpg
===================================================================
(Binary files differ)
Modified: templates/trunk/reic/images/header.gif
===================================================================
(Binary files differ)
Added: templates/trunk/reic/images/parentfolder.gif
===================================================================
(Binary files differ)
Property changes on: templates/trunk/reic/images/parentfolder.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: templates/trunk/reic/images/sound.gif
===================================================================
(Binary files differ)
Property changes on: templates/trunk/reic/images/sound.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: templates/trunk/reic/images/video.gif
===================================================================
(Binary files differ)
Property changes on: templates/trunk/reic/images/video.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: templates/trunk/reic/postandcomments.template
===================================================================
--- templates/trunk/reic/postandcomments.template 2005-03-15 14:31:07 UTC (rev 1508)
+++ templates/trunk/reic/postandcomments.template 2005-03-15 14:34:19 UTC (rev 1509)
@@ -1,19 +1,22 @@
{include file="$blogtemplate/header.template"}
{assign var="postDate" value=$post->getDateObject()}
{assign var="postOwner" value=$post->getUserInfo()}
+
<div id="container">
{* Prevpost and nextpost use *}
<div id="article_index">
{assign var=nextpost value=$post->getNextArticle()}
- {if $nextpost == true}
- <a href="{$url->postPermalink($nextpost)}" title="Next post: {$nextpost->getTopic()}">« Next_post</a> |
- {/if}
{assign var=prevpost value=$post->getPrevArticle()}
- {if $prevpost == true}
- <a href="{$url->postPermalink($prevpost)}" title="Previous post: {$prevpost->getTopic()}">Prev_post»</a>
+ {if $prevpost == true}
+ <a href="{$url->postPermalink($prevpost)}" title="Previous post: {$prevpost->getTopic()}">« {$locale->tr("previous_post")}</a> |
{/if}
+ {if $nextpost == true}
+ <a href="{$url->postPermalink($nextpost)}" title="Next post: {$nextpost->getTopic()}">{$locale->tr("next_post")}»</a>
+ {/if}
</div>
{* End of article_index *}
+
+
<div class="blog">
{include file="$blogtemplate/post.template"}
</div>
@@ -27,28 +30,30 @@
<div class="comments-head">
<a name="comments"></a>Comments
</div>
- {counter assign=commentNumber start=$post->getTotalComments() skip=1 direction=down}
- {foreach from=$comments item=comment}
+ {foreach name=comment from=$comments item=comment}
<div class="comments-body">
<a name="{$comment->getId()}"></a>
- <div class="com_countandpost"><span class="comments-count">[{$commentNumber}]{counter}</span>
- <span style="padding-left:10px;float:left;"><strong>{$comment->getTopic()}</strong></span><span class="comments-post">
+ <div class="com_countandpost"><span class="comments-count">[{$smarty.foreach.comment.total-$smarty.foreach.comment.iteration+1}]</span>
+ <span style="padding-left:10px;float:left;"><strong>{$comment->getTopic()}</strong></span><span class="comments-post">[<a href="{$url->postPermalink($post)}#comments_form">{$locale->tr("comments")}</a>]|
{$locale->tr("posted_by")}
{if $comment->getUserUrl() != ""}
<a href="{$comment->getUserUrl()}"}>{$comment->getUsername()}</a>
{else}
{$comment->getUsername()}
{/if}
- {assign var=commentDate value=$comment->getDateObject()}
+ |{assign var=commentDate value=$comment->getDateObject()}
{$locale->formatDate($commentDate, "%d %b %Y, %H:%M")}
</span>
</div>
- {$comment->getText()}
-
+
+ {$comment->getText()}
+
</div>
{/foreach}
</div>
+
+ <div class="clear"> </div>
</div>
{include file="$blogtemplate/panel.template"}
{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/reic/reic.css
===================================================================
--- templates/trunk/reic/reic.css 2005-03-15 14:31:07 UTC (rev 1508)
+++ templates/trunk/reic/reic.css 2005-03-15 14:34:19 UTC (rev 1509)
@@ -33,13 +33,24 @@
#title {
-color: #BB66AA;
-font-size:large;
-display:none;
-font-weight:bold;
+padding-left:35px;
+font-size:28px;
+padding-top:25px;
+ font-weight: bold;
}
+.description{
+ font-size:14px;
+ color: white;
+}
+#title a{
+ text-decoration: none;
+ color: #581085;
+}
+#title a:hover{
+ text-decoration: none;
+ color: White;
+}
-
#nav_r{
width: 760px;
height:25px;
@@ -231,10 +242,10 @@
#footer {
float: left;
width: 760px;
-height: 45px;
+height: 30px;
padding-top:15px;
text-align: left;
-background: transparent url(images/footer.jpg) no-repeat scroll;
+background: transparent url(images/footer.gif) no-repeat scroll left bottom;
color: #666666;
}
@@ -260,7 +271,7 @@
{
font-weight: bold;
}
-.calMonthToday{
+.calendarToday{
border:1px dotted #669933;
}
@@ -317,7 +328,25 @@
background: transparent;
}
+/* ****************** albums *************** */
+div.album {
+ text-align: center;
+ float: left;
+ width:150px;
+ margin-bottom:20px;
+ }
+
+.album p {
+ text-align: center;
+ padding:0;
+ margin:0;
+ width:150px;
+ }
+
.clear{
clear: both;
}
+img{
+ border: 0px;
+}
\ No newline at end of file
Modified: templates/trunk/reic/reic.psd
===================================================================
(Binary files differ)
Modified: templates/trunk/reic/resource.template
===================================================================
--- templates/trunk/reic/resource.template 2005-03-15 14:31:07 UTC (rev 1508)
+++ templates/trunk/reic/resource.template 2005-03-15 14:34:19 UTC (rev 1509)
@@ -1,56 +1,55 @@
-{include file="$blogtemplate/header.template"}
-{assign var=metadata value=$resource->getMetadataReader()}
-{assign var=updated value=$resource->getTimestamp()}
-<div id="container">
- <div class="blog">
- <h2 class="date">{$resource->getFileName()}</h2>
- <div class="blogbody">
- <div class="posted">
- <img src="{$url->getTemplateFile("download.gif")}" width="10" height="11" alt="Download" style="border:0px;" />
- <a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a>
- ({$metadata->getRoundedSize()}) | {$locale->tr("created")} {$locale->formatDate($updated,"%d %b, %Y")}
- </div>
- </div>
- <p>{$resource->getDescription()}</p>
- {if $resource->isImage()}
- <img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
- {else}
- <a href="{$url->resourceDownloadLink($resource)}">
- {* show some information about the file *}
- {if $resource->isSound()}
- <img alt="Sound" src="{$url->getUrl("/imgs/sound.gif")}" height="64" width="64" style="border:0px;" /><br/>
- {$resource->getFileName()}
- </a><br/>
- {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
- {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
- {$locale->tr("sample_rate")}: {$metadata->getSampleRate()} Khz
- {elseif $resource->isVideo()}
- <img alt="Sound" src="{$url->getUrl("/imgs/video.gif")}" height="64" width="64" style="border:0px;" /><br/>
- {$resource->getFileName()}
- </a><br/>
- {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
- {$locale->tr("size")}: {$metadata->getHeight()} x {$metadata->getWidth()}<br/>
- {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
- {$locale->tr("video_codec")}: {$metadata->getVideoCodec()}<br/>
- {$locale->tr("audio_codec")}: {$metadata->getAudioCodec()}
- {elseif $resource->isZip()}
- <img alt="Sound" src="{$url->getUrl("/imgs/compressed.gif")}" height="64" width="64" style="border:0px;" /><br/>
- {$resource->getFileName()}
- </a><br/>
- {$metadata->getTotalFiles()} {$locale->tr("files")}<br/>
- {$locale->tr("uncompressed_size")}: {$metadata->getRoundedUncompressedSize()}
- {else}
- <img alt="Sound" src="{$url->getUrl("/imgs/file.gif")}" height="64" width="64" style="border:0px;" /><br/>
- {$resource->getFileName()}
- </a>
- {/if}
- {/if}
- <br/>
- <p>
- <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
- </p>
- </div>
-</div>
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}
-
+{include file="$blogtemplate/header.template"}
+{assign var=metadata value=$resource->getMetadataReader()}
+{assign var=updated value=$resource->getTimestamp()}
+<div id="container">
+ <div class="blog">
+ <div class="blogbody">
+ <h3 class="title">{$resource->getFileName()}</h3>
+ <div class="posted">
+ <img src="{$url->getTemplateFile("download.gif")}" width="10" height="11" alt="Download" style="border:0px;" />
+ <a href="{$url->resourceDownloadLink($resource)}">{$locale->tr("download")}</a>
+ ({$metadata->getRoundedSize()}) | {$locale->tr("created")} {$locale->formatDate($updated,"%d %b, %Y")}
+ </div>
+ </div>
+ <p>{$resource->getDescription()}</p>
+ {if $resource->isImage()}
+ <img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
+ {else}
+ <a href="{$url->resourceDownloadLink($resource)}">
+ {* show some information about the file *}
+ {if $resource->isSound()}
+ <img alt="Sound" src="{$url->getTemplateFile("images/sound.gif")}" height="64" width="64" style="border:0px;" /><br/>
+ {$resource->getFileName()}
+ </a><br/>
+ {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
+ {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
+ {$locale->tr("sample_rate")}: {$metadata->getSampleRate()} Khz
+ {elseif $resource->isVideo()}
+ <img alt="Sound" src="{$url->getTemplateFile("images/video.gif")}" height="64" width="64" style="border:0px;" /><br/>
+ {$resource->getFileName()}
+ </a><br/>
+ {$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
+ {$locale->tr("size")}: {$metadata->getHeight()} x {$metadata->getWidth()}<br/>
+ {$locale->tr("length")}: {$metadata->getLengthString()}<br/>
+ {$locale->tr("video_codec")}: {$metadata->getVideoCodec()}<br/>
+ {$locale->tr("audio_codec")}: {$metadata->getAudioCodec()}
+ {elseif $resource->isZip()}
+ <img alt="Sound" src="{$url->getTemplateFile("images/compressed.gif")}" height="64" width="64" style="border:0px;" /><br/>
+ {$resource->getFileName()}
+ </a><br/>
+ {$metadata->getTotalFiles()} {$locale->tr("files")}<br/>
+ {$locale->tr("uncompressed_size")}: {$metadata->getRoundedUncompressedSize()}
+ {else}
+ <img alt="Sound" src="{$url->getTemplateFile("images/file.gif")}" height="64" width="64" style="border:0px;" /><br/>
+ {$resource->getFileName()}
+ </a>
+ {/if}
+ {/if}
+ <br/>
+ <p>
+ {assign var=album value=$resource->getAlbum()}
+ <a href="{$url->albumLink($album)}">{$locale->tr("parent")}</a>
+ </p>
+ </div>
+</div>
+{include file="$blogtemplate/footer.template"}
Modified: templates/trunk/reic/screenshot.jpg
===================================================================
(Binary files differ)
Modified: templates/trunk/reic/searchresults.template
===================================================================
--- templates/trunk/reic/searchresults.template 2005-03-15 14:31:07 UTC (rev 1508)
+++ templates/trunk/reic/searchresults.template 2005-03-15 14:34:19 UTC (rev 1509)
@@ -1,34 +1,28 @@
{include file="$blogtemplate/header.template"}
-<div id="container">
- <div class="blog">
- <div class="blogbody">
- <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 class="title"><a href="{$url->postPermalink($article)}>{$article->getTopic()}</a></h3>
- {else}
- <h3 class="title"><a href="{$url->postPermalink($article)}">{$article->getTopic()}</a></h3>
- {/if}
+<div id="container">
+ <div class="blog">
- <div class="posted">{$locale->tr("categories")}:
- {foreach name=categories from=$article->getCategories() item=postCategory}
- <a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
- {/foreach}
-
- </div>
-
- {$article->getText()|strip_tags|truncate:300:"...":false}
-
-
- {/foreach}
- </div>
+ <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+ <div id="SearchResults">
+ {foreach from=$searchresults item=result}
+ <div class="blogbody">
+
+ {assign var=article value=$result->getArticle()}
+ <h3 class="title"><a href="{$url->postPermalink($article)}">{$article->getTopic()}</a></h3>
+ <div class="posted">{foreach name=categories from=$article->getCategories() item=articleCategory}
+ {$locale->tr("categories")}: <a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+ {/foreach}</div>
+
+
+
+ {$article->getText()|strip_tags|truncate:300:"...":false}
+
+ </div>
+ {/foreach}
+
+ </div>
</div>
- </div>
</div>
{include file="$blogtemplate/panel.template"}
{include file="$blogtemplate/footer.template"}
-
+
More information about the pLog-svn
mailing list