Index: openacs-4/packages/evaluation/evaluation.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/evaluation.info,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/evaluation/evaluation.info	14 Jul 2004 17:42:06 -0000	1.10
+++ openacs-4/packages/evaluation/evaluation.info	26 Jul 2004 18:01:40 -0000	1.11
@@ -17,8 +17,8 @@
 
         <callbacks>
             <callback type="after-install"  proc="evaluation::apm::package_install"/>
-            <callback type="before-uninstantiate"  proc="evaluation::apm::package_uninstantiate"/>
             <callback type="after-instantiate"  proc="evaluation::apm::package_instantiate"/>
+            <callback type="before-uninstantiate"  proc="evaluation::apm::package_uninstantiate"/>
             <callback type="before-uninstall"  proc="evaluation::apm::package_uninstall"/>
         </callbacks>
         <parameters>
Index: openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml	7 Jul 2004 17:26:43 -0000	1.3
+++ openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml	26 Jul 2004 18:01:41 -0000	1.4
@@ -5,6 +5,7 @@
   <msg key="Add_Assignment_">Add Assignment </msg>
   <msg key="Add_Assignment_Type_">Add Assignment Type </msg>
   <msg key="Add_assignment_type_">Add assignment type </msg>
+  <msg key="Add_grade_name">Add $grade_name</msg>
   <msg key="Add_grade_name_">Add %grade_name% </msg>
   <msg key="Add_Member_to_group_">Add Member to group </msg>
   <msg key="Add_Task_">Add Task </msg>
@@ -105,10 +106,12 @@
   <msg key="Evaluated_">Evaluated </msg>
   <msg key="Evaluation_Index_">Evaluation Index </msg>
   <msg key="Evaluation_Modified_">Evaluation Modified </msg>
+  <msg key="evaluationpagename">Class Material </msg>
   <msg key="Evaluations">Evaluations</msg>
   <msg key="Evaluations_">Evaluations </msg>
   <msg key="Evaluations_Admin">Evaluations Admin</msg>
   <msg key="Evaluations_List_">Evaluations List </msg>
+  <msg key="Exam">Exam</msg>
   <msg key="Exams_">Exams </msg>
   <msg key="Exams_for_students_">Exams for students </msg>
   <msg key="File_">File </msg>
@@ -206,6 +209,7 @@
   <msg key="lt_Edit_Assignment_Type_">Edit Assignment Type </msg>
   <msg key="lt_Edit_assignment_type_">Edit assignment type </msg>
   <msg key="lt_Edit_grades_distribut">Edit grades distribution of $grade_plural_name </msg>
+  <msg key="lt_Edit_grades_distribut_1">Edit grades distribution of %grade_plural_name%</msg>
   <msg key="lt_Enter_the_grades_for_">Enter the grades for the students/groups and KEEP THE STRUCTURE of the file. If you are editing a grade, you MUST give an edit reason in the &quot;Comments/Edit reason&quot; field.</msg>
   <msg key="lt_Error_deleting_the_ev">Error deleting the evaluation </msg>
   <msg key="lt_Error_deleting_the_gr">Error deleting the grade </msg>
@@ -444,6 +448,7 @@
   <msg key="One_Group_">One Group </msg>
   <msg key="Online_Submit_">Online Submit </msg>
   <msg key="pero">y entonces </msg>
+  <msg key="Project">Project</msg>
   <msg key="Projects_">Projects </msg>
   <msg key="Remove_Grade">Remove Grade</msg>
   <msg key="Rename">Group </msg>
@@ -460,6 +465,7 @@
   <msg key="submit_answer_">submit answer </msg>
   <msg key="submit_answer_again_">submit answer again </msg>
   <msg key="Sumission_Date_">Sumission Date </msg>
+  <msg key="Task">Task</msg>
   <msg key="Task_Groups_">Task Groups </msg>
   <msg key="Task_Name">Task Name:</msg>
   <msg key="Task_Name_">Task Name </msg>
@@ -501,5 +507,4 @@
   <msg key="Y">upi , pero no yupin</msg>
   <msg key="Yes">Yes</msg>
   <msg key="Yes_">Yes </msg>
-  <msg key="evaluationpagename">Class Material </msg>
 </message_catalog>
Index: openacs-4/packages/evaluation/lib/evaluations-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/evaluations-chunk.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/evaluation/lib/evaluations-chunk.tcl	7 Jul 2004 17:26:44 -0000	1.6
+++ openacs-4/packages/evaluation/lib/evaluations-chunk.tcl	26 Jul 2004 18:01:42 -0000	1.7
@@ -26,7 +26,7 @@
 	     orderby_asc {task_weight asc} \
 	     orderby_desc {task_weight desc}] 
     set multirow_name grade_tasks_admin
-    set actions [list "[_ evaluation.lt_Edit_grades_distribut]" [export_vars -base "${base_url}admin/grades/distribution-edit" { grade_id }]]
+    set actions [list "[_ evaluation.lt_Edit_grades_distribut_1]" [export_vars -base "${base_url}admin/grades/distribution-edit" { grade_id }]]
 } else { 
     #student
     lappend elements grade \
Index: openacs-4/packages/evaluation/lib/tasks-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/tasks-chunk.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/evaluation/lib/tasks-chunk.tcl	7 Jul 2004 17:26:44 -0000	1.5
+++ openacs-4/packages/evaluation/lib/tasks-chunk.tcl	26 Jul 2004 18:01:42 -0000	1.6
@@ -59,7 +59,7 @@
 	     link_html { title "[_ evaluation.Delete_task_]" }]
     
     set multirow_name tasks_admin
-    set actions [list "Add $grade_name" [export_vars -base "${base_url}admin/tasks/task-add-edit" { return_url grade_id }] ]
+    set actions [list "[_ evaluation.Add_grade_name]" [export_vars -base "${base_url}admin/tasks/task-add-edit" { return_url grade_id }] ]
 } else { 
     #student
     lappend elements answer \
Index: openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl	31 May 2004 17:04:57 -0000	1.6
+++ openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl	26 Jul 2004 18:01:43 -0000	1.7
@@ -15,7 +15,7 @@
 namespace eval evaluation::apm {}
 
 
-ad_proc -private evaluation::apm::package_install {  
+ad_proc -public evaluation::apm::package_install {  
 } { 
     Does the integration whith the notifications package.  
 } { 
@@ -42,7 +42,7 @@
     }
 }
 
-ad_proc -private evaluation::apm::package_uninstall { 
+ad_proc -public evaluation::apm::package_uninstall { 
 } {
 
     Cleans the integration whith the notifications package.  
@@ -65,7 +65,7 @@
     } 
 }
 
-ad_proc -private evaluation::apm::package_instantiate { 
+ad_proc -public evaluation::apm::package_instantiate { 
     -package_id:required
 } {
 
@@ -80,7 +80,7 @@
 }
 
 
-ad_proc -private evaluation::apm::package_uninstantiate { 
+ad_proc -public evaluation::apm::package_uninstantiate { 
     -package_id:required
 } {
 
Index: openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql	14 Jul 2004 20:36:34 -0000	1.10
+++ openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql	26 Jul 2004 18:01:43 -0000	1.11
@@ -607,8 +607,8 @@
 	    select evaluation__new_grade (
 					  :exams_item_id,		
 					  :exams_revision_id,	
-					  'Exam',
-					  'Exams', 	
+					  :exams_singular_name,
+					  :exams_name, 	
 					  40,		
 					  'evaluation_grades',	
 					  now(), --creation date	
@@ -663,8 +663,8 @@
 	    select evaluation__new_grade (
 					  :projects_item_id,		
 					  :projects_revision_id,	
-					  'Project',
-					  'Projects', 	
+					  :projects_singular_name,
+					  :projects_name, 	
 					  20,		
 					  'evaluation_grades',	
 					  now(), --creation date	
@@ -720,8 +720,8 @@
 	    select evaluation__new_grade (
 					  :tasks_item_id,		
 					  :tasks_revision_id,	
-					  'Task', 	
-					  'Tasks',
+					  :tasks_singular_name, 	
+					  :tasks_name,
 					  40,		
 					  'evaluation_grades',	
 					  now(), --creation date	
Index: openacs-4/packages/evaluation/tcl/evaluation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/evaluation/tcl/evaluation-procs.tcl	14 Jul 2004 17:42:07 -0000	1.10
+++ openacs-4/packages/evaluation/tcl/evaluation-procs.tcl	26 Jul 2004 18:01:43 -0000	1.11
@@ -608,23 +608,23 @@
     $csv_formatted_content" 
 }
 
-ad_proc -private evaluation::apm::delete_one_assignment_impl {} {
+ad_proc -public evaluation::apm::delete_one_assignment_impl {} {
     Unregister the NotificationType implementation for one_assignment_notif_type.
 } {
     acs_sc::impl::delete \
         -contract_name "NotificationType" \
         -impl_name one_assignment_notif_type
 }
 
-ad_proc -private evaluation::apm::delete_one_evaluation_impl {} {
+ad_proc -public evaluation::apm::delete_one_evaluation_impl {} {
     Unregister the NotificationType implementation for one_evaluation_notif_type.
 } {
     acs_sc::impl::delete \
         -contract_name "NotificationType" \
         -impl_name one_evaluation_notif_type
 }
 
-ad_proc -private evaluation::apm::create_one_assignment_impl {} {
+ad_proc -public evaluation::apm::create_one_assignment_impl {} {
     Register the service contract implementation and return the impl_id
     @return impl_id of the created implementation 
 } {
@@ -639,7 +639,7 @@
     }]
 }
 
-ad_proc -private evaluation::apm::create_one_evaluation_impl {} {
+ad_proc -public evaluation::apm::create_one_evaluation_impl {} {
     Register the service contract implementation and return the impl_id
     @return impl_id of the created implementation 
 } {
@@ -654,7 +654,7 @@
     }]
 }
  
-ad_proc -private evaluation::apm::create_one_assignment_type {
+ad_proc -public evaluation::apm::create_one_assignment_type {
     -impl_id:required
 } {
     Create the notification type for one specific assignment
@@ -667,7 +667,7 @@
 		-description "[_ evaluation.lt_Notification_for_assi]"]
 }
 
-ad_proc -private evaluation::apm::create_one_evaluation_type {
+ad_proc -public evaluation::apm::create_one_evaluation_type {
     -impl_id:required
 } {
     Create the notification type for one specific evaluation
@@ -711,10 +711,13 @@
 } {
     db_transaction {
 	set exams_name "[_ evaluation.Exams_]"
+	set exams_singular_name "[_ evaluation.Exam]"
 	set exams_desc "[_ evaluation.Exams_for_students_]"
 	set tasks_name "[_ evaluation.Tasks_]"
+	set tasks_singular_name "[_ evaluation.Task]"
 	set tasks_desc "[_ evaluation.Tasks_for_students_]"
 	set projects_name "[_ evaluation.Projects_]"
+	set projects_singular_name "[_ evaluation.Project]"
 	set projects_desc "[_ evaluation.lt_Projects_for_students]"
 	db_exec_plsql create_evaluation_folders { *SQL* }
 
Index: openacs-4/packages/evaluation/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/index.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/evaluation/www/admin/index.adp	7 Jul 2004 17:26:44 -0000	1.7
+++ openacs-4/packages/evaluation/www/admin/index.adp	26 Jul 2004 18:01:43 -0000	1.8
@@ -2,8 +2,6 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-@portal_id@ - @page_id@ - @layout_id@ - @ds_id@
-
 <h2>#evaluation.Assignment_Types#</h2>
 <ul>
 <li><a href="grades/grades">#evaluation.lt_Admin_my_Assignment_T#</a></li>
Index: openacs-4/packages/evaluation/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/index.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/evaluation/www/admin/index.tcl	14 Jul 2004 17:42:07 -0000	1.7
+++ openacs-4/packages/evaluation/www/admin/index.tcl	26 Jul 2004 18:01:43 -0000	1.8
@@ -17,11 +17,6 @@
 set page_title "[_ evaluation.Evaluation_Index_]"
 set context {}
 
-#set portal_id [dotlrn_community::get_portal_id -community_id [dotlrn_community::get_community_id]]
-#set page_id [portal::get_page_id -create -portal_id $portal_id -page_name ""]
-#set layout_id [portal::get_layout_id -page_id $page_id $portal_id]
-set ds_id [portal::get_datasource_id evaluation_admin_portlet]
-
 set package_id [ad_conn package_id]
 set user_id [ad_conn user_id]
 set admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege admin]