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.2.6.1 -r1.2.6.2
--- openacs-4/packages/assessment/www/asm-admin/item-add.adp	24 Jan 2007 20:15:30 -0000	1.2.6.1
+++ openacs-4/packages/assessment/www/asm-admin/item-add.adp	5 Feb 2007 14:15:04 -0000	1.2.6.2
@@ -185,381 +185,12 @@
            
        <p><span class="form-label">Correct<br>Answer</span><br>
         <multiple name="choice_elements">
-        <formwidget id="correct.@choice_elements.id@">&nbsp;&nbsp;<formwidget id="choice.@choice_elements.id@"><br />
+       <formgroup id="correct.@choice_elements.id@">
+                @formgroup.widget;noquote@
+           </formgroup>
+&nbsp;&nbsp;<formwidget id="choice.@choice_elements.id@"><br />
 </multiple>
-<if 0>
-              <if @formerror.choice.1@ not nil>
-                <span class="form-label-error">
-              </if>
-              <else>
-                <span class="form-label">
-              </else>
-            
-            <label for="choice.1">
-              Choice 1
-            </label>
-            
-          </span>
-    <br />      
-            <if @formerror.choice.1@ not nil>
-              <span class="form-widget-error">
-            </if>
-            <else>
-              <span class="form-widget">                  
-            </else>
-          
-              <formwidget id="choice.1">
-            
-            <formerror id="choice.1">
-              <br>
-                  @formerror.choice.1;noquote@
-            </formerror>
-          
-            <p class="form-help-text">
-              
-                <formhelp id="choice.1">
-              
             </p>
-          
-<br>
-        
-              <if @formerror.correct.1@ not nil>
-                <span class="form-label-error">
-              </if>
-              <else>
-                <span class="form-label">
-              </else>
-            
-            <label for="correct.1">
-              Correct Answer Choice 1
-            </label>
-            
-          </span>
-          
-            <if @formerror.correct.1@ not nil>
-              <span class="form-widget-error">
-            </if>
-            <else>
-              <span class="form-widget">                  
-            </else>
-          
-              <formgroup id="correct.1">
-                @formgroup.widget;noquote@
-                <label for="item-add:elements:correct.1:@formgroup.option@">
-                  @formgroup.label;noquote@
-                </label>
-              </formgroup>
-            
-            <formerror id="correct.1">
-              <br>
-                  @formerror.correct.1;noquote@
-            </formerror>
-          
-            <p class="form-help-text">
-              
-                <formhelp id="correct.1">
-              
-            </p>
-          
-      <br>
-        
-              <if @formerror.choice.2@ not nil>
-                <span class="form-label-error">
-              </if>
-              <else>
-                <span class="form-label">
-              </else>
-            
-            <label for="choice.2">
-              Choice 2
-            </label>
-            
-          </span>
-          
-            <if @formerror.choice.2@ not nil>
-              <span class="form-widget-error">
-            </if>
-            <else>
-              <span class="form-widget">                  
-            </else>
-          
-              <formwidget id="choice.2">
-            
-            <formerror id="choice.2">
-              <br>
-                  @formerror.choice.2;noquote@
-            </formerror>
-          
-            <p class="form-help-text">
-              
-                <formhelp id="choice.2">
-              
-            </p>
-          
-      <br>
-        
-              <if @formerror.correct.2@ not nil>
-                <span class="form-label-error">
-              </if>
-              <else>
-                <span class="form-label">
-              </else>
-            
-            <label for="correct.2">
-              Correct Answer Choice 2
-            </label>
-            
-          </span>
-          
-            <if @formerror.correct.2@ not nil>
-              <span class="form-widget-error">
-            </if>
-            <else>
-              <span class="form-widget">                  
-            </else>
-          
-              <formgroup id="correct.2">
-                @formgroup.widget;noquote@
-                <label for="item-add:elements:correct.2:@formgroup.option@">
-                  @formgroup.label;noquote@
-                </label>
-              </formgroup>
-            
-            <formerror id="correct.2">
-              <br>
-                  @formerror.correct.2;noquote@
-            </formerror>
-          
-            <p class="form-help-text">
-              
-                <formhelp id="correct.2">
-              
-            </p>
-          
-      <br>
-        
-              <if @formerror.choice.3@ not nil>
-                <span class="form-label-error">
-              </if>
-              <else>
-                <span class="form-label">
-              </else>
-            
-            <label for="choice.3">
-              Choice 3
-            </label>
-            
-          </span>
-          
-            <if @formerror.choice.3@ not nil>
-              <span class="form-widget-error">
-            </if>
-            <else>
-              <span class="form-widget">                  
-            </else>
-          
-              <formwidget id="choice.3">
-            
-            <formerror id="choice.3">
-              <br>
-                  @formerror.choice.3;noquote@
-            </formerror>
-          
-            <p class="form-help-text">
-              
-                <formhelp id="choice.3">
-              
-            </p>
-          
-      <br>
-        
-              <if @formerror.correct.3@ not nil>
-                <span class="form-label-error">
-              </if>
-              <else>
-                <span class="form-label">
-              </else>
-            
-            <label for="correct.3">
-              Correct Answer Choice 3
-            </label>
-            
-          </span>
-          
-            <if @formerror.correct.3@ not nil>
-              <span class="form-widget-error">
-            </if>
-            <else>
-              <span class="form-widget">                  
-            </else>
-          
-              <formgroup id="correct.3">
-                @formgroup.widget;noquote@
-                <label for="item-add:elements:correct.3:@formgroup.option@">
-                  @formgroup.label;noquote@
-                </label>
-              </formgroup>
-            
-            <formerror id="correct.3">
-              <br>
-                  @formerror.correct.3;noquote@
-            </formerror>
-          
-            <p class="form-help-text">
-              
-                <formhelp id="correct.3">
-              
-            </p>
-          
-      <br>
-        
-              <if @formerror.choice.4@ not nil>
-                <span class="form-label-error">
-              </if>
-              <else>
-                <span class="form-label">
-              </else>
-            
-            <label for="choice.4">
-              Choice 4
-            </label>
-            
-          </span>
-          
-            <if @formerror.choice.4@ not nil>
-              <span class="form-widget-error">
-            </if>
-            <else>
-              <span class="form-widget">                  
-            </else>
-          
-              <formwidget id="choice.4">
-            
-            <formerror id="choice.4">
-              <br>
-                  @formerror.choice.4;noquote@
-            </formerror>
-          
-            <p class="form-help-text">
-              
-                <formhelp id="choice.4">
-              
-            </p>
-          
-      <br>
-        
-              <if @formerror.correct.4@ not nil>
-                <span class="form-label-error">
-              </if>
-              <else>
-                <span class="form-label">
-              </else>
-            
-            <label for="correct.4">
-              Correct Answer Choice 4
-            </label>
-            
-          </span>
-          
-            <if @formerror.correct.4@ not nil>
-              <span class="form-widget-error">
-            </if>
-            <else>
-              <span class="form-widget">                  
-            </else>
-          
-              <formgroup id="correct.4">
-                @formgroup.widget;noquote@
-                <label for="item-add:elements:correct.4:@formgroup.option@">
-                  @formgroup.label;noquote@
-                </label>
-              </formgroup>
-            
-            <formerror id="correct.4">
-              <br>
-                  @formerror.correct.4;noquote@
-            </formerror>
-          
-            <p class="form-help-text">
-              
-                <formhelp id="correct.4">
-              
-            </p>
-          
-      <br>
-        
-              <if @formerror.choice.5@ not nil>
-                <span class="form-label-error">
-              </if>
-              <else>
-                <span class="form-label">
-              </else>
-            
-            <label for="choice.5">
-              Choice 5
-            </label>
-            
-          </span>
-          
-            <if @formerror.choice.5@ not nil>
-              <span class="form-widget-error">
-            </if>
-            <else>
-              <span class="form-widget">                  
-            </else>
-          
-              <formwidget id="choice.5">
-            
-            <formerror id="choice.5">
-              <br>
-                  @formerror.choice.5;noquote@
-            </formerror>
-          
-            <p class="form-help-text">
-              
-                <formhelp id="choice.5">
-              
-            </p>
-          
-      <br>
-        
-              <if @formerror.correct.5@ not nil>
-                <span class="form-label-error">
-              </if>
-              <else>
-                <span class="form-label">
-              </else>
-            
-            <label for="correct.5">
-              Correct Answer Choice 5
-            </label>
-            
-          </span>
-          
-            <if @formerror.correct.5@ not nil>
-              <span class="form-widget-error">
-            </if>
-            <else>
-              <span class="form-widget">                  
-            </else>
-          
-              <formgroup id="correct.5">
-                @formgroup.widget;noquote@
-                <label for="item-add:elements:correct.5:@formgroup.option@">
-                  @formgroup.label;noquote@
-                </label>
-              </formgroup>
-            
-            <formerror id="correct.5">
-              <br>
-                  @formerror.correct.5;noquote@
-            </formerror>
-          
-            <p class="form-help-text">
-              
-                <formhelp id="correct.5">
-</if>                        
-            </p>
 
       <br>
 <formwidget id="add_another_choice">
@@ -575,7 +206,10 @@
 <legend>Long Answer</legend>
 <p class="form-help-text">       #assessment.item_type_long_answer_help#</p>
         <formgroup-widget id="item_type" row=3></formgroup-widget>
-<br />	<formwidget id="reference_answer">
+<br />
+            <label for="reference_answer">
+              Reference Answer
+            </label>	<formwidget id="reference_answer">
 <p class="form-help-text">        <formhelp id="reference_answer"></p>
 </fieldset>
 <fieldset>