Index: openacs-4/packages/assessment/www/asm-admin/one-a.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/one-a.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/assessment/www/asm-admin/one-a.tcl	12 Jun 2006 02:49:51 -0000	1.11
+++ openacs-4/packages/assessment/www/asm-admin/one-a.tcl	15 May 2007 20:14:18 -0000	1.12
@@ -14,49 +14,60 @@
     {asm_instance ""}
     {reg_url ""}
 }
-set is_reg_asm_p ""
+
 set package_id [ad_conn package_id]
-set p_title ""
 
 permission::require_permission -object_id $package_id -privilege create
 permission::require_permission -object_id $assessment_id -privilege admin
-set admin_p [acs_user::site_wide_admin_p]
+
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
 set title [as::assessment::title -title $assessment_data(title)]
+set p_title [_ assessment.One_Assessment_data]
 set context [list [list index [_ assessment.admin]] $title]
 
 set assessment_rev_id $assessment_data(assessment_rev_id)
 set subsite_id [subsite::main_site_id]
+set registration_id [parameter::get -parameter RegistrationId -package_id $subsite_id]
 set url [apm_package_url_from_id $subsite_id]
+
+set admin_p [acs_user::site_wide_admin_p]
 set anonymous_p [db_string has_privilege {} -default "f"]
 set read_p [permission::permission_p -object_id $assessment_id -privilege read -party_id -1]
-set value [parameter::get -parameter RegistrationId -package_id $subsite_id]
 
+set creation_date [util_AnsiDatetoPrettyDate $assessment_data(creation_date)]
+set creator_url [acs_community_member_url -user_id $assessment_data(creation_user)]
+set history_url [export_vars -base assessment-history {assessment_id}]
+set edit_url [export_vars -base assessment-form {assessment_id}]
+set toggle_publish_url [export_vars -base toggle-publish {assessment_id}]
+set toggle_type_url [export_vars -base toggle-type {assessment_id}]
+set toggle_anon_url [export_vars -base toggle-boolean {assessment_id {param anonymous_p}}]
+set toggle_secure_url [export_vars -base toggle-boolean {assessment_id {param secure_access_p}}]
+set toggle_reuse_url [export_vars -base toggle-boolean {assessment_id {param reuse_responses_p}}]
+set toggle_show_name_url [export_vars -base toggle-boolean {assessment_id {param show_item_name_p}}]
+set sessions_url [export_vars -base sessions {assessment_id}]
+set results_url [export_vars -base results-users {assessment_id}]
+set export_url [export_vars -base results-export {assessment_id}]
+
 if { [exists_and_not_null asm_instance]} {
     set reg_url "[apm_package_url_from_id $asm_instance]admin"
 } else {
     set reg_url "../admin"
 } 
-if { [string eq $assessment_id $value] } {
-    set is_reg_asm_p "[_ assessment.reg_asm]"
-}
 
-if {[exists_and_not_null is_reg_asm_p]} {
+if { $assessment_id eq $registration_id } {
+    # This is the user-registration assessment
+    set is_reg_asm_p 1
     set p_title "[_ assessment.Reg_Assessment_title]"
 } else {
     set p_title [_ assessment.One_Assessment_data]
-
 }
 
-
 if {![info exists assessment_data(assessment_id)]} {
     ad_return_complaint 1 "[_ assessment.Requested_assess_does]"
     ad_script_abort
 }
 
-set creation_date [util_AnsiDatetoPrettyDate $assessment_data(creation_date)]
-set creator_link [acs_community_member_url -user_id $assessment_data(creation_user)]
 if {$assessment_data(number_tries) > 0} {
     set response_limit_toggle "[_ assessment.allow_multiple]"
 } else {
@@ -72,24 +83,12 @@
 			    -pretty_name   $title \
 			    -url [export_vars -base one-a {assessment_id reg_p}] ]
 
-db_multirow sections assessment_sections {} {
+db_multirow -extend { section_url } sections assessment_sections {} {
     if {[empty_string_p $points]} {
 	set points 0
     }
     set max_time_to_complete [as::assessment::pretty_time -seconds $max_time_to_complete]
+    set section_url [export_vars -base one-section {assessment_id section_id}]
 }
 
-list::create \
-    -name sections \
-    -pass_properties assessment_id \
-    -multirow sections \
-    -key section_id \
-    -no_data "[_ assessment.None]" \
-    -elements {
-	title {
-	    label "[_ assessment.Sections]"
-	    display_template {<a href="one-a?assessment_id=@assessment_id@&\#@sections.section_id@">@sections.title;noquote@</a>} 
-	}
-    }
-
 ad_return_template