diff options
| -rw-r--r-- | modules/comment/css/comment.css | 2 | ||||
| -rw-r--r-- | modules/comment/js/comment.js | 9 | ||||
| -rw-r--r-- | modules/comment/views/comments.html.php | 77 |
3 files changed, 45 insertions, 43 deletions
diff --git a/modules/comment/css/comment.css b/modules/comment/css/comment.css index f58391b0..db096f2d 100644 --- a/modules/comment/css/comment.css +++ b/modules/comment/css/comment.css @@ -28,7 +28,7 @@ width: 32px; } -#g-admin-comment-button { +#g-add-comment { position: absolute; right: 0; top: 2px; diff --git a/modules/comment/js/comment.js b/modules/comment/js/comment.js index 3c8097c6..2487c5fc 100644 --- a/modules/comment/js/comment.js +++ b/modules/comment/js/comment.js @@ -1,5 +1,5 @@ $("document").ready(function() { - $("#g-admin-comment-button").click(function(event) { + $("#g-add-comment").click(function(event) { event.preventDefault(); if (!$("#g-comment-form").length) { $.get($(this).attr("href"), @@ -7,10 +7,11 @@ $("document").ready(function() { function(data) { $("#g-comment-detail").append(data); ajaxify_comment_form(); + $.scrollTo("#g-comment-form-anchor", 800); }); } }); - $("#g-no-comments").click(function(event) { + $(".g-no-comments a").click(function(event) { event.preventDefault(); if (!$("#g-comment-form").length) { $.get($(this).attr("href"), @@ -19,7 +20,7 @@ $("document").ready(function() { $("#g-comment-detail").append(data); ajaxify_comment_form(); }); - $("#g-no-comments-yet").remove(); + $(".g-no-comments").remove(); } }); }); @@ -32,7 +33,7 @@ function ajaxify_comment_form() { $("#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); + $("#g-no-comments").hide(2000); } else { if (data.form) { $("#g-comments form").replaceWith(data.form); diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php index 8e2a9e51..e4322e08 100644 --- a/modules/comment/views/comments.html.php +++ b/modules/comment/views/comments.html.php @@ -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> </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"> </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> |