[pLog-svn] r5045 - in plog/branches/lifetype-1.2/templates: admin standard

reto at devel.lifetype.net reto at devel.lifetype.net
Sat Mar 10 19:23:28 EST 2007


Author: reto
Date: 2007-03-10 19:23:28 -0500 (Sat, 10 Mar 2007)
New Revision: 5045

Modified:
   plog/branches/lifetype-1.2/templates/admin/dashboard.template
   plog/branches/lifetype-1.2/templates/admin/default.template
   plog/branches/lifetype-1.2/templates/admin/registerblog.template
   plog/branches/lifetype-1.2/templates/admin/simpleerror.template
   plog/branches/lifetype-1.2/templates/admin/simpleheader.template
   plog/branches/lifetype-1.2/templates/standard/header.template
   plog/branches/lifetype-1.2/templates/standard/post.template
   plog/branches/lifetype-1.2/templates/standard/postandcomments.template
Log:
some xhtml fixes


Modified: plog/branches/lifetype-1.2/templates/admin/dashboard.template
===================================================================
--- plog/branches/lifetype-1.2/templates/admin/dashboard.template	2007-03-11 00:22:45 UTC (rev 5044)
+++ plog/branches/lifetype-1.2/templates/admin/dashboard.template	2007-03-11 00:23:28 UTC (rev 5045)
@@ -33,8 +33,10 @@
                     <h3>{$locale->tr("recent_articles")}</h3>
                     <table class="dashboard_data_table" id="dashboard_data_table_{$blog->getId()}" summary="{$locale->tr("recent_articles")}">
                         <thead>
+                         <tr>
                             <th>{$locale->tr("topic")}</th>
                             <th style="width:60px;">{$locale->tr("actions")}</th>
+                         </tr>
                         </thead>
                         {assign var=blogId value=$blog->getId()}
                         {assign var=url value=$blog->getBlogRequestGenerator()}
@@ -59,11 +61,13 @@
                     <h3>{$locale->tr("recent_comments")}</h3>
                     <table class="dashboard_data_table" id="dashboard_recent_comments_{$blog->getId()}" summary="{$locale->tr("recent_comments")}">
                         <thead>
+                        <tr>
                             <th>{$locale->tr("topic")}</th>
                             <th>{$locale->tr("posted_by")}</th>
                             <th>{$locale->tr("in")}</th>
                             <th>{$locale->tr("date")}</th>
                             <th style="width:60px;">{$locale->tr("actions")}</th>
+                         </tr>
                         </thead>
                         {** loop to print out the list of recent comments **}
 						<tbody>
@@ -120,10 +124,12 @@
                     <h3>{$locale->tr("recent_trackbacks")}</h3>
                     <table class="dashboard_data_table" id="dashboard_recent_trackbacks_{$blog->getId()}" summary="{$locale->tr("recent_trackbacks")}">
                         <thead>
+                        <tr>
                             <th>{$locale->tr("topic")}</th>
                             <th>{$locale->tr("in")}</th>
                             <th>{$locale->tr("date")}</th>
                             <th style="width:60px;">{$locale->tr("actions")}</th>
+                        </tr>
                         </thead>
                         {** loop to print out the list of recent trackbacks **}
 						<tbody>
@@ -237,5 +243,5 @@
         </div>
     {/foreach}
     </div>
-
-{include file="$admintemplatepath/footer.template"}
+{include file="$blogtemplate/footernavigation.template"}
+{include file="$admintemplatepath/simplefooter.template"}

Modified: plog/branches/lifetype-1.2/templates/admin/default.template
===================================================================
--- plog/branches/lifetype-1.2/templates/admin/default.template	2007-03-11 00:22:45 UTC (rev 5044)
+++ plog/branches/lifetype-1.2/templates/admin/default.template	2007-03-11 00:23:28 UTC (rev 5045)
@@ -25,4 +25,5 @@
 		</div> 
        </form>		
 	</div>
-{include file="$blogtemplate/footer.template"}
+
+{include file="$blogtemplate/simplefooter.template"}

Modified: plog/branches/lifetype-1.2/templates/admin/registerblog.template
===================================================================
--- plog/branches/lifetype-1.2/templates/admin/registerblog.template	2007-03-11 00:22:45 UTC (rev 5044)
+++ plog/branches/lifetype-1.2/templates/admin/registerblog.template	2007-03-11 00:23:28 UTC (rev 5045)
@@ -100,4 +100,4 @@
   </div>  
  </form>
     </div>
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/simplefooter.template"}

Modified: plog/branches/lifetype-1.2/templates/admin/simpleerror.template
===================================================================
--- plog/branches/lifetype-1.2/templates/admin/simpleerror.template	2007-03-11 00:22:45 UTC (rev 5044)
+++ plog/branches/lifetype-1.2/templates/admin/simpleerror.template	2007-03-11 00:23:28 UTC (rev 5045)
@@ -14,4 +14,4 @@
    </p>
    </div>
 {include file="$blogtemplate/footernavigation.template"}
-{include file="$blogtemplate/footer.template"}
+{include file="$blogtemplate/simplefooter.template"}

Modified: plog/branches/lifetype-1.2/templates/admin/simpleheader.template
===================================================================
--- plog/branches/lifetype-1.2/templates/admin/simpleheader.template	2007-03-11 00:22:45 UTC (rev 5044)
+++ plog/branches/lifetype-1.2/templates/admin/simpleheader.template	2007-03-11 00:23:28 UTC (rev 5045)
@@ -21,7 +21,7 @@
 <script type="text/javascript" src="js/yui/dom/dom-min.js"></script> 
 <script type="text/javascript" src="js/yui/event/event-min.js"></script>
 {if $templatename=="default"}{** only to be used in the login page! **}
-<style>{literal}
+<style type="text/css">{literal}
 html,body
 {
     margin		     : 0px;

Modified: plog/branches/lifetype-1.2/templates/standard/header.template
===================================================================
--- plog/branches/lifetype-1.2/templates/standard/header.template	2007-03-11 00:22:45 UTC (rev 5044)
+++ plog/branches/lifetype-1.2/templates/standard/header.template	2007-03-11 00:23:28 UTC (rev 5045)
@@ -14,6 +14,17 @@
  <link rel="alternate" type="application/xml" title="RSS 0.90" href="{$url->rssLink("rss090")}" />
  <link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="{$url->rssLink("atom")}" />  
  <link rel="shortcut icon" type="image/x-icon" href="{$url->getTemplateFile("favicon.ico")}" />
+ 
+ {if $onAlbumPage}
+     <script type="text/javascript" src="js/prototype.js"></script>
+     <script type="text/javascript" src="js/scriptaculous.js?load=effects"></script>
+     <script type="text/javascript" src="js/lightbox.js"></script>
+ {/if}
+ {if $iconize}
+{if $iconize->isEnabled()}
+{$iconize->getJavascriptCode()}
+{/if}
+{/if}
  </head>
   <body> 
 <!-- Cached content created: {"0"|date_format:"%D %H:%M:%S"} -->

Modified: plog/branches/lifetype-1.2/templates/standard/post.template
===================================================================
--- plog/branches/lifetype-1.2/templates/standard/post.template	2007-03-11 00:22:45 UTC (rev 5044)
+++ plog/branches/lifetype-1.2/templates/standard/post.template	2007-03-11 00:23:28 UTC (rev 5045)
@@ -1,3 +1,4 @@
+<div id="post_274" class="post lead">
 <h2>{$post->getTopic()}</h2>
 		{assign var="postDate" value=$post->getDateObject()}
 		{assign var="postOwner" value=$post->getUserInfo()}
@@ -27,3 +28,4 @@
 </p>
 
 {/if}
+</div>

Modified: plog/branches/lifetype-1.2/templates/standard/postandcomments.template
===================================================================
--- plog/branches/lifetype-1.2/templates/standard/postandcomments.template	2007-03-11 00:22:45 UTC (rev 5044)
+++ plog/branches/lifetype-1.2/templates/standard/postandcomments.template	2007-03-11 00:23:28 UTC (rev 5045)
@@ -8,33 +8,68 @@
    		<!-- {$url->postTrackbackLink($post)} -->
    		
    		{include file="$blogtemplate/post.template"}
-{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $comments }<h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
+   		
+{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1 || $comments }
+<div id="loop_comments">
+    <h2 id="comments">{$locale->tr("comments")|capitalize}</h2>
+    <a name="comments"></a>
 {/if}
+
  {pager style="links"}
-   		{foreach from=$comments item=comment}
-<div class="comment">
-<h3 class="commentheader">{if $comment->getTopic() != null} {$comment->getTopic()|strip_tags}{else}Re: <em>{$post->getTopic()|strip_tags}</em>{/if}</h3>
+{assign var=counter value=0}
+{foreach from=$comments item=comment}
+{assign var="postDate" value=$comment->getTimestamp()}
+{assign var="counter" value="`$counter+1`"}
+		<a name="comment-{$comment->getId()}"></a>
+		<div id="comment_{$comment->getId()}" class="comment">
+			<dl class="metadata reduced">
+				{if $comment->IsPosterAuthenticated()}
+				{assign var=poster value=$comment->getUser()}
+				 {if $poster->hasPicture()}
+				   {assign var=posterimg value=$poster->getPicture()}
+                   {assign var=commenter value=$comment->getUser()}
+				    <dt class="comment_number gravatar">{$commenter->getUserName()}</dt>
+				    <dd class="comment_number">
+				    <img class="gravatar" border="0" src="{$posterimg->getPreviewLink()}" alt="{$commenter->getUserName()}" />
+				    </dd>
+				 {/if}
+				{/if}
+                <dt class="comment_number">Comment Number:</dt>
+                <dd class="comment_number">{$counter}</dd>
+                <?php endif; ?>
+                
+                <dt class="writer">Title:</dt>
+                <dd class="writer">
+                {if $comment->getTopic() != null}
+                    {$comment->getTopic()|strip_tags}
+                {else}
+                    Re: <em>{$post->getTopic()|strip_tags}</em>
+                {/if}              
+                </dd>
+                
+                <dt class="writer">Written by:</dt>
+                <dd class="writer">
+                {if $comment->getUserUrl() != ""}
+		            <a href="{$comment->getUserUrl()}">{$comment->getUsername()}</a>
+		        {else}
+			        {$comment->getUsername()}
+		        {/if}<br />
+		        </dd>
 
-<p class="commentposterinfo">
-		{assign var="postDate" value=$comment->getTimestamp()}
-		{if $comment->getUserUrl() != ""}<a href="{$comment->getUserUrl()}">{$comment->getUsername()}</a>
-		{else}
-			{$comment->getUsername()}
-		{/if} | {$locale->formatDate($postDate, "%d/%m/%Y, %H:%M")}
-</p>
+                <dt class="timedate">Posted on:</dt>
+                <dd class="timedate">{$locale->formatDate($postDate, "%d/%m/%Y, %H:%M")}</dd>
+            </dl>
+			<div class="content">
+				{$comment->getText()}
+			</div>
+		</div>
+{/foreach}
+</div>
+<br class="clear" />
 
-<div class="commenttext">
-{if $comment->IsPosterAuthenticated()}
- {assign var=poster value=$comment->getUser()}
- {if $poster->hasPicture()}
-   {assign var=posterimg value=$poster->getPicture()}
-   {assign var=commenter value=$comment->getUser()}
-   <img src="{$posterimg->getPreviewLink()}" alt="{$commenter->getUserName()}" />
-  {/if}
-{/if}
-{$comment->getText()}
-</div>
-</div>
-	{/foreach}			
+<script language="JavaScript" type="text/javascript" src="{$url->getTemplateFile("/assets/js/form_comments.js")}"></script>
+
+
+			
 {include file="$misctemplatepath/commentform.template"}					
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/footer.template"}



More information about the pLog-svn mailing list