diff -u -r1.52 paper.tpl
--- templates/paper/paper.tpl	18 Apr 2008 20:06:46 -0000	1.52
+++ templates/paper/paper.tpl	6 Jun 2008 20:08:08 -0000
@@ -139,14 +139,39 @@
 {assign var=poster value=$comment->getUser()}
 	<li>
 		<a href="{url page="comment" op="view" path=$paper->getPaperId()|to_array:$galleyId:$comment->getCommentId()}" target="_parent">{$comment->getTitle()|escape|default:"&nbsp;"}</a>
-		{if $comment->getChildCommentCount()==1}{translate key="comments.oneReply"}{elseif $comment->getChildCommentCount()>0}{translate key="comments.nReplies" num=$comment->getChildCommentCount()}{/if}<br/>
-		{if $poster}{translate key="comments.authenticated" userName=$comment->getPosterName()|escape}{elseif $comment->getPosterName()}{translate key="comments.anonymousNamed" userName=$comment->getPosterName()|escape}{else}{translate key="comments.anonymous"}{/if} ({$comment->getDatePosted()|date_format:$dateFormatShort})
+		{if $comment->getChildCommentCount()==1}
+			{translate key="comments.oneReply"}
+		{elseif $comment->getChildCommentCount()>0}
+			{translate key="comments.nReplies" num=$comment->getChildCommentCount()}
+		{/if}
+
+		<br/>
+
+		{if $poster}
+			{translate key="comments.authenticated" userName=$comment->getPosterName()|escape}
+		{elseif $comment->getPosterName()}
+			{translate key="comments.anonymousNamed" userName=$comment->getPosterName()|escape}
+		{else}
+			{translate key="comments.anonymous"}
+		{/if}
+		({$comment->getDatePosted()|date_format:$dateFormatShort})
 	</li>
 {/foreach}
 </ul>
 
-<a href="{url page="comment" op="view" path=$paper->getPaperId()|to_array:$galleyId}" class="action" target="_parent">{translate key="comments.viewAllComments"}</a>{if $postingAllowed}&nbsp;|&nbsp;<a class="action" href="{url page="comment" op="add" path=$paper->getPaperId()|to_array:$galleyId}" target="_parent">{translate key="rt.addComment"}</a>{/if}<br />
+<a href="{url page="comment" op="view" path=$paper->getPaperId()|to_array:$galleyId}" class="action" target="_parent">{translate key="comments.viewAllComments"}</a>
 
+{assign var=needsSeparator value=1}
+
+{/if}{* $comments *}
+
+{if $postingAllowed}
+	{if $needsSeparator}
+		&nbsp;|&nbsp;
+	{else}
+		<br/><br/>
+	{/if}
+	<a class="action" href="{url page="comment" op="add" path=$paper->getPaperId()|to_array:$galleyId}" target="_parent">{translate key="rt.addComment"}</a>
 {/if}
 
 {if $currentJournal && $currentJournal->getSetting('includeCreativeCommons')}
@@ -213,6 +238,5 @@
 </div><!-- footer -->
 {/if}
 
-
 </body>
 </html>
diff -u -r1.19 comments.tpl
--- templates/comment/comments.tpl	4 Jan 2008 17:26:44 -0000	1.19
+++ templates/comment/comments.tpl	6 Jun 2008 20:08:08 -0000
@@ -25,7 +25,16 @@
 {if $comment}
 	{assign var=user value=$comment->getUser()}
 	<h3>{$comment->getTitle()|escape|default:"&nbsp;"}</h3>
-	<h4>{if $user}{translate key="comments.authenticated" userName=$comment->getPosterName()|escape}{elseif $comment->getPosterName()}{translate key="comments.anonymousNamed" userName=$comment->getPosterName()|escape}{else}{translate key="comments.anonymous"}{/if} ({$comment->getDatePosted()|date_format:$dateFormatShort})</h4>
+	<h4>
+		{if $user}
+			{translate key="comments.authenticated" userName=$comment->getPosterName()|escape}
+		{elseif $comment->getPosterName()}
+			{translate key="comments.anonymousNamed" userName=$comment->getPosterName()|escape}
+		{else}
+			{translate key="comments.anonymous"}
+		{/if}
+		({$comment->getDatePosted()|date_format:$dateFormatShort})
+	</h4>
 
 	<p>
 
@@ -73,7 +82,16 @@
 {assign var=user value=$child->getUser()}
 {assign var=childId value=$child->getCommentId()}
 <h4><a href="{url op="view" path=$paperId|to_array:$galleyId:$childId}" target="_parent">{$child->getTitle()|escape|default:"&nbsp;"}</a></h4>
-<h5>{if $user}{translate key="comments.authenticated" userName=$child->getPosterName()|escape}{elseif $child->getPosterName()}{translate key="comments.anonymousNamed" userName=$child->getPosterName()|escape}{else}{translate key="comments.anonymous"}{/if} ({$child->getDatePosted()|date_format:$dateFormatShort})</h5>
+<h5>
+	{if $user}
+		{translate key="comments.authenticated" userName=$child->getPosterName()|escape}
+	{elseif $child->getPosterName()}
+		{translate key="comments.anonymousNamed" userName=$child->getPosterName()|escape}
+	{else}
+		{translate key="comments.anonymous"}
+	{/if}
+	({$child->getDatePosted()|date_format:$dateFormatShort})
+</h5>
 
 {assign var="hasPriorAction" value=0}
 
@@ -107,7 +125,14 @@
 	<li>
 		<a href="{url op="view" path=$paperId|to_array:$galleyId:$grandChild->getCommentId()}" target="_parent">{$grandChild->getTitle()|escape|default:"&nbsp;"}</a>
 		{if $grandChild->getChildCommentCount()==1}{translate key="comments.oneReply"}{elseif $grandChild->getChildCommentCount()>0}{translate key="comments.nReplies" num=$grandChild->getChildCommentCount()}{/if}<br/>
-		{if $user}{translate key="comments.authenticated" userName=$grandChild->getPosterName()|escape}{elseif $grandChild->getPosterName()}{translate key="comments.anonymousNamed" userName=$grandChild->getPosterName()|escape}{else}{translate key="comments.anonymous"}{/if} ({$grandChild->getDatePosted()|date_format:$dateFormatShort})
+		{if $user}
+			{translate key="comments.authenticated" userName=$grandChild->getPosterName()|escape}
+		{elseif $grandChild->getPosterName()}
+			{translate key="comments.anonymousNamed" userName=$grandChild->getPosterName()|escape}
+		{else}
+			{translate key="comments.anonymous"}
+		{/if}
+		({$grandChild->getDatePosted()|date_format:$dateFormatShort})
 	</li>
 {/foreach}
 {if $grandChildren}
@@ -125,4 +150,3 @@
 {/if}
 
 {include file="common/footer.tpl"}
-