[pLog-svn] r4871 - templates/branches/lifetype-1.2/unported/ShadedGrey
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Sat Feb 24 16:17:40 EST 2007
Author: oscar
Date: 2007-02-24 16:17:40 -0500 (Sat, 24 Feb 2007)
New Revision: 4871
Added:
templates/branches/lifetype-1.2/unported/ShadedGrey/favicon.ico
Modified:
templates/branches/lifetype-1.2/unported/ShadedGrey/header.template
templates/branches/lifetype-1.2/unported/ShadedGrey/main.template
templates/branches/lifetype-1.2/unported/ShadedGrey/panel.template
templates/branches/lifetype-1.2/unported/ShadedGrey/post.template
templates/branches/lifetype-1.2/unported/ShadedGrey/postandcomments.template
templates/branches/lifetype-1.2/unported/ShadedGrey/searchresults.template
templates/branches/lifetype-1.2/unported/ShadedGrey/style.css
Log:
Ported the ShadedGrey template
Added: templates/branches/lifetype-1.2/unported/ShadedGrey/favicon.ico
===================================================================
(Binary files differ)
Property changes on: templates/branches/lifetype-1.2/unported/ShadedGrey/favicon.ico
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: templates/branches/lifetype-1.2/unported/ShadedGrey/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/ShadedGrey/header.template 2007-02-24 20:15:52 UTC (rev 4870)
+++ templates/branches/lifetype-1.2/unported/ShadedGrey/header.template 2007-02-24 21:17:40 UTC (rev 4871)
@@ -4,12 +4,13 @@
<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">
@@ -18,8 +19,8 @@
<div class="description">{$blog->getAbout()}</div>
</div>
<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>
<hr />
\ No newline at end of file
Modified: templates/branches/lifetype-1.2/unported/ShadedGrey/main.template
===================================================================
--- templates/branches/lifetype-1.2/unported/ShadedGrey/main.template 2007-02-24 20:15:52 UTC (rev 4870)
+++ templates/branches/lifetype-1.2/unported/ShadedGrey/main.template 2007-02-24 21:17:40 UTC (rev 4871)
@@ -3,7 +3,7 @@
{foreach from=$posts item=post}
{include file="$blogtemplate/post.template"}
{/foreach}
- {pager style="links"}
+ {pager style="links"}
</div>
{include file="$blogtemplate/panel.template"}
{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Modified: templates/branches/lifetype-1.2/unported/ShadedGrey/panel.template
===================================================================
--- templates/branches/lifetype-1.2/unported/ShadedGrey/panel.template 2007-02-24 20:15:52 UTC (rev 4870)
+++ templates/branches/lifetype-1.2/unported/ShadedGrey/panel.template 2007-02-24 21:17:40 UTC (rev 4871)
@@ -1,4 +1,20 @@
<div id="sidebar">
+
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}
+<ul>
+<li>
+ <h2>{$locale->tr("about_myself")}</h2>
+ {assign var=picture value=$blogOwner->getPicture()}
+ <p>
+ <img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /><br/>
+ {$AboutMyself}
+ </p>
+</li>
+</ul>
+{/if}
+
<!--Calendar-->
<h2> {$locale->tr("calendar")} </h2>
<ul>
Modified: templates/branches/lifetype-1.2/unported/ShadedGrey/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/ShadedGrey/post.template 2007-02-24 20:15:52 UTC (rev 4870)
+++ templates/branches/lifetype-1.2/unported/ShadedGrey/post.template 2007-02-24 21:17:40 UTC (rev 4871)
@@ -12,4 +12,4 @@
</div>
<p class="post-info"><a href="{$url->postPermalink($post)}" rel="bookmark" title="Permanent Link: {$post->getTopic()}"> {$post->getTopic()} </a></p>
<div class="post-content">{$post->getText()}</div>
-<div class="post-footer"><span class='link-comment'>[<a href="{$url->postPermalink($post)}"> ({$post->getTotalComments()}) {$locale->tr("comment on this")} </a>]</span> | [<a href="{$url->postTrackbackStatsLink($post)}"> ({$post->getTotalTrackbacks()}) {$locale->tr("trackbacks")} </a>] | [<a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a>]</div>
\ No newline at end of file
+<div class="post-footer"><span class='link-comment'>[<a href="{$url->postPermalink($post)}"> ({$post->getNumComments()}) {$locale->tr("comments")|capitalize} </a>]</span> | [<a href="{$url->postTrackbackStatsLink($post)}"> ({$post->getNumTrackbacks()}) {$locale->tr("trackbacks")} </a>] | [<a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a>]</div>
\ No newline at end of file
Modified: templates/branches/lifetype-1.2/unported/ShadedGrey/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/ShadedGrey/postandcomments.template 2007-02-24 20:15:52 UTC (rev 4870)
+++ templates/branches/lifetype-1.2/unported/ShadedGrey/postandcomments.template 2007-02-24 21:17:40 UTC (rev 4871)
@@ -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,23 +18,36 @@
{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()}">
-{$locale->tr("posted_by")}
+{$locale->tr("posted_by")}:
{if $comment->getUserUrl() != ""}
<cite><a href="{$comment->getUserUrl()}"}>{$comment->getUsername()}</a></cite>
{else}
<cite>{$comment->getUsername()}</cite>
-{/if}
+{/if} |
<a name="{$comment->getId()}"></a>
{$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}
+
+{$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="$blogtemplate/commentform.template"}
Modified: templates/branches/lifetype-1.2/unported/ShadedGrey/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/ShadedGrey/searchresults.template 2007-02-24 20:15:52 UTC (rev 4870)
+++ templates/branches/lifetype-1.2/unported/ShadedGrey/searchresults.template 2007-02-24 21:17:40 UTC (rev 4871)
@@ -18,6 +18,9 @@
<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/ShadedGrey/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/ShadedGrey/style.css 2007-02-24 20:15:52 UTC (rev 4870)
+++ templates/branches/lifetype-1.2/unported/ShadedGrey/style.css 2007-02-24 21:17:40 UTC (rev 4871)
@@ -172,6 +172,7 @@
color: #333;
font-weight: normal;
background:transparent url('img/sidetitle.png') repeat-x top center;
+text-transform: capitalize;
}
h4 {
margin-top: 0;
@@ -379,3 +380,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