Index: openacs-4/packages/assessment/www/asm-admin/one-a.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/one-a.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/assessment/www/asm-admin/one-a.adp 4 Apr 2005 17:48:43 -0000 1.6 +++ openacs-4/packages/assessment/www/asm-admin/one-a.adp 7 Apr 2005 17:41:32 -0000 1.7 @@ -1,7 +1,6 @@ -#assessment.One_Assessment_data# +@p_title@ @context_bar;noquote@ - #assessment.Created_by# @assessment_data.creator_name@#assessment.on_creation_date# @@ -13,7 +12,7 @@ #assessment.Edit# - @assessment_data.title@
@reg_p@
+ @assessment_data.title@
@is_reg_asm_p@

#assessment.None#@assessment_data.description;noquote@

#assessment.None#@assessment_data.instructions;noquote@ @@ -77,7 +76,11 @@ #assessment.Extreme_Actions# #assessment.Delete_this_assess# #assessment.Removes_all_questio#
- #assessment.Copy_this_assess# #assessment.Lets_you_use_this_a# + #assessment.Copy_this_assess# #assessment.Lets_you_use_this_a# + +
#acs-subsite.set_reg_asm# +
+ 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.3 -r1.4 --- openacs-4/packages/assessment/www/asm-admin/one-a.tcl 4 Apr 2005 17:48:43 -0000 1.3 +++ openacs-4/packages/assessment/www/asm-admin/one-a.tcl 7 Apr 2005 17:41:32 -0000 1.4 @@ -9,20 +9,32 @@ @cvs-id $Id: } { assessment_id:integer + {context ""} + {reg_p ""} } -set reg_p "" +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 + +if {[exists_and_not_null reg_p]} { + set p_title "[_ assessment.Reg_Assessment_title]" +} else { + set p_title [_ assessment.One_Assessment_data] + +} +set context_bar [ad_context_bar $assessment_data(title)] + + set value [parameter::get_from_package_key -parameter AsmForRegisterId -package_key "acs-subsite"] if { [string eq $assessment_id $value] } { - set reg_p "[_ assessment.reg_asm]" + set is_reg_asm_p "[_ assessment.reg_asm]" } if {![info exists assessment_data(assessment_id)]} { @@ -41,16 +53,16 @@ } # allow site-wide admins to enable/disable assessments directly from here -set target "[export_vars -base one-a {assessment_id}]" +set target "[export_vars -base one-a {assessment_id reg_p}]" -set context_bar [ad_context_bar $assessment_data(title)] + set notification_chunk [notification::display::request_widget \ -type assessment_response_notif \ -object_id $assessment_id \ -pretty_name $assessment_data(title) \ - -url [export_vars -base one-a {assessment_id}] ] + -url [export_vars -base one-a {assessment_id reg_p}] ] db_multirow sections assessment_sections {} { if {[empty_string_p $points]} {