Index: openacs-4/packages/assessment/www/asm-admin/assessment-form.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/assessment-form.adp,v
diff -u -N -r1.3.2.3 -r1.3.2.4
--- openacs-4/packages/assessment/www/asm-admin/assessment-form.adp	16 Feb 2007 02:06:10 -0000	1.3.2.3
+++ openacs-4/packages/assessment/www/asm-admin/assessment-form.adp	23 Mar 2007 16:34:51 -0000	1.3.2.4
@@ -263,7 +263,7 @@
             </p>
           
       <br>
-        
+        <if @type@ eq "test">
               <if @formerror.random_p@ not nil>
                 <span class="form-label-error">
               </if>
@@ -296,9 +296,8 @@
                 <formhelp id="random_p">
               
             </p>
-
+</if>
       <br>
-        
               <if @formerror.number_tries@ not nil>
                 <span class="form-label-error">
               </if>
@@ -542,7 +541,7 @@
               
             </p>
 </fieldset>                    
-
+<if @type@ eq "test">
 <fieldset>
 <legend>#assessment.assessment_form_time_options#</legend>
         
@@ -753,6 +752,7 @@
                 <formhelp id="section_navigation">
               
             </p>
+</if>
           <formwidget id=type>
       <br>
 </if>
Index: openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl,v
diff -u -N -r1.12.2.4 -r1.12.2.5
--- openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl	10 Mar 2007 15:54:33 -0000	1.12.2.4
+++ openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl	23 Mar 2007 16:34:51 -0000	1.12.2.5
@@ -114,27 +114,14 @@
         }
     }
     
-    if { $type eq "test" } {
         ad_form -extend -name assessment_form -form {
             {number_tries:integer,optional,nospell {label "[_ assessment.Number_of_Tries]"} {html {size 10 maxlength 10}} {help_text "[_ assessment.as_Number_Tries_help]"}}
             {wait_between_tries:integer,optional,nospell {label "[_ assessment.Minutes_for_Retry]"} {html {size 10 maxlength 10}} {help_text "[_ assessment.as_Minutes_Retry_help]"}}
         }
-    } else {
-        ad_form -extend -name assessment_form -form {
-            {number_tries:text(hidden) {value ""}}
-            {wait_between_tries:text(hidden) {value ""}}
-        }
-    }
 
-    if { $type eq "test" } {
         ad_form -extend -name assessment_form -form {
             {time_for_response:integer,optional,nospell {label "[_ assessment.time_for_response]"} {html {size 10 maxlength 10}} {help_text "[_ assessment.as_time_help]"}}
         }
-    } else {
-        ad_form -extend -name assessment_form -form {
-            {time_for_response:text(hidden) {value ""}}
-        }
-    }
 
     if { $type eq "test" } {
         ad_form -extend -name assessment_form -form {