We are moving to Git Issues for bug tracking in future releases. During transition, content will be in both tools. If you'd like to file a new bug, please create an issue.

View | Details | Raw Unified | Return to bug 3536 | Differences between
and this patch

Collapse All | Expand All

(-)templates/article/article.tpl (-4 / +28 lines)
 Lines 139-152    Link Here 
139
{assign var=poster value=$comment->getUser()}
139
{assign var=poster value=$comment->getUser()}
140
	<li>
140
	<li>
141
		<a href="{url page="comment" op="view" path=$article->getArticleId()|to_array:$galleyId:$comment->getCommentId()}" target="_parent">{$comment->getTitle()|escape|default:"&nbsp;"}</a>
141
		<a href="{url page="comment" op="view" path=$article->getArticleId()|to_array:$galleyId:$comment->getCommentId()}" target="_parent">{$comment->getTitle()|escape|default:"&nbsp;"}</a>
142
		{if $comment->getChildCommentCount()==1}{translate key="comments.oneReply"}{elseif $comment->getChildCommentCount()>0}{translate key="comments.nReplies" num=$comment->getChildCommentCount()}{/if}<br/>
142
		{if $comment->getChildCommentCount()==1}
143
		{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})
143
			{translate key="comments.oneReply"}
144
		{elseif $comment->getChildCommentCount()>0}
145
			{translate key="comments.nReplies" num=$comment->getChildCommentCount()}
146
		{/if}
147
148
		<br/>
149
150
		{if $poster}
151
			{translate key="comments.authenticated" userName=$comment->getPosterName()|escape}
152
		{elseif $comment->getPosterName()}
153
			{translate key="comments.anonymousNamed" userName=$comment->getPosterName()|escape}
154
		{else}
155
			{translate key="comments.anonymous"}
156
		{/if}
157
		({$comment->getDatePosted()|date_format:$dateFormatShort})
144
	</li>
158
	</li>
145
{/foreach}
159
{/foreach}
146
</ul>
160
</ul>
147
161
148
<a href="{url page="comment" op="view" path=$article->getArticleId()|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=$article->getArticleId()|to_array:$galleyId}" target="_parent">{translate key="rt.addComment"}</a>{/if}<br />
162
<a href="{url page="comment" op="view" path=$article->getArticleId()|to_array:$galleyId}" class="action" target="_parent">{translate key="comments.viewAllComments"}</a>
149
163
164
{assign var=needsSeparator value=1}
165
166
{/if}{* $comments *}
167
168
{if $postingAllowed}
169
	{if $needsSeparator}
170
		&nbsp;|&nbsp;
171
	{else}
172
		<br/><br/>
173
	{/if}
174
	<a class="action" href="{url page="comment" op="add" path=$article->getArticleId()|to_array:$galleyId}" target="_parent">{translate key="rt.addComment"}</a>
150
{/if}
175
{/if}
151
176
152
{if $currentJournal && $currentJournal->getSetting('includeCreativeCommons')}
177
{if $currentJournal && $currentJournal->getSetting('includeCreativeCommons')}
 Lines 213-218    Link Here 
213
</div><!-- footer -->
238
</div><!-- footer -->
214
{/if}
239
{/if}
215
240
216
217
</body>
241
</body>
218
</html>
242
</html>
(-)templates/comment/comments.tpl (-4 / +28 lines)
 Lines 25-31    Link Here 
25
{if $comment}
25
{if $comment}
26
	{assign var=user value=$comment->getUser()}
26
	{assign var=user value=$comment->getUser()}
27
	<h3>{$comment->getTitle()|escape|default:"&nbsp;"}</h3>
27
	<h3>{$comment->getTitle()|escape|default:"&nbsp;"}</h3>
28
	<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>
28
	<h4>
29
		{if $user}
30
			{translate key="comments.authenticated" userName=$comment->getPosterName()|escape}
31
		{elseif $comment->getPosterName()}
32
			{translate key="comments.anonymousNamed" userName=$comment->getPosterName()|escape}
33
		{else}
34
			{translate key="comments.anonymous"}
35
		{/if}
36
		({$comment->getDatePosted()|date_format:$dateFormatShort})
37
	</h4>
29
38
30
	<p>
39
	<p>
31
40
 Lines 73-79    Link Here 
73
{assign var=user value=$child->getUser()}
82
{assign var=user value=$child->getUser()}
74
{assign var=childId value=$child->getCommentId()}
83
{assign var=childId value=$child->getCommentId()}
75
<h4><a href="{url op="view" path=$articleId|to_array:$galleyId:$childId}" target="_parent">{$child->getTitle()|escape|default:"&nbsp;"}</a></h4>
84
<h4><a href="{url op="view" path=$articleId|to_array:$galleyId:$childId}" target="_parent">{$child->getTitle()|escape|default:"&nbsp;"}</a></h4>
76
<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>
85
<h5>
86
	{if $user}
87
		{translate key="comments.authenticated" userName=$child->getPosterName()|escape}
88
	{elseif $child->getPosterName()}
89
		{translate key="comments.anonymousNamed" userName=$child->getPosterName()|escape}
90
	{else}
91
		{translate key="comments.anonymous"}
92
	{/if}
93
	({$child->getDatePosted()|date_format:$dateFormatShort})
94
</h5>
77
95
78
{assign var="hasPriorAction" value=0}
96
{assign var="hasPriorAction" value=0}
79
97
 Lines 107-113    Link Here 
107
	<li>
125
	<li>
108
		<a href="{url op="view" path=$articleId|to_array:$galleyId:$grandChild->getCommentId()}" target="_parent">{$grandChild->getTitle()|escape|default:"&nbsp;"}</a>
126
		<a href="{url op="view" path=$articleId|to_array:$galleyId:$grandChild->getCommentId()}" target="_parent">{$grandChild->getTitle()|escape|default:"&nbsp;"}</a>
109
		{if $grandChild->getChildCommentCount()==1}{translate key="comments.oneReply"}{elseif $grandChild->getChildCommentCount()>0}{translate key="comments.nReplies" num=$grandChild->getChildCommentCount()}{/if}<br/>
127
		{if $grandChild->getChildCommentCount()==1}{translate key="comments.oneReply"}{elseif $grandChild->getChildCommentCount()>0}{translate key="comments.nReplies" num=$grandChild->getChildCommentCount()}{/if}<br/>
110
		{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})
128
		{if $user}
129
			{translate key="comments.authenticated" userName=$grandChild->getPosterName()|escape}
130
		{elseif $grandChild->getPosterName()}
131
			{translate key="comments.anonymousNamed" userName=$grandChild->getPosterName()|escape}
132
		{else}
133
			{translate key="comments.anonymous"}
134
		{/if}
135
		({$grandChild->getDatePosted()|date_format:$dateFormatShort})
111
	</li>
136
	</li>
112
{/foreach}
137
{/foreach}
113
{if $grandChildren}
138
{if $grandChildren}
 Lines 125-128    Link Here 
125
{/if}
150
{/if}
126
151
127
{include file="common/footer.tpl"}
152
{include file="common/footer.tpl"}
128

Return to bug 3536