[pLog-svn] r4877 - templates/branches/lifetype-1.2/unported/connections
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Sun Feb 25 09:52:33 EST 2007
Author: oscar
Date: 2007-02-25 09:52:32 -0500 (Sun, 25 Feb 2007)
New Revision: 4877
Added:
templates/branches/lifetype-1.2/unported/connections/favicon.ico
Modified:
templates/branches/lifetype-1.2/unported/connections/footer.template
templates/branches/lifetype-1.2/unported/connections/header.template
templates/branches/lifetype-1.2/unported/connections/panel.template
templates/branches/lifetype-1.2/unported/connections/post.template
templates/branches/lifetype-1.2/unported/connections/postandcomments.template
templates/branches/lifetype-1.2/unported/connections/searchresults.template
templates/branches/lifetype-1.2/unported/connections/style.css
Log:
ported the 'connections' template too.
Added: templates/branches/lifetype-1.2/unported/connections/favicon.ico
===================================================================
(Binary files differ)
Property changes on: templates/branches/lifetype-1.2/unported/connections/favicon.ico
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: templates/branches/lifetype-1.2/unported/connections/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/connections/footer.template 2007-02-25 14:32:46 UTC (rev 4876)
+++ templates/branches/lifetype-1.2/unported/connections/footer.template 2007-02-25 14:52:32 UTC (rev 4877)
@@ -1,5 +1,5 @@
<p id="footer">
-Power by <a href="http://www.lifetype.net" target="_blank">LifeTYpe</a>. Design by <a href="http://wpthemes.info" title="WP Themes.Info">WPThemes.Info</a> Converted to use with LifeType by James Huang. Valid <a href="http://validator.w3.org/check/referer">XHTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></p>
+Powered by <a href="http://www.lifetype.net" target="_blank">Lifetype</a>. Design by <a href="http://wpthemes.info" title="WP Themes.Info">WPThemes.Info</a> Converted to use with LifeType by James Huang. Valid <a href="http://validator.w3.org/check/referer">XHTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></p>
</div>
</div>
</body>
Modified: templates/branches/lifetype-1.2/unported/connections/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/connections/header.template 2007-02-25 14:32:46 UTC (rev 4876)
+++ templates/branches/lifetype-1.2/unported/connections/header.template 2007-02-25 14:52:32 UTC (rev 4877)
@@ -4,20 +4,21 @@
<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>
+ <title>{$pageTitle|escape:"html"}</title>
<link rel="stylesheet" title="Default" href="{$url->getTemplateFile("style.css")}" type="text/css" />
<link rel="alternate" type="text/xml" title="RSS 2.0" href="{$url->rssLink("rss20")}" />
<link rel="alternate" type="text/xml" title="RSS 1.0" href="{$url->rssLink("rss10")}" />
<link rel="alternate" type="text/xml" title="RSS 0.90" href="{$url->rssLink("rss090")}" />
<link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="{$url->rssLink("atom")}" />
+ <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
</head>
<body>
<div id="rap">
<div id="header">
<ul id="topnav">
- <li><a href="{$url->blogLink()}"> {$locale->tr("main")} </a> | </li>
- <li><a href="{$url->getAdminUrl()}" accesskey="2">{$locale->tr("dashboard")} </a> | </li>
- <li><a href="{$url->albumLink()}">{$locale->tr("albums")} </a> | </li>
+ <li><a href="{$url->blogLink()}"> {$locale->tr("main")|capitalize} </a> | </li>
+ <li><a href="{$url->getAdminUrl()}" accesskey="2">{$locale->tr("dashboard")|capitalize} </a> | </li>
+ <li><a href="{$url->albumLink()}">{$locale->tr("albums")|capitalize} </a> | </li>
</ul>
<h1><a href="{$url->blogLink()}" accesskey="1"> {$blog->getBlog()}</a></h1>
<div id="desc">{$blog->getAbout()}</div>
Modified: templates/branches/lifetype-1.2/unported/connections/panel.template
===================================================================
--- templates/branches/lifetype-1.2/unported/connections/panel.template 2007-02-25 14:32:46 UTC (rev 4876)
+++ templates/branches/lifetype-1.2/unported/connections/panel.template 2007-02-25 14:52:32 UTC (rev 4877)
@@ -1,4 +1,19 @@
<div id="sidebar">
+
+<!-- user picture -->
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}
+ <h2>{$locale->tr("about_myself")}</h2>
+<ul>
+<li>
+{assign var=picture value=$blogOwner->getPicture()}
+<img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" />
+<p>{$AboutMyself}</p>
+</li>
+</ul>
+{/if}
+
<!--Calendar-->
<h2> {$locale->tr("calendar")} </h2>
<ul>
@@ -41,7 +56,7 @@
<h2> {$locale->tr("categories")} </h2>
<ul>
{foreach from=$articlecategories item=articleCategory}
-<li><a href="{$url->categoryRssLink($articleCategory)}"><img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" style="border:0px;" alt="RSS 0.90" align="middle" /></a>
+<li><a href="{$url->categoryRssLink($articleCategory)}"><img src="{$url->getUrl("/imgs/rss_logo_mini.gif")}" style="border:0px;" alt="RSS 0.90" align="middle" /></a>
<a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a> [{$articleCategory->getNumArticles()}]</li>
{/foreach}
</ul>
Modified: templates/branches/lifetype-1.2/unported/connections/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/connections/post.template 2007-02-25 14:32:46 UTC (rev 4876)
+++ templates/branches/lifetype-1.2/unported/connections/post.template 2007-02-25 14:52:32 UTC (rev 4877)
@@ -3,7 +3,7 @@
<!-- post start -->
<p class="post-date">{$locale->formatDate($postDate,"%d %B, %Y %H:%M")}</p>
<div class="post-info"><h2 class="post-title"><a href="{$url->postPermalink($post)}" rel="bookmark" title="Permanent Link: {$post->getTopic()}"> {$post->getTopic()} </a></h2>
- Posted by {$postOwner->getUsername()} under
+ {$locale->tr("posted_by")} {$postOwner->getUsername()}, {$locale->tr("categories")}
[{foreach name=categories from=$post->getCategories() item=postcategory}
<a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
{if !$smarty.foreach.categories.last}, {/if}
Modified: templates/branches/lifetype-1.2/unported/connections/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/connections/postandcomments.template 2007-02-25 14:32:46 UTC (rev 4876)
+++ templates/branches/lifetype-1.2/unported/connections/postandcomments.template 2007-02-25 14:52:32 UTC (rev 4877)
@@ -1,5 +1,3 @@
-{assign var="postPageTitle" value=$post->getTopic()}
-{assign var="postPageTitle" value=" - $postPageTitle"}
{include file="$blogtemplate/header.template"}
{assign var="postDate" value=$post->getDateObject()}
{assign var="postOwner" value=$post->getUserInfo()}
@@ -20,7 +18,8 @@
{include file="$blogtemplate/post.template"}
{* show comments *}
-<h3 id="comments">{$post->getTotalComments()} Comments on "{$post->getTopic()}"</h3>
+<a name="comments"></a>
+<h3 id="comments">{$post->getTotalComments()} {$locale->tr("comments")}: "{$post->getTopic()}"</h3>
<ol class="commentlist">
{foreach name=comment from=$comments item=comment}
<li class="alt" id="comment-{$comment->getId()}">
@@ -31,12 +30,23 @@
<cite>{$comment->getUsername()}</cite>
{/if}
<a name="{$comment->getId()}"></a>
-{$comment->getTopic()} [<a href="{$url->postPermalink($post)}#NewComment"> {$locale->tr("reply")} </a>]<br />
+: {$comment->getTopic()} [<a href="{$url->postPermalink($post)}#NewComment"> {$locale->tr("reply")} </a>]<br />
<small class="commentmetadata">{assign var=commentDate value=$comment->getDateObject()} {$locale->formatDate($commentDate, "%d/%m/%Y, %H:%M")}</small>
-<p>{$comment->getText()}</p>
+<p>
+{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()}" />
+ {/if}
+{/if}
+<br/>
+{$comment->getText()}</p>
</li>
{/foreach}
</ol>
+{pager style="links" anchor="#comments"}
{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
<h3 id="respond"><a name="Newcomment"></a>{$locale->tr("add_comment")}</h3>
{include file="$misctemplatepath/commentform.template"}
Modified: templates/branches/lifetype-1.2/unported/connections/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/connections/searchresults.template 2007-02-25 14:32:46 UTC (rev 4876)
+++ templates/branches/lifetype-1.2/unported/connections/searchresults.template 2007-02-25 14:52:32 UTC (rev 4877)
@@ -11,10 +11,10 @@
{foreach name=categories from=$article->getCategories() item=articleCategory}
<a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
{/foreach}
-
<div class="post-content">{$article->getText()|strip_tags|truncate:300:"...":false}</div>
<div class="post-footer"> </div>
{/foreach}
+{pager style="links"}
</div>
</div>
</div>
Modified: templates/branches/lifetype-1.2/unported/connections/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/connections/style.css 2007-02-25 14:32:46 UTC (rev 4876)
+++ templates/branches/lifetype-1.2/unported/connections/style.css 2007-02-25 14:52:32 UTC (rev 4877)
@@ -119,6 +119,7 @@
font-family: Georgia, "Lucida Sans Unicode", lucida, Verdana, sans-serif;
font-weight: normal;
letter-spacing: 1px;
+text-transform:capitalize;
}
#header h1
{
@@ -397,3 +398,44 @@
background: #fff;
color: #FF0084;
}
+
+#CommentForm fieldset {
+ border:2px solid #d4d0cd;
+ padding-top:10px;
+ margin-top:10px;
+ padding-left:10px;
+ padding-bottom:10px;
+}
+
+#CommentForm legend {
+ color:#525150;
+ padding:2px 4px 2px 4px;
+ background-color: #ffffff;
+ font-weight : bold;
+}
+
+#CommentForm label {
+ width:13em;
+ float:left;
+ display:block;
+ clear:both;
+ float:left;
+ margin-top:8px;
+ margin-bottom:0px;
+}
+
+#CommentForm input {
+ margin-top:
+ 8px;margin-bottom:8px;
+}
+
+#Submit {
+ margin-top:8px;
+ margin-bottom:8px;
+ margin-left:6em;
+}
+
+#CommentForm textarea {
+ margin-top:8px;
+ margin-bottom:0px;
+}
\ No newline at end of file
More information about the pLog-svn
mailing list