[pLog-svn] r1453 - templates/trunk/pink_lilies
jondaley at devel.plogworld.net
jondaley at devel.plogworld.net
Sun Mar 13 02:05:29 GMT 2005
Author: jondaley
Date: 2005-03-13 02:05:25 +0000 (Sun, 13 Mar 2005)
New Revision: 1453
Modified:
templates/trunk/pink_lilies/error.template
templates/trunk/pink_lilies/header.template
templates/trunk/pink_lilies/main.template
templates/trunk/pink_lilies/panel.template
templates/trunk/pink_lilies/post.template
templates/trunk/pink_lilies/style.css
Log:
missed this one the first time through. copied blorange files. fixed up calendar.
Modified: templates/trunk/pink_lilies/error.template
===================================================================
--- templates/trunk/pink_lilies/error.template 2005-03-13 01:58:53 UTC (rev 1452)
+++ templates/trunk/pink_lilies/error.template 2005-03-13 02:05:25 UTC (rev 1453)
@@ -10,7 +10,7 @@
</div>
<div class="storycontent">
- <img src="{$url->getUrl("/imgs/error.gif")}" height="32" width="32" alt="Error"/>
+ <img src="{$url->getTemplateFile("error.gif")}" height="32" width="32" alt="Error"/>
{$locale->tr($message)}
</div>
</div>
Modified: templates/trunk/pink_lilies/header.template
===================================================================
--- templates/trunk/pink_lilies/header.template 2005-03-13 01:58:53 UTC (rev 1452)
+++ templates/trunk/pink_lilies/header.template 2005-03-13 02:05:25 UTC (rev 1453)
@@ -16,9 +16,6 @@
<body>
<div id="rap">
- <div id="header">
- <span id="description">{$blog->getAbout()}</span>
- <span id="title"><a href="{$url->blogLink()}">{$blog->getBlog()}</a></span>
- </div>
+ <h1 id="header"><a href="{$url->blogLink()}" title="{$blog->getBlog()}">{$blog->getBlog()}</a></h1>
Modified: templates/trunk/pink_lilies/main.template
===================================================================
--- templates/trunk/pink_lilies/main.template 2005-03-13 01:58:53 UTC (rev 1452)
+++ templates/trunk/pink_lilies/main.template 2005-03-13 02:05:25 UTC (rev 1453)
@@ -1,5 +1,4 @@
{include file="$blogtemplate/header.template"}
-
<div id="content">
{foreach from=$posts item=post}
<div class="post">
Modified: templates/trunk/pink_lilies/panel.template
===================================================================
--- templates/trunk/pink_lilies/panel.template 2005-03-13 01:58:53 UTC (rev 1452)
+++ templates/trunk/pink_lilies/panel.template 2005-03-13 02:05:25 UTC (rev 1453)
@@ -1,8 +1,16 @@
<div id="menu">
<ul>
- <li id="wordpress">
- {$locale->tr("menu")}
+ <li id="search">{$locale->tr("search")}
+ <form name="search_form" method="post"
+ action="{$url->getIndexUrl()}">
+ <input type="text" name="searchTerms" value="" size="14" /><br/>
+ <input type="hidden" name="op" value="Search" />
+ <input type="hidden" name="blogId" value="{$blog->getId()}"/>
+ </form>
+ </li>
+
+ <li id="wordpress">{$locale->tr("menu")}
<ul>
<li><a href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
</ul>
@@ -11,23 +19,23 @@
<li id="categories">
{$locale->tr("categories")}
<ul>
- {foreach name="articlecategories" from=$articlecategories item=articleCategory}
+ {foreach from=$articlecategories item=articleCategory}
<li><a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} [{$articleCategory->getNumArticles()}]</a></li>
{/foreach}
- </ul>
+ </ul>
</li>
<li id="archives">
{$locale->tr("archives")}
<ul>
- {foreach name=archives from=$archives item=archivelink}
- <li><a href="{$archivelink->getUrl()}">{$archivelink->getName()}</a></li>
- {/foreach}
+ {foreach from=$archives item=archivelink}
+ <li><a href="{$archivelink->getUrl()}">{$archivelink->getName()}</a></li>
+ {/foreach}
</ul>
- </li>
- <li id="calendar">
- {$calendar}
- </li>
+ </li>
+ <li id="calendar">
+ {$calendar}
+ </li>
<li id="meta">
Meta
@@ -43,17 +51,17 @@
<li id="style">
{$locale->tr("links")}
- {foreach name=linkscategories from=$mylinkscategories item=linkcategory}
- {if $smarty.foreach.linkscategories.first}<ul>{/if}
+ <ul>
+ {foreach from=$mylinkscategories item=linkcategory}
<li><b>{$linkcategory->getName()}</b>
- {foreach name=linkscategorieslinks from=$linkcategory->getLinks() item=link}
- {if $smarty.foreach.linkscategorieslinks.first}<ul>{/if}
- <li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a></li>
- {if $smarty.foreach.linkscategorieslinks.last}</ul>{/if}
+ <ul>
+ {foreach from=$linkcategory->getLinks() item=link}
+ <li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a></li>
{/foreach}
+ </ul>
</li>
- {if $smarty.foreach.linkscategories.last}</ul>{/if}
{/foreach}
+ </ul>
</li>
</ul>
</div>
Modified: templates/trunk/pink_lilies/post.template
===================================================================
--- templates/trunk/pink_lilies/post.template 2005-03-13 01:58:53 UTC (rev 1452)
+++ templates/trunk/pink_lilies/post.template 2005-03-13 02:05:25 UTC (rev 1453)
@@ -6,7 +6,13 @@
{assign var=postCategory value=$post->getCategory()}
{assign var=postText value=$post->getText()}
<div class="meta">
-<ul class="post-categories"><li><a href="{$url->categoryLink($postCategory)}" title="{$postCategory->getName()}">{$postCategory->getName()}</a></li></ul>
+
+ {foreach name=categories from=$post->getCategories() item=postCategory}
+ <a href="{$url->categoryLink($postCategory)}"
+ title="{$postCategory->getName()}">
+ {$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+ {/foreach}
+
— {$locale->tr("posted_by")} {$postOwner->getUsername()} @ {$locale->formatDate($postDate,"%H:%M")}
</div>
<div class="storycontent">
Modified: templates/trunk/pink_lilies/style.css
===================================================================
--- templates/trunk/pink_lilies/style.css 2005-03-13 01:58:53 UTC (rev 1452)
+++ templates/trunk/pink_lilies/style.css 2005-03-13 02:05:25 UTC (rev 1453)
@@ -167,6 +167,12 @@
width: 380px;
margin: 10px 0px 0px 0px;
}
+.searchresult {
+ font-size: 1em;
+ text-align: justify;
+ width: 380px;
+ margin: 10px 0px 0px 0px;
+ }
.feedback {
font-size: .7em;
@@ -265,35 +271,34 @@
}
#calendar {
- background: #CCBE92;
empty-cells: show;
font-size: 11px;
width: 150px;
margin-bottom: 8px;
- border: 1px solid #AFA37C;
}
-#calendar #next a, #calendar #next {
- padding: 0px 5px 0px 0px;
- text-align: right;
- color: #333;
- background: #CCBE92;
- font-weight:normal;
- }
+.calMonthHeader, .calMonthNav{
+ font: 14px Verdana, Arial, serif;
+ padding-top:10px;
+ text-align: center;
+}
-#calendar #prev a, #calendar #prev{
- padding: 0px 0px 0px 5px;
- text-align: left;
- color: #333;
- background: #CCBE92;
- font-weight:normal;
- }
+#calendar .calMonthForward, #calendar .calMonthForward>a{
+ padding-left: 5px;
+ text-align: center;
+ border:0px;
+}
+#calendar .calMonthBackward, #calendar .calMonthBackward>a{
+ padding-right: 5px;
+ text-align: center;
+ border:0px;
+}
+
.calDayLink {
display: block;
text-decoration: none;
- color: #6E2224;
- }
+}
#calendar a:hover {
color: #FFF;
@@ -301,18 +306,17 @@
#calendar td, #calendar th {
- color: #666;
- font-size: 14px;
+ font-size: 12px;
font-weight: normal;
padding: 0px;
text-align: center;
- }
+}
#calendar td.pad {
background: #CCBE92;
}
-#calendarToday {
+#calendar .calMonthToday {
background: #6E2224;
color: #FFF;
}
More information about the pLog-svn
mailing list