[pLog-svn] r4721 - in templates/branches/lifetype-1.2/unported/subtle: . assets/css assets/images styles/default
reto at devel.lifetype.net
reto at devel.lifetype.net
Mon Feb 12 17:59:13 EST 2007
Author: reto
Date: 2007-02-12 17:59:13 -0500 (Mon, 12 Feb 2007)
New Revision: 4721
Removed:
templates/branches/lifetype-1.2/unported/subtle/assets/images/logo_wp.gif
templates/branches/lifetype-1.2/unported/subtle/links.template
Modified:
templates/branches/lifetype-1.2/unported/subtle/album.template
templates/branches/lifetype-1.2/unported/subtle/albums.template
templates/branches/lifetype-1.2/unported/subtle/archives.template
templates/branches/lifetype-1.2/unported/subtle/assets/css/layout.css
templates/branches/lifetype-1.2/unported/subtle/error.template
templates/branches/lifetype-1.2/unported/subtle/header.template
templates/branches/lifetype-1.2/unported/subtle/panel.template
templates/branches/lifetype-1.2/unported/subtle/post.template
templates/branches/lifetype-1.2/unported/subtle/postandcomments.template
templates/branches/lifetype-1.2/unported/subtle/resource.template
templates/branches/lifetype-1.2/unported/subtle/searchresults.template
templates/branches/lifetype-1.2/unported/subtle/styles/default/default.css
Log:
still not finished, but it's getting there. some effects probably implemented for the first time in an lt template.
Modified: templates/branches/lifetype-1.2/unported/subtle/album.template
===================================================================
--- templates/branches/lifetype-1.2/unported/subtle/album.template 2007-02-12 22:40:49 UTC (rev 4720)
+++ templates/branches/lifetype-1.2/unported/subtle/album.template 2007-02-12 22:59:13 UTC (rev 4721)
@@ -1,5 +1,7 @@
+ {assign var="OnAlbumPage" value=1}
{include file="$blogtemplate/header.template"}
+<div id="loop_articles">
<h2>{$locale->tr("albums")}</h2>
<h3>{$album->getName()}</h3>
@@ -7,7 +9,6 @@
<!-- album contents go here -->
-<div id="loop_articles">
<div class="clearer"> </div>
Modified: templates/branches/lifetype-1.2/unported/subtle/albums.template
===================================================================
--- templates/branches/lifetype-1.2/unported/subtle/albums.template 2007-02-12 22:40:49 UTC (rev 4720)
+++ templates/branches/lifetype-1.2/unported/subtle/albums.template 2007-02-12 22:59:13 UTC (rev 4721)
@@ -1,10 +1,13 @@
+{assign var="OnAlbumPage" value=1}
{include file="$blogtemplate/header.template"}
+ <div id="loop_articles">
+
<h2>{$locale->tr("albums")}</h2>
<!-- album contents go here -->
-
-<div id="loop_articles">
+
+
<div class="clearer"> </div>
@@ -26,5 +29,5 @@
<!-- end of the albums -->
-
+{include file="$blogtemplate/panel.template"}
{include file="$blogtemplate/footer.template"}
Modified: templates/branches/lifetype-1.2/unported/subtle/archives.template
===================================================================
--- templates/branches/lifetype-1.2/unported/subtle/archives.template 2007-02-12 22:40:49 UTC (rev 4720)
+++ templates/branches/lifetype-1.2/unported/subtle/archives.template 2007-02-12 22:59:13 UTC (rev 4721)
@@ -1,3 +1,4 @@
+{assign var="OnArchivesPage" value=1}
{assign var=title value=$locale->tr("archives")}
{include file="$blogtemplate/header.template" pageTitle="$pageTitle | $title"}
<h2>{$locale->tr("archives")}</h2>
Modified: templates/branches/lifetype-1.2/unported/subtle/assets/css/layout.css
===================================================================
--- templates/branches/lifetype-1.2/unported/subtle/assets/css/layout.css 2007-02-12 22:40:49 UTC (rev 4720)
+++ templates/branches/lifetype-1.2/unported/subtle/assets/css/layout.css 2007-02-12 22:59:13 UTC (rev 4721)
@@ -493,6 +493,17 @@
margin: 0px 10px 5px 0px;
padding: 0px 0px 0px 25px;
list-style-type: none;
+}
+ul.icon li ul li{
+ background-repeat: no-repeat;
+ background-position: 0px 1px;
+ display: block;
+ margin: 0px 10px 5px -10px;
+ padding: 0px 0px 0px 25px;
+ list-style-type: none;
+}
+ul.icon li ul li{
+ background-image: url(../images/icon_url.gif);
}
ul .date, dl .date, ul.icon li {
@@ -725,3 +736,20 @@
padding: 0px 0px 0px 25px;
list-style-type: none;
}
+
+/* archive chooser */
+#archivelist {
+ margin: 10px 0px 10px 0px;
+ border:1px solid grey;
+ font-size: 90%;
+
+}
+
+option.archOption {
+ height:100%;
+ padding-left:20px;
+ margin: 5px 0px 5px 0px;
+ background-repeat: no-repeat;
+ background-position: 0px 0px;
+ background-image: url(../images/icon_date.gif);
+}
Deleted: templates/branches/lifetype-1.2/unported/subtle/assets/images/logo_wp.gif
===================================================================
(Binary files differ)
Modified: templates/branches/lifetype-1.2/unported/subtle/error.template
===================================================================
--- templates/branches/lifetype-1.2/unported/subtle/error.template 2007-02-12 22:40:49 UTC (rev 4720)
+++ templates/branches/lifetype-1.2/unported/subtle/error.template 2007-02-12 22:59:13 UTC (rev 4721)
@@ -1,3 +1,4 @@
+{assign var="OnErrorPage" value=1}
{include file="$blogtemplate/header.template"}
<h2>{$locale->tr("error")}</h2>
<p>{$locale->tr($message)}</p>
Modified: templates/branches/lifetype-1.2/unported/subtle/header.template
===================================================================
--- templates/branches/lifetype-1.2/unported/subtle/header.template 2007-02-12 22:40:49 UTC (rev 4720)
+++ templates/branches/lifetype-1.2/unported/subtle/header.template 2007-02-12 22:59:13 UTC (rev 4721)
@@ -35,13 +35,15 @@
</form>
<h1 id="title"><a href="{$url->blogLink()}"><span>{$blog->getBlog()}</span></a></h1>
- <p id="tagline"><span>{$blog->getAbout()}</span></p>
-
-
+ <p id="tagline"><span>{$blog->getAbout()}</span></p>
+{if $OnMainPage}{assign var=mainClass value="current_page_item"}{else}{assign var=mainClass value="page_item"}{/if}
+{if $OnAlbumPage}{assign var=albumClass value="current_page_item"}{else}{assign var=albumClass value="page_item"}{/if}
+{if $OnArchivesPage}{assign var=archClass value="current_page_item"}{else}{assign var=archClass value="page_item"}{/if}
+
<ul id="menu">
- <li class="page_item"><a title="{$locale->tr("main")}" href="{$url->blogLink()}">{$locale->tr("main")}</a></li>
- <li class="page_item"><a title="{$locale->tr("archives")}" href="{$url->templatePage("archives")}">{$locale->tr("archives")}</a></li>
- <li class="page_item"><a title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
+ <li class="{$mainClass}"><a title="{$locale->tr("main")}" href="{$url->blogLink()}">{$locale->tr("main")}</a></li>
+ <li class="{$archClass}"><a title="{$locale->tr("archives")}" href="{$url->templatePage("archives")}">{$locale->tr("archives")}</a></li>
+ <li class="{$albumClass}"><a title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
</ul>
</div>
Deleted: templates/branches/lifetype-1.2/unported/subtle/links.template
===================================================================
--- templates/branches/lifetype-1.2/unported/subtle/links.template 2007-02-12 22:40:49 UTC (rev 4720)
+++ templates/branches/lifetype-1.2/unported/subtle/links.template 2007-02-12 22:59:13 UTC (rev 4721)
@@ -1,17 +0,0 @@
-{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()} {if $link->getRssFeed() != ""}
- <a href="{$link->getRssFeed()}"><img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" alt="RSS" /></a>
- {/if}</li>
- {/foreach}
- </ul>
- {/foreach}
- </div>
-
- {include file="$blogtemplate/footer.template"}
\ No newline at end of file
Modified: templates/branches/lifetype-1.2/unported/subtle/panel.template
===================================================================
--- templates/branches/lifetype-1.2/unported/subtle/panel.template 2007-02-12 22:40:49 UTC (rev 4720)
+++ templates/branches/lifetype-1.2/unported/subtle/panel.template 2007-02-12 22:59:13 UTC (rev 4721)
@@ -25,21 +25,30 @@
<div id="widgets" class="home">
<div id="widgets_home_a" class="widget_set reduced">
- <h3>{$locale->tr("archives")}</h3>
- <ul class="icon category">
- {foreach from=$archives item=month}
- <li><a href="{$month->getUrl()}" title="{$month->getName()}">{$month->getName()}</a> [{$month->getNumArticles()}]</li>
- {/foreach}
- </ul>
+ <h3>{$locale->tr("categories")}</h3>
+ <ul class="icon category">
+ {foreach from=$articlecategories item=articleCategory}
+ {if $category && $articleCategory->getId() === $category->getId()}
+ <li>{$articleCategory->getName()} [{$articleCategory->getNumArticles()}]</li>
+ {else}
+ <li><a class="navigation" href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} [{$articleCategory->getNumArticles()}]</a></li>
+ {/if}
+ {/foreach}
+ </ul>
+
{if $mylinkscategories}
<h3>{$locale->tr("links")}</h3>
- <ul class="icon jump">
- {foreach name=mylinkscategories from=$mylinkscategories item=panel_linkcategory}
- {if $smarty.foreach.mylinkscategories.first}
- <li><a title="{$locale->tr("links")}" href="{$url->templatePage("links")}">{$locale->tr("links")}</a></li>
- {/if}
- {/foreach}
+ <ul class="icon category">
+ {foreach from=$mylinkscategories item=linkcategory}
+ <li><strong>{$linkcategory->getName()}</strong>
+ <ul>
+ {foreach from=$linkcategory->getLinks() item=link}
+ <li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a></li>
+ {/foreach}
+ </ul>
+ </li>
+ {/foreach}
</ul>
{/if}
</div>
@@ -53,7 +62,34 @@
<li><a title="{$post->getTopic()|strip_tags}}" href="{$url->postLink($post)}">{$post->getTopic()|strip_tags|truncate:20:"...":false}</a></li>
{/foreach}
</ul>
+{literal}
+<SCRIPT LANGUAGE="JavaScript">
+<!--
+function DropDownLinks(list) {
+ var newPage = list.options[list.selectedIndex].value
+ location.href=newPage
+}
+//-->
+</SCRIPT>
+{/literal}
+<h3>testarchives</h3>
+<form>
+<select size="1" name="archives" id="archivelist" onChange="location.href=this.options[this.selectedIndex].value">
+{foreach from=$archives item=month}
+<option class="archOption" value="{$month->getUrl()}">{$month->getName()}</option>
+{/foreach}
+</select>
+</form>
+
+
+ <h3>{$locale->tr("archives")}</h3>
+ <ul class="icon archive">
+ {foreach from=$archives item=month}
+ <li><a href="{$month->getUrl()}" title="{$month->getName()}">{$month->getName()}</a> [{$month->getNumArticles()}]</li>
+ {/foreach}
+ </ul>
+
<h3>{$locale->tr("syndicate")}</h3>
<ul class="icon feed">
<li><a title="RSS 0.90" href="{$url->rssLink("rss090")}">RSS 0.90</a></li>
@@ -64,7 +100,7 @@
</div>
</div>
+{debug}
-
<!-- Content End -->
Modified: templates/branches/lifetype-1.2/unported/subtle/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/subtle/post.template 2007-02-12 22:40:49 UTC (rev 4720)
+++ templates/branches/lifetype-1.2/unported/subtle/post.template 2007-02-12 22:59:13 UTC (rev 4721)
@@ -22,7 +22,7 @@
{/if}
{if $post->getNumTrackbacks() > 0}
<li class="icon jump">
-<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")} -> {$post->getTopic()|strip_tags}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a>{else}{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})
+<a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")} -> {$post->getTopic()|strip_tags}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a>
</li>
{/if}
</ul>
Modified: templates/branches/lifetype-1.2/unported/subtle/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/subtle/postandcomments.template 2007-02-12 22:40:49 UTC (rev 4720)
+++ templates/branches/lifetype-1.2/unported/subtle/postandcomments.template 2007-02-12 22:59:13 UTC (rev 4721)
@@ -21,7 +21,7 @@
<dl class="metadata odd">
<dt class="">Information</dt>
- <dd class="icon date"><a href="#">Link to this Month Archive</a></dd>
+ {*<dd class="icon date"><a href="{$url->categoryLink()}">Link to this Month Archive</a></dd>*}
{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $post->getNumComments() > 0 }
<dd class="icon comment"><a href="{$url->postPermalink($post)}#comments" title="{$locale->tr("comments")|capitalize} -> {$post->getTopic()|strip_tags}">{if $post->getNumComments() == 0 }{$locale->tr("add_comment")}{else if}{$locale->tr("comments")|capitalize} ({$post->getNumComments()}){/if}</a></dd>
{/if}
@@ -32,23 +32,25 @@
<dl class="metadata even">
<dt>Feeds and Links</dt>
-
- <dd class="icon feed"><a href="#">Comment Feed</a></dd>
- <dd class="icon feed"><a href="#">Comment Feed</a></dd>
- <dd class="icon feed"><a href="#">Comment Feed</a></dd>
- <dd class="icon entry"><a href="#">From This Author</a></dd>
+ {* {foreach name=categories from=$post->getCategories() item=postCategory}
+ <dd class="icon feed"><a href="<a href="{$url->categoryRssLink($articleCategory)}" title="{$locale->tr("category")}: {$postCategory->getName()}">{$postCategory->getName()} Feed</a></dd>
+ {/foreach} *}
+ {if $authuser->getUsername() === $poster->getUsername()}
+ <dd class="icon entry"><a href="<a href="{$url->getAdminUrl()}">Edit this Post</a></dd>
+ {/if}
<dd class="icon delicious"><a href="http://del.icio.us/post?url={$url->postPermalink($post)}&title={$post->getTopic()|strip_tags}">Del.icio.us</a></dd>
<dd class="icon digg"><a href="http://www.digg.com/submit" target="_new">Digg</a></dd>
<dd class="icon technorati"><a href="http://technorati.com/cosmos/search.html?url={$url->postPermalink($post)}">Technorati</a></dd>
</dl>
-
+{debug}
<dl class="metadata odd">
- <dt>Categories</dt>
+ <dt>Categories</dt> {*
{foreach name=categories from=$post->getCategories() item=postCategory}
<dd class="icon category">
<a href="{$url->categoryLink($postCategory)}" title="{$locale->tr("category")}: {$postCategory->getName()}">{$postCategory->getName()}</a>
</dd>{/foreach}
+*}
</dl>
<br class="clear" />
Modified: templates/branches/lifetype-1.2/unported/subtle/resource.template
===================================================================
--- templates/branches/lifetype-1.2/unported/subtle/resource.template 2007-02-12 22:40:49 UTC (rev 4720)
+++ templates/branches/lifetype-1.2/unported/subtle/resource.template 2007-02-12 22:59:13 UTC (rev 4721)
@@ -1,3 +1,4 @@
+{assign var="OnResourcePage" value=1}
{include file="$blogtemplate/header.template"}
<div id="loop_articles">
Modified: templates/branches/lifetype-1.2/unported/subtle/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/subtle/searchresults.template 2007-02-12 22:40:49 UTC (rev 4720)
+++ templates/branches/lifetype-1.2/unported/subtle/searchresults.template 2007-02-12 22:59:13 UTC (rev 4721)
@@ -1,3 +1,4 @@
+{assign var="OnSearchPage" value=1}
{include file="$blogtemplate/header.template"}
<div id="loop_articles">
<h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
Modified: templates/branches/lifetype-1.2/unported/subtle/styles/default/default.css
===================================================================
--- templates/branches/lifetype-1.2/unported/subtle/styles/default/default.css 2007-02-12 22:40:49 UTC (rev 4720)
+++ templates/branches/lifetype-1.2/unported/subtle/styles/default/default.css 2007-02-12 22:59:13 UTC (rev 4721)
@@ -198,3 +198,64 @@
width:6em;
}
+
+/**
+ * Images, Flickr images (menu)
+ */
+img.border, ul.flickr img
+{
+ background: #f3f3f3;
+ border: 1px solid #ddd;
+ padding: 7px;
+ margin: 1px;
+ -moz-border-radius: 3px;
+}
+
+img.inline {
+ padding: 5px 5px 5px 5px;
+ margin: 10px 10px 10px 10px;
+}
+
+img.left {
+ float: left;
+ margin-left: 0px;
+ }
+
+img.right {
+ float: right;
+ margin-right: 0px;
+ }
+
+img.ImageFrame_none {
+ margin: 10px 10px 10px 10px;
+ float: left;
+ margin-left: 0px;
+ background: #f3f3f3;
+ border: 1px solid #ddd;
+ padding: 7px;
+ margin: 1px;
+ -moz-border-radius: 3px;
+}
+/**
+ * Horizontal Rule
+ */
+hr {
+ color: #333;
+ height: 0px;
+ margin: 0.5em 0em 2em 0em;
+ border: 0px;
+ text-align: center;
+}
+
+* html hr {
+ margin: 0.5em 0em 0.5em 0em;
+ width: 80px;
+ color: #777;
+}
+
+hr:after {
+ content: "***";
+ letter-spacing: 2em;
+}
+
+
More information about the pLog-svn
mailing list