Index: openacs-4/packages/lab-report/www/view-section.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report/www/view-section.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/lab-report/www/view-section.tcl	23 Aug 2006 05:43:56 -0000	1.5
+++ openacs-4/packages/lab-report/www/view-section.tcl	24 Aug 2006 10:56:29 -0000	1.6
@@ -23,6 +23,9 @@
 # Otherwise retrieve list of lab reports for the designated author.
 set author_id [lab_report::get_author_id -package_id $package_id]
 
+# Is the user an instructor?
+set instructor_p [lab_report::instructor_p $user_id]
+
 # Retrieve lab details.
 db_1row lab_details {}
 
@@ -63,14 +66,20 @@
     }
 }
 
+set editable_p 0
+if { [db_0or1row select_report_dates {}] } {
+    if { [lab_report::within_date_bounds_p -now_date $now -start_date $start_date -end_date $end_date] } {
+	set editable_p 1
+    }
+}
+
 # General comments
-set return_url [export_vars -url \
-		    -base "[ad_conn package_url]view-report" \
-		    { lab_id template_id report_id }]
+set comment ""
+if { [db_0or1row select_comments {}] } {
+    set comment [template::util::richtext::get_property html_value $comment]
+}
 
-set gc_link [general_comments_create_link -link_attributes {class="button"} \
-		 $report_id $return_url]
-set gc_comments [general_comments_get_comments $report_id $return_url]
+set comments_link [export_vars -url -base section-comment-ae {report_id lab_id template_id section_id comment_id}]
 
 
 # Title and context