[pLog-svn] r1191 - in plog/trunk/templates: admin grey-sf summary wizard

jondaley at devel.plogworld.net jondaley at devel.plogworld.net
Thu Feb 24 02:28:06 GMT 2005


Author: jondaley
Date: 2005-02-24 02:28:05 +0000 (Thu, 24 Feb 2005)
New Revision: 1191

Modified:
   plog/trunk/templates/admin/createuser.template
   plog/trunk/templates/admin/default.template
   plog/trunk/templates/admin/error.template
   plog/trunk/templates/admin/message.template
   plog/trunk/templates/admin/newblogtemplate.template
   plog/trunk/templates/admin/newglobaltemplate.template
   plog/trunk/templates/admin/resourceinfo.template
   plog/trunk/templates/admin/simpleerror.template
   plog/trunk/templates/admin/siteblogusers.template
   plog/trunk/templates/admin/sitetemplates.template
   plog/trunk/templates/grey-sf/album.template
   plog/trunk/templates/grey-sf/albums.template
   plog/trunk/templates/grey-sf/commentarticle.template
   plog/trunk/templates/grey-sf/demosites.template
   plog/trunk/templates/grey-sf/donations.template
   plog/trunk/templates/grey-sf/error.template
   plog/trunk/templates/grey-sf/extras.template
   plog/trunk/templates/grey-sf/features.template
   plog/trunk/templates/grey-sf/main.template
   plog/trunk/templates/grey-sf/posttrackbacks.template
   plog/trunk/templates/grey-sf/samplerss.template
   plog/trunk/templates/grey-sf/templates.template
   plog/trunk/templates/summary/blogprofile.template
   plog/trunk/templates/summary/blogslist.template
   plog/trunk/templates/summary/changepassword.template
   plog/trunk/templates/summary/faq.template
   plog/trunk/templates/summary/index.template
   plog/trunk/templates/summary/message.template
   plog/trunk/templates/summary/recent.template
   plog/trunk/templates/summary/registererror.template
   plog/trunk/templates/summary/registerfinished.template
   plog/trunk/templates/summary/registerstep0.template
   plog/trunk/templates/summary/registerstep1.template
   plog/trunk/templates/summary/registerstep2.template
   plog/trunk/templates/summary/registerstep3.template
   plog/trunk/templates/summary/registerstep4.template
   plog/trunk/templates/summary/registerstep5.template
   plog/trunk/templates/summary/resetpassword.template
   plog/trunk/templates/summary/searchresults.template
   plog/trunk/templates/summary/summary.template
   plog/trunk/templates/summary/summaryerror.template
   plog/trunk/templates/summary/userlist.template
   plog/trunk/templates/summary/userprofile.template
   plog/trunk/templates/wizard/intro.template
   plog/trunk/templates/wizard/step1.template
   plog/trunk/templates/wizard/step2.template
   plog/trunk/templates/wizard/step3.template
   plog/trunk/templates/wizard/step4.template
   plog/trunk/templates/wizard/step5.template
   plog/trunk/templates/wizard/update1.template
   plog/trunk/templates/wizard/update2.template
   plog/trunk/templates/wizard/update3.template
   plog/trunk/templates/wizard/update4.template
Log:
all templates should use $blogtemplate

Modified: plog/trunk/templates/admin/createuser.template
===================================================================
--- plog/trunk/templates/admin/createuser.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/admin/createuser.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,5 +1,5 @@
-{include file="admin/header.template"}
-{include file="admin/navigation.template" showOpt=createUser title=$locale->tr("createUser")}
+{include file="$blogtemplate/header.template"}
+{include file="$blogtemplate/navigation.template" showOpt=createUser title=$locale->tr("createUser")}
 
  <form name="addUser" action="admin.php" method="post">
   <fieldset class="inputField">
@@ -61,5 +61,5 @@
     <input type="hidden" name="op" value="addUser" />
   </div>
  </form>
-{include file="admin/footer.template"}
-{include file="admin/footernavigation.template"}
+{include file="$blogtemplate/footer.template"}
+{include file="$blogtemplate/footernavigation.template"}

Modified: plog/trunk/templates/admin/default.template
===================================================================
--- plog/trunk/templates/admin/default.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/admin/default.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,10 +1,10 @@
-{include file="admin/simpleheader.template"}
+{include file="$blogtemplate/simpleheader.template"}
 	<div class="loginBox">
 	   <form name="loginForm" method="post" action="admin.php">
 		  <fieldset class="inputField">
 		   <h4>{$locale->tr("login")}</h4> 
-            {include file="admin/errormessage.template" message=$viewErrorMessage}
-            {include file="admin/successmessage.template" message=$viewSuccessMessage}
+            {include file="$blogtemplate/errormessage.template" message=$viewErrorMessage}
+            {include file="$blogtemplate/successmessage.template" message=$viewSuccessMessage}
 		   {if $viewIsError=="" && $viewIsSuccess==""}
 		     <div class="welcomeMessage">
 		   	   {$locale->tr("welcome_message")}
@@ -25,4 +25,4 @@
 		</div> 
        </form>		
 	</div>
-{include file="admin/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/admin/error.template
===================================================================
--- plog/trunk/templates/admin/error.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/admin/error.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,8 +1,8 @@
-{include file="admin/header.template"}
-{include file="admin/navigation.template" title=$locale->tr("error")}
+{include file="$blogtemplate/header.template"}
+{include file="$blogtemplate/navigation.template" title=$locale->tr("error")}
   <p>
    <img src="imgs/icon_warning-16.png" alt="Error" />  
    {$message}
   </p>
-{include file="admin/footernavigation.template"}
-{include file="admin/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/footernavigation.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/admin/message.template
===================================================================
--- plog/trunk/templates/admin/message.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/admin/message.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,8 +1,8 @@
-{include file="admin/header.template"}
-{include file="admin/navigation.template" title=$locale->tr("message")}
+{include file="$blogtemplate/header.template"}
+{include file="$blogtemplate/navigation.template" title=$locale->tr("message")}
   <p>
    <img src="imgs/icon_info-16.png" alt="Error" />
    {$message}
   </p>
-{include file="admin/footernavigation.template"}
-{include file="admin/footer.template"}
+{include file="$blogtemplate/footernavigation.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/admin/newblogtemplate.template
===================================================================
--- plog/trunk/templates/admin/newblogtemplate.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/admin/newblogtemplate.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,5 +1,5 @@
-{include file="admin/header.template"}
-{include file="admin/navigation.template" showOpt=newBlogTemplate title=$locale->tr("newBlogTemplate")}
+{include file="$blogtemplate/header.template"}
+{include file="$blogtemplate/navigation.template" showOpt=newBlogTemplate title=$locale->tr("newBlogTemplate")}
 <form name="newBlogTemplate" action="admin.php" method="post" enctype="multipart/form-data">
  <fieldset class="inputField">
   <legend>{$locale->tr("newBlogTemplate")}</legend>
@@ -19,5 +19,5 @@
   <input type="submit" name="addBlogTemplate" value="{$locale->tr("add")}" />    
  </div>
 </form>
-{include file="admin/footernavigation.template"}
-{include file="admin/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/footernavigation.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/admin/newglobaltemplate.template
===================================================================
--- plog/trunk/templates/admin/newglobaltemplate.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/admin/newglobaltemplate.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,5 +1,5 @@
-{include file="admin/header.template"}
-{include file="admin/navigation.template" showOpt=newTemplate title=$locale->tr("newTemplate")}
+{include file="$blogtemplate/header.template"}
+{include file="$blogtemplate/navigation.template" showOpt=newTemplate title=$locale->tr("newTemplate")}
 <form name="newTemplate" action="admin.php" method="post" enctype="multipart/form-data">
  <fieldset class="inputField">
   <legend>{$locale->tr("newTemplate")}</legend>
@@ -19,5 +19,5 @@
   <input type="submit" name="addTemplateUpload" value="{$locale->tr("add")}" />    
  </div>
 </form>
-{include file="admin/footernavigation.template"}
-{include file="admin/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/footernavigation.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/admin/resourceinfo.template
===================================================================
--- plog/trunk/templates/admin/resourceinfo.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/admin/resourceinfo.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -85,6 +85,6 @@
  <input type="submit" name="Update" value="{$locale->tr("update")}" />
 </div> 
 </form>
-{include file="admin/footernavigation.template"}
-{include file="admin/footer.template"}
+{include file="$blogtemplate/footernavigation.template"}
+{include file="$blogtemplate/footer.template"}
 

Modified: plog/trunk/templates/admin/simpleerror.template
===================================================================
--- plog/trunk/templates/admin/simpleerror.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/admin/simpleerror.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,8 +1,8 @@
-{include file="admin/simpleheader.template"}
+{include file="$blogtemplate/simpleheader.template"}
 <div id="container">
  <h1>{$locale->tr("error")}</h1>
  <p>
   {$message}
  </p>
 </div>
-{include file="admin/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/admin/siteblogusers.template
===================================================================
--- plog/trunk/templates/admin/siteblogusers.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/admin/siteblogusers.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="admin/header.template"}
+{include file="$blogtemplate/header.template"}
 
  <h3>{$locale->tr("blog_users")}</h3>
  <form name="editSiteBlogUsers" method="post" action="admin.php">
@@ -35,4 +35,4 @@
  <input type="hidden" name="editBlogId" value="{$editblog->getId()}"/>
  </form>
 
-{include file="admin/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/admin/sitetemplates.template
===================================================================
--- plog/trunk/templates/admin/sitetemplates.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/admin/sitetemplates.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,5 +1,5 @@
-{include file="admin/header.template"}
-{include file="admin/navigation.template" showOpt=siteTemplates title=$locale->tr("siteTemplates")}
+{include file="$blogtemplate/header.template"}
+{include file="$blogtemplate/navigation.template" showOpt=siteTemplates title=$locale->tr("siteTemplates")}
  <form id="siteTemplates" method="post" action="admin.php">
  <div id="list">
   {include file="$admintemplatepath/successmessage.template"}
@@ -48,5 +48,5 @@
  </div>
  </form>
  
-{include file="admin/footernavigation.template"}
-{include file="admin/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/footernavigation.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/grey-sf/album.template
===================================================================
--- plog/trunk/templates/grey-sf/album.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/grey-sf/album.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="grey-sf/header.template"}
+{include file="$blogtemplate/header.template"}
 <h1>{$album->getName()}</h1>
 <p>
  {$album->getDescription()}
@@ -82,4 +82,4 @@
 </div>
  <!-- end of album contents -->
  
- {include file="grey-sf/footer.template"}
+ {include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/grey-sf/albums.template
===================================================================
--- plog/trunk/templates/grey-sf/albums.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/grey-sf/albums.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="grey-sf/header.template"}
+{include file="$blogtemplate/header.template"}
 <h1>{$locale->tr("albums")}</h1>
  <!-- album contents go here -->
 <div id="album">
@@ -22,4 +22,4 @@
  </table>
  </div>
  <!-- end of the albums -->
-{include file="grey-sf/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/grey-sf/commentarticle.template
===================================================================
--- plog/trunk/templates/grey-sf/commentarticle.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/grey-sf/commentarticle.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="grey-sf/header.template"}
+{include file="$blogtemplate/header.template"}
 <h3>{$locale->tr("add_comment")}</h3>
- {include file="grey-sf/commentform.template"}
-{include file="grey-sf/footer.template"}
+ {include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/grey-sf/demosites.template
===================================================================
--- plog/trunk/templates/grey-sf/demosites.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/grey-sf/demosites.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="grey-sf/header.template"}
+{include file="$blogtemplate/header.template"}
   <p>
    The following sites are running pLog. Have a look at them if you want to see how 
    pLog feels like:
@@ -22,4 +22,4 @@
  <p>
   If you would like to have your site featured here, <a href="mailto:phunkphorce at users.sourceforge.net">let us know!</a>
  </p>
-{include file="grey-sf/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/grey-sf/donations.template
===================================================================
--- plog/trunk/templates/grey-sf/donations.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/grey-sf/donations.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="grey-sf/header.template"}
+{include file="$blogtemplate/header.template"}
  <h3>Donations</h3>
  <p>
   When dealing with donations to Open Source projects such as pLog, it is often
@@ -24,4 +24,4 @@
  <p>
   Thanks.
  </p>
-{include file="grey-sf/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/grey-sf/error.template
===================================================================
--- plog/trunk/templates/grey-sf/error.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/grey-sf/error.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="grey-sf/header.template"}
+{include file="$blogtemplate/header.template"}
  <h1>{$locale->tr("error")}</h1>
  {$locale->tr($message)}
-{include file="grey-sf/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/grey-sf/extras.template
===================================================================
--- plog/trunk/templates/grey-sf/extras.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/grey-sf/extras.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="grey-sf/header.template"}
+{include file="$blogtemplate/header.template"}
 <h1>pLog Extras</h1>
 <p>
  You will find here additional files for pLog, such as plugins to extend its functionality,
@@ -149,4 +149,4 @@
 </tr>
 </table>
 
-{include file="grey-sf/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/grey-sf/features.template
===================================================================
--- plog/trunk/templates/grey-sf/features.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/grey-sf/features.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="grey-sf/header.template"}
+{include file="$blogtemplate/header.template"}
  <h3>Features</h3>
  {$blog->getAbout()}
-{include file="grey-sf/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/grey-sf/main.template
===================================================================
--- plog/trunk/templates/grey-sf/main.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/grey-sf/main.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,5 +1,5 @@
-{include file="grey-sf/header.template"}
+{include file="$blogtemplate/header.template"}
  {foreach from=$posts item=post}
-  {include file="grey-sf/post.template"}
+  {include file="$blogtemplate/post.template"}
  {/foreach}
-{include file="grey-sf/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/grey-sf/posttrackbacks.template
===================================================================
--- plog/trunk/templates/grey-sf/posttrackbacks.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/grey-sf/posttrackbacks.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="grey-sf/header.template"}
+{include file="$blogtemplate/header.template"}
   <p>
     {$locale->tr("trackbacks_for_article")} "<a href="{$url->postLink($post)}">{$post->getTopic()}</a>":
   </p>
@@ -11,4 +11,4 @@
    <b>{$locale->tr("date")}:</b> {$locale->formatDate($trackbackDate, "%d/%m/%Y %H:%M")}<br/><br/>
   {/foreach}
   </p>
-{include file="grey-sf/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/grey-sf/samplerss.template
===================================================================
--- plog/trunk/templates/grey-sf/samplerss.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/grey-sf/samplerss.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="grey-sf/header.template"}
+{include file="$blogtemplate/header.template"}
 <h1>Sample template</h1>
 <p>
  {$message}
@@ -9,4 +9,4 @@
 {foreach from=$rss->getItems() item=rssItem}
  <a href="{$rssItem->getLink()}">{$rssItem->getTitle()}</a><br/>
 {/foreach}
-{include file="grey-sf/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/grey-sf/templates.template
===================================================================
--- plog/trunk/templates/grey-sf/templates.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/grey-sf/templates.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="grey-sf/header.template"}
+{include file="$blogtemplate/header.template"}
   <!-- beginning of content -->
   
   <h1>pLog Template Sets</h1>
@@ -658,4 +658,4 @@
    
   </table>
   <!-- end of content -->
-{include file="grey-sf/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/summary/blogprofile.template
===================================================================
--- plog/trunk/templates/summary/blogprofile.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/blogprofile.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,6 +1,6 @@
 {assign value=$locale->tr("blog") var=title}
 {assign value=$blog->getBlog() var=blogName}
-{include file="summary/header.template" selected="blogslist" columns=1 section="$title $blogName"}
+{include file="$blogtemplate/header.template" selected="blogslist" columns=1 section="$title $blogName"}
 <div id="onecolumn">
 	{assign var="url" value=$blog->getBlogRequestGenerator()}
     <h4><a href="{$url->blogLink()}">&raquo; {$blog->getBlog()|strip_tags}</a></h4>
@@ -25,7 +25,7 @@
 		  <h4>&raquo; {$locale->tr("latest_posts")}</h4>
 		  <p>
 		  {foreach from=$blogposts item=post}
-		   {include file="summary/post.template"}
+		   {include file="$blogtemplate/post.template"}
 		  {/foreach}
 		  </p>
 		  <p>
@@ -33,4 +33,4 @@
 		  </p>
         </div>
 </div>
-{include file="summary/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/summary/blogslist.template
===================================================================
--- plog/trunk/templates/summary/blogslist.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/blogslist.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="summary/header.template" section=$locale->tr("blogs")}
+{include file="$blogtemplate/header.template" section=$locale->tr("blogs")}
 <div id="onecolumn">
     {foreach from=$blogs item=blog}
         {assign var="updateDate" value=$blog->getUpdateDateObject()}
@@ -25,8 +25,8 @@
         </div>
     {/foreach}
 	<div class="pager">
-	  {include file="summary/pager.template" style=links}
+	  {include file="$blogtemplate/pager.template" style=links}
 	</div>  
 </div>
 </div>
-{include file="summary/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/summary/changepassword.template
===================================================================
--- plog/trunk/templates/summary/changepassword.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/changepassword.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="summary/header.template" section=$locale->tr("change_password")}
+{include file="$blogtemplate/header.template" section=$locale->tr("change_password")}
 <div id="onecolumn">
  <form name="changePassword" method="post">
   <fieldset class="inputField">
@@ -6,17 +6,17 @@
    <p>
     {$locale->tr("change_password_help")}
    </p>
-   {include file="summary/formvalidate.template" message=$locale->tr("error_resetting_password")}
+   {include file="$blogtemplate/formvalidate.template" message=$locale->tr("error_resetting_password")}
    <div class="field">
     <label for="newPassword">{$locale->tr("new_password")}</label>
 	<span class="required">*</span>
 	<div class="formHelp">{$locale->tr("new_password_help")}</div>	
     <input type="password" name="newPassword" value="" />
-	{include file="summary/validate.template" field=newPassword message=$locale->tr("error_invalid_password")}
+	{include file="$blogtemplate/validate.template" field=newPassword message=$locale->tr("error_invalid_password")}
 	<br/>
     <div class="formHelp">{$locale->tr("confirm_password")}</div>
 	<input type="password" name="retypePassword" value="" />
-	{include file="summary/validate.template" field=retypePassword message=$locale->tr("error_passwords_dont_match")}	
+	{include file="$blogtemplate/validate.template" field=retypePassword message=$locale->tr("error_passwords_dont_match")}	
    </div>
   </fieldset>
   <div class="buttons">
@@ -28,4 +28,4 @@
   </div> 
  </form>
 </div>
-{include file="summary/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/summary/faq.template
===================================================================
--- plog/trunk/templates/summary/faq.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/faq.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="summary/header.template" selected="faq" columns=1}
+{include file="$blogtemplate/header.template" selected="faq" columns=1}
 
 <div id="onecolumn">
     <h2>{$locale->tr("summary_faq")}</h2>
@@ -8,4 +8,4 @@
     {$locale->tr("summary_faq_description")}
     </p>
 
-{include file="summary/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/summary/index.template
===================================================================
--- plog/trunk/templates/summary/index.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/index.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="summary/header.template" selected="index"}
+{include file="$blogtemplate/header.template" selected="index"}
 
 <div id="column-left">
     <form id="loginForm" method="post" action="admin.php">
@@ -36,7 +36,7 @@
 		templates/summary, that is where all template files that make up this page are stored. You are
 		free to change them in any way you like.
     </div>
-    {include file="summary/recent.template"}
+    {include file="$blogtemplate/recent.template"}
 </div>
 
 <div id="column-right">
@@ -85,4 +85,4 @@
     {/foreach}
     </ul>
 </div>
-{include file="summary/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/summary/message.template
===================================================================
--- plog/trunk/templates/summary/message.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/message.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="summary/header.template" section=$locale->tr("message")}
+{include file="$blogtemplate/header.template" section=$locale->tr("message")}
 <div id="onecolumn">
 {if $viewIsSuccess}
 <div id="FormInfo">
@@ -13,4 +13,4 @@
 </div>
 {/if}
 </div>
-{include file="summary/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/summary/recent.template
===================================================================
--- plog/trunk/templates/summary/recent.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/recent.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -2,5 +2,5 @@
 <a href="{$url->getRssUrl()}?summary=1"><img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" alt="RSS" /></a>
 </h4>
 {foreach from=$posts item=post}
- {include file="summary/post.template"}
+ {include file="$blogtemplate/post.template"}
 {/foreach}

Modified: plog/trunk/templates/summary/registererror.template
===================================================================
--- plog/trunk/templates/summary/registererror.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/registererror.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="summary/header.template" selected="register" columns=1 section=$locale->tr("error")}
+{include file="$blogtemplate/header.template" selected="register" columns=1 section=$locale->tr("error")}
 <div id="onecolumn">
  <p>
   {$locale->tr("register_error")}
@@ -10,4 +10,4 @@
 <a href="#" onclick="javascript:history.go(-1)">&laquo; {$locale->tr("back")}</a>
  </p>
 </div>
-{include file="summary/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/summary/registerfinished.template
===================================================================
--- plog/trunk/templates/summary/registerfinished.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/registerfinished.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="summary/header.template" selected="register" columns=1}
+{include file="$blogtemplate/header.template" selected="register" columns=1}
 <div id="onecolumn">
 
  <h1>{$locale->tr("register_finished")}</h1>
@@ -7,4 +7,4 @@
  </p>
 
 </div>
-{include file="summary/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/summary/registerstep0.template
===================================================================
--- plog/trunk/templates/summary/registerstep0.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/registerstep0.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="summary/header.template" section=$locale->tr("register_step0_title")}
+{include file="$blogtemplate/header.template" section=$locale->tr("register_step0_title")}
 <form action="summary.php" method="post">
   <fieldset class="inputField">
    <legend>{$locale->tr("agreement")}</legend>
@@ -7,7 +7,7 @@
     <label for="contract">{$locale->tr("read_service_agreement")}</label>
     <div class="formHelp"></div>
     <textarea name="contract" class="contract" readonly="readonly" style="width:100%" rows="15">
-{include file="summary/agreement.template"}
+{include file="$blogtemplate/agreement.template"}
     </textarea>
     <!--end user agreement-->
    </div>
@@ -18,4 +18,4 @@
    <input type="hidden" name="op" value="RegisterStep1"/>
   </div>
  </form>
-{include file="summary/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/summary/registerstep1.template
===================================================================
--- plog/trunk/templates/summary/registerstep1.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/registerstep1.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,17 +1,17 @@
-{include file="summary/header.template" section=$locale->tr("register_step1_title")}
+{include file="$blogtemplate/header.template" section=$locale->tr("register_step1_title")}
   <form name="newUser" action="summary.php" method="post">
     <fieldset class="inputField">
         <legend>{$locale->tr("step1")}</legend>
         <p>
           {$locale->tr("register_step1_help")}
         </p>        
-        {include file="summary/formvalidate.template" message=$locale->tr("error_adding_user")}
+        {include file="$blogtemplate/formvalidate.template" message=$locale->tr("error_adding_user")}
         <div class="field">
             <label for="userName">{$locale->tr("username")}</label>
 			<span class="required">*</span>
 			<div class="formHelp">{$locale->tr("username_help")}</div>
             <input type="text" name="userName" value="{$userName}" id="userName" />
-            {include file="summary/validate.template" field=userName message=$locale->tr("error_incorrect_username")}
+            {include file="$blogtemplate/validate.template" field=userName message=$locale->tr("error_incorrect_username")}
         </div>
         <div class="field">
             <label for="userFullName">{$locale->tr("full_name")}</label>
@@ -23,18 +23,18 @@
             <label for="userPassword">{$locale->tr("password")}</label>
 			<span class="required">*</span>
             <input type="password" name="userPassword" id="userPassword" value="{$userPassword}"/>
-            {include file="summary/validate.template" field=userPassword message=$locale->tr("error_invalid_password")}            
+            {include file="$blogtemplate/validate.template" field=userPassword message=$locale->tr("error_invalid_password")}            
 			<div class="formHelp">{$locale->tr("password_help")}</div>
             <label for="userPasswordCheck">{$locale->tr("confirm_password")}</label><br />
             <input type="password" name="userPasswordCheck" id="userPasswordCheck" value="{$userPasswordCheck}"/>
-            {include file="summary/validate.template" field=userPasswordCheck message=$locale->tr("error_passwords_dont_match")}            
+            {include file="$blogtemplate/validate.template" field=userPasswordCheck message=$locale->tr("error_passwords_dont_match")}            
         </div>
         <div class="field">
             <label for="userPasswordCheck">{$locale->tr("email")}</label>
 			<span class="required">*</span>
 			<div class="formHelp">{$locale->tr("email_help")}</div>
             <input type="text" name="userEmail" id="userEmail" value="{$userEmail}"/>
-            {include file="summary/validate.template" field=userEmail message=$locale->tr("error_incorrect_email_address")}
+            {include file="$blogtemplate/validate.template" field=userEmail message=$locale->tr("error_incorrect_email_address")}
         </div>
     </fieldset>
     <div class="buttons">
@@ -42,4 +42,4 @@
       <input type="hidden" name="op" value="RegisterStep2"/>
     </div>
   </form>
-{include file="summary/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/summary/registerstep2.template
===================================================================
--- plog/trunk/templates/summary/registerstep2.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/registerstep2.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,14 +1,14 @@
-{include file="summary/header.template" section=$locale->tr("register_step2_title")}
+{include file="$blogtemplate/header.template" section=$locale->tr("register_step2_title")}
  <form name="createBlog" action="summary.php" method="post">
   <fieldset class="inputField">
    <legend>{$locale->tr("step2")}</legend>
-   {include file="summary/formvalidate.template" message=$locale->tr("error_adding_blog")}     
+   {include file="$blogtemplate/formvalidate.template" message=$locale->tr("error_adding_blog")}     
    <div class="field">
      <label for="blogName">{$locale->tr("name")}</label>
      <span class="required">*</span>
      <div class="formHelp">{$locale->tr("register_blog_name_help")}</div>
      <input type="text" name="blogName" value="{$blogName}" id="blogName" />
-     {include file="summary/validate.template" field=blogName message=$locale->tr("error_empty_name")}
+     {include file="$blogtemplate/validate.template" field=blogName message=$locale->tr("error_empty_name")}
    </div>  
    <div class="field">
      <label for="blogLocale">{$locale->tr("language")}</label>
@@ -31,4 +31,4 @@
     <input type="hidden" name="userEmail" value="{$userEmail}"/>
   </div>  
  </form>
-{include file="summary/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/summary/registerstep3.template
===================================================================
--- plog/trunk/templates/summary/registerstep3.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/registerstep3.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,11 +1,11 @@
-{include file="summary/header.template" section=$locale->tr("register_step3_title")}
+{include file="$blogtemplate/header.template" section=$locale->tr("register_step3_title")}
  <form name="templateChooser" method="post">
   <fieldset class="inputField">
    <legend>{$locale->tr("step3")}</legend>
    <div class="field">
 	<label for="">{$locale->tr("select_template")}</label>
 	<div class="formHelp">{$locale->tr("register_step3_help")}</div>
-    {include file="summary/validate.template" field=templateId message=$locale->tr("error_must_choose_template")}	
+    {include file="$blogtemplate/validate.template" field=templateId message=$locale->tr("error_must_choose_template")}	
     {foreach from=$templates item=template}
      {assign var=templateName value=$template->getName()}
      <img src="{$template->getScreenshotUrl()}" alt="{$templateName}" height="300" width="400" /><br/>
@@ -27,4 +27,4 @@
     <input type="hidden" name="blogLocale" value="{$blogLocale}"/>
   </div>  
  </form>
-{include file="summary/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/summary/registerstep4.template
===================================================================
--- plog/trunk/templates/summary/registerstep4.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/registerstep4.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="summary/header.template" section=$locale->tr("register_new_blog_step4_title")}
+{include file="$blogtemplate/header.template" section=$locale->tr("register_new_blog_step4_title")}
    {$locale->tr("register_new_blog_step4_description")}
 <div id="onecolumn">
  <form name="createBlog" action="summary.php" method="post">
@@ -59,4 +59,4 @@
  </form> 
 
 </div>
-{include file="summary/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/summary/registerstep5.template
===================================================================
--- plog/trunk/templates/summary/registerstep5.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/registerstep5.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="summary/header.template" section=$locale->tr("register_step5_title")}
+{include file="$blogtemplate/header.template" section=$locale->tr("register_step5_title")}
 <div id="onecolumn">
  <form name="formDone"> 
   <fieldset class="inputField">
@@ -22,4 +22,4 @@
    <input type="submit" name="finish" value="{$locale->tr("finish")}" />
  </form> 
 </div>
-{include file="summary/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/summary/resetpassword.template
===================================================================
--- plog/trunk/templates/summary/resetpassword.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/resetpassword.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="summary/header.template" section=$locale->tr("reset_password")}
+{include file="$blogtemplate/header.template" section=$locale->tr("reset_password")}
 <div id="onecolumn">
   <form name="resetPasswordForm" method="post">
    <fieldset class="inputField">
@@ -6,20 +6,20 @@
     <p>
      {$locale->tr("reset_password_help")}
     </p>   
-    {include file="summary/formvalidate.template" message=$locale->tr("error_resetting_password")}
+    {include file="$blogtemplate/formvalidate.template" message=$locale->tr("error_resetting_password")}
     <div class="field">
       <label for="userName">{$locale->tr("username")}</label>
 	  <span class="required">*</span>
 	  <div class="formHelp">{$locale->tr("reset_password_username_help")}</div>
       <input type="text" name="userName" id="userName" value="{$userName}" />
-      {include file="summary/validate.template" field=userName message=$locale->tr("error_incorrect_username")}
+      {include file="$blogtemplate/validate.template" field=userName message=$locale->tr("error_incorrect_username")}
     </div>
     <div class="field">  
      <label for="userEmail">{$locale->tr("email")}</label>
      <span class="required">*</span>	 
 	 <div class="formHelp">{$locale->tr("reset_password_email_help")}</div>	  
      <input type="text" name="userEmail" id="userEmail" value="{$userEmail}" />
-     {include file="summary/validate.template" field=userEmail message=$locale->tr("reset_password_error_incorrect_email_address")}     
+     {include file="$blogtemplate/validate.template" field=userEmail message=$locale->tr("reset_password_error_incorrect_email_address")}     
     </div>
    </fieldset>
    <div class="buttons">
@@ -27,4 +27,4 @@
     <input type="hidden" name="op" value="sendResetEmail" />
    </div>
 </div>
-{include file="summary/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/summary/searchresults.template
===================================================================
--- plog/trunk/templates/summary/searchresults.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/searchresults.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,11 +1,11 @@
-{include file="summary/header.template" section=$locale->tr("search_results")}
+{include file="$blogtemplate/header.template" section=$locale->tr("search_results")}
 <div id="onecolumn">
     {foreach from=$searchresults item=result}
 	    {assign var="post" value=$result->getArticle()}
 		{assign var="blog" value=$post->getBlogInfo()}
 		{assign var="request" value=$blog->getBlogRequestGenerator()}
-	    {include file="summary/post.template"}
+	    {include file="$blogtemplate/post.template"}
     {/foreach}
 	{** bloglistpager links=$linkslist current=$currentPage **}
 </div>
-{include file="summary/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/summary/summary.template
===================================================================
--- plog/trunk/templates/summary/summary.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/summary.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="summary/header.template"}
+{include file="$blogtemplate/header.template"}
  {foreach from=$posts item=post}
    <h3>{$post->getTopic()}</h3>
 {assign var="postDate" value=$post->getDateObject()}
@@ -23,4 +23,4 @@
 </div>
 
   {/foreach}
-{include file="summary/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/summary/summaryerror.template
===================================================================
--- plog/trunk/templates/summary/summaryerror.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/summaryerror.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="summary/header.template" selected="register" columns=1 section=$locale->tr("error")}
+{include file="$blogtemplate/header.template" selected="register" columns=1 section=$locale->tr("error")}
 <div id="onecolumn">
  <p>
   <span style="color: red">{$viewErrorMessage}</span>
@@ -7,4 +7,4 @@
 <a href="#" onclick="javascript:history.go(-1)">&laquo; {$locale->tr("back")}</a>
  </p>
 </div>
-{include file="summary/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/summary/userlist.template
===================================================================
--- plog/trunk/templates/summary/userlist.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/userlist.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="summary/header.template" section=$locale->tr("users")}
+{include file="$blogtemplate/header.template" section=$locale->tr("users")}
 <div id="onecolumn">
     {foreach from=$users item=user}
         <h3><a href="?op=UserProfile&amp;userId={$user->getId()}">{$user->getUsername()}</a></h3>
@@ -14,7 +14,7 @@
     {/foreach}
 </div>
 <div class="pager">
-	{include file="summary/pager.template" style=links}
+	{include file="$blogtemplate/pager.template" style=links}
 </div>
 </div>
-{include file="summary/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/summary/userprofile.template
===================================================================
--- plog/trunk/templates/summary/userprofile.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/summary/userprofile.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,7 +1,7 @@
 {assign var=userName value=$user->getUsername()}
 {assign var=title value=$locale->tr("user")}
 {assign var=sectionTitle value="$title $userName"}
-{include file="summary/header.template" selected="userslist" section="$title $userName"}
+{include file="$blogtemplate/header.template" selected="userslist" section="$title $userName"}
 <div id="onecolumn">
     {if $user->hasPicture()}
     <p>
@@ -27,4 +27,4 @@
 		 <a href="javascript:history.go(-1);">{$locale->tr("back")}</a>
 		</p>
 </div>
-{include file="summary/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/wizard/intro.template
===================================================================
--- plog/trunk/templates/wizard/intro.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/wizard/intro.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" title="1 Welcome!" step=1 mode=install}
+{include file="$blogtemplate/header.template" title="1 Welcome!" step=1 mode=install}
  <form name="databaseInfo" action="wizard.php" method="post">
   <fieldset class="inputField">
    <legend>Database settings</legend>  
@@ -27,7 +27,7 @@
     <span class="required">*</span>
     <div class="formHelp">This is the host where your database server is running.</div>
     <input style="width:100%" type="text" id="dbServer" name="dbServer" value="{$dbServer}"/>
-    {include file="wizard/validate.template" field=dbServer message="Database server is missing or incorrect"}
+    {include file="$blogtemplate/validate.template" field=dbServer message="Database server is missing or incorrect"}
    </div>
    
    <div class="field">
@@ -35,7 +35,7 @@
     <span class="required">*</span>
     <div class="formHelp">User that will be used to access the database.</div>
     <input style="width:100%" type="text" id="dbUser" name="dbUser" value="{$dbUser}"/>
-    {include file="wizard/validate.template" field=dbUser message="Database user is missing or incorrect"}    
+    {include file="$blogtemplate/validate.template" field=dbUser message="Database user is missing or incorrect"}    
    </div>
    
    <div class="field">
@@ -50,7 +50,7 @@
     <span class="required">*</span> 
     <input style="width:100%" type="text" id="dbName" name="dbName" value="{$dbName}"/>
     <div class="formHelp">Name of the database where tables will be created</div>
-    {include file="wizard/validate.template" field=dbName message="Database name is missing or incorrect"}    
+    {include file="$blogtemplate/validate.template" field=dbName message="Database name is missing or incorrect"}    
    </div> 
    
    <div class="field">
@@ -67,4 +67,4 @@
     <input type="submit" name="Next" value="Next &raquo;"/>
    </div> 
  </form>
-{include file="wizard/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/wizard/step1.template
===================================================================
--- plog/trunk/templates/wizard/step1.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/wizard/step1.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" title="2 Confirm Information" mode=install step=2}
+{include file="$blogtemplate/header.template" title="2 Confirm Information" mode=install step=2}
  <form name="formStep1" method="post">
   <fieldset class="inputField">
   <legend>Database Initialization</legend>   
@@ -53,4 +53,4 @@
   <input type="submit" name="Next &raquo;" value="Next &raquo;"/>
  </div>
  </form>
-{include file="wizard/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/wizard/step2.template
===================================================================
--- plog/trunk/templates/wizard/step2.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/wizard/step2.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" title="3 Database Initialized" step=3 mode="install"}
+{include file="$blogtemplate/header.template" title="3 Database Initialized" step=3 mode="install"}
 <form name="formStep2" action="wizard.php" method="post">
  <fieldset class="inputField">
   <legend>Database Initialization</legend>
@@ -22,4 +22,4 @@
    <input type="submit" name="Next &raquo;" value="Next &raquo;"/>
   </div> 
  </form>
-{include file="wizard/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/wizard/step3.template
===================================================================
--- plog/trunk/templates/wizard/step3.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/wizard/step3.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" title="4 User Creation" step=4 mode=install}
+{include file="$blogtemplate/header.template" title="4 User Creation" step=4 mode=install}
 <form name="newUser" action="wizard.php" method="post">
  <fieldset class="inputField">
   <legend>User Creation</legend>
@@ -20,7 +20,7 @@
     <span class="required">*</span>
     <div class="fieldHelp">Name of the first default user that will be created. This user will be given administrator privileges</div>
     <input type="text" id="userName" name="userName" value="{$userName}"/>
-    {include file="wizard/validate.template" field=userName message="User name is missing or incorrect"}
+    {include file="$blogtemplate/validate.template" field=userName message="User name is missing or incorrect"}
    </div>
    <div class="field"> 
     <label for="userFullName">Full name</label>
@@ -33,18 +33,18 @@
     <span class="required">*</span>
     <div class="fieldHelp">Password assigned to this user</div>
     <input type="password" name="userPassword" id="userPassword" value=""/>
-    {include file="wizard/validate.template" field=userPassword message="Password is missing or too short"}    
+    {include file="$blogtemplate/validate.template" field=userPassword message="Password is missing or too short"}    
     <br/>
     <div class="fieldHelp">Please confirm the password</div>
     <input type="password" name="userPasswordCheck" id="userPasswordCheck" value=""/>
-    {include file="wizard/validate.template" field=userPasswordCheck message="Passwords do not match"}
+    {include file="$blogtemplate/validate.template" field=userPasswordCheck message="Passwords do not match"}
    </div>
    <div class="field">
     <label for="userEmail">Email address</label>
     <span class="required">*</span>
     <div class="fieldHelp">Email address where notifications will be sent</div>
     <input type="text" name="userEmail" id="userEmail" value="{$userEmail}" />
-    {include file="wizard/validate.template" field=userEmail message="The email address is missing or incorrect"}    
+    {include file="$blogtemplate/validate.template" field=userEmail message="The email address is missing or incorrect"}    
    </div>
   </fieldset>
   <div class="buttons">
@@ -54,4 +54,4 @@
    <input type="hidden" name="nextStep" value="Step4"/></p>
   </p>
 
-{include file="wizard/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/wizard/step4.template
===================================================================
--- plog/trunk/templates/wizard/step4.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/wizard/step4.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" title="5 Blog Configuration" step=5 mode=install}
+{include file="$blogtemplate/header.template" title="5 Blog Configuration" step=5 mode=install}
 <form name="newBlog" method="post">
 <fieldset class="inputField">
 <legend>Blog Creation</legend>
@@ -20,7 +20,7 @@
    <span class="required">*</span>
    <div class="fieldHelp">Short but descriptive name for the new blog</div>
    <input type="text" style="width:100%" name="blogName" id="blogName" value="{$blogName}"/>
-   {include file="wizard/validate.template" field=blogName message="Blog name is missing or incorrect"}
+   {include file="$blogtemplate/validate.template" field=blogName message="Blog name is missing or incorrect"}
   </div>
   <div class="field">
    <label for="blogLocale">Language</label>
@@ -40,7 +40,7 @@
      <img height="150" width="150" src="{$template->getScreenshotUrl()}" alt="{$template->getName()}" /><br/>
      <input type="radio" class="radio" id="blogTemplate" name="blogTemplate" value="{$template->getName()}" {if $blogTemplate==$template->getName()}checked="checked"{/if} /> {$template->getName()}<br/>
     {/foreach}
-    {include file="wizard/validate.template" field=blogTemplate message="Please select a template for the blog"}
+    {include file="$blogtemplate/validate.template" field=blogTemplate message="Please select a template for the blog"}
   </div>
  </fieldset>
  <div class="buttons">  
@@ -51,4 +51,4 @@
    <input type="hidden" name="ownerid" value="{$ownerid}"/>
   </div>
 </form>
-{include file="wizard/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/wizard/step5.template
===================================================================
--- plog/trunk/templates/wizard/step5.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/wizard/step5.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" title="6 Done!" mode=install step=6}
+{include file="$blogtemplate/header.template" title="6 Done!" mode=install step=6}
 <form method="post">
  <fieldset class="inputField">
   <div class="wizardInfo">
@@ -27,4 +27,4 @@
   <input value="Go to administration interface" type="button" onClick="javascript:window.location='admin.php'" />
  </div> 
 </form> 
-{include file="wizard/footer.template"}
+{include file="$blogtemplate/footer.template"}

Modified: plog/trunk/templates/wizard/update1.template
===================================================================
--- plog/trunk/templates/wizard/update1.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/wizard/update1.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" title="1 Update" step=1 mode=update}
+{include file="$blogtemplate/header.template" title="1 Update" step=1 mode=update}
 <form name="databaseInfo" method="post">
 <fieldset class="inputField">
 <legend>Database Info</legend>
@@ -49,4 +49,4 @@
     <input type="submit" name="Next" value="Next &raquo;"/>
    </div>
  </form>
-{include file="wizard/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/wizard/update2.template
===================================================================
--- plog/trunk/templates/wizard/update2.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/wizard/update2.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" step=2 title="2 Database Changes"}
+{include file="$blogtemplate/header.template" step=2 title="2 Database Changes"}
 <form name="update2" method="post">
 <fieldset class="inputField">
 <legend>Database Changes</legend>
@@ -23,4 +23,4 @@
    <input type="submit" name="Next" value="Next &raquo;"/>
 </div>
 </form>
-{include file="wizard/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/wizard/update3.template
===================================================================
--- plog/trunk/templates/wizard/update3.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/wizard/update3.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" step=3 mode=update title="3 Data Changes"}
+{include file="$blogtemplate/header.template" step=3 mode=update title="3 Data Changes"}
 <form name="update2" method="post">
 <fieldset class="inputField">
 <legend>Data Changes</legend>
@@ -24,4 +24,4 @@
    <input type="submit" name="Next" value="Next &raquo;"/>
 </div>  
 </form>
-{include file="wizard/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/wizard/update4.template
===================================================================
--- plog/trunk/templates/wizard/update4.template	2005-02-24 02:07:52 UTC (rev 1190)
+++ plog/trunk/templates/wizard/update4.template	2005-02-24 02:28:05 UTC (rev 1191)
@@ -1,4 +1,4 @@
-{include file="wizard/header.template" step=4 mode=upgrade title="4 Done!"}
+{include file="$blogtemplate/header.template" step=4 mode=upgrade title="4 Done!"}
 <form method="post">
 <fieldset class="inputField">
 <legend>Upgrade Complete</legend>
@@ -30,4 +30,4 @@
   <input value="Go to administration interface" type="button" onClick="javascript:window.location='admin.php'" />
  </div> 
 </form> 
-{include file="wizard/footer.template"}
+{include file="$blogtemplate/footer.template"}




More information about the pLog-svn mailing list