diff options
author | Bharat Mediratta <bharat@menalto.com> | 2008-11-16 07:14:12 +0000 |
---|---|---|
committer | Bharat Mediratta <bharat@menalto.com> | 2008-11-16 07:14:12 +0000 |
commit | 140736a1e49d47376ebc893aa2da250ba3d836a3 (patch) | |
tree | 994c4ef0103c15352f0cc059274b462475a9c49c /themes/default | |
parent | b8b60df391637ff21bb79ba64f820749ef324ee9 (diff) |
Several large changes:
1) Changed the way that we get forms. Now, if you want to get a form
for a REST resource you prefix /form to the resource id. So:
/form/photo/1 : returns a form for editing photo id 1
/form/comments/1 : returns a form for adding a comment to photo id 1
/form/comment/1 : returns a form for editing comment id 1
2) Changed the comment module to have two controllers:
comment: deals with a single comment resource
comments: deal with collections of comments attached to an item
Related stuff:
- Moved the comments js into the theme
- Reworked Comment_Helper for clarity
- Moved form generation code down into Comment_Helper
- Cleaned up routes (eliminating new comment ones added in recent rev)
- Added form() function to all REST controllers
- Changed comment module to use a block instead of an arbitrary helper call from the theme
- Comment controller only returns HTML currently, but returns a 201 Created status
code when a new comment is added, which the Ajax code can catch and act upon.
- Got rid of a lot of extra views in comment module
Diffstat (limited to 'themes/default')
-rw-r--r-- | themes/default/js/comment.js | 20 | ||||
-rw-r--r-- | themes/default/views/page.html.php | 1 | ||||
-rw-r--r-- | themes/default/views/photo.html.php | 2 |
3 files changed, 22 insertions, 1 deletions
diff --git a/themes/default/js/comment.js b/themes/default/js/comment.js new file mode 100644 index 00000000..5d2ed599 --- /dev/null +++ b/themes/default/js/comment.js @@ -0,0 +1,20 @@ +$("document").ready(function() { + ajaxify_comment_form(); +}); + +function ajaxify_comment_form() { + $("#gCommentForm").ajaxForm({ + target: "#gCommentForm", + complete: function(xhr, statusText) { + ajaxify_comment_form(); + if (xhr.status == 201) { + $.get(xhr.getResponseHeader("Location"), function(data, textStatus) { + $("#gComment div.gBlockContent ul:first").append(data); + $("#gComment div.gBlockContent ul:first li:last").hide().slideDown(); + } + ); + $("#gCommentForm").clearForm(); + } + } + }); +} diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php index ac2a326b..75c9a1a9 100644 --- a/themes/default/views/page.html.php +++ b/themes/default/views/page.html.php @@ -14,6 +14,7 @@ <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script> <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script> <script src="<?= $theme->url("js/user.js") ?>" type="text/javascript"></script> + <script src="<?= $theme->url("js/comment.js") ?>" type="text/javascript"></script> <? if ($user): ?> <script src="<?= url::file("lib/jquery.jeditable.js") ?>" type="text/javascript"></script> <? endif; ?> diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php index 1d54fe7d..8b8f44d4 100644 --- a/themes/default/views/photo.html.php +++ b/themes/default/views/photo.html.php @@ -9,5 +9,5 @@ <h1><?= $item->title_edit ?></h1> <div><?= $item->description_edit ?></div> - <? comment::show_comments($item->id); ?> + <?= comment::block($theme, true); ?> </div> |