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 -N -r1.2.6.3 -r1.2.6.4
--- openacs-4/packages/assessment/www/asm-admin/item-add.adp	5 Feb 2007 19:54:42 -0000	1.2.6.3
+++ openacs-4/packages/assessment/www/asm-admin/item-add.adp	23 Feb 2007 17:27:49 -0000	1.2.6.4
@@ -146,9 +146,88 @@
             <p class="form-help-text">
               
                 <formhelp id="feedback_wrong">
-              
+              </span>
             </p>
-          <formwidget id=points><formwidget id=field_code><formwidget id=field_name><formwidget id=max_time_to_complete><formwidget id=validate_block><formwidget id=content><formwidget id=description>
+
+           <if @formerror.points@ not nil>
+            <span class="form-label-error">
+          </if>
+          <else>
+            <span class="form-label">
+          </else>
+             <label for="points">
+              Points
+             </label>
+           </span>
+           <if @formerror.points@ not nil>
+             <span class="form-widget-error">
+           </if>
+           <else>
+            <span class="form-widget">
+           </else>
+             <formwidget id=points>
+             <formerror id="points">
+             <br>
+               @formerror.points;noquote@
+            </formerror>
+            <p class="form-help-text">
+              <formhelp id="points">
+           </p>
+          </br>
+         </span>
+
+
+<formwidget id=field_code>
+        
+
+          <if @formerror.field_name@ not nil>
+            <span class="form-label-error">
+          </if>
+          <else>
+             <span class="form-label">
+           </else>
+              <label for="field_name">
+                Field name
+              </label>
+            </span>
+            <br>					      
+           <if @formerror.field_name@ not nil>
+              <span class="form-widget-error">
+           </if>
+           <else>
+             <span class="form-widget">
+           </else>        
+           <formwidget id=field_name>
+           <formerror id="feedback_wrong">
+             <br>
+               @formerror.field_name;noquote@
+            </formerror>    
+         <br>
+	     <p class="form-help-text">
+               <formhelp id="field_name"></p>
+          </br>
+         </span>  
+       
+
+
+       <formwidget id=max_time_to_complete>
+           <br />
+
+        <if @formerror.validate_block@ not nil>
+            <span class="form-label-error">
+        </if>
+        <else>
+            <span class="form-label">
+        </else>
+	   <label for="validate_block">
+              Validate block
+           </label>
+          </span>
+          <br />
+           <formwidget id=validate_block>
+            <p class="form-help-text">
+                <formhelp id="validate_block"></p>
+            </p><formwidget id=content><formwidget id=description>
       <br>
 </fieldset>        
 <fieldset>              <if @formerror.item_type@ not nil>
@@ -163,13 +242,17 @@
             </label>
             <span class="form-required-mark">*</span>
           </span>
-          
+
             <if @formerror.item_type@ not nil>
               <div class="form-widget-error">
             </if>
             <else>
               <div class="form-widget">                  
             </else>
+
+	<formgroup id=item_type>
+         <tr><td>@formgroup.widget;noquote@</td><td>@formgroup.label;noquote@</td></tr>
+      </formgroup>
             <formerror id="item_type">
               <span class="form-error">
                   <br>
Index: openacs-4/packages/assessment/www/asm-admin/item-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add.tcl,v
diff -u -N -r1.13.2.4 -r1.13.2.5
--- openacs-4/packages/assessment/www/asm-admin/item-add.tcl	5 Feb 2007 19:54:42 -0000	1.13.2.4
+++ openacs-4/packages/assessment/www/asm-admin/item-add.tcl	23 Feb 2007 17:27:49 -0000	1.13.2.5
@@ -86,22 +86,28 @@
     {feedback_right:text(hidden),optional {value ""}}
     {feedback_wrong:text(hidden),optional {value ""}}
     {max_time_to_complete:text(hidden),optional {value ""}}
-    {points:text(hidden),ptional {value ""}}
+    {points:text(hidden),optional {value ""}}
     {data_type:text(hidden),optional {value ""}}
-
+    {validate_block:text(textarea),optional \
+	 {label "[_ assessment.Validation_Block]"} \
+	 {help_text "[_ assessment.lt_This_field_is_used_to]"} \
+	 {html {cols 70 rows 6}}}
 }
 }
 
 if { $type ne "survey"} {
-#ad_form -extend -name item-add -form {
-#    {data_type:text(select) {label "[_ assessment.Data_Type]"} {options $data_types} {help_text "[_ assessment.Data_Type_help]"}}}
-#} 
+    #ad_form -extend -name item-add -form {
+    #    {data_type:text(select) {label "[_ assessment.Data_Type]"} {options $data_types} {help_text "[_ assessment.Data_Type_help]"}}}
+} 
+
 ad_form -extend -name item-add -form {
     {item_type:text(radio) {label "[_ assessment.Item_Type]"} {options $item_types} {help_text "[_ assessment.Item_Type_help]"}}
-#    {validate_block:text(textarea),optional {label "[_ assessment.Validation_Block]"} {help_text "[_ assessment.lt_This_field_is_used_to]"} {html {cols 70 rows 6}}}
+    #	    {validate_block:text(textarea),optional {label "[_ assessment.Validation_Block]"} {help_text "[_ assessment.lt_This_field_is_used_to]"} {html {cols 70 rows 6}}}
     {num_choices:text(hidden)}
 }
 
+
+
 ##############################################################################
 # Multiple Choice Section
 ##############################################################################
@@ -110,15 +116,15 @@
     {add_another_choice:text(submit) {label "[_ assessment.Add_another_choice]"}}
 }
 if {[template::form::is_submission item-add] \
-        && [template::element::get_value item-add add_another_choice] \
-        eq [_ assessment.Add_another_choice]} {
+	&& [template::element::get_value item-add add_another_choice] \
+	eq [_ assessment.Add_another_choice]} {
     set num_choices [element::get_value item-add num_choices]
     incr num_choices
     element::set_value item-add num_choices $num_choices
 } 
 
 if {![template::form::is_submission item-add] \
-        && ![info exists num_choices]} {
+	&& ![info exists num_choices]} {
     set num_choices 5
 } else {
     set num_choices [template::element::get_value item-add num_choices]
@@ -299,11 +305,13 @@
 } -after_submit {
     if {[exists_and_not_null formbutton_ok]} {
 	ad_returnredirect [export_vars -base questions {assessment_id}]&\#$as_item_id
+	
 	ad_script_abort
     } elseif {[exists_and_not_null formbutton_add_another_question]} {
 	set after [expr {$after + 1}]
 	ad_returnredirect [export_vars -base item-add {after assessment_id section_id}]&\#$as_item_id	    
     }
 }
 
+
 ad_return_template