[pLog-svn] r1414 - templates/trunk/Mac-Stripe

Sat Mar 12 20:58:19 GMT 2005

Author: jondaley
Date: 2005-03-12 20:58:18 +0000 (Sat, 12 Mar 2005)
New Revision: 1414

Modified:
   templates/trunk/Mac-Stripe/footer.template
   templates/trunk/Mac-Stripe/header.template
   templates/trunk/Mac-Stripe/post.template
   templates/trunk/Mac-Stripe/resource.template
Log:
resource template now includes header and footer.  fixed a smarty spacing issue.  moved title below content-type

Modified: templates/trunk/Mac-Stripe/footer.template
===================================================================

--- templates/trunk/Mac-Stripe/footer.template	2005-03-12 20:53:04 UTC (rev 1413)
+++ templates/trunk/Mac-Stripe/footer.template	2005-03-12 20:58:18 UTC (rev 1414)
@@ -3,9 +3,19 @@
 
 <div id="links">
 
+<div class="sidetitle">{$locale->tr("search")}</div>
+<div class="side">
+   <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()}"/>   
+    <input type="submit" name="Search" value="{$locale->tr("search")|capitalize}" />
+   </form>
+</div>
+
 <div class="sidetitle">{$locale->tr("calendar")|capitalize}</div>
 <div class="side">
-<div align="center" style="padding-top: 15px;">
+<div align="center">
 {$calendar}
 </div>
 </div>

Modified: templates/trunk/Mac-Stripe/header.template
===================================================================
--- templates/trunk/Mac-Stripe/header.template	2005-03-12 20:53:04 UTC (rev 1413)
+++ templates/trunk/Mac-Stripe/header.template	2005-03-12 20:58:18 UTC (rev 1414)
@@ -2,10 +2,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<title>{$blog->getBlog()}</title>
 <meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}" />
 <meta name="MSSmartTagsPreventParsing" content="TRUE" />
-<style type="text/css" media="screen">@import "{$url->getTemplateFile("/style.css")}";</style>
+<style type="text/css" media="screen">@import "{$url->getTemplateFile("style.css")}";</style>
+<title>{$blog->getBlog()}</title>
 </head>
 
 <body>

Modified: templates/trunk/Mac-Stripe/post.template
===================================================================
--- templates/trunk/Mac-Stripe/post.template	2005-03-12 20:53:04 UTC (rev 1413)
+++ templates/trunk/Mac-Stripe/post.template	2005-03-12 20:58:18 UTC (rev 1414)
@@ -1,20 +1,22 @@
 <!-- {$url->postTrackbackLink($post)} -->
 {assign var="postDate" value=$post->getDateObject()}
 {assign var="postOwner" value=$post->getUserInfo()}
+
 <h3 class="title">{$post->getTopic()}</h3>
 <p>{$post->getText()}</p>
 <div class="posted">
  {$locale->tr("posted_by")} 
  <a href="{$url->postUserLink($postOwner)}">{$postOwner->getUsername()}</a>
-({foreach name=categories from=$post->getCategories() item=postCategory}
-   <a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>
-   {if !$smarty.foreach.categories.last}, {/if}
- {/foreach})  
+
+ ({foreach name=categories from=$post->getCategories() item=postCategory}
+    <a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+  {/foreach})
+  
  :: 
 {if $post->getCommentsEnabled()}
-<a href="{$url->postPermalink($post)}">{$locale->tr("comment")|capitalize}
-({$post->getTotalComments()})</a>
-{else}
-<a href="{$url->postPermalink($post)}">Permanent link</a>
+<a href="{$url->postPermalink($post)}">{$locale->tr("comments")|capitalize}
+({$post->getTotalComments()})</a>::
 {/if}
+<a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a>
+
 </div>

Modified: templates/trunk/Mac-Stripe/resource.template
===================================================================
--- templates/trunk/Mac-Stripe/resource.template	2005-03-12 20:53:04 UTC (rev 1413)
+++ templates/trunk/Mac-Stripe/resource.template	2005-03-12 20:58:18 UTC (rev 1414)
@@ -1,20 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+{include file="Mac-Stripe/header.template}
 
-<html>
-<head>
-
-<!-- This template has been designed by Martijn ten Napel, http://blogtemplates.noipo.org/ -->
-
-<title>{$blog->getBlog()}</title>
-<meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}" />
-<meta name="MSSmartTagsPreventParsing" content="TRUE" />
-<style type="text/css" media="screen">@import "{$url->getTemplateFile("/style.css")}";</style>
-</head>
-<body>
-<div id="content">
-<!-- start content -->
-<h1>{$blog->getBlog()}</h1>
 {assign var=metadata value=$resource->getMetadataReader()}
 {assign var=updated value=$resource->getTimestamp()}
 <div id="container">
@@ -67,6 +52,5 @@
   </p>
  </div>
 </div>
-</div>
-</body>
-</html>
+{include file="Mac-Stripe/footer.template}
+


