diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-14 07:11:14 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-14 07:11:14 -0800 |
| commit | e41a2d4e5226c45a5201df91ca6633a40b357630 (patch) | |
| tree | f7c06e2c2495c833028dfcffd1ef90447047b586 /modules/comment | |
| parent | dcd7a8fbb8924665a07582aa53f07a86ef922287 (diff) | |
| parent | df8273e3f26f35ad87fd6f96610f370bdad7f1e5 (diff) | |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/comment')
| -rw-r--r-- | modules/comment/js/comment.js | 2 | ||||
| -rw-r--r-- | modules/comment/views/comments.html.php | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/modules/comment/js/comment.js b/modules/comment/js/comment.js index bb204b78..3c8097c6 100644 --- a/modules/comment/js/comment.js +++ b/modules/comment/js/comment.js @@ -29,7 +29,7 @@ function ajaxify_comment_form() { dataType: "json", success: function(data) { if (data.result == "success") { - $("#g-comments #g-comment-detail ul").append(data.view); + $("#g-comments #g-comment-detail ul").append(data.view); $("#g-comments #g-comment-detail ul li:last").effect("highlight", {color: "#cfc"}, 8000); $("#g-comment-form").hide(2000).remove(); $("#g-no-comments-yet").hide(2000); diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php index 0ed07c22..58ff1765 100644 --- a/modules/comment/views/comments.html.php +++ b/modules/comment/views/comments.html.php @@ -10,7 +10,9 @@ <?= 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> </ul> <? endif ?> +<? if ($comments->count()): ?> <ul> <? foreach ($comments as $comment): ?> <li id="g-comment-<?= $comment->id ?>"> @@ -39,4 +41,5 @@ </li> <? endforeach ?> </ul> +<? endif ?> </div> |