From 140736a1e49d47376ebc893aa2da250ba3d836a3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 16 Nov 2008 07:14:12 +0000
Subject: 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
---
 modules/comment/views/comment.html.php       | 11 +++++++++
 modules/comment/views/comment_form.html.php  | 35 ----------------------------
 modules/comment/views/comment_list.html.php  | 13 -----------
 modules/comment/views/show_comments.html.php | 11 ---------
 4 files changed, 11 insertions(+), 59 deletions(-)
 create mode 100644 modules/comment/views/comment.html.php
 delete mode 100644 modules/comment/views/comment_form.html.php
 delete mode 100644 modules/comment/views/comment_list.html.php
 delete mode 100644 modules/comment/views/show_comments.html.php

(limited to 'modules/comment/views')

diff --git a/modules/comment/views/comment.html.php b/modules/comment/views/comment.html.php
new file mode 100644
index 00000000..2b306404
--- /dev/null
+++ b/modules/comment/views/comment.html.php
@@ -0,0 +1,11 @@
+<? defined("SYSPATH") or die("No direct script access."); ?>
+<li id="gComment-<?= $comment->id; ?>">
+  <p>
+    <a href="#" class="gAuthor"><?= $comment->author ?></a>
+    <?= comment::format_elapsed_time($comment->datetime) ?>,
+    <span class="gUnderstate"><?= strftime('%c', $comment->datetime) ?></span>
+  </p>
+  <div>
+    <?= $comment->text ?> 
+  </div>
+</li>
diff --git a/modules/comment/views/comment_form.html.php b/modules/comment/views/comment_form.html.php
deleted file mode 100644
index 86c76dba..00000000
--- a/modules/comment/views/comment_form.html.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<? defined("SYSPATH") or die("No direct script access."); ?>
-<script type="text/javascript">
-  // <![CDATA[
-function show_comment_add_form(url) {
-  $("#gCommentAddLink").hide();
-  $.get(url, function(data) {
-    $("#gCommentAddFormContainer").html(data);
-    ajaxify_comment_add_form();
-  });
-}
-
-function ajaxify_comment_add_form() {
-  $("form#gComment").ajaxForm({
-    dataType: 'json',
-    success: function(response_data, status_text) {
-      if (response_data['valid']) {
-        $("#gCommentThread").html(response_data["html"]);
-    $("#gCommentAddFormContainer").html("");
-        $("#gCommentAddLink").show();
-      } else {
-        $("#gCommentAddFormContainer").html(response_data["html"]);
-        ajaxify_comment_add_form();
-      }
-    },
-  });
-}
-  // ]]>
-</script>
-<span id="gCommentAddLink">
-  <a href="javascript:show_comment_add_form('<?= url::site("photo/{$item_id}/comments/add") ?>')">
-    <?= _("Add Comment") ?>
-  </a>
-</span>
-<div id="gCommentAddFormContainer"></div>
-
diff --git a/modules/comment/views/comment_list.html.php b/modules/comment/views/comment_list.html.php
deleted file mode 100644
index 16371541..00000000
--- a/modules/comment/views/comment_list.html.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<? defined("SYSPATH") or die("No direct script access."); ?>
-<? foreach (array_reverse($comments) as $index => $comment): ?>
-<li id="gComment-<?= $index; ?>" class="gComment <?= text::alternate("gEven", "gOdd") ?>">
-  <p>
-    <a href="#" class="gAuthor"><?= $comment->author ?></a>
-    <?= comment::format_elapsed_time($comment->datetime) ?>,
-    <span class="gUnderstate"><?= strftime('%c', $comment->datetime) ?></span>
-  </p>
-  <div>
-    <?= $comment->text ?>
-  </div>
-</li>
-<? endforeach; ?>
diff --git a/modules/comment/views/show_comments.html.php b/modules/comment/views/show_comments.html.php
deleted file mode 100644
index 35b2c67a..00000000
--- a/modules/comment/views/show_comments.html.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<? defined("SYSPATH") or die("No direct script access."); ?>
-<div id="gComments">
-  <? if ($comment_list): ?>
-    <h2><?= _("Comments") ?></h2>
-    <ul id="gCommentThread">
-      <?= $comment_list ?>
-    </ul>
-  <? endif ?>
-
-  <?= $comment_form ?>
-</div>
-- 
cgit v1.2.3