[pLog-svn] r5623 - templates/branches/lifetype-1.2/unported/pink_lilies

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2007-07-06 10:39:35 -0400 (Fri, 06 Jul 2007)
New Revision: 5623

Modified:
   templates/branches/lifetype-1.2/unported/pink_lilies/panel.template
   templates/branches/lifetype-1.2/unported/pink_lilies/post.template
   templates/branches/lifetype-1.2/unported/pink_lilies/postandcomments.template
   templates/branches/lifetype-1.2/unported/pink_lilies/searchresults.template
   templates/branches/lifetype-1.2/unported/pink_lilies/style.css
Log:
ported to 1.2, and removed height restrictions, so the image shows better - it is done kind of funny - that the sidebar is outside of the 'content' div, so the background doesn't continue down if the sidebar is longer than the posts, but I don't feel like rewriting the entire template

Modified: templates/branches/lifetype-1.2/unported/pink_lilies/panel.template
===================================================================
--- templates/branches/lifetype-1.2/unported/pink_lilies/panel.template	2007-07-06 13:41:47 UTC (rev 5622)
+++ templates/branches/lifetype-1.2/unported/pink_lilies/panel.template	2007-07-06 14:39:35 UTC (rev 5623)
@@ -1,7 +1,7 @@
 
 <div id="menu">
 <ul>
-    <li id="search">{$locale->tr("search")}
+    <li id="search">{$locale->tr("search")|capitalize}
 	   <form name="search_form" method="post"
 	   	      action="{$url->getIndexUrl()}">
 	      <input type="text" name="searchTerms" value="" size="14" /><br/>
@@ -37,7 +37,7 @@
  </li>
   
  <li id="archives">
-  {$locale->tr("archives")}
+  {$locale->tr("archives")|capitalize}
   <ul>
   {foreach from=$archives item=archivelink}
    <li><a href="{$archivelink->getUrl()}">{$archivelink->getName()}</a></li>

Modified: templates/branches/lifetype-1.2/unported/pink_lilies/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/pink_lilies/post.template	2007-07-06 13:41:47 UTC (rev 5622)
+++ templates/branches/lifetype-1.2/unported/pink_lilies/post.template	2007-07-06 14:39:35 UTC (rev 5623)
@@ -21,7 +21,7 @@
  </div>
 <div class="feedback">
     <a href="{$url->postPermalink($post)}#comments" title="{$locale->tr("comment on this")}">
-        {if $post->getNumComments() eq 0}{$locale->tr("comment on this")}{else}{$post->getNumComments()} {$locale->tr("comments")}{/if}
+        {if $post->getNumComments() == 0}{$locale->tr("comment on this")}{else}{$post->getNumComments()} {$locale->tr("comments")}{/if}
     </a> |
 	{if $post->getNumTrackbacks() > 0}
 	  <a href="{$url->postTrackbackStatsLink($post)}" title="{$locale->tr("trackbacks")}">{$post->getNumTrackbacks()} {$locale->tr("trackbacks")}</a>

Modified: templates/branches/lifetype-1.2/unported/pink_lilies/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/pink_lilies/postandcomments.template	2007-07-06 13:41:47 UTC (rev 5622)
+++ templates/branches/lifetype-1.2/unported/pink_lilies/postandcomments.template	2007-07-06 14:39:35 UTC (rev 5623)
@@ -35,9 +35,11 @@
             </li>
         {/foreach}    
         </ol>
+        {pager style="links"}
+
         {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
            <h2>{$locale->tr("add_comment")}</h2>
-          {include file="$blogtemplate/commentform.template"}
+          {include file="$misctemplatepath/commentform.template"}
         {/if}
     </div>
 </div>

Modified: templates/branches/lifetype-1.2/unported/pink_lilies/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/pink_lilies/searchresults.template	2007-07-06 13:41:47 UTC (rev 5622)
+++ templates/branches/lifetype-1.2/unported/pink_lilies/searchresults.template	2007-07-06 14:39:35 UTC (rev 5623)
@@ -15,6 +15,7 @@
      </div>
      <br/>
     {/foreach}
+    {pager style="links"}
    </p> 
 </div>
 {include file="$blogtemplate/panel.template"}

Modified: templates/branches/lifetype-1.2/unported/pink_lilies/style.css
===================================================================
--- templates/branches/lifetype-1.2/unported/pink_lilies/style.css	2007-07-06 13:41:47 UTC (rev 5622)
+++ templates/branches/lifetype-1.2/unported/pink_lilies/style.css	2007-07-06 14:39:35 UTC (rev 5623)
@@ -79,7 +79,6 @@
 }
 	
 #content {
-/*	position: relative;*/
 	background: url(imgs/lilies.jpg) repeat-y #F9F5E7;
 	text-align: left;
 	width: 718px;
@@ -87,11 +86,10 @@
 	float: left;
 	color: #666;
 	clear: both;
-	min-height: 800px;
+	min-height: 900px;
 	voice-family: "\"}\""; 
 	voice-family: inherit;
 	width: 558px;
-	height: 527px; 	
 }
 	
 #content .post {