[pLog-svn] r4675 - in templates/branches/lifetype-1.2/SimpleRules: . css
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Fri Feb 2 10:30:19 EST 2007
Author: oscar
Date: 2007-02-02 10:30:18 -0500 (Fri, 02 Feb 2007)
New Revision: 4675
Removed:
templates/branches/lifetype-1.2/SimpleRules/commentform.template
templates/branches/lifetype-1.2/SimpleRules/flickr.template
Modified:
templates/branches/lifetype-1.2/SimpleRules/about.template
templates/branches/lifetype-1.2/SimpleRules/album.template
templates/branches/lifetype-1.2/SimpleRules/albums.template
templates/branches/lifetype-1.2/SimpleRules/css/poolie.css
templates/branches/lifetype-1.2/SimpleRules/footer.template
templates/branches/lifetype-1.2/SimpleRules/header.template
templates/branches/lifetype-1.2/SimpleRules/postandcomments.template
templates/branches/lifetype-1.2/SimpleRules/resource.template
Log:
Finalized Reto's porting job according to our (new) guidelines here: http://wiki.lifetype.net/index.php/Template_Guidelines, as well as polished a few things in the template. Hopefully the template author will approve of these changes :)
- added $pageTitle as the default page title for all pages
- made the user picture linkable and pointing to about.template
- fixed album.template so that all albums and files are properly laid out in the grid
- fixed album.template so that the list of child albums only appears in the first page
- removed commentform.template so that the global one under templates/default/ is used, and added some CSS code to make it look like it is the old one.
- added support for showing the picture of the user who posted the comment
- replaced $post->getComments() with $comments so that paging of comments works in postandcomments.template
Modified: templates/branches/lifetype-1.2/SimpleRules/about.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/about.template 2007-02-02 14:17:06 UTC (rev 4674)
+++ templates/branches/lifetype-1.2/SimpleRules/about.template 2007-02-02 15:30:18 UTC (rev 4675)
@@ -1,9 +1,10 @@
-{assign var="postPageTitle" value=" - About"}
-{include file="$blogtemplate/header.template"}
+{assign var=pageTitle value=$blog->getBlog()}
+{assign var=about value=$locale->tr("about")}
+{include file="$blogtemplate/header.template" pageTitle="$pageTitle | $about"}
<div id="content" class="narrowcolumn">
<div>
<div>
-<h2 class="title">About</h2>
+<h2 class="title">{$locale->tr("about")}</h2>
{$blog->getAbout()}
</div>
<br />
Modified: templates/branches/lifetype-1.2/SimpleRules/album.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/album.template 2007-02-02 14:17:06 UTC (rev 4674)
+++ templates/branches/lifetype-1.2/SimpleRules/album.template 2007-02-02 15:30:18 UTC (rev 4675)
@@ -20,81 +20,73 @@
**}
<!-- 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>
+
+
+<div class="album">
+ <a href="{$url->parentAlbumLink($album)}">
+ <img src="{$url->getUrl("/imgs/folder.gif")}" alt="{$locale->tr("parent")}" /></a>
+ <p>{$locale->tr("parent")}</p>
+</div>
+
+{if $pager->getCurrentPage() == 1}
+ {assign var="counter" value=1}
+ {assign var=children value=$album->getChildren()}
+ {foreach from=$children item=childalbum}
+ <div class="album">
+ <a href="{$url->albumLink($childalbum)}">
+ <img src="{$url->getUrl("/imgs/folder.gif")}" alt="{$childalbum->getName()}" /></a>
+ <p>{$childalbum->getName()} ({$childalbum->getNumResources()})</p>
+ {assign var="counter" value="`$counter+1`"}
+ {if $counter%3 == 0}
+ {/if}
+ </div>
+ {/foreach}
{/if}
-{/foreach}
+
<!--- show the resources here -->
{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}
+ <div class="album">
+ {if $resource->hasPreview()}
+ {*<a target="_blank" href="resserver.php?blogId={$blog->getId()}&resource={$resource->getFileName()}">*}
+ <a href="{$url->resourceLink($resource)}">
+ <img alt="{$resource->getDescription()}" src="{$url->resourcePreviewLink($resource)}" /></a>
+ <p>{$resource->getFileName()}</p>
+ {else}
+ <a href="{$url->resourceLink($resource)}">
+ {if $resource->isSound()}
+ <img alt="Sound" src="{$url->getUrl("/imgs/sound.gif")}" /></a>
+ {elseif $resource->isVideo()}
+ <img alt="Video" src="{$url->getUrl("/imgs/video.gif")}" /></a>
+ {elseif $resource->isZip()}
+ <img alt="Zip" src="{$url->getUrl("/imgs/compressed.gif")}" /></a>
+ {else}
+ <img alt="File" src="{$url->getUrl("/imgs/file.gif")}" /></a>
+ {/if}
+ <p>{$resource->getFileName()}</p>
+ {/if}
+ {assign var=metadata value=$resource->getMetadataReader()}
+ <p>{$metadata->getRoundedSize()}</p>
+ {if $resource->isImage()}
+ <p>{$metadata->getWidth()} x {$metadata->getHeight()}</p>
+ {elseif $resource->isSound()}
+ <p>{$metadata->getFormat()|upper} {$metadata->getSampleRate()} bps</p>
+ {elseif $resource->isVideo()}
+ <p>{$metadata->getFormat()|upper} {$metadata->getWidth()} x {$metadata->getHeight()}, {$metadata->getLengthString()}</p>
+ {elseif $resource->isZip()}
+ <p>{$metadata->getTotalFiles()} {$locale->tr("files")}</p>
+ {/if}
+ {assign var="counter" value="`$counter+1`"}
+ {if $counter%3 == 0}
+ {/if}
+ </div>
{/foreach}
-<td></td></tr>
-</table>
- {pager style="links"}
+<div style="clear:both"> </div>
+{pager style="links"}
+
<!-- end of album contents -->
</div>
Modified: templates/branches/lifetype-1.2/SimpleRules/albums.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/albums.template 2007-02-02 14:17:06 UTC (rev 4674)
+++ templates/branches/lifetype-1.2/SimpleRules/albums.template 2007-02-02 15:30:18 UTC (rev 4675)
@@ -12,6 +12,7 @@
</div>
{$album->getDescription()|strip_tags|truncate:255:"..."|escape}
</div>
+<br/>
{/foreach}
</div>
{include file="$blogtemplate/footer.template"}
Deleted: templates/branches/lifetype-1.2/SimpleRules/commentform.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/commentform.template 2007-02-02 14:17:06 UTC (rev 4674)
+++ templates/branches/lifetype-1.2/SimpleRules/commentform.template 2007-02-02 15:30:18 UTC (rev 4675)
@@ -1,36 +0,0 @@
-
-<h3 id="respond">{$locale->tr("add_comment")}</h3>
-<div class="commentBox">
-<form action="{$url->getIndexUrl()}" method="post">
-<div style="width:180px; padding-right:15px; margin-right:15px; float:left; text-align:left; border-right:1px dotted #bbb;">
-{dynamic}
-<label for="subject">{$locale->tr("comment_topic")}:</label><br />
-<input tabindex="1" id="subject" name="commentTopic" /><br /><br />
-<label for="author">{$locale->tr("comment_username")}:</label><br />
-{if $authuser}
- {$authuser->getUsername()} (<b>{$locale->tr("form_authenticated")}</b>)<br />
- <input type="hidden" name="userName" id="userName" value="{if $authuser}{$authuser->getUsername()}{/if}" />
- {else}
- <input tabindex="2" id="author" name="userName" /><br /><br />
-{/if}
-<label for="email">{$locale->tr("comment_email")}:</label><br />
-<input tabindex="3" id="email" name="userEmail" /><br /><br />
-<label for="url">{$locale->tr("comment_url")}:</label><br />
-<input tabindex="4" id="url" name="userUrl" /><br /><br />
-{/dynamic}
-</div>
-<div>
-<div id="toolbar">
-Hey, why don't you leave a Comment?<br />
-<acronym title="Hypertext Markup Language" xml:lang="en" lang="en">HTML</acronym> is allowed.
-</div>
-<textarea tabindex="5" id="text" name="commentText" rows="10" cols="50"></textarea><br /><br />
-<input style="font-weight: bold;" type="submit" name="post" value=" {$locale->tr("comment_send")} " /><br /><br />
-<input type="hidden" name="op" value="AddComment"/>
-<input type="hidden" name="articleId" value="{$post->getId()}"/>
-<input type="hidden" name="blogId" value="{$blog->getId()}"/>
-<input type="hidden" name="parentId" value="{$parentId}"/>
-</div>
-</form>
-</div>
-
Modified: templates/branches/lifetype-1.2/SimpleRules/css/poolie.css
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/css/poolie.css 2007-02-02 14:17:06 UTC (rev 4674)
+++ templates/branches/lifetype-1.2/SimpleRules/css/poolie.css 2007-02-02 15:30:18 UTC (rev 4675)
@@ -130,32 +130,6 @@
float: left;
}
-/* Begin Form Elements */
-.entry form { /* This is mainly for password protected posts, makes them look better. */
-text-align:center;
-}
-
-select {
-width: 130px;
-}
-
-#commentform input {
-width: 170px;
-padding: 2px;
-margin: 5px 5px 1px 0;
-}
-
-#commentform textarea {
-width: 100%;
-padding: 2px;
-}
-
-#commentform #submit {
-margin: 0;
-float: right;
-}
-/* End Form Elements */
-
/* Begin Comments*/
.alt {
margin: 0;
@@ -244,3 +218,75 @@
background: #fff;
color: #FF0084;
}
+
+/**
+ * styles for the comment form
+ */
+#CommentForm {
+ border:2px solid #9B1B34;
+ padding-top:10px;
+ margin-top:10px;
+ padding-left:10px;
+ padding-bottom:10px;
+ width:100%;
+}
+
+#CommentForm legend {
+ color:#525150;
+ padding:2px 4px 2px 4px;
+ background-color: #ffffff;
+ font-weight : bold;
+}
+
+#CommentForm label {
+ width:150px;
+ display:block;
+ clear:both;
+ float:left;
+ margin-top:8px;
+ margin-bottom:0px;
+}
+
+#CommentForm input {
+ width: 170px;
+ padding: 2px;
+ margin: 5px 5px 1px 0;
+}
+
+#Submit {
+ margin: 0;
+ float: right;
+}
+
+#CommentForm textarea {
+ width: 270px;
+ padding: 2px;
+ margin: 5px 5px 1px 0;
+}
+
+select {
+width: 130px;
+}
+
+/** styles for the album display **/
+
+div.album {
+ text-align: center;
+ float: left;
+ width:150px;
+ margin-bottom:20px;
+ margin-right:5px;
+ }
+
+.album p {
+ text-align: center;
+ padding: 0;
+ margin:0;
+ width:150px;
+ overflow: hidden;
+ }
+
+a img {border:none;}
+#album a:link {color: #004ca1;}
+#album a:visited {color: #b50394;}
+#album a:hover, #album a:active, #album a:focus {color: #004ca1;background:none;}
Deleted: templates/branches/lifetype-1.2/SimpleRules/flickr.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/flickr.template 2007-02-02 14:17:06 UTC (rev 4674)
+++ templates/branches/lifetype-1.2/SimpleRules/flickr.template 2007-02-02 15:30:18 UTC (rev 4675)
@@ -1,140 +0,0 @@
-{assign var="postPageTitle" value=" - Flickr Gallery"}
-{include file="$blogtemplate/header.template"}
-{if !empty($flickr)}
-<script type="text/javascript" src="{$url->getBaseUrl()}/plugins/flickr/js/annotation/annotation.js"></script>
-{literal}
-<STYLE TYPE="text/css">
-<!--
-.flickr-album {
-padding: 0 0 0 35px;
-width: 450px;
-clear: both;
-}
-
-.flickr-thumbnail {
-float: left;
-padding-right: 20px;
-background-color: #fff;
-border: 1px solid #a9a9a9;
-margin: 6px 6px 6px 6px;
-padding: 4px;
-margin-top: 10px;
-}
-
-.flickr-photo {
-padding-right: 20px;
-background-color: #fff;
-border: 1px solid #a9a9a9;
-margin: 6px 6px 6px 6px;
-padding: 4px;
-margin-top:10px;
-}
-
-.flickr-title {
-color: #260;
-border-bottom: 1px dashed #CCC;
-padding: 5px 0;
-}
-
-.flickr-album-nav {
-clear: both;
-text-align: left;
-}
-
-.flickr-photo-nav {
-clear: both;
-text-align: center;
-}
-
-.flickr-slideshow {
-clear: both;
-text-align: right;
-}
-
-.flickr-description {
-font-size: 11px;
-}
-
-a.annotation {
-position: absolute;
-border: 2px solid yellow;
-padding: 0;
-display: none;
-opacity: 0.2;
--moz-opacity: 0.2;
-filter: alpha(opacity=20);
-}
-a.annotation span {
-display: block;
-width: 100%;
-height: 100%;
-background: white;
-opacity: 0.2;
--moz-opacity: 0.2;
-filter: alpha(opacity=20);
-}
-a.annotation:hover {
-background: white;
-opacity: 0.2;
--moz-opacity: 0.2;
-filter: alpha(opacity=20);
-border: 2px solid blue;
-}
--->
-</STYLE>
-{/literal}
-<div id="content" class="narrowcolumn">
-<div>
-<div>
-<h2 class="title">Flickr Gallery</h2>
-{if $flickr->isEnabled()}
-{assign var=albumId value=$smarty.request.album}
-{assign var=photoId value=$smarty.request.photo}
-{assign var=secretId value=$smarty.request.secret}
-{if $albumId != '' && $photoId != '' && $secretId != ''}
-<div class="flickr-album-nav"><a href="{$flickr->pluginTemplatePage()}">{$locale->tr("flickr")}</a> » <a href="{$flickr->getAlbumUrl($albumId)}">{$locale->tr("flickr_album_id")} {$albumId}</a> » <b>{$locale->tr("flickr_photo_id")} {$photoId}</b></div>
-{assign var=flickrPhotoInfo value=$flickr->getPhotoInfo($photoId,$secretId)}
-<h3 class="flickr-title">{$locale->tr("flickr_photo_title")} {$flickrPhotoInfo.title}</h3>
-{assign var=photoNavigation value=$flickr->getPhotoNavigation($albumId,$photoId)}
-<div class="flickr-photo-nav">{if $photoNavigation.prevPhotoUrl != ''}<a href="{$photoNavigation.prevPhotoUrl}">« {$locale->tr("flickr_prev_photo")}</a>{/if} | {if $photoNavigation.nextPhotoUrl != ''}<a href="{$photoNavigation.nextPhotoUrl}">{$locale->tr("flickr_next_photo")} »</a>{/if}</div>
-<a href="{$flickrPhotoInfo.originalimageUrl}"><img class="annotated flickr-photo" src="{$flickrPhotoInfo.resizeimageUrl}" alt="" usemap="imgmap" /></a><br />
-{assign var=flickrNotes value=$flickrPhotoInfo.notes}
-<map id="imgmap">
-{foreach item=flickrNote from=$flickrNotes}
-<area alt="" title="{$flickrNote.noteDesc}" nohref="nohref" shape="rect" coords="{$flickrNote.noteX},{$flickrNote.noteY},{$flickrNote.noteX+$flickrNote.noteW-1},{$flickrNote.noteY+$flickrNote.noteH-1}" />
-{/foreach}
-</map>
-{assign var=flickrTags value=$flickrPhotoInfo.tags}
-<div class="flickr-description">{$locale->tr("flickr_photo_description")} {$flickrPhotoInfo.description}</div>
-<div class="flickr-description">{$locale->tr("flickr_photo_date")} {$flickrPhotoInfo.date}</div>
-<div class="flickr-description">{$locale->tr("flickr_photo_tag")} {foreach item=flickrTag from=$flickrTags}<a href="{$flickrTag.tagUrl}">{$flickrTag.tagName}</a> {/foreach}</div>
-<div class="flickr-description">{$locale->tr("flickr_photo_url")} <a href="{$flickrPhotoInfo.flickrUrl}">{$locale->tr("flickr_photo_see_url")} ({$flickrPhotoInfo.comments} {$locale->tr("comments")})</a></div>
-{elseif $albumId != '' && ($photoId == '' || $secretId == '')}
-<div class="flickr-nav"><a href="{$flickr->pluginTemplatePage()}">{$locale->tr("flickr")}</a> » <b>{$locale->tr("flickr_album_id")} {$albumId}</b></div>
-<div class="flickr-slideshow"><a href="#" onclick="window.open('{$flickr->getSlideShowUrl($albumId)}','slideShowWin','width=500,height=500,top=150,left=70,scrollbars=no, status=no, resizable=no')">{$locale->tr("flickr_view_as_slideshow")}</a></div>
-{assign var=flickrPhotos value=$flickr->getPhotos($albumId)}
-{foreach item=flickrPhoto from=$flickrPhotos}
-<a href="{$flickrPhoto.photoUrl}"><img class="flickr-thumbnail" src="{$flickrPhoto.thumbnailUrl}" alt="" /></a>
-{/foreach}
-{else}
-{assign var=flickrAlbums value=$flickr->getPhotoList()}
-{foreach name=flickrAlbum item=flickrAlbum from=$flickrAlbums}
-<div class="flickr-album">
-<a href="{$flickrAlbum.albumUrl}"><img class="flickr-thumbnail" src="{$flickrAlbum.thumbnailUrl}" alt="{$flickrAlbum.title}" /></a><br />
-<h4 class="flickr-title">{$locale->tr("flickr_album_title")} {$flickrAlbum.title}</h4>
-<div class="flickr-description">{$locale->tr("flickr_album_description")} {$flickrAlbum.description}</div>
-<div class="flickr-description">{$locale->tr("flickr_album_photos")} <a href="{$flickrAlbum.albumUrl}">{$flickrAlbum.photos}</a></div>
-<div class="flickr-description">{$locale->tr("flickr_album_url")} <a href="{$flickrAlbum.flickrUrl}">{$locale->tr("flickr_album_see_url")}</a></div>
-</div>
-{/foreach}
-{assign var=totalAlbums value=$smarty.foreach.flickrAlbum.total}
-{/if}
-{else}
-{$locale->tr("error_flickr_not_enabled")}
-{/if}
-{/if}
-</div>
-<br />
-</div>
-</div>
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Modified: templates/branches/lifetype-1.2/SimpleRules/footer.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/footer.template 2007-02-02 14:17:06 UTC (rev 4674)
+++ templates/branches/lifetype-1.2/SimpleRules/footer.template 2007-02-02 15:30:18 UTC (rev 4675)
@@ -21,7 +21,9 @@
<ul>
<li><div align="center">
{assign var=picture value=$blogOwner->getPicture()}
-<img src="{$picture->getPreviewLink()}" alt="{$picture->getDescription()}" />
+<a href="{$url->templatePage("about")}">
+ <img style="border:0px" src="{$picture->getPreviewLink()}" alt="{$picture->getDescription()}" />
+</a>
</div>
</li>
</ul>
@@ -85,11 +87,6 @@
<p style="float:right; text-align:right;"><span>
<a title="{$locale->tr("main")}" href="{$url->blogLink()}">{$locale->tr("main")}</a> | <a title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a>
-{if $flickr}
-{if $flickr->isEnabled()}
-| <a title="Flickr" href="{$flickr->pluginTemplatePage()}">Flickr</a>
-{/if}
-{/if}
<br />
<a title="RSS 0.90 feed." href="{$url->rssLink("rss090")}" style="color:#898989;">RSS 0.90</a> | <a title="RSS 1.0 feed." href="{$url->rssLink("rss10")}" style="color:#898989;">RSS 1.0</a> | <a title="RSS 2.0 feed." href="{$url->rssLink("rss20")}" style="color:#898989;">RSS 2.0</a> | <a title="Atom 0.3 feed." href="{$url->rssLink("atom")}" style="color:#898989;">Atom 0.3</a></span></p>
Modified: templates/branches/lifetype-1.2/SimpleRules/header.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/header.template 2007-02-02 14:17:06 UTC (rev 4674)
+++ templates/branches/lifetype-1.2/SimpleRules/header.template 2007-02-02 15:30:18 UTC (rev 4675)
@@ -4,7 +4,7 @@
lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
<head>
-<title>{$blog->getBlog()}{$postPageTitle}</title>
+ <title>{$pageTitle|escape:"html"}</title>
<!-- Meta Tags -->
<meta http-equiv="content-type" content="text/html; charset={$locale->getCharset()}" />
Modified: templates/branches/lifetype-1.2/SimpleRules/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/postandcomments.template 2007-02-02 14:17:06 UTC (rev 4674)
+++ templates/branches/lifetype-1.2/SimpleRules/postandcomments.template 2007-02-02 15:30:18 UTC (rev 4675)
@@ -42,16 +42,21 @@
<div>
<h3 id="comments">{$post->getTotalComments()} {$locale->tr("comments")} and {$post->getTotalTrackbacks()} {$locale->tr("trackbacks")} - "{$post->getTopic()}" </h3>
- {pager style="links"}
-{foreach from=$post->getComments() item=comment}
-<br />
+ {pager style="links"}
+{foreach from=$comments item=comment}
+<br />
-<ol class="commentlist">
-{if $gravatar}
-{if $gravatar->isEnabled()}
-<img alt="{$comment->getUsername()}" src="{$gravatar->gravatar($comment)}" width="{$gravatar->getSize()}" height="{$gravatar->getSize()}" align="right" />
-{/if}
-{/if}
+<ol class="commentlist">
+
+{if $comment->IsPosterAuthenticated()}
+ {assign var=poster value=$comment->getUser()}
+ {if $poster->hasPicture()}
+ {assign var=posterimg value=$poster->getPicture()}
+ {assign var=commenter value=$comment->getUser()}
+ <img src="{$posterimg->getPreviewLink()}" alt="{$commenter->getUserName()}" align="right" />
+ {/if}
+{/if}
+
<strong>{$comment->getTopic()}</strong>
<a name="{$comment->getId()}"></a><p>{$comment->getText()}</p>
<span class="comments-post">
@@ -65,7 +70,7 @@
am {$locale->formatDate($commentDate, "%d %b %Y, %H:%M")}
</span>
</ol>
-{/foreach}
+{/foreach}
{pager style="links"}
</div>
{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
@@ -75,4 +80,4 @@
</div>
{/if}
</div>
-{include file="$blogtemplate/footer.template"}
+{include file="$blogtemplate/footer.template"}
Modified: templates/branches/lifetype-1.2/SimpleRules/resource.template
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/resource.template 2007-02-02 14:17:06 UTC (rev 4674)
+++ templates/branches/lifetype-1.2/SimpleRules/resource.template 2007-02-02 15:30:18 UTC (rev 4675)
@@ -6,7 +6,6 @@
<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>
@@ -54,5 +53,4 @@
</p>
</div>
</div>
-
{include file="$blogtemplate/footer.template"}
\ No newline at end of file
More information about the pLog-svn
mailing list