Index: openacs-4/packages/assessment/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/index.tcl,v
diff -u -r1.14 -r1.14.2.1
--- openacs-4/packages/assessment/www/index.tcl	29 Apr 2005 18:38:50 -0000	1.14
+++ openacs-4/packages/assessment/www/index.tcl	18 Jul 2005 16:57:41 -0000	1.14.2.1
@@ -24,7 +24,7 @@
     -elements {
         title {
             label "[_ assessment.open_assessments]"
-            display_template {<a href="@assessments.assessment_url@">@assessments.title@</a>}
+            display_template {<a href="@assessments.assessment_url@">@assessments.title;noquote@</a>}
         }
     } -main_class {
         narrow
@@ -33,6 +33,7 @@
 # get the information of all open assessments
 template::multirow create assessments assessment_id title description assessment_url
 db_foreach open_asssessments {} {
+    set title [as::assessment::title -title $title]
     if {([empty_string_p $start_time] || $start_time <= $cur_time) && ([empty_string_p $end_time] || $end_time >= $cur_time)} {
 	if {[empty_string_p $password]} {
 	    set assessment_url [export_vars -base "assessment" {assessment_id}]
@@ -51,7 +52,7 @@
     -elements {
         title {
             label "[_ assessment.Assessments]"
-            display_template {@sessions.title@}
+            display_template {@sessions.title;noquote@}
         }
         session {
             label {[_ assessment.Sessions]}
Index: openacs-4/packages/assessment/www/asm-admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/index.tcl,v
diff -u -r1.6.2.2 -r1.6.2.3
--- openacs-4/packages/assessment/www/asm-admin/index.tcl	21 Jun 2005 20:30:55 -0000	1.6.2.2
+++ openacs-4/packages/assessment/www/asm-admin/index.tcl	18 Jul 2005 16:58:08 -0000	1.6.2.3
@@ -34,9 +34,9 @@
 }
 
 if { $sw_admin } {
-    set actions [list "[_ assessment.New_Assessment]" assessment-form "[_ assessment.New_Assessment2]" [_ assessment.set_reg_asm] "../admin/set-reg-assessment" [_ assessment.set_reg_asm]]
+    set actions [list "[_ assessment.New_Assessment]" assessment-new "[_ assessment.New_Assessment2]" [_ assessment.set_reg_asm] "../admin/set-reg-assessment" [_ assessment.set_reg_asm]]
 } else {
-    set actions [list "[_ assessment.New_Assessment]" assessment-form "[_ assessment.New_Assessment2]"]
+    set actions [list "[_ assessment.New_Assessment]" assessment-new"[_ assessment.New_Assessment2]"]
 }
 
 if {[ad_permission_p [acs_magic_object "security_context_root"] "admin"]} {
@@ -45,6 +45,7 @@
 
 #get all assessments order by title
 db_multirow -extend { export permissions admin_request} assessments $m_name {} {
+    set title [as::assessment::title -title $title]
     set export "[_ assessment.Export]"
     set permissions "[_ assessment.permissions]"
     set admin_request "[_ assessment.Request] [_ assessment.Administration]"
@@ -58,7 +59,7 @@
     -elements {
 	title {
 	    label "[_ assessment.Title]"
-	    link_url_eval "[export_vars -base one-a { assessment_id }]"
+	    display_template {<a href="one-a?assessment_id=@assessments.assessment_id@">@assessments.title;noquote@</a>} 
 	}
 	export {
 	    label "[_ assessment.Export]"