Index: openacs-4/packages/general-comments/www/view-comment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-comment.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/general-comments/www/view-comment.tcl	24 Jan 2005 00:40:36 -0000	1.7
+++ openacs-4/packages/general-comments/www/view-comment.tcl	9 Nov 2008 23:29:27 -0000	1.8
@@ -96,7 +96,7 @@
     }
 }
 
-db_multirow attachments get_attachments {
+db_multirow -extend {file_edit_url delete_attachment_url view_image_url} attachments get_attachments {
    select r.title,
           r.mime_type,
           i.name,
@@ -105,19 +105,27 @@
           cr_revisions r
     where i.parent_id = :comment_id and
           r.revision_id = i.live_revision
+} {
+    set file_edit_url [export_vars -base "file-edit" {{attach_id $item_id} {parent_id $comment_id} return_url}]
+    set delete_attachment_url [export_vars -base "delete-attachment" {{attach_id $item_id} {parent_id $comment_id} return_url}]
+    set view_image_url [export_vars -base "view-image" {{image_id $item_id} {return_url return_url_view}}]
 }
 
-db_multirow links get_links {
+db_multirow -extend {url_edit_url delete_attachment_url} links get_links {
     select i.item_id,
            e.label,
            e.url
       from cr_items i, cr_extlinks e
      where i.parent_id = :comment_id and
            e.extlink_id = i.item_id
+} {
+    set url_edit_url [export_vars -base "url-edit" {{attach_id $item_id} {parent_id $comment_id} return_url}]
+    set delete_attachment_url [export_vars -base "delete-attachment" {{attach_id $item_id} {parent_id $comment_id} return_url}]
 }
 
-db_multirow revisions get_revisions {*SQL*} { 
+db_multirow -extend {view_comment_url} revisions get_revisions {*SQL*} { 
     set revision_date [lc_time_fmt $revision_date %c]
+    set view_comment_url [export_vars -base "view-comment" {comment_id revision_id return_url}]
 }
 
 set allow_file_p [ad_parameter AllowFileAttachmentsP {general-comments} {t}]
@@ -129,12 +137,36 @@
 set comment_on_id [db_string get_object_id "select object_id from general_comments where comment_id = :comment_id"]
 set page_title "[_ general-comments.View_comment_on]: [acs_object_name $comment_on_id]"
 set context "\"[_ general-comments.View_comment]\""
-set return_url_view "[ad_urlencode view-comment?[export_ns_set_vars url]]"
+set return_url_view "view-comment?[export_ns_set_vars url]"
 set is_creator_p "f"
 if { $user_id == $creation_user } {
     set is_creator_p "t"
 }
 
-set html_content [ad_html_text_convert -from $mime_type -- $content]
+if { $mime_type ne "text/html" } {
+    set html_content "<p>[ad_html_text_convert -from $mime_type -- $content]</p>"
+} else {
+    set html_content $content
+}
 
+set comment_edit_url [export_vars -base "comment-edit" {comment_id revision_id return_url}]
+
+# Actions section
+set action_file_add_url [export_vars -base "file-add" {{parent_id $comment_id} return_url}]
+set action_url_add_url [export_vars -base "url-add" {{parent_id $comment_id} return_url}]
+
+# Revisions section
+set return_url_view "../${return_url_view}"
+if { $live_revision ne $revision_id } {
+    set font_color "red"
+    set pre_text [_ general-comments.lt_This_revision_is_not_]
+    set admin_toggle_url [export_vars -base "admin/toggle-approval" {comment_id revision_id {return_url $return_url_view}}]
+    set admin_toggle_text [_ general-comments.lt_approve_this_revision]
+} else {
+    set font_color "green"
+    set pre_text [_ general-comments.lt_This_revision_is_live]
+    set admin_toggle_url [export_vars -base "admin/toggle-approval" {comment_id revision_id {return_url $return_url_view}}]
+    set admin_toggle_text [_ general-comments.reject_this_revision]
+}
+
 ad_return_template