[pLog-svn] r6415 - templates/branches/lifetype-1.2/unported/standard-with-plugins
jondaley at devel.lifetype.net
jondaley at devel.lifetype.net
Tue Apr 29 08:52:50 EDT 2008
Author: jondaley
Date: 2008-04-29 08:52:50 -0400 (Tue, 29 Apr 2008)
New Revision: 6415
Added:
templates/branches/lifetype-1.2/unported/standard-with-plugins/style-ie.css
Removed:
templates/branches/lifetype-1.2/unported/standard-with-plugins/imgs/
templates/branches/lifetype-1.2/unported/standard-with-plugins/video.gif
Modified:
templates/branches/lifetype-1.2/unported/standard-with-plugins/album.template
templates/branches/lifetype-1.2/unported/standard-with-plugins/albums.template
templates/branches/lifetype-1.2/unported/standard-with-plugins/archives.template
templates/branches/lifetype-1.2/unported/standard-with-plugins/footer.template
templates/branches/lifetype-1.2/unported/standard-with-plugins/header.template
templates/branches/lifetype-1.2/unported/standard-with-plugins/links.template
templates/branches/lifetype-1.2/unported/standard-with-plugins/main.template
templates/branches/lifetype-1.2/unported/standard-with-plugins/post.template
templates/branches/lifetype-1.2/unported/standard-with-plugins/postandcomments.template
templates/branches/lifetype-1.2/unported/standard-with-plugins/readme.txt
templates/branches/lifetype-1.2/unported/standard-with-plugins/resource.template
templates/branches/lifetype-1.2/unported/standard-with-plugins/searchresults.template
templates/branches/lifetype-1.2/unported/standard-with-plugins/style.css
Log:
copying stuff from 'standard'
Modified: templates/branches/lifetype-1.2/unported/standard-with-plugins/album.template
===================================================================
--- templates/branches/lifetype-1.2/unported/standard-with-plugins/album.template 2008-04-29 12:32:52 UTC (rev 6414)
+++ templates/branches/lifetype-1.2/unported/standard-with-plugins/album.template 2008-04-29 12:52:50 UTC (rev 6415)
@@ -13,13 +13,14 @@
<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}
- {assign var=children value=$album->getChildren()}
- {foreach from=$children item=childalbum}
+ {if $pager->getCurrentPage() == 1}
+ {assign var="counter" value=1}
+ {assign var=children value=$album->getChildren()}
+ {foreach from=$children item=childalbum}
<div class="album">
<a href="{$url->albumLink($childalbum)}">
<img src="{$url->getTemplateFile("imgs/folder.gif")}" alt="{$childalbum->getName()}" /></a>
@@ -28,12 +29,15 @@
{if $counter%3 == 0}
{/if}
</div>
- {/foreach}
+ {/foreach}
+ {/if}
<!-- show the resources here -->
- {assign var=resources value=$album->getResources()}
- {foreach from=$resources item=resource}
+ {** assign var=resources value=$album->getResources() **}
+ {** use the code above if you want to display all the resources at once, or leave it commented **}
+ {** if you would like to use the new paged display that was introduced in lifetype 1.1 **}
+ {foreach from=$resources item=resource}
<div class="album">
{if $resource->hasPreview()}
{*<a target="_blank" href="resserver.php?blogId={$blog->getId()}&resource={$resource->getFileName()}">*}
@@ -47,7 +51,7 @@
{elseif $resource->isVideo()}
<img alt="Video" src="{$url->getTemplateFile("imgs/video.gif")}" /></a>
{elseif $resource->isZip()}
- <img alt="Zip" src="{$url->getTemplateFile("imgs/compressed.gif")}" /></a>
+ <img alt="Zip" src="{$url->getTemplateFile("imgs/compressed.gif")}" /></a>
{else}
<img alt="File" src="{$url->getTemplateFile("imgs/file.gif")}" /></a>
{/if}
Modified: templates/branches/lifetype-1.2/unported/standard-with-plugins/albums.template
===================================================================
--- templates/branches/lifetype-1.2/unported/standard-with-plugins/albums.template 2008-04-29 12:32:52 UTC (rev 6414)
+++ templates/branches/lifetype-1.2/unported/standard-with-plugins/albums.template 2008-04-29 12:52:50 UTC (rev 6415)
@@ -1,4 +1,4 @@
- {include file="$blogtemplate/header.template"}
+{include file="$blogtemplate/header.template"}
<h2>{$locale->tr("albums")}</h2>
@@ -24,5 +24,4 @@
</div>
<!-- end of the albums -->
-
- {include file="$blogtemplate/footer.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Modified: templates/branches/lifetype-1.2/unported/standard-with-plugins/archives.template
===================================================================
--- templates/branches/lifetype-1.2/unported/standard-with-plugins/archives.template 2008-04-29 12:32:52 UTC (rev 6414)
+++ templates/branches/lifetype-1.2/unported/standard-with-plugins/archives.template 2008-04-29 12:52:50 UTC (rev 6415)
@@ -1,4 +1,5 @@
- {include file="$blogtemplate/header.template"}
+{assign var=title value=$locale->tr("archives")}
+{include file="$blogtemplate/header.template" pageTitle="$pageTitle | $title"}
<h2>{$locale->tr("archives")}</h2>
<div id="Archives">
Modified: templates/branches/lifetype-1.2/unported/standard-with-plugins/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/standard-with-plugins/footer.template 2008-04-29 12:32:52 UTC (rev 6414)
+++ templates/branches/lifetype-1.2/unported/standard-with-plugins/footer.template 2008-04-29 12:52:50 UTC (rev 6415)
@@ -1,6 +1,20 @@
+ {pager style="links"}
+
</div>
<div id="Menu">
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}
+
+ <h2>{$locale->tr("about_myself")}</h2>
+ <div id="AboutMyself">
+ {assign var=picture value=$blogOwner->getPicture()}
+ <img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" />
+ <p>{$AboutMyself}</p>
+ <div class="clearer"> </div>
+ </div>
+{/if}
<h2>{$locale->tr("menu")}</h2>
<div id="Sections">
@@ -9,40 +23,20 @@
<li><a title="{$locale->tr("archives")}" href="{$url->templatePage("archives")}">{$locale->tr("archives")}</a></li>
<li><a title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
<li><a title="{$locale->tr("links")}" href="{$url->templatePage("links")}">{$locale->tr("links")}</a></li>
- {if !empty($flickr)}
- {if $flickr->isEnabled()}
+ {if !empty($flickr) && $flickr->isEnabled()}
<li><a title="{$locale->tr("flickr")}" href="{$flickr->pluginTemplatePage()}">{$locale->tr("flickr")}</a></li>
- {/if}
{/if}
- {if !empty($delicious)}
- {if $delicious->isEnabled()}
+ {if !empty($delicious) && $delicious->isEnabled()}
<li><a title="{$locale->tr("delicious")}" href="{$delicious->pluginTemplatePage()}">{$locale->tr("delicious")}</a></li>
- {/if}
{/if}
- {if !empty($guestbook)}
- {if $guestbook->isEnabled()}
+ {if !empty($guestbook) && $guestbook->isEnabled()}
<li><a title="{$locale->tr("guestbook")}" href="{$guestbook->pluginTemplatePage()}">{$locale->tr("guestbook")}</a></li>
- {/if}
{/if}
- {if !empty($karma)}
- {if $karma->isEnabled()}
+ {if !empty($karma) && $karma->isEnabled()}
<li><a title="{$locale->tr("karma_moderated_down_articles")}" href="{$karma->pluginTemplatePage()}">{$locale->tr("karma_moderated_down_articles")}</a></li>
- {/if}
{/if}
</ul>
</div>
- {assign var=blogOwner value=$blog->getOwnerInfo()}
-{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
-{if $blogOwner->hasPicture() && $AboutMyself}
-
- <h2>{$locale->tr("about_myself")}</h2>
- <div id="AboutMyself">
- {assign var=picture value=$blogOwner->getPicture()}
- <img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" />
- <p>{$AboutMyself}</p>
- <div class="clearer"> </div>
- </div>
-{/if}
<h2>{$locale->tr("search")}</h2>
<div id="Search">
<form id="search_form" method="post" action="{$url->getIndexUrl()}">
@@ -78,8 +72,7 @@
</ul>
</div>
- {if !empty($recentcomments)}
- {if $recentcomments->isEnabled()}
+ {if !empty($recentcomments) && $recentcomments->isEnabled()}
<h2>{$locale->tr("recentcomments")}</h2>
<div id="Recently">
{assign var=comments value=$recentcomments->getRecentComments()}
@@ -99,11 +92,9 @@
{/foreach}
</ul>
</div>
- {/if}
{/if}
- {if !empty($recenttrackbacks)}
- {if $recenttrackbacks->isEnabled()}
+ {if !empty($recenttrackbacks) && $recenttrackbacks->isEnabled()}
<h2>{$locale->tr("recenttrackbacks")}</h2>
<div id="Recently">
{assign var=trackbacks value=$recenttrackbacks->getRecentTrackbacks()}
@@ -116,11 +107,9 @@
{/foreach}
</ul>
</div>
- {/if}
{/if}
- {if !empty($topcommentposts)}
- {if $topcommentposts->isEnabled()}
+ {if !empty($topcommentposts) && $topcommentposts->isEnabled()}
<h2>{$locale->tr("topcommentposts")}</h2>
<div id="Recently">
<ul>
@@ -130,11 +119,9 @@
{/foreach}
</ul>
</div>
- {/if}
{/if}
- {if !empty($topcommentvisitors)}
- {if $topcommentvisitors->isEnabled()}
+ {if !empty($topcommentvisitors) && $topcommentvisitors->isEnabled()}
<h2>{$locale->tr("topcommentvisitors")}</h2>
<div id="Recently">
<ul>
@@ -144,11 +131,9 @@
{/foreach}
</ul>
</div>
- {/if}
{/if}
- {if !empty($topreadposts)}
- {if $topreadposts->isEnabled()}
+ {if !empty($topreadposts) && $topreadposts->isEnabled()}
<h2>{$locale->tr("topreadposts")}</h2>
<div id="Recently">
<ul>
@@ -158,11 +143,9 @@
{/foreach}
</ul>
</div>
- {/if}
{/if}
- {if !empty($toptrackbackposts)}
- {if $toptrackbackposts->isEnabled()}
+ {if !empty($toptrackbackposts) && $toptrackbackposts->isEnabled()}
<h2>{$locale->tr("toptrackbackposts")}</h2>
<div id="Recently">
<ul>
@@ -172,7 +155,6 @@
{/foreach}
</ul>
</div>
- {/if}
{/if}
<h2>{$locale->tr("syndicate")}</h2>
Modified: templates/branches/lifetype-1.2/unported/standard-with-plugins/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/standard-with-plugins/header.template 2008-04-29 12:32:52 UTC (rev 6414)
+++ templates/branches/lifetype-1.2/unported/standard-with-plugins/header.template 2008-04-29 12:52:50 UTC (rev 6415)
@@ -6,12 +6,19 @@
<meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
<title>{$pageTitle|escape:"html"}</title>
<link rel="stylesheet" type="text/css" title="Style" href="{$url->getTemplateFile("style.css")}" />
+ <!--[if IE ]>
+<link rel="stylesheet" type="text/css" title="Style" href="{$url->getTemplateFile("style-ie.css")}" />
+<![endif] -->
<link rel="alternate" type="application/xml" title="RSS 2.0" href="{$url->rssLink("rss20")}" />
<link rel="alternate" type="application/xml" title="RSS 1.0" href="{$url->rssLink("rss10")}" />
<link rel="alternate" type="application/xml" title="RSS 0.90" href="{$url->rssLink("rss090")}" />
<link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="{$url->rssLink("atom")}" />
- {if !empty($dropcase)}
- {if $dropcase->isEnabled()}
+ <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
+
+ {if $badbehavior}
+ {$badbehavior->showBB2JavaScript()}
+ {/if}
+ {if !empty($dropcase) && $dropcase->isEnabled()}
{literal}
<STYLE TYPE="text/css">
<!--
@@ -29,16 +36,17 @@
-->
</STYLE>
{/literal}
- {/if}
{/if}
- <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
-{if $badbehavior}
- {$badbehavior->showBB2JavaScript()}
-{/if}
-</head>
- <body>
- <div id="Container">
- <div id="Title"><h1><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1></div>
- <div id="Subtitle">{$blog->getAbout()}</div>
- <div id="Subcontainer">
- <div id="Content">
\ No newline at end of file
+
+ </head>
+ <body>
+<!-- Cached content created: {"0"|date_format:"%D %H:%M:%S"} -->
+<div id="Container">
+
+<div id="Title"><h1><a href="{$url->blogLink()}">{$blog->getBlog()}</a></h1></div>
+
+<div id="Subtitle">{$blog->getAbout()}</div>
+
+<div id="Subcontainer">
+
+<div id="Content">
Modified: templates/branches/lifetype-1.2/unported/standard-with-plugins/links.template
===================================================================
--- templates/branches/lifetype-1.2/unported/standard-with-plugins/links.template 2008-04-29 12:32:52 UTC (rev 6414)
+++ templates/branches/lifetype-1.2/unported/standard-with-plugins/links.template 2008-04-29 12:52:50 UTC (rev 6415)
@@ -1,12 +1,14 @@
- {include file="$blogtemplate/header.template"}
-
+{assign var=title value=$locale->tr("links")}
+{include file="$blogtemplate/header.template" pageTitle="$pageTitle | $title"}
<div id="Links">
<h2>{$locale->tr("my_links")}</h2>
{foreach from=$mylinkscategories item=linkcategory}
<h3>{$linkcategory->getName()}</h3>
<ul>
{foreach from=$linkcategory->getLinks() item=link}
- <li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a>: {$link->getDescription()}</li>
+ <li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a>: {$link->getDescription()} {if $link->getRssFeed() != ""}
+ <a href="{$link->getRssFeed()}"><img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" alt="RSS" /></a>
+ {/if}</li>
{/foreach}
</ul>
{/foreach}
Modified: templates/branches/lifetype-1.2/unported/standard-with-plugins/main.template
===================================================================
--- templates/branches/lifetype-1.2/unported/standard-with-plugins/main.template 2008-04-29 12:32:52 UTC (rev 6414)
+++ templates/branches/lifetype-1.2/unported/standard-with-plugins/main.template 2008-04-29 12:52:50 UTC (rev 6415)
@@ -1,11 +1,10 @@
+ {assign var="OnMainPage" value=1}
{include file="$blogtemplate/header.template"}
-
- {if $showAll == 1 && $category}<h2>{$locale->tr("posts")}: {$category->getName()}</h2>{/if}
-
-
+{if $category}<h2>{$locale->tr("category")}: {$category->getName()}</h2>{/if}
+
{foreach from=$posts item=post}
-{if $showAll}
+{if $showAll | 1 && $category}
<!-- showing only the topic of the post, in case we have too many! -->
<h3><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h3>
<div>
@@ -14,8 +13,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->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
{/foreach}
</p>
{else}
@@ -23,11 +21,9 @@
{include file="$blogtemplate/post.template"}
{/if}
{/foreach}
-
-{if !empty($blogtimes)}
- {if $blogtimes->isEnabled()}
+
+{if !empty($blogtimes) && $blogtimes->isEnabled()}
{$blogtimes->show()}
- {/if}
{/if}
-
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file
+
+ {include file="$blogtemplate/footer.template"}
Modified: templates/branches/lifetype-1.2/unported/standard-with-plugins/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/standard-with-plugins/post.template 2008-04-29 12:32:52 UTC (rev 6414)
+++ templates/branches/lifetype-1.2/unported/standard-with-plugins/post.template 2008-04-29 12:52:50 UTC (rev 6415)
@@ -7,17 +7,29 @@
{$post->getText()}
</div>
+{if $OnMainPage}
+
<p class="footer">
-{foreach name=categories from=$post->getCategories() item=postCategory}
- <a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>
- {if !$smarty.foreach.categories.last}, {/if}
-{/foreach}
-:: <a href="{$url->postPermalink($post)}">{$locale->tr("comment on this")} ({$post->getNumComments()})</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>
-{if !empty($karma)}
-{if $karma->isEnabled()}
+<img src="{$url->getTemplateFile("imgs/category.gif")}" alt="" />{foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->categoryLink($postCategory)}" title="{$locale->tr("category")}: {$postCategory->getName()}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach} |
+<img src="{$url->getTemplateFile("imgs/permalink.gif")}" alt="" /><a title="{$locale->tr("permalink_title")} -> {$post->getTopic()}" href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> |
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $post->getNumComments() > 0 }<img src="{$url->getTemplateFile("imgs/comment.gif")}" alt="" /><a href="{$url->postPermalink($post)}#comments" title="{$locale->tr("comments")|capitalize} -> {$post->getTopic()}">{if $post->getNumComments() == 0 }{$locale->tr("add_comment")}{else if}{$locale->tr("comments")|capitalize} ({$post->getNumComments()}){/if}</a> | {/if}
+<img src="{$url->getTemplateFile("imgs/trackback.gif")}" alt="" />{if $post->getNumTrackbacks() > 0}<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")} -> {$post->getTopic()}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a>{else}{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()}){/if}
+</p>
+
+{else}
+
+<p class="footer">
+<img src="{$url->getTemplateFile("imgs/category.gif")}" alt="" />{foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->categoryLink($postCategory)}" title="{$locale->tr("category")}: {$postCategory->getName()}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach} |
+{assign var=nextpost value=$post->getNextArticle()}{if $nextpost == true}<img src="{$url->getTemplateFile("imgs/next.gif")}" alt="" /><a href="{$url->postPermalink($nextpost)}" title="{$locale->tr("next_post")}: {$nextpost->getTopic()}">{$locale->tr("next_post")}</a> | {/if}
+{assign var=prevpost value=$post->getPrevArticle()}{if $prevpost == true}<img src="{$url->getTemplateFile("imgs/previous.gif")}" alt="" /><a href="{$url->postPermalink($prevpost)}" title="{$locale->tr("previous_post")}: {$prevpost->getTopic()}">{$locale->tr("previous_post")}</a> | {/if}
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $post->getNumComments() > 0 }<img src="{$url->getTemplateFile("imgs/comment.gif")}" alt="" />{$locale->tr("comments")|capitalize} ({$post->getNumComments()}) | {/if}
+<img src="{$url->getTemplateFile("imgs/trackback.gif")}" alt="" />{if $post->getNumTrackbacks() > 0}<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")} -> {$post->getTopic()}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a>{else}{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()}){/if}
+</p>
+
+{/if}
+
+{if !empty($karma) && $karma->isEnabled()}
{assign var="positiveKarma" value=$post->getField("positiveKarma")}{if $positiveKarma == ""}{assign var="positiveKarma" value=0}{/if}
{assign var="negativeKarma" value=$post->getField("negativeKarma")}{if $negativeKarma == ""}{assign var="negativeKarma" value=0}{/if}
:: {$locale->tr("karma")} (<a href="{$karma->getPositiveUrl($post)}">+{$positiveKarma}</a>/<a href="{$karma->getNegativeUrl($post)}">-{$negativeKarma}</a>)
{/if}
-{/if}
-</p>
Modified: templates/branches/lifetype-1.2/unported/standard-with-plugins/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/standard-with-plugins/postandcomments.template 2008-04-29 12:32:52 UTC (rev 6414)
+++ templates/branches/lifetype-1.2/unported/standard-with-plugins/postandcomments.template 2008-04-29 12:52:50 UTC (rev 6415)
@@ -1,56 +1,43 @@
{assign var="postPageTitle" value=$post->getTopic()}
{assign var="postPageTitle" value=" | $postPageTitle"}
{include file="$blogtemplate/header.template"}
-<p id="Nextpost">
- {assign var=nextpost value=$post->getNextArticle()}
- {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}
-</p>
+
+
{assign var="poster" value=$post->getUserInfo()}
- <!-- {$url->postTrackbackLink($post)} -->
+ <!-- {$url->postTrackbackLink($post)} -->
{include file="$blogtemplate/post.template"}
-
- {pager style="links"}
-
-<h2>{$locale->tr("comments_for_post")}</h2>
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $comments }<h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
+{/if}
+ {pager style="links"}
{foreach from=$comments item=comment}
+<div class="comment">
+<h3 class="commentheader">{if $comment->getTopic() != null} {$comment->getTopic()|strip_tags}{else}Re: <em>{$post->getTopic()|strip_tags}</em>{/if}</h3>
-<a name="{$comment->getId()}"><h3 class="commentheader"><img src="{$url->getUrl("/imgs/comment_icon1.gif")}" alt="Comment Icon" /> {$comment->getTopic()|strip_tags}</h3></a>
-
<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")}
+ {$comment->getUsername()}
+ {/if} | {$locale->formatDate($postDate, "%d/%m/%Y, %H:%M")}
</p>
<div class="commenttext">
-{if !empty($gravatar)}
- {if $gravatar->isEnabled()}
+{if !empty($gravatar) && $gravatar->isEnabled()}
<img src="{$gravatar->gravatar($comment)}" width="{$gravatar->getSize()}" style="margin: 5px 5px 5px 5px;" height="{$gravatar->getSize()}" align="left" />
- {/if}
{/if}
{if $comment->IsPosterAuthenticated()}
- {assign var=poster value=$comment->getUser()}
- {if $poster->hasPicture()}
- {assign var=posterimg value=$poster->getPicture()}
- <img src="{$posterimg->getPreviewLink()}" alt="{$poster->getUserName()}" align="right" class="poster_avatar"/>
- {/if}
+ {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()}" />
+ {/if}
{/if}
-{$comment->gettext()}
+{$comment->getText()}
</div>
- {/foreach}
-
- {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
- {include file="$blogtemplate/commentform.template"}
- {/if}
-
- {include file="$blogtemplate/footer.template"}
+</div>
+ {/foreach}
+{include file="$misctemplatepath/commentform.template"}
+{include file="$blogtemplate/footer.template"}
Modified: templates/branches/lifetype-1.2/unported/standard-with-plugins/readme.txt
===================================================================
--- templates/branches/lifetype-1.2/unported/standard-with-plugins/readme.txt 2008-04-29 12:32:52 UTC (rev 6414)
+++ templates/branches/lifetype-1.2/unported/standard-with-plugins/readme.txt 2008-04-29 12:52:50 UTC (rev 6415)
@@ -24,10 +24,8 @@
15. Guest Book (New)
Notice:
-All plugin sections rounded with two {if} statements
+All plugin sections rounded with one {if} statement
-{if !empty($plugin)} // To check the plugin is installed or not
- {if $plugin->isEnabled()} // To check the plugin is enabled or not
+{if !empty($plugin) && $plugin->isEnabled()} // To check the plugin is installed and enabled
Plugin Template Here!!
- {/if}
-{if}
\ No newline at end of file
+{if}
Modified: templates/branches/lifetype-1.2/unported/standard-with-plugins/resource.template
===================================================================
--- templates/branches/lifetype-1.2/unported/standard-with-plugins/resource.template 2008-04-29 12:32:52 UTC (rev 6414)
+++ templates/branches/lifetype-1.2/unported/standard-with-plugins/resource.template 2008-04-29 12:52:50 UTC (rev 6415)
@@ -14,7 +14,7 @@
<div id="Resource">
<p>{$resource->getDescription()}</p>
{if $resource->isImage()}
- <img src="{$url->resourceDownloadLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
+ <img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
{else}
<a href="{$url->resourceDownloadLink($resource)}">
@@ -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("parent")}</a></p>
</div>
Modified: templates/branches/lifetype-1.2/unported/standard-with-plugins/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/standard-with-plugins/searchresults.template 2008-04-29 12:32:52 UTC (rev 6414)
+++ templates/branches/lifetype-1.2/unported/standard-with-plugins/searchresults.template 2008-04-29 12:52:50 UTC (rev 6415)
@@ -1,23 +1,22 @@
-{include file="$blogtemplate/header.template"}
- <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
- <div id="SearchResults">
- {foreach from=$searchresults item=result}
-
-
- {assign var=article value=$result->getArticle()}
- <h3><a href="{$url->postPermalink($article)}">{$article->getTopic()}</a></h3>
- <p class="searchArticle">
- {$article->getText()|strip_tags|truncate:300:"...":false}
- </p>
- <p class="footer">
- {foreach name=categories from=$article->getCategories()
- item=postCategory}
- <a href="{$url->categoryLink($postCategory)}">
- {$postCategory->getName()}</a>{if
- !$smarty.foreach.categories.last}, {/if}
- {/foreach}
- </p>
-
- {/foreach}
- </div>
-{include file="$blogtemplate/footer.template"}
+{include file="$blogtemplate/header.template"}
+ <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
+ <div id="SearchResults">
+ {foreach from=$searchresults item=result}
+
+
+ {assign var=article value=$result->getArticle()}
+ <h3><a href="{$url->postPermalink($article)}">{$article->getTopic()}</a></h3>
+ <p class="searchArticle">
+ {$article->getText()|strip_tags|truncate:300:"...":false}
+ </p>
+ <p class="footer">
+ {foreach name=categories from=$article->getCategories()
+ item=postCategory}
+ <a href="{$url->categoryLink($postCategory)}">
+ {$postCategory->getName()}</a>{if
+ !$smarty.foreach.categories.last}, {/if}
+ {/foreach}
+ </p>
+ {/foreach}
+ </div>
+{include file="$blogtemplate/footer.template"}
Added: templates/branches/lifetype-1.2/unported/standard-with-plugins/style-ie.css
===================================================================
--- templates/branches/lifetype-1.2/unported/standard-with-plugins/style-ie.css (rev 0)
+++ templates/branches/lifetype-1.2/unported/standard-with-plugins/style-ie.css 2008-04-29 12:52:50 UTC (rev 6415)
@@ -0,0 +1,3 @@
+#Content {
+ word-wrap: break-word;
+ }
\ No newline at end of file
Modified: templates/branches/lifetype-1.2/unported/standard-with-plugins/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/standard-with-plugins/style.css 2008-04-29 12:32:52 UTC (rev 6414)
+++ templates/branches/lifetype-1.2/unported/standard-with-plugins/style.css 2008-04-29 12:52:50 UTC (rev 6415)
@@ -90,11 +90,14 @@
/* ****************** column a *************** */
#Content {
- width: 62%;
+ width: 58%;
float: left;
margin-right:3%;
margin-left:2%;
background-color:#fff;
+ overflow: hidden;
+ line-height:1.5em;
+ text-align:justify;
}
#Content h2 {
@@ -109,12 +112,27 @@
.footer {
padding-bottom:1em;
border-bottom: 1px solid #d4d0cd;
+ text-align:left;
+ font-size:90%;
}
+.footer img {
+ margin-right:3px;
+ vertical-align:middle;
+ }
+
#Nextpost {
text-align:center;
}
+div.comment {
+ border-top: 1px dotted #d4d0cd;
+ padding-top:0.5em;
+ background: url('./imgs/comments.gif') no-repeat;
+ background-position: top right;
+ margin-top:1.5em;
+ }
+
.commentposterinfo {
margin-bottom:1em;
font-weight: bold;
@@ -128,9 +146,7 @@
.reply {font-weight: normal;font-size:small;}
-div.commenttext {
- border-bottom: 1px solid #d4d0cd;
- padding-bottom:1em;
+div.commenttext {;
margin-bottom:1em;
}
@@ -151,7 +167,7 @@
}
#CommentForm label {
- width:6em;
+ width:13em;
float:left;
display:block;
clear:both;
@@ -179,13 +195,13 @@
/* ****************** columnb *************** */
#Menu {
- width:30%;
+ width:34%;
float: left;
text-align:left;
background-color:#fff;
}
-#Calendar, #Search {
+#Calendar, #Search, #AboutMyself {
border-left-color:#d4d0cd;
border-left-style:solid;
border-left-width:6px;
@@ -240,9 +256,9 @@
text-align:center
}
-.calendarToday {
+.calMonthToday {
background-color: #d4d0cd;
- }
+ }
#Menu h2 {
background-color: #004ca1;
@@ -255,6 +271,7 @@
color:#fff;
margin-top:10px;
border-left-width:6px;
+ text-transform: capitalize;
}
#Categories ul, #Syndicate ul, #Recently ul, #Sections ul {
@@ -265,6 +282,10 @@
list-style:none;
font-size:small;
}
+
+#Syndicate ul, #Sections ul {
+ text-transform: capitalize;
+ }
#Categories a, #Syndicate a, #Recently a, #Sections a {
width:86%;
@@ -289,6 +310,9 @@
background-color:#b50394;
}
+#Links h2 {
+ text-transform: capitalize;
+ }
/* ****************** footer *************** */
@@ -326,13 +350,15 @@
float: left;
width:150px;
margin-bottom:20px;
+ margin-right:5px;
}
.album p {
text-align: center;
- padding:0;
+ padding: 0;
margin:0;
- width:150px;
+ width:150px;
+ overflow: hidden;
}
a img {border:none;}
@@ -362,6 +388,10 @@
padding-left:4em;
}
+
+blockquote {background:url('imgs/blockquote.gif') no-repeat; padding:10px 10px 2px 41px;border: dotted #d4d0cd 1px;
+}
+
/* ****************** to align elements *************** */
.left {text-align: left;display:block}
.right {text-align: right;display:block}
@@ -374,4 +404,18 @@
/* ****************** to highlight text *************** */
.bold {font-weight: bold;}
.italic {font-style:italic;}
-.underline {text-decoration:underline}
\ No newline at end of file
+.underline {text-decoration:underline}
+
+/* ****************** aboutmyself *************** */
+#UserPicture {float:left;margin:10px 10px 10px 6px;border:solid #D4D0CD 1px;padding:3px;background-color:#fff}
+#AboutMyself p {padding:10px 0;margin:0}
+
+.comment_1 {
+ margin-left: 10px;
+ }
+ .comment_2 {
+ margin-left: 20px;
+ }
+ .comment_3 {
+ margin-left: 30px;
+ }
\ No newline at end of file
Deleted: templates/branches/lifetype-1.2/unported/standard-with-plugins/video.gif
===================================================================
(Binary files differ)
More information about the pLog-svn
mailing list