[pLog-svn] r4869 - templates/branches/lifetype-1.2/unported/ocadia

oscar at devel.lifetype.net oscar at devel.lifetype.net
Sat Feb 24 15:13:15 EST 2007 

Author: oscar
Date: 2007-02-24 15:13:15 -0500 (Sat, 24 Feb 2007)
New Revision: 4869

Added:
   templates/branches/lifetype-1.2/unported/ocadia/favicon.ico
Modified:
   templates/branches/lifetype-1.2/unported/ocadia/blankpanel.template
   templates/branches/lifetype-1.2/unported/ocadia/footer.template
   templates/branches/lifetype-1.2/unported/ocadia/header.template
   templates/branches/lifetype-1.2/unported/ocadia/panel.template
   templates/branches/lifetype-1.2/unported/ocadia/post.template
   templates/branches/lifetype-1.2/unported/ocadia/postandcomments.template
   templates/branches/lifetype-1.2/unported/ocadia/searchresults.template
   templates/branches/lifetype-1.2/unported/ocadia/style.css
Log:
'ocadia' template ported to LT 1.2


Modified: templates/branches/lifetype-1.2/unported/ocadia/blankpanel.template
===================================================================
--- templates/branches/lifetype-1.2/unported/ocadia/blankpanel.template	2007-02-24 20:08:02 UTC (rev 4868)
+++ templates/branches/lifetype-1.2/unported/ocadia/blankpanel.template	2007-02-24 20:13:15 UTC (rev 4869)
@@ -2,12 +2,11 @@
 <ul>
 
 <li id="topnav">
-<h2>Meta</h2>
+<h2>{$locale->tr("menu")</h2>
 <ul>
 <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="http://blog.ysmis.cc">資管地下窩</a></li>
 </ul>
 </li>
 

Added: templates/branches/lifetype-1.2/unported/ocadia/favicon.ico
===================================================================
(Binary files differ)


Property changes on: templates/branches/lifetype-1.2/unported/ocadia/favicon.ico
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Modified: templates/branches/lifetype-1.2/unported/ocadia/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/ocadia/footer.template	2007-02-24 20:08:02 UTC (rev 4868)
+++ templates/branches/lifetype-1.2/unported/ocadia/footer.template	2007-02-24 20:13:15 UTC (rev 4869)
@@ -1,6 +1,8 @@
+
 <div id="footer">
 <p>
-Theme Design by <a href="http://beccary.com/goodies/wordpress-themes/">Becca Wei</a>. Modify by <a href="http://blog.ysmis.cc/mit">MIT</a>.
+Theme Design by <a href="http://beccary.com/goodies/wordpress-themes/">Becca Wei</a>. Modified by <a href="http://blog.ysmis.cc/mit">MIT</a>.
+Powered by <a href="http://www.lifetype.net">Lifetype</a>.
 </p>
 </div>
 

Modified: templates/branches/lifetype-1.2/unported/ocadia/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/ocadia/header.template	2007-02-24 20:08:02 UTC (rev 4868)
+++ templates/branches/lifetype-1.2/unported/ocadia/header.template	2007-02-24 20:13:15 UTC (rev 4869)
@@ -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>

Modified: templates/branches/lifetype-1.2/unported/ocadia/panel.template
===================================================================
--- templates/branches/lifetype-1.2/unported/ocadia/panel.template	2007-02-24 20:08:02 UTC (rev 4868)
+++ templates/branches/lifetype-1.2/unported/ocadia/panel.template	2007-02-24 20:13:15 UTC (rev 4869)
@@ -1,9 +1,22 @@
-<div id="sidebar" style="word-wrap: break-word;">
+<div id="sidebar" style="word-wrap: break-word;">
 <ul>
 
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}	
+<li class="about">
+  	<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>
+{/if}
+
 <li id="topnav">
-<h2>Meta</h2>
-<ul>
+<h2>{$locale->tr("menu")}</h2>
+<ul class="panelMenu">
 <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>

Modified: templates/branches/lifetype-1.2/unported/ocadia/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/ocadia/post.template	2007-02-24 20:08:02 UTC (rev 4868)
+++ templates/branches/lifetype-1.2/unported/ocadia/post.template	2007-02-24 20:13:15 UTC (rev 4869)
@@ -6,15 +6,15 @@
 <h1 class="storydate">{$locale->formatDate($postDate,"%d.%m.%y")}</h1>
 <h2 id="post-11" class="storytitle"><a href="{$url->postPermalink($post)}" rel="bookmark" title="Permanent Link: {$post->getTopic()}">{$post->getTopic()}</a></h2>
 
-<p class="meta">Post in
+<p class="meta">{$locale->tr("posted_in")}
 {foreach name=categories from=$post->getCategories() item=postcategory}<a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
 {if !$smarty.foreach.categories.last} & {/if}
 {/foreach}
-at {$locale->formatDate($postDate,"%H:%M")} :: 點閱次數 ({$post->getNumReads()})</p>
+| {$locale->formatDate($postDate,"%H:%M")}</p>
 
 {$post->getText()}
 
-<p class="feedback"><a href="{$url->postPermalink($post)}#Comments" class="commentslink"> ({$post->getTotalComments()}) {$locale->tr("comment on this")} </a>&nbsp;&nbsp;<a href="{$url->postTrackbackStatsLink($post)}" class="commentslink"> ({$post->getTotalTrackbacks()}) {$locale->tr("trackbacks")}  </a>&nbsp;&nbsp; <a href="{$url->postPermalink($post)}" title="Permanent Link: {$post->getTopic()}" class="permalink">{$locale->tr("permalink")}</a>
+<p class="feedback"><a href="{$url->postPermalink($post)}#Comments" class="commentslink"> ({$post->getNumComments()}) {$locale->tr("comments")} </a>&nbsp;&nbsp;<a href="{$url->postTrackbackStatsLink($post)}" class="commentslink"> ({$post->getNumTrackbacks()}) {$locale->tr("trackbacks")}  </a>&nbsp;&nbsp; <a href="{$url->postPermalink($post)}" title="Permanent Link: {$post->getTopic()}" class="permalink">{$locale->tr("permalink")}</a>
 </p>
 
 </div>
\ No newline at end of file

Modified: templates/branches/lifetype-1.2/unported/ocadia/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/ocadia/postandcomments.template	2007-02-24 20:08:02 UTC (rev 4868)
+++ templates/branches/lifetype-1.2/unported/ocadia/postandcomments.template	2007-02-24 20:13:15 UTC (rev 4869)
@@ -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()}
@@ -19,7 +17,8 @@
 {include file="$blogtemplate/post.template"}
 
 {* show comments *}
-<h2 id="comments"><a name="Comments"></a>{$post->getTotalComments()} Comments on "{$post->getTopic()}" <a href="#NewComment" title="{$locale->tr("add_comment")}">&raquo;</a></h2>
+<h2 id="comments"><a name="Comments"></a>{$post->getTotalComments()} {$locale->tr("comments")|capitalize} | "{$post->getTopic()}" <a href="#NewComment" title="{$locale->tr("add_comment")}">&raquo;</a></h2>
+<a name="#comments"></a>
 <ol id="commentlist">
 {assign var="counter" value=1}
 {foreach name=comment from=$comments item=comment}
@@ -33,17 +32,30 @@
 <a href="{$comment->getUserUrl()}"}>{$comment->getUsername()}</a>
 {else}
 {$comment->getUsername()}
-{/if} said: {$comment->getTopic()}
+{/if}: {$comment->getTopic()}
 </p>
 <p class="commentmeta">
 {assign var=commentDate value=$comment->getDateObject()}	
 {$locale->formatDate($commentDate, "%d/%m/%Y, at %H:%M")} [<a href="{$url->postPermalink($post)}#NewComment"> {$locale->tr("reply")} </a>]
 </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()}
 </li>
 {assign var="counter" value="`$counter+1`"}
 {/foreach}
 </ol>
+
+{pager style="links" anchor="#comments"}  
+
 {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
 <h2><a name="NewComment"></a>{$locale->tr("add_comment")}</h2>
 {include file="$blogtemplate/commentform.template"}

Modified: templates/branches/lifetype-1.2/unported/ocadia/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/ocadia/searchresults.template	2007-02-24 20:08:02 UTC (rev 4868)
+++ templates/branches/lifetype-1.2/unported/ocadia/searchresults.template	2007-02-24 20:13:15 UTC (rev 4869)
@@ -7,7 +7,7 @@
 {assign var=article value=$result->getArticle()}
 <h3 class="post-title"><a href="{$url->postPermalink($article)}">{$article->getTopic()}</a></h3>
 
-{$locale->tr("categories")}:
+{$locale->tr("categories")|capitalize}:
 {foreach name=categories from=$article->getCategories() item=articleCategory}
 <a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
 {/foreach}
@@ -15,6 +15,9 @@
 <div class="post-content">{$article->getText()|strip_tags|truncate:300:"...":false}</div>
 <div class="post-footer">&nbsp;</div>
 {/foreach}
+
+{pager style="links"}
+
 </div>
 </div>
 </div>

Modified: templates/branches/lifetype-1.2/unported/ocadia/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/ocadia/style.css	2007-02-24 20:08:02 UTC (rev 4868)
+++ templates/branches/lifetype-1.2/unported/ocadia/style.css	2007-02-24 20:13:15 UTC (rev 4869)
@@ -163,6 +163,7 @@
 padding: 1.2em 40px 0 20px;
 font-size: 1.1em;
 background: url(img/sidebar-top.gif) no-repeat;
+text-transform: capitalize;
 }
 /* Fix our list and paragraph styles */
 #sidebar p, #sidebar ul ul, #sidebar ul ol {
@@ -256,6 +257,7 @@
 .commentslink {
 padding: 0 0 0 1.5em;
 background: url(img/comments.gif) no-repeat center left;
+text-transform: capitalize;
 }
 .storytitle a, .meta a, .feedback a, .commentauthor a, .commentmeta a, #comments a {
 text-decoration: none;
@@ -325,3 +327,52 @@
 	background: #fff; 
 	color: #FF0084;	
 }
+
+.panelMenu {
+	text-transform: capitalize;
+}
+
+.about {
+	padding-left: 15px;
+}
+
+#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