Index: openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml,v
diff -u -r1.79 -r1.80
--- openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml	10 Dec 2007 09:12:27 -0000	1.79
+++ openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml	2 Feb 2008 21:15:46 -0000	1.80
@@ -371,7 +371,7 @@
   <msg key="Letter_other">Other</msg>
   <msg key="limited_tries">Number of tries allowed: %assessment_data.number_tries%</msg>
   <msg key="Live">Live</msg>
-  <msg key="lt_bNoteb_This_assessmen">&lt;b&gt;Note:&lt;/b&gt; This assessment is set to be anonymous and&lt;br /&gt;your name will not be included in the results.</msg>
+  <msg key="lt_bNoteb_This_assessmen">&lt;b&gt;Note:&lt;/b&gt; This assessment is set to be anonymous and&lt;br&gt;your name will not be included in the results.</msg>
   <msg key="lt_default_entry_page"></msg>
   <msg key="lt_default_exit_page">Congratulations, you're done! Use the link below to review your answers.</msg>
   <msg key="lt_default_instructions"></msg>
Index: openacs-4/packages/assessment/lib/comments-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/comments-chunk.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/lib/comments-chunk.adp	2 Feb 2008 17:40:05 -0000	1.4
+++ openacs-4/packages/assessment/lib/comments-chunk.adp	2 Feb 2008 21:15:46 -0000	1.5
@@ -1,17 +1,19 @@
 <if @has_permission_p@>
 <h2>Reviewer Comments</h2>
 <if @comments:rowcount@ gt 0>
-<multiple name="comments">
-<b>@comments.title@</b> <a href="@comments.edit_url@"></a>
-<br>
-@comments.html_content;noquote@
-<br>
-- @comments.author@ (on @comments.creation_date_ansi@)
-</multiple>
+  <multiple name="comments">
+    <div><b>@comments.title@</b> <a href="@comments.edit_url@"></a></div>
+    <div>
+      @comments.html_content;noquote@
+    </div>
+    <div>- @comments.author@ (on @comments.creation_date_ansi@)</div>
+  </multiple>
 </if>
 <else>
-<i>No reviewer comments have been added to this assessment yet.</i>
+  <p style="font-style:italic">No reviewer comments have been added to this assessment yet.</p>
 </else>
-<br>
-<a href="@comment_add_url@" class="button">Add comment<a/>
+
+<div>
+  <a href="@comment_add_url@" class="button">Add comment</a>
+</div>
 </if>
Index: openacs-4/packages/assessment/lib/comments-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/comments-chunk.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/lib/comments-chunk.tcl	12 Jun 2006 02:49:49 -0000	1.2
+++ openacs-4/packages/assessment/lib/comments-chunk.tcl	2 Feb 2008 21:15:46 -0000	1.3
@@ -29,9 +29,9 @@
 if {[set has_permission_p [permission::permission_p -object_id $object_id -privilege "general_comments_create"]]} {
     set comment_add_url [export_vars -base "${general_comments_url}comment-add" {object_id return_url}]
 
-db_multirow -extend { html_content edit_url } comments comments {} {
-    set html_content [ad_html_text_convert -from $mime_type -- $content]
-    set edit_url [export_vars -base "${general_comments_url}comment-edit" {comment_id return_url}]
-}
+    db_multirow -extend { html_content edit_url } comments comments {} {
+        set html_content [ad_html_text_convert -from $mime_type -- $content]
+        set edit_url [export_vars -base "${general_comments_url}comment-edit" {comment_id return_url}]
+    }
 
-}
\ No newline at end of file
+}
Index: openacs-4/packages/assessment/lib/results-messages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/results-messages.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/lib/results-messages.adp	15 May 2007 20:14:16 -0000	1.3
+++ openacs-4/packages/assessment/lib/results-messages.adp	2 Feb 2008 21:15:46 -0000	1.4
@@ -1,5 +1,7 @@
 <if @results:rowcount@ gt 0>
+  <ul>
     <multiple name="results">
       <li>@results.description@ <if @results.session_id@ eq @session_id@>#assessment.Results_change_display#</if><else>#assessment.Results_change_display_previous#</else></li>
-      </multiple>
+    </multiple>
+  </ul>
 </if>
Index: openacs-4/packages/assessment/lib/session-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/assessment/lib/session-items.adp	2 Feb 2008 17:40:05 -0000	1.15
+++ openacs-4/packages/assessment/lib/session-items.adp	2 Feb 2008 21:15:46 -0000	1.16
@@ -4,9 +4,9 @@
     </if>
 
     <multiple name="items">
-<if @admin_p@><p><a href="asm-admin/item-edit-general?as_item_id=@items.as_item_id@&assessment_id=@assessment_id@&section_id=@items.section_id@">Edit this question</a></p></if>
+<if @admin_p@><p><a href="@item_edit_general_url@">Edit this question</a></p></if>
 <if @feedback_only_p@ eq 0 or @items.has_feedback_p@ eq 1>
-     <if @show_item_name_p@ eq t><b>@items.name@:</b></if>
+     <if @show_item_name_p@ eq t><p style="font-weight:bold;">@items.name@:</p></if>
       <if @survey_p@ ne t and @items.title@ ne @items.next_title@>
 	<if @items.max_time_to_complete@ not nil> (#assessment.max_time# @items.max_time_to_complete@) </if>
       </if>
@@ -16,12 +16,11 @@
 	    <if @items.correct_p@ eq 0><if @show_feedback@ eq all or @show_feedback@ eq incorrect><div class="wrong">@items.feedback_wrong;noquote@</div></if></if>
 </div>
 	  <if @items.presentation_type@ ne fitb>
-	    <b>@items.title;noquote@</b>
+	    <p style="font-weight:bold;">@items.title;noquote@</p>
 	     @items.content;noquote@
-<br>
 	</if>
 	    <group column=title>
-	      <td valign=top>@items.description;noquote@
+	      @items.description;noquote@
 		<if @survey_p@ ne t>
 		  <if @items.title@ eq @items.next_title@ or @items.groupnum@ gt 1>
 		    <if @items.presentation_type@ eq @items.next_pr_type@ or @items.choice_orientation@ eq horizontal>
@@ -31,25 +30,26 @@
 			    </if>
 		      <~--- fixme --->
 		      <else>
-			<if @items.answered_p@ eq t><br><b>#assessment.not_yet_reviewed#</b> </if>
-			<else><br><b>#assessment.not_answered#</b> </else>
+			<if @items.answered_p@ eq t><p style="font-weight:bold;">#assessment.not_yet_reviewed#</p> </if>
+			<else><p style="font-weight:bold;">#assessment.not_answered#</p></else>
 		      </else>
 		      <if @edit_p@ eq 1 and @items.answered_p@ eq t><a href="results-edit?session_id=@session_id@&section_id=@section_id@&as_item_id=@items.as_item_id@">#assessment.Edit#</a></if>
 		      <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@">
 		    </if>
 		    <else>
-		      <if @items.answered_p@ eq t><br><b>#assessment.not_yet_reviewed#</b> </if>
-		      <else><br><b>#assessment.not_answered#</b> </else>
+		      <if @items.answered_p@ eq t><p style="font-weight:bold">#assessment.not_yet_reviewed#</p> </if>
+		      <else><p style="font-weight:bold">#assessment.not_answered#</p> </else>
 		    </else>
-		    <if @edit_p@ eq 1 and @items.answered_p@ eq t><a href="results-edit?session_id=@session_id@&section_id=@section_id@&as_item_id=@items.as_item_id@">#assessment.Edit#</a></if>
+		    <if @edit_p@ eq 1 and @items.answered_p@ eq t>
+              <a href="@results_edit_url@">#assessment.Edit#</a>
+            </if>
 		    <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@"> 
 		  </if>
 		</if>
 	      <if @items.presentation_type@ eq rb or @items.presentation_type@ eq cb>
-		<fieldset class="radio">
 		  <if @items.choice_orientation@ ne horizontal>
 		    <formgroup id="response_to_item.@items.as_item_id@">
-		      @formgroup.widget;noquote@ @formgroup.label;noquote@<br>
+		      <div>@formgroup.widget;noquote@ @formgroup.label;noquote@</div>
 		    </formgroup>
 		  </if>
 		  <elseif @items.title@ ne @items.next_title@ and @items.groupnum@ eq 1>
@@ -62,18 +62,16 @@
 		    <formgroup id="response_to_item.@items.as_item_id@">
 		      @formgroup.widget;noquote@ @formgroup.label;noquote@
 		    </formgroup>
-      </tr><tr><td></td><td colspan=10>
         </else>
-	</fieldset>
 	</if>
 	  <elseif @items.presentation_type@ eq fitb>
-	    <td>@items.html;noquote@ 
+	    @items.html;noquote@ 
 	  </elseif>
 	  <elseif @items.presentation_type@ eq f>
 	    <a href= "@items.view@" onclick= "var w=window.open(this.href, 'newWindow', 'width=650,height=400'); return !w;"><formwidget id="response_to_item.@items.as_item_id@"></a>
 	  </elseif>
 	  <else>
-	    <formwidget id="response_to_item.@items.as_item_id@">
+	    <div><formwidget id="response_to_item.@items.as_item_id@"></div>
 	  </else>
 	  <if @items.subtext@ not nil>
 	    <div class="form-help-text">
@@ -82,11 +80,15 @@
 	    </div>
 	  </if>
     </group>
-</if>
 
-<ul> <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@" &=assessment>    <if @edit_p@ eq 1 and @items.answered_p@ eq t><li><a href="results-edit?session_id=@session_id@&section_id=@section_id@&as_item_id=@items.as_item_id@">#assessment.Add_Comment#</a></li></if>
-	    <if @feedback_only_p@ ne "t" and @assessment_data.type@ ne survey and @items.result_points@ not nil and @showpoints@ true and @items.points@ gt 0><li><b>@items.result_points@ / @items.points@ #assessment.points#</b></li></if>
-</ul>
+  <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@" &=assessment>    
+  <if @edit_p@ eq 1 and @items.answered_p@ eq t>
+    <p><a href="@results_edit_url@" class="button">#assessment.Add_Comment#</a></p>
+  </if>
+  <if @feedback_only_p@ ne "t" and @assessment_data.type@ ne survey and @items.result_points@ not nil and @showpoints@ true and @items.points@ gt 0>
+    <p style="font-weight: bold">@items.result_points@ / @items.points@ #assessment.points#</p>
+  </if>
+
 <hr>
 </multiple>
 
Index: openacs-4/packages/assessment/lib/session-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/assessment/lib/session-items.tcl	7 Oct 2007 22:36:53 -0000	1.18
+++ openacs-4/packages/assessment/lib/session-items.tcl	2 Feb 2008 21:15:46 -0000	1.19
@@ -38,6 +38,11 @@
 }
 set feedback_count 0
 db_multirow -extend { presentation_type html result_points feedback answered_p choice_orientation next_title next_pr_type num content has_feedback_p correct_p view} items session_items {} {
+
+    # build URLs
+    set item_edit_general_url [export_vars -base "asm-admin/item-edit-general" {as_item_id assessment_id section_id}]
+    set results_edit_url [export_vars -base "results-edit" {session_id section_id as_item_id}]
+
     set default_value [as::item_data::get -subject_id $subject_id -as_item_id $as_item_id -session_id $session_id]
     array set item [as::item::item_data -as_item_id $as_item_id]
 
Index: openacs-4/packages/assessment/lib/session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/assessment/lib/session.adp	2 Feb 2008 17:40:05 -0000	1.8
+++ openacs-4/packages/assessment/lib/session.adp	2 Feb 2008 21:15:46 -0000	1.9
@@ -36,13 +36,12 @@
       </fieldset><!-- End Section FieldSet -->
 
 </multiple>
-</p>
-<p><include src="/packages/assessment/lib/actions-results" session_id="@session_id@"></p>
 
+<include src="/packages/assessment/lib/actions-results" session_id="@session_id@">
+
 <hr>
 <if @assessment_data.survey_p@ ne t and @assessment_data.show_feedback@ ne none and @assessment_score@ gt 0><b>#assessment.Total_score#:</b> @session_score@ / @assessment_score@ = @percent_score@%</if>
 
 <if @comments_installed_p@>
 <include src="/packages/assessment/lib/comments-chunk" object_id="@session_id@" />
 </if>
-</master>
Index: openacs-4/packages/assessment/www/asm-admin/item-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/assessment/www/asm-admin/item-add.adp	2 Feb 2008 15:58:35 -0000	1.6
+++ openacs-4/packages/assessment/www/asm-admin/item-add.adp	2 Feb 2008 21:15:46 -0000	1.7
@@ -198,8 +198,8 @@
 <div style="float:right; width: 40%;">        <fieldset>
         <legend>Multiple Choice</legend>
 <p class="form-help-text">       #assessment.item_type_multiple_choice_help#</p>
-        <formgroup-widget id="item_type"></formgroup-widget><br>
-        <formgroup-widget id="item_type"></formgroup-widget>
+        <formgroup-widget id="item_type" row=2></formgroup-widget><br>
+        <formgroup-widget id="item_type" row=5></formgroup-widget>
            
        <p><span class="form-label">Correct<br>Answer</span><br>
         <multiple name="choice_elements">
@@ -224,12 +224,12 @@
 <fieldset>
 <legend>Short Answer</legend>
 <p class="form-help-text">       #assessment.item_type_short_answer_help#</p>
-        <formgroup-widget id="item_type"></formgroup-widget>
+        <formgroup-widget id="item_type" row=4></formgroup-widget>
 </fieldset>
 <fieldset>
 <legend>Long Answer</legend>
 <p class="form-help-text">       #assessment.item_type_long_answer_help#</p>
-        <formgroup-widget id="item_type"></formgroup-widget>
+        <formgroup-widget id="item_type" row=3></formgroup-widget>
 <br>
             <label for="reference_answer">
               Reference Answer
@@ -239,7 +239,7 @@
 <fieldset>
 <legend>File Upload</legend>
 <p class="form-help-text">        #assessment.item_type_file_upload_help#</p>
-<formgroup-widget id="item_type"></formgroup-widget>
+<formgroup-widget id="item_type" row=1></formgroup-widget>
 </fieldset>
 </div>
 </div>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp	31 Jan 2008 16:06:26 -0000	1.5
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp	2 Feb 2008 21:15:46 -0000	1.6
@@ -16,9 +16,9 @@
             <label for="question_text">
               Question
             </label>
+            </span>
 
             <span class="form-required-mark">*</span>
-          </span>
           
             <if @formerror.question_text@ not nil>
               <span class="form-widget-error">
@@ -191,11 +191,12 @@
             <div><br><formgroup-widget id="display_type" row=2></formgroup-widget></div>
 
             <if @formerror.display_type@ not nil>
-              <span class="form-widget-error"></span>
+              <div class="form-widget-error">
             </if>
             <else>
-              <span class="form-widget"></span>
+              <div class="form-widget">
             </else>
+            </div>
                      
             <formerror id="display_type">
                   @formerror.data_type;noquote@
@@ -209,7 +210,7 @@
 
 <switch @item_type@>
 <case value="mc">
-<formwidget id="num_choices">
+<div><formwidget id="num_choices"></div>
          
        <p><span class="form-label">Correct<br>Answer</span><br>
         <multiple name="choice_elements">
@@ -230,7 +231,12 @@
 </if>
     <br>
 </multiple>
-<formwidget id="save_answer_set"> <label for="save_answer_set">#assessment.Save_this_set_of_answers_for_reuse_later#</label><br>
+
+  <formgroup id="save_answer_set">
+    @formgroup.widget;noquote@
+    <label for="item_edit_general:elements:save_answer_set:t">#assessment.Save_this_set_of_answers_for_reuse_later#</label><br>
+  </formgroup>
+
 <formwidget id="add_another_choice"><br>
 <if @choice_sets@ not nil><p>#assessment.OrUseChoices#<br>
 <formwidget id="add_existing_mc_id">
Index: openacs-4/packages/assessment/www/asm-admin/results-session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-session.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/assessment/www/asm-admin/results-session.adp	19 Dec 2007 11:55:07 -0000	1.9
+++ openacs-4/packages/assessment/www/asm-admin/results-session.adp	2 Feb 2008 21:15:46 -0000	1.10
@@ -18,12 +18,12 @@
 <if @sections.max_time_to_complete@ not nil> (#assessment.max_time# @sections.max_time_to_complete@) </if>
 <if @sections.description@ not nil><p>@sections.description@</p></if>
 <if @sections.feedback_text@ not nil><p>@sections.feedback_text@</p></if>
-<include src="/packages/assessment/lib/session-items" edit_p=1 section_id="@sections.section_id@" subject_id="@subject_id@" session_id="@session_id@" &assessment_data="assessment_data" show_item_name_p="@assessment_data.show_item_name_p@" show_feedback="@assessment_data.show_feedback@" survey_p="@assessment_data.survey_p@"></p>
-</div>
+<include src="/packages/assessment/lib/session-items" edit_p=1 section_id="@sections.section_id@" subject_id="@subject_id@" session_id="@session_id@" &assessment_data="assessment_data" show_item_name_p="@assessment_data.show_item_name_p@" show_feedback="@assessment_data.show_feedback@" survey_p="@assessment_data.survey_p@">
+</div> <!-- section -->
 </multiple>
 <hr>
 <if @assessment_data.type@ ne survey and @assessment_data.show_feedback@ ne none ><b>#assessment.Total_score#:</b> @session_score@ / @assessment_score@ = @percent_score@%</if>
 <if @comments_installed_p@>
 <include src="/packages/assessment/lib/comments-chunk" object_id="@session_id@" />
 </if>
-</master>
\ No newline at end of file
+</div> <!-- result -->