Index: openacs-4/packages/lab-report/lab-report.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report/lab-report.info,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/lab-report/lab-report.info	11 May 2006 11:11:36 -0000	1.1
+++ openacs-4/packages/lab-report/lab-report.info	23 Aug 2006 05:43:55 -0000	1.2
@@ -14,11 +14,11 @@
         <maturity>0</maturity>
 
         <provides url="lab-report" version="0.1d"/>
-	<requires url="acs-translations" version="0.1d1"/>
-	<requires url="lab-report-central" version="0.1d"/>
+        <requires url="acs-translations" version="0.1d1"/>
+        <requires url="lab-report-central" version="0.1d"/>
 
         <callbacks>
-            <callback type="after-instantiate" proc="lab_report::install::package_instantiate"/>
+            <callback type="after-instantiate"  proc="lab_report::install::package_instantiate"/>
         </callbacks>
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="LabReportCSS"  default="/resources/lab-report/main-portal.css" description="Specify the location of a CSS file to use for this application's colour scheme."/>
Index: openacs-4/packages/lab-report/catalog/lab-report.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report/catalog/lab-report.en_US.ISO-8859-1.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/lab-report/catalog/lab-report.en_US.ISO-8859-1.xml	21 Aug 2006 23:25:11 -0000	1.4
+++ openacs-4/packages/lab-report/catalog/lab-report.en_US.ISO-8859-1.xml	23 Aug 2006 05:43:56 -0000	1.5
@@ -17,6 +17,7 @@
   <msg key="help_enter_section_content">Enter content for this section of your lab report.</msg>
   <msg key="help_select_author">Select an author from the list.</msg>
   <msg key="help_select_rating">Select a rating for this criteria.</msg>
+  <msg key="instructions">Instructions</msg>
   <msg key="lab_report">Lab Report</msg>
   <msg key="lab_reports_for">Lab reports for</msg>
   <msg key="labs">Labs</msg>
@@ -25,6 +26,7 @@
   <msg key="please_inform_administrator_need_author">This application requires an author to be set in order to write lab reports.  Please inform your site administrator that an author needs to be set for this application.</msg>
   <msg key="rating">Rating</msg>
   <msg key="report">Report</msg>
+  <msg key="report_view">Report View</msg>
   <msg key="reports_for">Reports for</msg>
   <msg key="resources">Resources</msg>
   <msg key="search">Search</msg>
Index: openacs-4/packages/lab-report/sql/postgresql/lab-report-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report/sql/postgresql/lab-report-create.sql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/lab-report/sql/postgresql/lab-report-create.sql	21 Aug 2006 23:25:15 -0000	1.5
+++ openacs-4/packages/lab-report/sql/postgresql/lab-report-create.sql	23 Aug 2006 05:43:56 -0000	1.6
@@ -146,7 +146,6 @@
 				constraint lrc_lab_instructor_id_fk
 				references users(user_id),
 	rating			varchar (5120),
-	comment			text,
 	package_id		integer
 				constraint lr_section_feedback_package_id_fk
 				references apm_packages (package_id)
@@ -282,7 +281,7 @@
 end;' language 'plpgsql';
 
 
-select define_function_args('lr_section_feedback__new','feedback_id,feedback_criteria_id,report_id,section_id,instructor_id,rating,comment,package_id,creation_date;now,creation_user,creation_ip,context_id');
+select define_function_args('lr_section_feedback__new','feedback_id,feedback_criteria_id,report_id,section_id,instructor_id,rating,package_id,creation_date;now,creation_user,creation_ip,context_id');
 
 create function lr_section_feedback__new (
 	integer,
@@ -291,7 +290,6 @@
 	integer,
 	integer,
 	varchar,
-	text,
 	integer,
 	timestamptz,
 	integer,
@@ -305,12 +303,11 @@
     	p_section_id	        alias for $4;
 	p_instructor_id		alias for $5;
 	p_rating		alias for $6;
-	p_comment		alias for $7;
-	p_package_id		alias for $8;
-    	p_creation_date         alias for $9;        	-- default now()
-    	p_creation_user         alias for $10;        	-- default null
-    	p_creation_ip           alias for $11;		-- default null
-    	p_context_id            alias for $12;		-- default null
+	p_package_id		alias for $7;
+    	p_creation_date         alias for $8;        	-- default now()
+    	p_creation_user         alias for $9;        	-- default null
+    	p_creation_ip           alias for $10;		-- default null
+    	p_context_id            alias for $11;		-- default null
 
     	v_feedback_id		lr_section_feedback.feedback_id%TYPE;
 	v_inst_group_id		integer;
@@ -332,7 +329,6 @@
 		section_id,
 		instructor_id,
 		rating,
-		comment,
 		package_id
     	) VALUES (
        		v_feedback_id,
@@ -341,7 +337,6 @@
 		p_section_id,
 		p_instructor_id,
 		p_rating,
-		p_comment,
 		p_package_id
     	);
 
@@ -375,4 +370,4 @@
 
 
 -- Register service contract implementations.
-\i lab-report-sc-create.sql
\ No newline at end of file
+\i lab-report-sc-create.sql
Index: openacs-4/packages/lab-report/sql/postgresql/lab-report-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report/sql/postgresql/lab-report-drop.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/lab-report/sql/postgresql/lab-report-drop.sql	21 Aug 2006 23:25:15 -0000	1.2
+++ openacs-4/packages/lab-report/sql/postgresql/lab-report-drop.sql	23 Aug 2006 05:43:56 -0000	1.3
@@ -49,7 +49,6 @@
 	integer,
 	integer,
 	varchar,
-	text,
 	integer,
 	timestamptz,
 	integer,
Index: openacs-4/packages/lab-report/www/edit-section.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report/www/edit-section.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/lab-report/www/edit-section.adp	12 May 2006 01:34:34 -0000	1.1
+++ openacs-4/packages/lab-report/www/edit-section.adp	23 Aug 2006 05:43:56 -0000	1.2
@@ -1,7 +1,6 @@
 <master src="resources/main-portal">
 <property name="title">@title;noquote@</property>
 <property name="context">@context;noquote@</property>
-<property name="admin_options">[<a href="admin/">#lab-report.admin#</a>]</property>
 <property name="header_stuff">
 <link rel="stylesheet" type="text/css" href="/resources/lab-report/lab-report.css" media="all">
 </property>
Index: openacs-4/packages/lab-report/www/view-report.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report/www/view-report.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/lab-report/www/view-report.adp	24 May 2006 12:30:41 -0000	1.4
+++ openacs-4/packages/lab-report/www/view-report.adp	23 Aug 2006 05:43:56 -0000	1.5
@@ -1,7 +1,6 @@
-<master src="resources/main-portal">
+<master src="resources/blank-portal">
 <property name="title">@title;noquote@</property>
 <property name="context">@context;noquote@</property>
-<property name="admin_options">[<a href="admin/">#lab-report.admin#</a>]</property>
 <property name="header_stuff">
 <link rel="stylesheet" type="text/css" href="/resources/lab-report/lab-report.css" media="all">
 </property>
@@ -14,7 +13,7 @@
       <td class="nav">
         <div id="nav-container">
           <ul id="navlist">
-            <li><a id="current">#lab-report.overview#</a></li>
+            <li><a id="current">#lab-report.report_view#</a></li>
 	    <multiple name="sections">
             <li><a href="@sections.section_url@">@sections.section_name;noquote@</a></li>
 	    </multiple>
@@ -24,7 +23,7 @@
       <td class="content">
 	<ul>
           <li class="description">
-          <h3>#lab-report.description#</h3> @template_desc;noquote@
+          <h3>#lab-report.instructions#</h3> @template_desc;noquote@
           </li>
           <li class="content">
 	  <multiple name="sections">
Index: openacs-4/packages/lab-report/www/view-section.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report/www/view-section.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/lab-report/www/view-section.adp	21 Aug 2006 23:25:16 -0000	1.5
+++ openacs-4/packages/lab-report/www/view-section.adp	23 Aug 2006 05:43:56 -0000	1.6
@@ -1,19 +1,18 @@
 <master src="resources/main-portal">
 <property name="title">@title;noquote@</property>
 <property name="context">@context;noquote@</property>
-<property name="admin_options">[<a href="admin/">#lab-report.admin#</a>]</property>
 <property name="header_stuff">
 <link rel="stylesheet" type="text/css" href="/resources/lab-report/lab-report.css" media="all">
 </property>
 
-
+<h1>@template_name@ - @title@</h1>
 <div id="report-container">
   <table>
     <tr>
       <td class="nav">
         <div id="nav-container">
           <ul id="navlist">
-            <li><a href="@overview_url@">#lab-report.overview#</a></li>
+            <li><a href="@overview_url@">#lab-report.report_view#</a></li>
 	    <multiple name="navs">
             <li>
               <if @section_id@ eq @navs.nav_section_id@>
@@ -40,7 +39,7 @@
       <td class="content">
 	<ul>
           <li class="description">
-          <h3>#lab-report.description#</h3> @section_desc;noquote@
+          <h3>#lab-report.instructions#</h3> @section_desc;noquote@
           </li>
           <li class="content">
           <h3>@section_name@</h3>
@@ -55,23 +54,34 @@
             </else>
           </if>
           </li>
-          <if @content_created_p@>
-            <if @feedback:rowcount@ gt 0>
-            <li class="comments">
+          <li class="comments">
+            <h3>#lab-report.comments#</h3>
+            <ul>
+            @gc_comments;noquote@
+            </ul>
+            <div class="add-comment">@gc_link;noquote@</div>
+          </li>
+        </ul>
+      </td>
+      <if @content_created_p@>
+      <if @feedback:rowcount@ gt 0>
+      <td class="feedback">
+        <ul>
+          <li>
               <h3>#lab-report.feedback#</h3>
               <hr />
               <multiple name="feedback">
-              <iframe src="@feedback.iframe_url@" width="600px" height="110px" marginwidth="0" marginheight="0" frameborder="0">
+              <iframe src="@feedback.iframe_url@" width="150px" height="100px" marginwidth="0" marginheight="0" frameborder="0">
               Your browser does not support IFRAMES,
               please consider upgrading your browser.
               </iframe>
               <hr />
               </multiple>
-            </li>
-            </if>
-          </if>
+          </li>
         </ul>
       </td>
+      </if>
+      </if>
     </tr>
   </table>
 </div>
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.4 -r1.5
--- openacs-4/packages/lab-report/www/view-section.tcl	21 Aug 2006 23:25:16 -0000	1.4
+++ openacs-4/packages/lab-report/www/view-section.tcl	23 Aug 2006 05:43:56 -0000	1.5
@@ -63,6 +63,16 @@
     }
 }
 
+# General comments
+set return_url [export_vars -url \
+		    -base "[ad_conn package_url]view-report" \
+		    { lab_id template_id report_id }]
+
+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]
+
+
 # Title and context
 set title "$section_name"
 set context [list [list $lab_url $lab_name] \
Index: openacs-4/packages/lab-report/www/iframe/feedback-ae-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report/www/iframe/feedback-ae-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/lab-report/www/iframe/feedback-ae-postgresql.xql	21 Aug 2006 23:25:21 -0000	1.1
+++ openacs-4/packages/lab-report/www/iframe/feedback-ae-postgresql.xql	23 Aug 2006 05:43:56 -0000	1.2
@@ -13,8 +13,7 @@
    <fullquery name="feedback_update">
      <querytext>
        UPDATE lr_section_feedback
-           SET rating = :rating,
-	   comment = :comment
+           SET rating = :rating
 	   WHERE feedback_id = :feedback_id
      </querytext>
    </fullquery>
Index: openacs-4/packages/lab-report/www/iframe/feedback-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report/www/iframe/feedback-ae.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/lab-report/www/iframe/feedback-ae.adp	21 Aug 2006 23:25:21 -0000	1.1
+++ openacs-4/packages/lab-report/www/iframe/feedback-ae.adp	23 Aug 2006 05:43:56 -0000	1.2
@@ -1,9 +1,7 @@
 <master src="../resources/iframe-master">
 <property name="title">@page_title;noquote@</property>
 <property name="header_stuff">
-<link rel="stylesheet" type="text/css" href="/resources/acs-templating/forms.css" media="all" />
-<link rel="stylesheet" type="text/css" href="/resources/acs-templating/forms.css" media="all" />
-<link rel="stylesheet" type="text/css" href="/resources/acs-templating/lists.css" media="all" />
+<link rel="stylesheet" type="text/css" href="/resources/lab-report/forms.css" media="all" />
 </property>
 
 
Index: openacs-4/packages/lab-report/www/iframe/feedback-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report/www/iframe/feedback-ae.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/lab-report/www/iframe/feedback-ae.tcl	21 Aug 2006 23:25:21 -0000	1.1
+++ openacs-4/packages/lab-report/www/iframe/feedback-ae.tcl	23 Aug 2006 05:43:56 -0000	1.2
@@ -24,7 +24,7 @@
 
 set criteria_name [db_string select_criteria_name {} -default ""]
 
-ad_form -name feedback -cancel_url $return_url -form {
+ad_form -name feedback -form {
     {feedback_id:key(acs_object_id_seq)}
     {report_id:text(hidden) {value $report_id}}
     {lab_id:text(hidden) {value $lab_id}}
@@ -39,18 +39,10 @@
     }
     {rating:text(select),optional
 	{label "[_ lab-report.rating]" }
-	{help_text "[_ lab-report.help_select_rating]"}
 	{options {{None none} {"Needs Work" needs_work} {Satisfactory satisfactory} {Complete complete}}}
     }
-    {comment:richtext(richtext),optional
-	{html {cols 50 rows 4}}
-	{htmlarea_p 0}
-	{nospell}
-	{label "[_ lab-report.comments]" }
-	{help_text "[_ lab-report.help_enter_comments]"}
-    }
 } -select_query {
-       SELECT rating, comment
+       SELECT rating
 	   FROM lr_section_feedback WHERE feedback_id = :feedback_id
 } -new_data {
 
@@ -64,8 +56,7 @@
 			   [list report_id $report_id] \
 			   [list section_id $section_id] \
 			   [list instructor_id $instructor_id] \
-			   [list rating $rating] \
-			   [list comment $comment]] \
+			   [list rating $rating]] \
 	    -form_id feedback lr_section_feedback]
     }
 
Index: openacs-4/packages/lab-report/www/iframe/feedback-view-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report/www/iframe/feedback-view-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/lab-report/www/iframe/feedback-view-postgresql.xql	21 Aug 2006 23:25:21 -0000	1.1
+++ openacs-4/packages/lab-report/www/iframe/feedback-view-postgresql.xql	23 Aug 2006 05:43:56 -0000	1.2
@@ -5,8 +5,7 @@
 
    <fullquery name="select_feedback">
      <querytext>
-       SELECT c.name AS feedback_criteria_name, sf.feedback_id,
-           sf.rating, sf.comment
+       SELECT c.name AS feedback_criteria_name, sf.feedback_id, sf.rating
        FROM lrc_feedback_criteria c LEFT OUTER JOIN lr_section_feedback sf
            ON (c.feedback_criteria_id = sf.feedback_criteria_id
                AND sf.report_id = :report_id)
Index: openacs-4/packages/lab-report/www/iframe/feedback-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report/www/iframe/feedback-view.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/lab-report/www/iframe/feedback-view.adp	21 Aug 2006 23:25:21 -0000	1.1
+++ openacs-4/packages/lab-report/www/iframe/feedback-view.adp	23 Aug 2006 05:43:56 -0000	1.2
@@ -12,7 +12,6 @@
   <ul>
     <li class="title">@feedback_criteria_name@</li>
     <li><b>#lab-report.rating#:</b> @rating@</li>
-    <li><b>#lab-report.comments#:</b> @comment;noquote@</li>
     <if @instructor_p@><li class="edit"><a class="button" href="@edit_url@">#lab-report.edit#</a><div class="spacer"></div></li></if>
   </ul>
 </div>
Index: openacs-4/packages/lab-report/www/iframe/feedback-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report/www/iframe/feedback-view.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/lab-report/www/iframe/feedback-view.tcl	21 Aug 2006 23:25:21 -0000	1.1
+++ openacs-4/packages/lab-report/www/iframe/feedback-view.tcl	23 Aug 2006 05:43:56 -0000	1.2
@@ -19,7 +19,6 @@
 
 # set defaults
 set rating "none"
-set comment ""
 
 db_0or1row select_feedback {}
 
@@ -33,8 +32,6 @@
     set rating "None"
 }
 
-set comment [template::util::richtext::get_property html_value $comment]
-
 if { [info exists feedback_id] && $feedback_id ne "" } {
     set edit_url [export_vars -url -base feedback-ae {report_id lab_id template_id section_id feedback_criteria_id feedback_id}]
 } else {
Index: openacs-4/packages/lab-report/www/resources/lab-report.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report/www/resources/lab-report.css,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/lab-report/www/resources/lab-report.css	21 Aug 2006 23:25:25 -0000	1.6
+++ openacs-4/packages/lab-report/www/resources/lab-report.css	23 Aug 2006 05:43:56 -0000	1.7
@@ -76,13 +76,15 @@
 	margin-left: 3px;
 }
 
+
 #lr-lab-list-container ul ul.report li span.label {
 	margin-left: 3em;
 	float:left;
 }
 
 #lr-lab-list-container ul ul.report li span.options {
 	float: right;
+        border: 1px solid #000;
 }
 
 #lr-lab-list-container ul ul li.notice {
@@ -144,6 +146,7 @@
 
 #lr-report-list-container ul.report li span.options {
 	float: right;
+        border: 1px solid #000;
 }
 
 
@@ -212,8 +215,8 @@
 	vertical-align: top;
 	margin: 0;
 	padding: 0;
-	padding-right: 1em;
-	padding-top: 1em;
+	padding-right: 0.5em;
+	padding-top: 0.5em;
 }
 
 div#report-container table tr td.content {
@@ -235,6 +238,7 @@
 	padding: 5px;
 	margin-bottom: 1em;
 	border: 1px solid #000;
+	background-color: #FFFFCC;
 }
 
 div#report-container table tr td.content ul li.content {
@@ -265,7 +269,24 @@
 	color: #686868;
 }
 
+div#report-container table tr td.feedback {
+	padding: 0;
+	width: 100%;
+	vertical-align: top;
+	line-height: 130%;
+}
 
+div#report-container table tr td.feedback ul {
+	margin: 0 0 0 0.5em;
+	padding: 0.5em;
+	list-style-type: none;
+	border: 1px solid #000;
+	font-family: verdana, arial, sans-serif;
+	font-size: small;
+        background-color: #CCFF99;
+}
+
+
 /* Resources container */
 ul#resources-list {
 	width: 158px;
@@ -326,18 +347,21 @@
 	padding: 0;
 	list-style-type: none;
 	font-family: verdana, arial, sans-serif;
-	font-size: small;
+	font-size: x-small;
 }
 
 #lr-feedback-container ul li.title {
 	padding-top: 0.5em;
 	padding-bottom: 0.5em;
 	font-weight: bold;
 	color: #686868;
+	font-size: x-small;
 }
 
 #lr-feedback-container ul li.edit {
-	padding-top: 2em;
+	padding-top: 0.5em;
+	padding-bottom: 0.5em;
 	padding-right: 0.5em;
 	float: right;
-}
\ No newline at end of file
+	font-size: small;
+}
Index: openacs-4/packages/lab-report/www/resources/main-portal.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report/www/resources/main-portal.css,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/lab-report/www/resources/main-portal.css	11 May 2006 11:11:37 -0000	1.1
+++ openacs-4/packages/lab-report/www/resources/main-portal.css	23 Aug 2006 05:43:56 -0000	1.2
@@ -25,8 +25,7 @@
 
 /* Padding for the columns */
 #portal-column-content .visualPadding {
-    /*padding: 0em 2em 1em 2em;*/
-    padding: 0em 1em 1em 1em;
+    padding: 0em 0.5em 0.5em 0.5em;
 }
 
 .documentBorder {
@@ -35,5 +34,10 @@
 }
 
 .documentContent {
-    padding: 1em !important;
+    padding: 0.5em !important;
 }
+
+.documentContentBorder {
+    border: 0px solid #666;
+    background: White;
+}