Comment updates. Add empty <li> to empty <ul> for HTML validation, fixes #1066. Minor CSS/JS fixes. Add scrollTo effect when clicking on 'Add a Comment'.

This commit is contained in:
Chad Kieffer
2010-04-21 22:36:52 -06:00
parent 2257776f9b
commit 39818dd29f
3 changed files with 45 additions and 43 deletions

View File

@@ -1,45 +1,46 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<a href="<?= url::site("form/add/comments/{$item->id}") ?>" id="g-admin-comment-button"
<a href="<?= url::site("form/add/comments/{$item->id}") ?>#comment-form" id="g-add-comment"
class="g-button ui-corner-all ui-icon-left ui-state-default">
<span class="ui-icon ui-icon-comment"></span>
<?= t("Add a comment") ?>
</a>
<div id="g-comment-detail">
<? if (!$comments->count()): ?>
<p id="g-no-comments-yet">
<?= t("No comments yet. Be the first to <a %attrs>comment</a>!",
array("attrs" => html::mark_clean("id= \"g-no-comments\" href=\"" . url::site("form/add/comments/{$item->id}") . "\" class=\"showCommentForm\""))) ?>
</p>
<ul>&nbsp;</ul>
<? endif ?>
<? if ($comments->count()): ?>
<ul>
<? foreach ($comments as $comment): ?>
<li id="g-comment-<?= $comment->id ?>">
<p class="g-author">
<a href="#">
<img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
class="g-avatar"
alt="<?= html::clean_attribute($comment->author_name()) ?>"
width="40"
height="40" />
</a>
<? if ($comment->author()->guest): ?>
<?= t('on %date %name said',
array("date" => date("Y-M-d H:i:s", $comment->created),
"name" => html::clean($comment->author_name()))); ?>
<? else: ?>
<?= t('on %date <a href="%url">%name</a> said',
array("date" => date("Y-M-d H:i:s", $comment->created),
"url" => user_profile::url($comment->author_id),
"name" => html::clean($comment->author_name()))); ?>
<? endif ?>
</p>
<div>
<?= nl2br(html::purify($comment->text)) ?>
</div>
</li>
<? endforeach ?>
</ul>
<? endif ?>
<? if (!$comments->count()): ?>
<p class="g-no-comments">
<?= t("No comments yet. Be the first to <a %attrs>comment</a>!",
array("attrs" => html::mark_clean("href=\"" . url::site("form/add/comments/{$item->id}") . "\" class=\"showCommentForm\""))) ?>
</p>
<ul><li class="g-no-comments">&nbsp;</li></ul>
<? endif ?>
<? if ($comments->count()): ?>
<ul>
<? foreach ($comments as $comment): ?>
<li id="g-comment-<?= $comment->id ?>">
<p class="g-author">
<a href="#">
<img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
class="g-avatar"
alt="<?= html::clean_attribute($comment->author_name()) ?>"
width="40"
height="40" />
</a>
<? if ($comment->author()->guest): ?>
<?= t('on %date %name said',
array("date" => date("Y-M-d H:i:s", $comment->created),
"name" => html::clean($comment->author_name()))); ?>
<? else: ?>
<?= t('on %date <a href="%url">%name</a> said',
array("date" => date("Y-M-d H:i:s", $comment->created),
"url" => user_profile::url($comment->author_id),
"name" => html::clean($comment->author_name()))); ?>
<? endif ?>
</p>
<div>
<?= nl2br(html::purify($comment->text)) ?>
</div>
</li>
<? endforeach ?>
</ul>
<? endif ?>
<a name="comment-form" id="g-comment-form-anchor"></a>
</div>