Index: openacs-4/packages/assessment/assessment.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/assessment.info,v
diff -u -N -r1.47 -r1.48
--- openacs-4/packages/assessment/assessment.info	5 Nov 2008 19:08:35 -0000	1.47
+++ openacs-4/packages/assessment/assessment.info	1 Dec 2008 16:57:02 -0000	1.48
@@ -9,8 +9,8 @@
     
     <version name="0.23d3" url="http://openacs.org/repository/download/apm/assessment-0.23d3.apm">
         <owner url="mailto:eperez@it.uc3m.es">Eduardo Perez Ureta</owner>
-        <summary>Assessment package that will replace the survey,
-    quizz, complex survey, poll and other data collection packages
+        <summary>Assessment package that will replace the surveys
+    quizz, complex survey, poll and other data collection packages
     that OpenACS currently supports.</summary>
         <release-date>2007-06-15</release-date>
         <vendor url="http://www.e-lane.org/">E-LANE</vendor>
@@ -19,14 +19,14 @@
         <package_instance_name>#assessment.Assessment#</package_instance_name>
 
         <provides url="assessment" version="0.23d3"/>
-        <requires url="acs-content-repository" version="5.4.0"/>
-        <requires url="acs-kernel" version="5.4.0"/>
-        <requires url="acs-templating" version="5.4.0"/>
-        <requires url="categories" version="1.1"/>
-        <requires url="notifications" version="5.4.0"/>
+        <requires url="acs-content-repository" version="5.4.2"/>
+        <requires url="acs-kernel" version="5.4.2"/>
+        <requires url="acs-templating" version="5.4.2"/>
+        <requires url="categories" version="1.1.2d3"/>
+        <requires url="notifications" version="5.4.2"/>
 
         <callbacks>
-            <callback type="after-install"  proc="as::install::assessment_create_install"/>
+            <callback type="after-install"  proc="as::install::after_install"/>
             <callback type="after-instantiate"  proc="as::install::package_instantiate"/>
             <callback type="after-mount"  proc="as::actions::insert_actions"/>
             <callback type="after-upgrade"  proc="as::install::after_upgrade"/>
Index: openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml,v
diff -u -N -r1.84 -r1.85
--- openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml	26 Feb 2008 16:13:47 -0000	1.84
+++ openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml	1 Dec 2008 16:57:02 -0000	1.85
@@ -15,6 +15,7 @@
   <msg key="action_tcl_code">Tcl_code</msg>
   <msg key="action_that_will">The action that will be executed.</msg>
   <msg key="action_to_perform">Action to Perform</msg>
+  <msg key="Actions_Performed">Action Performed</msg>
   <msg key="Add_another_choice">Add another choice</msg>
   <msg key="Add_another_question">Add another question</msg>
   <msg key="Add_Comment">Add Comment</msg>
@@ -45,13 +46,15 @@
   <msg key="Add_to_assessment">Add to assessment &quot;%assessment_data.title%&quot;</msg>
   <msg key="Add_to_section">Add to section &quot;%section_title%&quot;</msg>
   <msg key="add_trigger">Add Trigger</msg>
+  <msg key="Admin">Admin</msg>
   <msg key="admin">Admin</msg>
   <msg key="admin_actions">Actions Administration</msg>
   <msg key="Admin_catalog">Question Catalog Administration</msg>
   <msg key="admin_categories">Categories Administration</msg>
   <msg key="admin_requests">Requests Administration</msg>
   <msg key="admin_triggers">Administer triggers</msg>
   <msg key="Administration">Administration</msg>
+  <msg key="Advanced_Options">Advanced Options</msg>
   <msg key="after_this_asm">After this Assessment:</msg>
   <msg key="All">All</msg>
   <msg key="all">All</msg>
@@ -64,6 +67,7 @@
   <msg key="allow_tries">allow %assessment_data.number_tries%</msg>
   <msg key="alphabetical">Alphabetical</msg>
   <msg key="and">AND</msg>
+  <msg key="anonymous">this assessment is anonymous</msg>
   <msg key="anonymous_name">Anonymous</msg>
   <msg key="Anonymous_Responses">Anonymous Responses</msg>
   <msg key="anonymous_users_allow">Anonymous respondents allowed</msg>
@@ -180,6 +184,7 @@
   <msg key="comparison_type">Comparison Type</msg>
   <msg key="comparison_type_help">Different fields below will be required depending on this setting</msg>
   <msg key="Complete">Complete</msg>
+  <msg key="complete_responses">complete responses</msg>
   <msg key="condition">Condition</msg>
   <msg key="Confirm_Consent">Confirmation</msg>
   <msg key="Consent_Page">Consent Page</msg>
@@ -193,6 +198,7 @@
   <msg key="copy_item">Copy Question</msg>
   <msg key="copy_section">Copy Section</msg>
   <msg key="Copy_this_assess">Copy this assessment</msg>
+  <msg key="Correct_Answer">Correct Answer</msg>
   <msg key="Correct_Answer_Choice">Correct Answer Choice</msg>
   <msg key="Correct_Answer_help">Is this the correct answer?</msg>
   <msg key="Created_by">Created by</msg>
@@ -270,13 +276,16 @@
   <msg key="Feedback_help">Feedback given to the user.</msg>
   <msg key="Feedback_right">Feedback right&lt;br&gt;(Optional)</msg>
   <msg key="Feedback_right_help">Feedback given to the user if correctly answered (you can create feedback for individual answers separately).</msg>
+  <msg key="Feedback_right_Optional">Feedback right (Optional)</msg>
   <msg key="Feedback_wrong">Feedback wrong&lt;br&gt;(Optional)</msg>
   <msg key="Feedback_wrong_help">Feedback given to the user if answer was wrong (you can create feedback for individual answers separately)</msg>
+  <msg key="Feedback_wrong_Optional">Feedback wrong (Optional)</msg>
   <msg key="Field_Code">QTI Field Code&lt;br&gt;(Optional)</msg>
   <msg key="Field_Code_help">A short label used when exporting question in QTI</msg>
   <msg key="Field_Name">CSV Field Name&lt;br&gt;(Optional)</msg>
   <msg key="Field_Name_help">A short label used when exporting question answers to spreadsheets (will be generated if you do not create it)</msg>
   <msg key="file_too_large">Your file is too large. Files are limited to %pretty_max_size% bytes.\n</msg>
+  <msg key="File_Upload">File Upload</msg>
   <msg key="file_zero_size">Your file is zero-length. Either you attempted to upload a zero length file, a file which does not exists, or something went wrong during the transfer.\n</msg>
   <msg key="filter">Filter</msg>
   <msg key="filter_add">Add New Filter</msg>
@@ -297,6 +306,7 @@
   <msg key="filters_available">Filters Available</msg>
   <msg key="filters_currently_mapped">Filters Currently Mapped to This Item</msg>
   <msg key="filters_none">There are no filters matching these criteria.</msg>
+  <msg key="Finish">Finish</msg>
   <msg key="Finish_Time">Finish Time</msg>
   <msg key="Finished">Finished</msg>
   <msg key="Fixed_Position">Fixed Order Position</msg>
@@ -314,6 +324,7 @@
   <msg key="Import_QTI_ZIP_File">Import QTI ZIP File</msg>
   <msg key="Import_Results">Import Results</msg>
   <msg key="Incomplete">Incomplete</msg>
+  <msg key="incomplete_responses">incomplete responses</msg>
   <msg key="Increasing">Partial Credit</msg>
   <msg key="Increasing_help">If there is more than one correct answer, this will give the user partial credit for the fraction of answers they submit that are correct. If not allowed the user must answer all questions correctly to get any credit for the question.</msg>
   <msg key="Instructions">Instructions&lt;br&gt;(Optional)</msg>
@@ -333,6 +344,7 @@
   <msg key="item_display_ta">Textarea</msg>
   <msg key="item_display_tb">Textbox</msg>
   <msg key="item_Name_help">Name of the question, identifier searchable in the catalog</msg>
+  <msg key="Item_Question">Item Question</msg>
   <msg key="item_Question">Question</msg>
   <msg key="item_Question_help">Enter the question the user will see here (may include images and links to files).</msg>
   <msg key="item_Required_help">Does this item have to be answered (when displayed)?</msg>
@@ -371,9 +383,11 @@
   <msg key="Letter_other">Other</msg>
   <msg key="limited_tries">Number of tries allowed: %assessment_data.number_tries%</msg>
   <msg key="Live">Live</msg>
+  <msg key="Long_Answer">Long Answer</msg>
   <msg key="lt_bNoteb_This_assessmen">&lt;b&gt;Note:&lt;/b&gt; This assessment is set to be anonymous and&lt;br&gt;your name will not be included in the results.</msg>
   <msg key="lt_default_entry_page"></msg>
   <msg key="lt_default_exit_page">Congratulations, you're done! Use the link below to review your answers.</msg>
+  <msg key="lt_default_exit_page_anonymous_user">Congratulations, you're done!</msg>
   <msg key="lt_default_instructions"></msg>
   <msg key="lt_Everyone_eligible_to_">Everyone eligible to take this assessment</msg>
   <msg key="lt_Everyone_who_has_alre">Everyone who has already completed this assessment</msg>
@@ -406,6 +420,7 @@
   <msg key="Move_Down">Move Down</msg>
   <msg key="Move_Up">Move Up</msg>
   <msg key="Multiple">Allow Multiple Answers</msg>
+  <msg key="Multiple_Choice">Multiple Choice</msg>
   <msg key="Multiple_help">Allo Multiple Answers?</msg>
   <msg key="Name">Name&lt;br&gt;(Optional)</msg>
   <msg key="Name_help">Assessment name of the new copy</msg>
@@ -423,6 +438,7 @@
   <msg key="no_display">-- None --</msg>
   <msg key="No_open_assessments">No open assessments</msg>
   <msg key="No_responses">No responses</msg>
+  <msg key="No_reviewer_comments_have_been_added_to_this_assessment_yet">No reviewer comments have been added to this assessment yet.</msg>
   <msg key="No_sessions_found">No sessions found</msg>
   <msg key="no_waiting">Immediate retry allowed</msg>
   <msg key="None">None</msg>
@@ -459,6 +475,7 @@
   <msg key="oq_Reference_Answer_help">Text for Reference Answer.</msg>
   <msg key="oq_Title_help">A title for this Open Question so it can be reused in the future.</msg>
   <msg key="or">OR</msg>
+  <msg key="Or_use_choices_from_an_existing_question">Or use choices from an existing question</msg>
   <msg key="order_of_entry">Order of Entry</msg>
   <msg key="Order_Type">Order Type</msg>
   <msg key="Order_Type_help">Ordering of choices</msg>
@@ -477,9 +494,11 @@
   <msg key="performed">Performed</msg>
   <msg key="permissions">Permissions</msg>
   <msg key="Please_select_one">Please select one</msg>
+  <msg key="Points">Points</msg>
   <msg key="points">points</msg>
   <msg key="points_answer">Points for Answer</msg>
   <msg key="points_answer_help">How many points is this question answer worth.</msg>
+  <msg key="Points_for_Question_Optional">Points for Question (Optional)</msg>
   <msg key="points_item">Points for Question&lt;br&gt;(Optional)</msg>
   <msg key="points_item_help">How many points is this question worth in a section. This is a measurement for relative difficulty.</msg>
   <msg key="points_section">Points for Section&lt;br&gt;(Optional)</msg>
@@ -488,6 +507,7 @@
   <msg key="Prepend_Empty_Item">Prepend Empty Item</msg>
   <msg key="Preview">Preview</msg>
   <msg key="Preview_link_and_message">&lt;a href=&quot;../instructions?assessment_id=%assessment_id%&quot;&gt;Preview&lt;/a&gt; (your response will be recorded)</msg>
+  <msg key="Publish_failed_Following_section_s_have_no_questions">Publish failed. Following section(s) have no questions: %empty_sections%</msg>
   <msg key="Publish_Status">Publish Status</msg>
   <msg key="publish_status">Publish Status</msg>
   <msg key="query">Query</msg>
@@ -499,6 +519,7 @@
   <msg key="Questions">Questions</msg>
   <msg key="Randomized">Randomized</msg>
   <msg key="randomized">Randomized</msg>
+  <msg key="Reference_Answer">Reference Answer</msg>
   <msg key="reg_asm">Used in the Registration Process</msg>
   <msg key="Reg_Assessment_title">Main Site Custom Registration Questionnaire: &quot;%assessment_data.title%&quot;</msg>
   <msg key="reg_users_required">Registrated respondents required</msg>
@@ -530,18 +551,21 @@
   <msg key="Results_edit_Description">Comment</msg>
   <msg key="Results_edit_Description_help">Enter your comment for this question here</msg>
   <msg key="Resume_Assessment_Title">&lt;a href=&quot;%assessment_data.url%&quot; title=&quot;Start&quot;&gt;Start %assessment_data.title%&lt;/a&gt;</msg>
+  <msg key="Retake">Retake</msg>
   <msg key="Retake_Assessment_Title">Previously Completed. &lt;a href=&quot;%assessment_data.url%&quot; title=&quot;Retake Assessment&quot;&gt;Retake %assessment_data.title%&lt;/a&gt;</msg>
   <msg key="return">Return</msg>
   <msg key="Return_Url">Return URL</msg>
   <msg key="reuse_responses">Old responses displayed</msg>
   <msg key="Reuse_Responses_1">Reuse Responses</msg>
   <msg key="Review">Review</msg>
   <msg key="Review_Asessment">Review Assessment</msg>
+  <msg key="Reviewer_Comments">Reviewer Comments</msg>
   <msg key="right">Right</msg>
   <msg key="Rulebased_branching">Rule-based Branching</msg>
   <msg key="sa_Title_help">A title for this short answer feature set so it can be reused in the future.</msg>
   <msg key="Save_and_add_another_question">Save and add another question</msg>
   <msg key="Save_and_finish">Save and finish</msg>
+  <msg key="Save_this_set_of_answers_for_reuse_later">Save this set of answers to reuse later</msg>
   <msg key="Score">Score</msg>
   <msg key="Search">Search</msg>
   <msg key="Search_Item">Search for questions</msg>
@@ -584,12 +608,14 @@
   <msg key="Select_All">Select All</msg>
   <msg key="Selected_Sections">Selected Sections</msg>
   <msg key="Send_bulkmail">Send bulk mail</msg>
+  <msg key="Send_Email">Send e-mail</msg>
   <msg key="Send_Mail">Send Mail</msg>
   <msg key="Send_mail_to">Send mail to</msg>
   <msg key="Session">Session</msg>
   <msg key="session_time_remaining">Remaining session time: %assessment_data.pretty_remaining_time%</msg>
   <msg key="Sessions">Sessions</msg>
   <msg key="set_reg_asm">New Registration Assessment</msg>
+  <msg key="Short_Answer">Short Answer</msg>
   <msg key="Show_Assessments">Show Assessments</msg>
   <msg key="Show_Feedback">Show Feedback</msg>
   <msg key="show_item_name">Question name displayed</msg>
@@ -611,6 +637,7 @@
   <msg key="Subtext">Subtext&lt;br&gt;(Optional)</msg>
   <msg key="Summary">Summary</msg>
   <msg key="survey_section">Section 1</msg>
+  <msg key="Take">Take</msg>
   <msg key="Target_Community">Target Community</msg>
   <msg key="Target_Community_help">Choose the target community</msg>
   <msg key="the_condition_to">The condition to branch or execute the action</msg>
@@ -649,9 +676,11 @@
   <msg key="unsecure_access_allow">Unsecure access allowed</msg>
   <msg key="unsubscribe">Unsubscribe</msg>
   <msg key="unsubscribe_user">Unsubscribe user to this rule&quot;</msg>
+  <msg key="Untaken">Untaken</msg>
   <msg key="Upload_files">Upload files</msg>
   <msg key="User_Answer">User Answer</msg>
   <msg key="User_ID">User</msg>
+  <msg key="users_in_community">users in community</msg>
   <msg key="Users_may_edit_their_">Users may edit their responses</msg>
   <msg key="Users_may_not_edit_th">Users may not edit their responses</msg>
   <msg key="Validation_Block">Validation Block&lt;br&gt;(Optional)</msg>
@@ -669,29 +698,4 @@
   <msg key="when_this_will">When this will be executed?</msg>
   <msg key="yes">Yes</msg>
   <msg key="yesterday">Yesterday</msg>
-  <msg key="Actions_Performed">Action Performed</msg>
-  <msg key="Reviewer_Comments">Reviewer Comments</msg>
-  <msg key="No_reviewer_comments_have_been_added_to_this_assessment_yet">No reviewer comments have been added to this assessment yet.</msg>
-  <msg key="Admin">Admin</msg>
-  <msg key="Item_Question">Item Question</msg>
-  <msg key="Points">Points</msg>
-  <msg key="Multiple_Choice">Multiple Choice</msg>
-  <msg key="Correct_Answer">Correct Answer</msg>
-  <msg key="Or_use_choices_from_an_existing_question">Or use choices from an existing question</msg>
-  <msg key="Short_Answer">Short Answer</msg>
-  <msg key="Long_Answer">Long Answer</msg>
-  <msg key="File_Upload">File Upload</msg>
-  <msg key="Points_for_Question_Optional">Points for Question (Optional)</msg>
-  <msg key="Feedback_right_Optional">Feedback right (Optional)</msg>
-  <msg key="Feedback_wrong_Optional">Feedback wrong (Optional)</msg>
-  <msg key="Advanced_Options">Advanced Options</msg>
-  <msg key="users_in_community">users in community</msg>
-  <msg key="complete_responses">complete responses</msg>
-  <msg key="incomplete_responses">incomplete responses</msg>
-  <msg key="Publish_failed_Following_section_s_have_no_questions">Publish failed. Following section(s) have no questions: %empty_sections%</msg>
-  <msg key="anonymous">this assessment is anonymous</msg>
-  <msg key="Untaken">Untaken</msg>
-  <msg key="Finish">Finish</msg>
-  <msg key="Take">Take</msg>
-  <msg key="Retake">Retake</msg>
 </message_catalog>
Index: openacs-4/packages/assessment/catalog/assessment.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/catalog/assessment.es_ES.ISO-8859-1.xml,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/assessment/catalog/assessment.es_ES.ISO-8859-1.xml	10 Dec 2007 09:12:27 -0000	1.24
+++ openacs-4/packages/assessment/catalog/assessment.es_ES.ISO-8859-1.xml	1 Dec 2008 16:57:02 -0000	1.25
@@ -15,6 +15,7 @@
   <msg key="action_tcl_code">C�digo TCL</msg>
   <msg key="action_that_will">La acci�n se har�.</msg>
   <msg key="action_to_perform">Acci�n a realizar</msg>
+  <msg key="Actions_Performed">Acci�n Realizada</msg>
   <msg key="Add_another_choice">A�adir otra selecci�n</msg>
   <msg key="Add_another_question">A�adir otra pregunta</msg>
   <msg key="Add_Comment">A�adir comentario</msg>
@@ -45,13 +46,15 @@
   <msg key="Add_to_assessment">A�adir al cuestionario &quot;%assessment_data.title%&quot;</msg>
   <msg key="Add_to_section">A�adir a la secci�n &quot;%section_title%&quot;</msg>
   <msg key="add_trigger">A�adir condici�n</msg>
+  <msg key="Admin">Admin</msg>
   <msg key="admin">Administraci�n</msg>
   <msg key="admin_actions">Administraci�n de acciones</msg>
   <msg key="Admin_catalog">Administraci�n del cat�logo de preguntas</msg>
   <msg key="admin_categories">Administraci�n de Categor�as</msg>
   <msg key="admin_requests">Administraci�n de peticiones</msg>
   <msg key="admin_triggers">Administrar condiciones</msg>
   <msg key="Administration">Administraci�n</msg>
+  <msg key="Advanced_Options">Opciones Avanzadas</msg>
   <msg key="after_this_asm">Despu�s de este cuestionario:</msg>
   <msg key="All">Todos</msg>
   <msg key="all">Todo</msg>
@@ -64,6 +67,7 @@
   <msg key="allow_tries">permite %assessment_data.number_tries%</msg>
   <msg key="alphabetical">Alfab�ticamente</msg>
   <msg key="and">Y</msg>
+  <msg key="anonymous">este cuestionario es an�nimo</msg>
   <msg key="anonymous_name">An�nimo</msg>
   <msg key="Anonymous_Responses">Respuestas an�nimas</msg>
   <msg key="anonymous_users_allow">Permitir que sea respondido por an�nimos</msg>
@@ -176,6 +180,7 @@
   <msg key="comparison_type">Tipo de Comparaci�n</msg>
   <msg key="comparison_type_help">Diferentes campos ser�n requeridos m�s adelante dependiendo de este valor</msg>
   <msg key="Complete">Completado</msg>
+  <msg key="complete_responses">complete las respuestas</msg>
   <msg key="condition">Condici�n</msg>
   <msg key="Confirm_Consent">Confirmaci�n</msg>
   <msg key="Consent_Page">P�gina de Consentimiento</msg>
@@ -189,6 +194,7 @@
   <msg key="copy_item">Copiar Pregunta</msg>
   <msg key="copy_section">Copiar Secci�n</msg>
   <msg key="Copy_this_assess">Copiar este cuestionario</msg>
+  <msg key="Correct_Answer">Respuesta Correcta</msg>
   <msg key="Correct_Answer_Choice">Elegir Respuesta Correcta</msg>
   <msg key="Correct_Answer_help">�es esta respuesta la correcta?</msg>
   <msg key="Created_by">Creado por</msg>
@@ -265,13 +271,16 @@
   <msg key="Feedback_help">Feedback mostrado al usuario.</msg>
   <msg key="Feedback_right">Feedback para respuesta correcta</msg>
   <msg key="Feedback_right_help">Feedback dado al alumno si ha contestado correctamente la pregunta.</msg>
+  <msg key="Feedback_right_Optional">Feedback para respuesta correcta (opcional)</msg>
   <msg key="Feedback_wrong">Feedback para respuesta err�nea</msg>
   <msg key="Feedback_wrong_help">Feedback dado al alumno si ha contestado err�neamente</msg>
+  <msg key="Feedback_wrong_Optional">Feedback para respuesta incorrecta (opcional)</msg>
   <msg key="Field_Code">C�digo QTI para el Campo</msg>
   <msg key="Field_Code_help">Breve etiqueta usada cuando se exporta una pregunta (por ejemplo, el nombre de una columna o una fila en una hoja de c�lculo)</msg>
   <msg key="Field_Name">CSV Nombre del Campo</msg>
   <msg key="Field_Name_help">Nombre corto usado en la exportaci�n de preguntas y respuestas en archivo CSV</msg>
   <msg key="file_too_large">Tu archivo es demasiado grande. El tama�o de los archivos est� limitado a %pretty_max_size% bytes.</msg>
+  <msg key="File_Upload">Fichero Subido</msg>
   <msg key="file_zero_size">Tu archivo tiene 0 bytes. Puede que hayas intentado subir un archivo de 0 bytes, un archivo que no exista o puede que haya ocurrido un error durante la transferencia.</msg>
   <msg key="filter">Filtro</msg>
   <msg key="filter_add">Agregar nuevo Filtro</msg>
@@ -292,6 +301,7 @@
   <msg key="filters_available">Filtros Disponibles</msg>
   <msg key="filters_currently_mapped">Filtros actualmente mapeados a este objecto</msg>
   <msg key="filters_none">No hay filtros que cumplan este criterio.</msg>
+  <msg key="Finish">Terminar</msg>
   <msg key="Finish_Time">Hora de finalizaci�n</msg>
   <msg key="Finished">Hora de finalizaci�n</msg>
   <msg key="Fixed_Position">Orden fijo</msg>
@@ -309,6 +319,7 @@
   <msg key="Import_QTI_ZIP_File">Importar un fichero QTI ZIP</msg>
   <msg key="Import_Results">Resultados de la importaci�n</msg>
   <msg key="Incomplete">Incompleto</msg>
+  <msg key="incomplete_responses">Respuestas Incompletas</msg>
   <msg key="Increasing">Incrementar</msg>
   <msg key="Increasing_help">Si ha elegido &quot;S�&quot; en &quot;incrementar&quot;, se obtendr�n (n�mero de respuestas correctas/n�mero total de respuestas)*100% puntos. 
 Si ha elegido &quot;no&quot;, se obtendr� el 100% en caso de que todas las respuestas esten correctas, 0% en otro caso.</msg>
@@ -329,6 +340,7 @@
   <msg key="item_display_ta">�rea de texto</msg>
   <msg key="item_display_tb">Caja de texto</msg>
   <msg key="item_Name_help">Nombre de la pregunta, identificador a buscar en el cat�logo</msg>
+  <msg key="Item_Question">Pregunta</msg>
   <msg key="item_Question">Pregunta</msg>
   <msg key="item_Question_help">Introduzca la pregunta que el usuario ver� (puede incluir im�genes y enlaces)</msg>
   <msg key="item_Required_help">�Tiene que contestarse obligatoriamente esta pregunta?</msg>
@@ -363,6 +375,7 @@
   <msg key="Letter_other">Otro</msg>
   <msg key="limited_tries">N�mero de intentos permitidos: %assessment_data.number_tries%</msg>
   <msg key="Live">Activo</msg>
+  <msg key="Long_Answer">Respuesta de texto largo</msg>
   <msg key="lt_bNoteb_This_assessmen">&lt;b&gt;Nota:&lt;/b&gt; Se trata de un cuestionario an�nimo por lo que su nombre no aparecer� en los resultados.</msg>
   <msg key="lt_default_exit_page">�Enhorabuena, ha terminado! Siga el enlace para revisar sus respuestas.</msg>
   <msg key="lt_Everyone_eligible_to_">Alguien que hace este cuestionario</msg>
@@ -396,6 +409,7 @@
   <msg key="Move_Down">Bajar</msg>
   <msg key="Move_Up">Subir</msg>
   <msg key="Multiple">Permitir m�ltiples respuestas</msg>
+  <msg key="Multiple_Choice">Selecci�n m�ltiple</msg>
   <msg key="Multiple_help">Desea permitir m�ltiples respuestas?</msg>
   <msg key="Name">Nombre</msg>
   <msg key="Name_help">Nombre de la nueva copia del cuestionario</msg>
@@ -413,6 +427,7 @@
   <msg key="no_display">-- Ninguno --</msg>
   <msg key="No_open_assessments">Sin Cuestionarios Abiertos</msg>
   <msg key="No_responses">Sin respuestas</msg>
+  <msg key="No_reviewer_comments_have_been_added_to_this_assessment_yet">No hay comentarios de los revisores todav�a</msg>
   <msg key="No_sessions_found">Sin Sesiones</msg>
   <msg key="no_waiting">Permitir reintentar el cuestionario de forma inmediata</msg>
   <msg key="None">Ninguno</msg>
@@ -451,6 +466,7 @@
   <msg key="oq_Reference_Answer_help">Texto para la Respuesta de Referencia.</msg>
   <msg key="oq_Title_help">T�tulo para esta Pregunta Abierta. Usado para busquedas en un futuro.</msg>
   <msg key="or">O</msg>
+  <msg key="Or_use_choices_from_an_existing_question">O utilice las opciones de una pregunta existente</msg>
   <msg key="order_of_entry">Orden de entrada</msg>
   <msg key="Order_Type">Tipo de orden</msg>
   <msg key="Order_Type_help">Orden de las respuestas</msg>
@@ -470,10 +486,12 @@
   <msg key="performed">Realizado</msg>
   <msg key="permissions">Permisos</msg>
   <msg key="Please_select_one">Por favor, seleccione uno</msg>
+  <msg key="Points">Puntos</msg>
   <msg key="points">puntos</msg>
   <msg key="points_answer">Puntos para la respuesta</msg>
   <msg key="points_answer_help">Los puntos que vale responder esta pregunta.
 </msg>
+  <msg key="Points_for_Question_Optional">Puntos para la pregunta (opcional)</msg>
   <msg key="points_item">Puntos por pregunta</msg>
   <msg key="points_item_help">Cu�ntos puntos vale esta pregunta en una secci�n. �sta es una medida de la dificultad relativa.</msg>
   <msg key="points_section">Puntos por Secci�n</msg>
@@ -483,6 +501,7 @@
   <msg key="Prepend_Empty_Item">A�adir un elemento vac�o</msg>
   <msg key="Preview">Visualizaci�n previa</msg>
   <msg key="Preview_link_and_message">&lt;a href=&quot;../instructions?assessment_id=%assessment_id%&quot;&gt;Vista previa&lt;/a&gt; (sus respuestas ser�n grabadas)</msg>
+  <msg key="Publish_failed_Following_section_s_have_no_questions">La publicaci�n ha fallado. Las secciones a continuaci�n no contienen preguntas: %empty_sections%</msg>
   <msg key="Publish_Status">Estado de publicaci�n</msg>
   <msg key="publish_status">Estado de publicaci�n</msg>
   <msg key="query">Consulta</msg>
@@ -494,6 +513,7 @@
   <msg key="Questions">Preguntas</msg>
   <msg key="Randomized">Aleatoria</msg>
   <msg key="randomized">Aleatorio</msg>
+  <msg key="Reference_Answer">Respuesta de Referencia</msg>
   <msg key="reg_asm">Usando en el proceso de Registro</msg>
   <msg key="Reg_Assessment_title">Cuestionario de Registro de personalizaci�n del Sitio Principal: &quot;%assessment_data.title%&quot;</msg>
   <msg key="reg_users_required">Se requiere que los usuarios est�n registrados</msg>
@@ -513,6 +533,7 @@
   <msg key="request_notif">Pedir notificaci�n para</msg>
   <msg key="Requested_assess_does">El cuestionario solicitado no existe</msg>
   <msg key="Requested_assess_is_no_longer_available">El cuestionario no est� disponible</msg>
+  <msg key="Requested_attempts_deleted">Intentos borrados.</msg>
   <msg key="Required">Obligatorio</msg>
   <msg key="Responding_Users">Respondiendo a usuarios</msg>
   <msg key="Response_Options">Opciones de la respuesta: </msg>
@@ -524,18 +545,21 @@
   <msg key="Results_edit_Description">Cambiar explicaci�n</msg>
   <msg key="Results_edit_Description_help">Introduzca su comentario para esta pregunta aqu�</msg>
   <msg key="Resume_Assessment_Title">&lt;a href=&quot;%assessment_data.url%&quot; title=&quot;Empezar&quot;&gt;Empezar %assessment_data.title%&lt;/a&gt;</msg>
+  <msg key="Retake">Volver a responder</msg>
   <msg key="Retake_Assessment_Title">Ya completado. &lt;a href=&quot;%assessment_data.url%&quot; title=&quot;Reempezar cuestionario&quot;&gt;Reempezar %assessment_data.title%&lt;/a&gt;</msg>
   <msg key="return">Volver</msg>
   <msg key="Return_Url">URL de Finalizaci�n</msg>
   <msg key="reuse_responses">Visualizar las respuestas anteriores</msg>
   <msg key="Reuse_Responses_1">Reutilizar Respuestas</msg>
   <msg key="Review">Revisar</msg>
   <msg key="Review_Asessment">Revisi�n del Examen</msg>
+  <msg key="Reviewer_Comments">Comentarios de los Revisores</msg>
   <msg key="right">Derecha</msg>
   <msg key="Rulebased_branching">Branching seg�n una regla</msg>
   <msg key="sa_Title_help">T�tulo para esta caracter�stica de short answer para que pueda reutilizarse en el futuro.</msg>
   <msg key="Save_and_add_another_question">Salvar y a�adir otra pregunta</msg>
   <msg key="Save_and_finish">Salvar y terminar</msg>
+  <msg key="Save_this_set_of_answers_for_reuse_later">Guardar este conjunto de respuestas para ser reutilizadas</msg>
   <msg key="Score">Puntuaci�n</msg>
   <msg key="Search">Buscar</msg>
   <msg key="Search_Item">Buscar y a�adir preguntas</msg>
@@ -577,12 +601,14 @@
   <msg key="Select_All">Seleccionar todo</msg>
   <msg key="Selected_Sections">Secciones Seleccionadas</msg>
   <msg key="Send_bulkmail">Enviar e-mail</msg>
+  <msg key="Send_Email">Enviar correo</msg>
   <msg key="Send_Mail">Enviar correo</msg>
   <msg key="Send_mail_to">Enviar correo a </msg>
   <msg key="Session">Sesi�n</msg>
   <msg key="session_time_remaining">Tiempo restante de la sesi�n: %assessment_data.pretty_remaining_time%</msg>
   <msg key="Sessions">Sesiones</msg>
   <msg key="set_reg_asm">Nuevo Cuestionario de Suscripci�n</msg>
+  <msg key="Short_Answer">Respuesta de texto corto</msg>
   <msg key="Show_Assessments">Ver Cuestionarios</msg>
   <msg key="Show_Feedback">Mostrar Feedback</msg>
   <msg key="show_item_name">Visualizar el nombre de la pregunta</msg>
@@ -604,6 +630,7 @@
   <msg key="Subtext">Subtexto</msg>
   <msg key="Summary">Resumen</msg>
   <msg key="survey_section">Secci�n 1</msg>
+  <msg key="Take">Responder</msg>
   <msg key="Target_Community">Comunidad Destino</msg>
   <msg key="Target_Community_help">Elija la comunidad destino</msg>
   <msg key="the_condition_to">La condici�n para saltar o ejecutar la acci�n</msg>
@@ -643,9 +670,11 @@
   <msg key="unsecure_access_allow">Permitir acceso no seguro</msg>
   <msg key="unsubscribe">Desuscribirse</msg>
   <msg key="unsubscribe_user">Desuscribir al usuario de esta regla</msg>
+  <msg key="Untaken">Sin responder</msg>
   <msg key="Upload_files">Subir ficheros</msg>
   <msg key="User_Answer">Respuesta del usuario</msg>
   <msg key="User_ID">Usuario</msg>
+  <msg key="users_in_community">usuarios en la comunidad</msg>
   <msg key="Users_may_edit_their_">Los usuarios pueden editar sus respuestas</msg>
   <msg key="Users_may_not_edit_th">Los usuarios no pueden editar sus respuestas</msg>
   <msg key="Validation_Block">Bloque de Validaci�n</msg>
Index: openacs-4/packages/assessment/lib/actions-results.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/actions-results.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/lib/actions-results.adp	22 Feb 2008 23:42:32 -0000	1.2
+++ openacs-4/packages/assessment/lib/actions-results.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,6 @@
 <multiple name="actions">
  @actions.user_message@
 <if @actions.error_txt@ ne nil>
-	<font color=red>@actions.error_txt@</font>
+	<span style="color:red">@actions.error_txt@</span>
 </if>
 </multiple>
\ No newline at end of file
Index: openacs-4/packages/assessment/lib/assessment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/assessment.tcl,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/assessment/lib/assessment.tcl	15 Sep 2008 16:25:06 -0000	1.24
+++ openacs-4/packages/assessment/lib/assessment.tcl	1 Dec 2008 16:57:02 -0000	1.25
@@ -45,9 +45,14 @@
 permission::require_permission -object_id $assessment_id -privilege read
 if {![info exists assessment_data(assessment_id)]} {
     ad_return_complaint 1 "[_ assessment.Requested_assess_does]"
-    ad_script_abort
+    return
 }
 
+if { $assessment_data(publish_status) ne "live" } {
+    ad_return_complaint 1 [_ assessment.Requested_assess_is_no_longer_available]
+    return
+}
+
 set assessment_rev_id $assessment_data(assessment_rev_id)
 set number_tries $assessment_data(number_tries)
 db_1row total_tries {}
@@ -330,7 +335,7 @@
     {session_id:text(hidden) {value $session_id}}
 }
 
-multirow create items as_item_id name title description subtext required_p max_time_to_complete presentation_type html submitted_p content as_item_type_id choice_orientation next_title validate_block next_pr_type question_text
+multirow create items as_item_id name title description subtext required_p max_time_to_complete presentation_type html submitted_p content as_item_type_id choice_orientation next_as_item_id validate_block next_pr_type question_text
 
 set unsubmitted_list [list]
 set validate_list [list]
@@ -464,10 +469,10 @@
     upvar 0 items:$i this
     if {$i < ${items:rowcount}} {
 	upvar 0 items:$j next
-	set this(next_title) $next(title)
+	set this(next_as_item_id) $next(as_item_id)
 	set this(next_pr_type) $next(presentation_type)
     } else {
-	set this(next_title) ""
+	set this(next_as_item_id) ""
 	set this(next_pr_type) ""
     }
 }
Index: openacs-4/packages/assessment/lib/finish.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/finish.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/lib/finish.adp	12 Jun 2006 03:30:09 -0000	1.1
+++ openacs-4/packages/assessment/lib/finish.adp	1 Dec 2008 16:57:02 -0000	1.2
@@ -1,6 +1,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <p><a href="session?session_id=@session_id@">#assessment.View_results#</a></p>
-</blockquote>
Index: openacs-4/packages/assessment/lib/item-show-display-cb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-display-cb.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/lib/item-show-display-cb.adp	8 Dec 2004 15:30:32 -0000	1.1
+++ openacs-4/packages/assessment/lib/item-show-display-cb.adp	1 Dec 2008 16:57:02 -0000	1.2
@@ -1,3 +1,2 @@
-<blockquote>
+
   <formtemplate id="item_show_display_cb"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/lib/item-show-display-f.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-display-f.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/lib/item-show-display-f.adp	12 Jun 2006 02:49:49 -0000	1.2
+++ openacs-4/packages/assessment/lib/item-show-display-f.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -1,3 +1,2 @@
-<blockquote>
+
   <formtemplate id="item_show_display_f"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/lib/item-show-display-fu.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-display-fu.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/lib/item-show-display-fu.adp	12 Jun 2006 02:49:49 -0000	1.2
+++ openacs-4/packages/assessment/lib/item-show-display-fu.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -1,3 +1,2 @@
-<blockquote>
+
   <formtemplate id="item_show_display_sa"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/lib/item-show-display-rb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-display-rb.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/lib/item-show-display-rb.adp	8 Dec 2004 15:30:32 -0000	1.1
+++ openacs-4/packages/assessment/lib/item-show-display-rb.adp	1 Dec 2008 16:57:02 -0000	1.2
@@ -1,3 +1,2 @@
-<blockquote>
+
   <formtemplate id="item_show_display_rb"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/lib/item-show-display-sa.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-display-sa.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/lib/item-show-display-sa.adp	8 Dec 2004 15:30:32 -0000	1.1
+++ openacs-4/packages/assessment/lib/item-show-display-sa.adp	1 Dec 2008 16:57:02 -0000	1.2
@@ -1,3 +1,2 @@
-<blockquote>
+
   <formtemplate id="item_show_display_sa"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/lib/item-show-display-sb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-display-sb.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/lib/item-show-display-sb.adp	8 Dec 2004 15:30:32 -0000	1.1
+++ openacs-4/packages/assessment/lib/item-show-display-sb.adp	1 Dec 2008 16:57:02 -0000	1.2
@@ -1,3 +1,2 @@
-<blockquote>
+
   <formtemplate id="item_show_display_sb"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/lib/item-show-display-ta.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-display-ta.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/lib/item-show-display-ta.adp	8 Dec 2004 15:30:32 -0000	1.1
+++ openacs-4/packages/assessment/lib/item-show-display-ta.adp	1 Dec 2008 16:57:02 -0000	1.2
@@ -1,3 +1,2 @@
-<blockquote>
+
   <formtemplate id="item_show_display_ta"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/lib/item-show-display-tb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-display-tb.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/lib/item-show-display-tb.adp	8 Dec 2004 15:30:32 -0000	1.1
+++ openacs-4/packages/assessment/lib/item-show-display-tb.adp	1 Dec 2008 16:57:02 -0000	1.2
@@ -1,3 +1,2 @@
-<blockquote>
+
   <formtemplate id="item_show_display_tb"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/lib/item-show-fu.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-fu.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/lib/item-show-fu.adp	12 Jun 2006 02:49:49 -0000	1.2
+++ openacs-4/packages/assessment/lib/item-show-fu.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -1,3 +1,2 @@
-<blockquote>
+
   <formtemplate id="item_show_fu"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/lib/item-show-mc.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-mc.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/lib/item-show-mc.adp	8 Dec 2004 15:30:32 -0000	1.1
+++ openacs-4/packages/assessment/lib/item-show-mc.adp	1 Dec 2008 16:57:02 -0000	1.2
@@ -1,3 +1,2 @@
-<blockquote>
+
   <formtemplate id="item_show_mc"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/lib/item-show-oq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-oq.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/lib/item-show-oq.adp	8 Dec 2004 15:30:32 -0000	1.1
+++ openacs-4/packages/assessment/lib/item-show-oq.adp	1 Dec 2008 16:57:02 -0000	1.2
@@ -1,3 +1,2 @@
-<blockquote>
+
   <formtemplate id="item_show_oq"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/lib/item-show-sa.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-sa.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/lib/item-show-sa.adp	8 Dec 2004 15:30:32 -0000	1.1
+++ openacs-4/packages/assessment/lib/item-show-sa.adp	1 Dec 2008 16:57:02 -0000	1.2
@@ -1,3 +1,2 @@
-<blockquote>
+
   <formtemplate id="item_show_sa"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/lib/progress-bar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/Attic/progress-bar.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/lib/progress-bar.adp	15 May 2007 20:14:16 -0000	1.2
+++ openacs-4/packages/assessment/lib/progress-bar.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -20,5 +20,5 @@
     </td> 
   </tr>
 </table>
-<br />
+<br>
 </if>
Index: openacs-4/packages/assessment/lib/results-edit-oq.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/results-edit-oq.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/lib/results-edit-oq.tcl	24 Feb 2005 09:22:11 -0000	1.2
+++ openacs-4/packages/assessment/lib/results-edit-oq.tcl	1 Dec 2008 16:57:02 -0000	1.3
@@ -6,5 +6,5 @@
 set answer_text [ad_text_to_html -no_links -- $answer_text]
 
 foreach keyword $keywords {
-    regsub -all -nocase $keyword $answer_text {<font color=green>\0</font>} answer_text
+    regsub -all -nocase $keyword $answer_text {<span style="color:green">\0</span>} answer_text
 }
Index: openacs-4/packages/assessment/lib/section-show.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/section-show.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/lib/section-show.adp	10 Dec 2004 20:21:50 -0000	1.3
+++ openacs-4/packages/assessment/lib/section-show.adp	1 Dec 2008 16:57:02 -0000	1.4
@@ -14,7 +14,7 @@
     <tr class="even">
   </else>
 
-<td valign="top">@items.rownum@. @items.name@<if @items.required_p@ eq t> <font color=red>*</font> </if>
+<td valign="top">@items.rownum@. @items.name@<if @items.required_p@ eq t> <span style="color:red>*</span> </if>
 <if @items.max_time_to_complete@ not nil> (#assessment.max_time# @items.max_time_to_complete@) </if>
 (@items.points@ #assessment.points#)
 </td></tr>
@@ -26,7 +26,6 @@
     <tr class="even">
   </else>
 <td>
-  <blockquote>
     <if @items.presentation_type@ ne fitb>@items.title;noquote@<br></if>
     <if @items.presentation_type@ eq rb or @items.presentation_type@ eq cb>
       <formgroup id="response_to_item.@items.as_item_id@">
@@ -45,7 +44,6 @@
       <noparse>@items.subtext@</noparse>
       </div>
     </if>
-  </blockquote>
 </td></tr>
 
 </multiple>
Index: openacs-4/packages/assessment/lib/session-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.adp,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/assessment/lib/session-items.adp	2 Sep 2008 17:36:40 -0000	1.18
+++ openacs-4/packages/assessment/lib/session-items.adp	1 Dec 2008 16:57:02 -0000	1.19
@@ -4,10 +4,10 @@
     </if>
 
     <multiple name="items">
-<if @admin_p@><p><a href="@item_edit_general_url@">Edit this question</a></p></if>
+<if @admin_p@><p><a href="@items.item_edit_general_url@">Edit this question</a></p></if>
 <if @feedback_only_p@ eq 0 or @items.has_feedback_p@ eq 1>
      <if @show_item_name_p@ eq t><p style="font-weight:bold;">@items.name@:</p></if>
-      <if @survey_p@ ne t and @items.title@ ne @items.next_title@>
+      <if @survey_p@ ne t and @items.as_item_id@ ne @items.next_as_item_id@>
 	<if @items.max_time_to_complete@ not nil> (#assessment.max_time# @items.max_time_to_complete@) </if>
       </if>
      </if>
@@ -18,29 +18,29 @@
 	  <if @items.presentation_type@ ne fitb>
 	     @items.content;noquote@
 	</if>
-	    <group column=title>
+	    <group column=as_item_id>
 	      @items.description;noquote@
 		<if @survey_p@ ne t>
-		  <if @items.title@ eq @items.next_title@ or @items.groupnum@ gt 1>
+		  <if @items.as_item_id@ eq @items.next_as_item_id@ or @items.groupnum@ gt 1>
 		    <if @items.presentation_type@ eq @items.next_pr_type@ or @items.choice_orientation@ eq horizontal>
 
 			    <if @show_feedback@ ne none>
 			      <if @items.feedback@ not nil>:<br>@items.feedback;noquote@</if>
 			    </if>
-		      <~--- fixme --->
+		      <!--- fixme --->
 		      <else>
 			<if @items.answered_p@ eq t><p style="font-weight:bold;">#assessment.not_yet_reviewed#</p> </if>
 			<else><p style="font-weight:bold;">#assessment.not_answered#</p></else>
 		      </else>
-		      <if @edit_p@ eq 1 and @items.answered_p@ eq t><a href="results-edit?session_id=@session_id@&section_id=@section_id@&as_item_id=@items.as_item_id@">#assessment.Edit#</a></if>
+		      <if @edit_p@ eq 1 and @items.answered_p@ eq t><a href="@items.results_edit_url@">#assessment.Edit#</a></if>
 		      <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@">
 		    </if>
 		    <else>
 		      <if @items.answered_p@ eq t><p style="font-weight:bold">#assessment.not_yet_reviewed#</p> </if>
 		      <else><p style="font-weight:bold">#assessment.not_answered#</p> </else>
 		    </else>
 		    <if @edit_p@ eq 1 and @items.answered_p@ eq t>
-              <a href="@results_edit_url@">#assessment.Edit#</a>
+              <a href="@items.results_edit_url@">#assessment.Edit#</a>
             </if>
 		    <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@"> 
 		  </if>
@@ -51,7 +51,7 @@
 		      <div>@formgroup.widget;noquote@ @formgroup.label;noquote@</div>
 		    </formgroup>
 		  </if>
-		  <elseif @items.title@ ne @items.next_title@ and @items.groupnum@ eq 1>
+		  <elseif @items.as_item_id@ ne @items.next_as_item_id@ and @items.groupnum@ eq 1>
 		    <formgroup id="response_to_item.@items.as_item_id@">
 		      @formgroup.widget;noquote@ @formgroup.label;noquote@
 		    </formgroup>
@@ -82,7 +82,7 @@
 
   <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@" &=assessment>    
   <if @edit_p@ eq 1 and @items.answered_p@ eq t>
-    <p><a href="@results_edit_url@" class="button">#assessment.Add_Comment#</a></p>
+    <p><a href="@items.results_edit_url@" class="button">#assessment.Add_Comment#</a></p>
   </if>
   <if @feedback_only_p@ ne "t" and @assessment_data.type@ ne survey and @items.result_points@ not nil and @showpoints@ true and @items.points@ gt 0>
     <p style="font-weight: bold">@items.result_points@ / @items.points@ #assessment.points#</p>
Index: openacs-4/packages/assessment/lib/session-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.tcl,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/assessment/lib/session-items.tcl	2 Sep 2008 17:36:40 -0000	1.20
+++ openacs-4/packages/assessment/lib/session-items.tcl	1 Dec 2008 16:57:02 -0000	1.21
@@ -37,15 +37,15 @@
     {section_id:text(hidden) {value $section_id}}
 }
 set feedback_count 0
-db_multirow -extend { presentation_type html result_points feedback answered_p choice_orientation next_title next_pr_type num content has_feedback_p correct_p view} items session_items {} {
-
+set admin_package_url [ad_conn package_url]asm-admin/
+db_multirow -extend { presentation_type html result_points feedback answered_p choice_orientation next_as_item_id next_pr_type num content has_feedback_p correct_p view item_edit_general_url results_edit_url} items session_items {} {
     # build URLs
-    set item_edit_general_url [export_vars -base "asm-admin/item-edit-general" {as_item_id assessment_id section_id}]
-    set results_edit_url [export_vars -base "results-edit" {session_id section_id as_item_id}]
+    set item_edit_general_url [export_vars -base "${admin_package_url}item-edit-general" {as_item_id assessment_id section_id}]
+    set results_edit_url [export_vars -base "${admin_package_url}results-edit" {session_id section_id as_item_id}]
 
     set default_value [as::item_data::get -subject_id $subject_id -as_item_id $as_item_id -session_id $session_id]
     array set item [as::item::item_data -as_item_id $as_item_id]
-
+    
     set presentation_type [as::item_form::add_item_to_form -name session_results_$section_id -section_id $section_id -item_id $as_item_id -session_id $session_id -default_value $default_value -show_feedback $show_feedback -random_p $assessment_data(random_p)]
 
     if {$presentation_type == "fitb"} {
@@ -79,7 +79,7 @@
 		set correct_p 0
 		if {$show_feedback != "correct"} {
 		    if { $feedback_wrong ne "" } {
-			set feedback "<font color=red>$feedback_wrong</font>"
+			set feedback "<span style=\"color:red\">$feedback_wrong</span>"
 			set has_feedback_p 1
 		    } else {
 			set feedback ""
@@ -89,7 +89,7 @@
 		set correct_p 1
 		if {$show_feedback ne "incorrect"} {
 		    if { $feedback_right ne "" } {
-			set feedback "<font color=green>$feedback_right</font>"
+			set feedback "<span style=\"color:green\">$feedback_right</span>"
 			set has_feedback_p 1
 		    } else {
 			set feedback ""
@@ -110,7 +110,7 @@
 			set correct_p 0
 			if {$show_feedback != "correct"} {
 			    if { $feedback_wrong ne "" } {
-				set feedback "<font color=red>$feedback_wrong</font>"
+				set feedback "<span style=\"color:red\">$feedback_wrong</span>"
 				set has_feedback_p 1
 			    } else {
 				set feedback ""
@@ -119,7 +119,7 @@
 		    } else {
 			if {$show_feedback != "incorrect"} {
 			    if { $feedback_right ne "" } {
-				set feedback "<font color=green>$feedback_right</font>"
+				set feedback "<span style=\"color:green\">$feedback_right</span>"
 				set has_feedback_p 1
 			    } else {
 				set feedback ""
@@ -145,7 +145,7 @@
 		    if { !$correct_p } {
 			if {$show_feedback != "correct"} {
 			    if { $feedback_wrong ne "" } {
-				set feedback "<font color=red>$feedback_wrong</font>"
+				set feedback "<span style=\"color:red\">$feedback_wrong</span>"
 				set has_feedback_p 1
 			    } else {
 				set feedback ""
@@ -154,7 +154,7 @@
 		    } else {
 			if {$show_feedback != "incorrect"} {
 			    if { $feedback_right ne "" } {
-				set feedback "<font color=green>$feedback_right</font>"
+				set feedback "<span style=\"color:green\">$feedback_right</span>"
 				set has_feedback_p 1
 			    } else {
 				set feedback ""
@@ -193,13 +193,13 @@
     set this(num) $counter
     if {$i < ${items:rowcount}} {
 	upvar 0 items:$j next
-	set this(next_title) $next(title)
+	set this(next_as_item_id) $next(as_item_id)
 	set this(next_pr_type) $next(presentation_type)
-	if {$this(title) != $next(title)} {
+	if {$this(as_item_id) != $next(as_item_id)} {
 	    incr counter
 	}
     } else {
-	set this(next_title) ""
+	set this(next_as_item_id) ""
 	set this(next_pr_type) ""
     }
 }
Index: openacs-4/packages/assessment/lib/session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session.adp,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/assessment/lib/session.adp	2 Sep 2008 17:39:57 -0000	1.10
+++ openacs-4/packages/assessment/lib/session.adp	1 Dec 2008 16:57:02 -0000	1.11
@@ -1,6 +1,3 @@
-<property name="title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-
 <table width="100%" cellpadding="3" cellspacing="0" border="0">
 <tr>
 <th colspan="3" align=left>#assessment.Assessment#: <a href="assessment?assessment_id=@assessment_id@">@assessment_data.title@</a></th></tr>
Index: openacs-4/packages/assessment/lib/session.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/assessment/lib/session.tcl	2 Sep 2008 17:39:57 -0000	1.7
+++ openacs-4/packages/assessment/lib/session.tcl	1 Dec 2008 16:57:02 -0000	1.8
@@ -5,48 +5,26 @@
     @author timo@timohentschel.de
     @date   2004-12-24
     @cvs-id $Id: 
-} {
-    {session_id:integer 0}
-    {assessment_id:integer 0}
-    {next_url ""}
-} -properties {
-    context_bar:onevalue
-    page_title:onevalue
 }
+
 set user_id [ad_conn user_id]
-if {$session_id == 0} {
-    # require assessment_id if session_id is blank
-    if {$assessment_id == 0} {
-	ad_return_complaint 1 "Session_id or Assessment_id is required"
-    }
-    #find the latest session
-    if {![db_0or1row get_latest_session "" -column_array latest_session]} {
-	ad_return_complaint 1 "You have not completed this assessment yet."
-    }
-    set session_id $latest_session(session_id)
-}
 
 db_1row find_assessment {}
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
-permission::require_permission -object_id $assessment_id -privilege read
 
 if {![info exists assessment_data(assessment_id)]} {
     ad_return_complaint 1 "[_ assessment.Requested_assess_does]"
     ad_script_abort
 }
 
-if {$subject_id != $user_id} {
-    permission::require_permission -object_id $assessment_id -privilege admin
-}
 set admin_p [permission::permission_p \
                  -object_id $session_id \
                  -privilege admin \
                  -party_id $user_id]
 
-set delete_return_url [export_vars -base ../session {assessment_id}]
-set delete_url [export_vars -base asm-admin/session-delete {assessment_id subject_id {orig_session_id $session_id} {return_url $delete_return_url}}]
+set delete_url [export_vars -base asm-admin/session-delete {assessment_id subject_id {orig_session_id $session_id} {return_url [ad_return_url]}}]
 
 set page_title "[_ assessment.View_Results]"
 set context_bar [ad_context_bar [list [export_vars -base sessions {assessment_id}] "[_ assessment.Show_Sessions]"] $page_title]
@@ -90,5 +68,4 @@
 }
 
 set comments_installed_p [apm_package_enabled_p "general-comments"]
-
 ad_return_template
Index: openacs-4/packages/assessment/lib/session.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/assessment/lib/session.xql	26 Sep 2006 04:08:36 -0000	1.4
+++ openacs-4/packages/assessment/lib/session.xql	1 Dec 2008 16:57:02 -0000	1.5
@@ -41,4 +41,20 @@
       </querytext>
 </fullquery>
 
+<fullquery name="get_session_score">
+    <querytext>
+        select sum(coalesce(points,0))
+        from as_item_data
+        where session_id=:session_id
+    </querytext>
+</fullquery>
+
+<fullquery name="get_max_points">
+     <querytext>
+        select sum(coalesce(i.points,0))
+        from as_items i, as_item_data d
+        where d.session_id = :session_id and i.as_item_id = d.as_item_id
+     </querytext>
+</fullquery>
+   
 </queryset>
Index: openacs-4/packages/assessment/sql/oracle/upgrade/upgrade-0.17-0.18.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/oracle/upgrade/upgrade-0.17-0.18.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/sql/oracle/upgrade/upgrade-0.17-0.18.sql	12 Jun 2006 02:49:50 -0000	1.2
+++ openacs-4/packages/assessment/sql/oracle/upgrade/upgrade-0.17-0.18.sql	1 Dec 2008 16:57:02 -0000	1.3
@@ -1,7 +1,5 @@
 -- upgrade the column size
-drop view as_assessmentsx;
-drop view as_assessmentsi;
-alter table as_assessments alter column entry_page type varchar(4000);
-alter table as_assessments alter column exit_page type varchar(4000);
-alter table as_assessments alter column return_url type varchar(4000);
-select content_type__refresh_view('as_assessments');
\ No newline at end of file
+alter table as_assessments modify entry_page varchar(4000);
+alter table as_assessments modify exit_page varchar(4000);
+alter table as_assessments modify return_url varchar(4000);
+exec content_type.refresh_view('as_assessments');
Index: openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.17-0.18.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.17-0.18.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.17-0.18.sql	12 Jun 2006 02:49:50 -0000	1.2
+++ openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.17-0.18.sql	1 Dec 2008 16:57:02 -0000	1.3
@@ -1,20 +1,18 @@
 -- upgrade the column size
-drop view as_assessmentsx;
-drop view as_assessmentsi;
 
 alter table as_assessments rename entry_page to entry_page_old;
 alter table as_assessments add entry_page varchar(4000);
 update as_assessments set entry_page = entry_page_old;
-alter table as_assessments drop entry_page_old;
+alter table as_assessments drop entry_page_old cascade;
 
 alter table as_assessments rename exit_page to exit_page_old;
 alter table as_assessments add exit_page varchar(4000);
 update as_assessments set exit_page = exit_page_old;
-alter table as_assessments drop exit_page_old;
+alter table as_assessments drop exit_page_old cascade;
 
 alter table as_assessments rename return_url to return_url_old;
 alter table as_assessments add return_url varchar(4000);
 update as_assessments set return_url = return_url_old;
-alter table as_assessments drop return_url_old;
+alter table as_assessments drop return_url_old cascade;
 
-select content_type__refresh_view('as_assessments');
\ No newline at end of file
+select content_type__refresh_view('as_assessments');
Index: openacs-4/packages/assessment/tcl/as-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-install-procs.tcl,v
diff -u -N -r1.40 -r1.41
--- openacs-4/packages/assessment/tcl/as-install-procs.tcl	7 Sep 2008 19:38:13 -0000	1.40
+++ openacs-4/packages/assessment/tcl/as-install-procs.tcl	1 Dec 2008 16:57:02 -0000	1.41
@@ -12,13 +12,26 @@
 namespace eval as::install {}
 
 
+ad_proc -public as::install::after_install {  
+} { 
+    Create content types and implementations
+} { 
+
+    # Create implementation for notifications of type "inter_item"
+    inter_item_checks::apm_callback::package_install
+
+    # Create content types and attributes
+    as::install::assessment_create_install
+
+    # Create implementation for notifications of type "assessment_response"
+    as::install::notifications
+}
+
 ad_proc -public as::install::assessment_create_install {  
 } { 
     Creates the content type and adds in attributes.
 } { 
 
-inter_item_checks::apm_callback::package_install
-
 set value [parameter::get -parameter "AsmForRegisterId" -package_id [subsite::main_site_id]]
 
 if {[empty_string_p $value]} {
@@ -281,170 +294,154 @@
         -spec {
             0.08d 0.09d1 {
                 db_transaction {
-		    content::type::attribute::new -content_type {as_sections} -attribute_name {num_items}      -datatype {number}  -pretty_name {Number of items displayed in this section}  -column_spec {integer}
-		    content::type::attribute::new -content_type {as_item_choices} -attribute_name {fixed_position}         -datatype {number}  -pretty_name {Fixed Position} -column_spec {integer}
-		    set packages [db_list packages {select package_id from apm_packages where package_key = 'assessment'}]
-		    foreach package_id $packages {
-			set folder_id [as::assessment::folder_id -package_id $package_id]
-			content::folder::register_content_type -folder_id $folder_id -content_type {image} -include_subtypes t
-			content::folder::register_content_type -folder_id $folder_id -content_type {content_revision} -include_subtypes t
-		    }
+                    content::type::attribute::new -content_type {as_sections} -attribute_name {num_items}      -datatype {number}  -pretty_name {Number of items displayed in this section}  -column_spec {integer}
+                    content::type::attribute::new -content_type {as_item_choices} -attribute_name {fixed_position}         -datatype {number}  -pretty_name {Fixed Position} -column_spec {integer}
+                    set packages [db_list packages {select package_id from apm_packages where package_key = 'assessment'}]
+                    foreach package_id $packages {
+                        set folder_id [as::assessment::folder_id -package_id $package_id]
+                        content::folder::register_content_type -folder_id $folder_id -content_type {image} -include_subtypes t
+                        content::folder::register_content_type -folder_id $folder_id -content_type {content_revision} -include_subtypes t
+                    }
                 }
             }
             0.09d1 0.10d1 {
-		content::type::attribute::new -content_type {as_section_data} -attribute_name {points} -datatype {number} -pretty_name {Points Awarded} -column_spec {integer}
+                content::type::attribute::new -content_type {as_section_data} -attribute_name {points} -datatype {number} -pretty_name {Points Awarded} -column_spec {integer}
             }
             0.10d1 0.10d2 {
-		content::type::attribute::new -content_type {as_item_data} -attribute_name {section_id} -datatype {number} -pretty_name {Section ID} -column_spec {integer}
+                content::type::attribute::new -content_type {as_item_data} -attribute_name {section_id} -datatype {number} -pretty_name {Section ID} -column_spec {integer}
             }
             0.10d2 0.10d3 {
-		db_transaction {
-		    content::type::attribute::new -content_type {as_section_data} -attribute_name {creation_datetime} -datatype {number} -pretty_name {Creation Date Time} -column_spec {timestamptz}
-		    content::type::attribute::new -content_type {as_section_data} -attribute_name {completed_datetime} -datatype {number} -pretty_name {Final Submission} -column_spec {timestamptz}
-		    content::type::attribute::new -content_type {as_assessments} -attribute_name {ip_mask} -datatype {string} -pretty_name {IP Mask} -column_spec {varchar(100)}
-		}
-	    }
+                db_transaction {
+                    content::type::attribute::new -content_type {as_section_data} -attribute_name {creation_datetime} -datatype {number} -pretty_name {Creation Date Time} -column_spec {timestamptz}
+                    content::type::attribute::new -content_type {as_section_data} -attribute_name {completed_datetime} -datatype {number} -pretty_name {Final Submission} -column_spec {timestamptz}
+                    content::type::attribute::new -content_type {as_assessments} -attribute_name {ip_mask} -datatype {string} -pretty_name {IP Mask} -column_spec {varchar(100)}
+                }
+            }
             0.10d3 0.10d4 {
-		db_transaction {
-		    set impl_id [acs_sc::impl::new -contract_name NotificationType -name assessment_response_notif_type -owner assessment]
-		    acs_sc::impl::alias::new -contract_name NotificationType -impl_name assessment_response_notif_type -operation GetURL -alias as::notification::get_url -language TCL
-		    acs_sc::impl::alias::new -contract_name NotificationType -impl_name assessment_response_notif_type -operation ProcessReply -alias as::notification::process_reply -language TCL
-		    acs_sc::impl::binding::new -contract_name NotificationType -impl_name assessment_response_notif_type
+                as::install::notifications
+            }
+            0.10d6 0.10d7 {
+                as::actions::insert_actions_after_upgrade
+            }
+            0.10d8 0.10d9 {
+                db_transaction {
+                    content::type::new -content_type {as_session_results} -supertype {content_revision} -pretty_name {Assessment Session Result} -pretty_plural {Assessment Session Results} -table_name {as_session_results} -id_column {result_id}
+                    content::type::attribute::new -content_type {as_session_results} -attribute_name {target_id} -datatype {number} -pretty_name {Target Answer} -column_spec {integer}
+                    content::type::attribute::new -content_type {as_session_results} -attribute_name {points} -datatype {number} -pretty_name {Points} -column_spec {integer}
 
-		    set type_id [notification::type::new -sc_impl_id $impl_id -short_name assessment_response_notif -pretty_name "Survey Response Notification" -description "Notifications for Assessment"]
+                    set packages [db_list packages {select package_id from apm_packages where package_key = 'assessment'}]
+                    foreach package_id $packages {
+                        set folder_id [as::assessment::folder_id -package_id $package_id]
+                        content::folder::register_content_type -folder_id $folder_id -content_type {as_session_results} -include_subtypes t
+                    }
 
-		    db_dml insert_intervals {
-			insert into notification_types_intervals
-			(type_id, interval_id)
-			select :type_id as type_id, interval_id
-			from notification_intervals
-			where name in ('instant','hourly','daily')
-		    }
-		    db_dml insert_delivery_method {
-			insert into notification_types_del_methods
-			(type_id, delivery_method_id)
-			select :type_id as type_id, delivery_method_id
-			from notification_delivery_methods
-			where short_name = 'email'
-		    }
-		}
-	    }
-	    0.10d6 0.10d7 {
-		as::actions::insert_actions_after_upgrade
-	    }
-	    0.10d8 0.10d9 {
-		db_transaction {
-		    content::type::new -content_type {as_session_results} -supertype {content_revision} -pretty_name {Assessment Session Result} -pretty_plural {Assessment Session Results} -table_name {as_session_results} -id_column {result_id}
-		    content::type::attribute::new -content_type {as_session_results} -attribute_name {target_id} -datatype {number} -pretty_name {Target Answer} -column_spec {integer}
-		    content::type::attribute::new -content_type {as_session_results} -attribute_name {points} -datatype {number} -pretty_name {Points} -column_spec {integer}
+                    set item_data_list [db_list_of_lists get_all_item_data_ids {
+                        select item_data_id, points
+                        from as_item_data
+                        where points is not null
+                    }]
+                    foreach item_data $item_data_list {
+                        as::session_results::new -target_id [lindex $item_data 0] -points [lindex $item_data 1]
+                    }
 
-		    set packages [db_list packages {select package_id from apm_packages where package_key = 'assessment'}]
-		    foreach package_id $packages {
-			set folder_id [as::assessment::folder_id -package_id $package_id]
-			content::folder::register_content_type -folder_id $folder_id -content_type {as_session_results} -include_subtypes t
-		    }
+                    set section_data_list [db_list_of_lists get_all_section_data_ids {
+                        select section_data_id, points
+                        from as_section_data
+                        where points is not null
+                    }]
+                    foreach section_data $section_data_list {
+                        as::session_results::new -target_id [lindex $section_data 0] -points [lindex $section_data 1]
+                    }
 
-		    set item_data_list [db_list_of_lists get_all_item_data_ids {
-			select item_data_id, points
-			from as_item_data
-			where points is not null
-		    }]
-		    foreach item_data $item_data_list {
-			as::session_results::new -target_id [lindex $item_data 0] -points [lindex $item_data 1]
-		    }
+                    set session_list [db_list_of_lists get_all_session_ids {
+                        select session_id, percent_score
+                        from as_sessions
+                        where percent_score is not null
+                    }]
+                    foreach session $session_list {
+                        as::session_results::new -target_id [lindex $session 0] -points [lindex $session 1]
+                    }
 
-		    set section_data_list [db_list_of_lists get_all_section_data_ids {
-			select section_data_id, points
-			from as_section_data
-			where points is not null
-		    }]
-		    foreach section_data $section_data_list {
-			as::session_results::new -target_id [lindex $section_data 0] -points [lindex $section_data 1]
-		    }
+                    content::type::attribute::new -content_type {as_assessments} -attribute_name {password} -datatype {string} -pretty_name {Password} -column_spec {varchar(100)}
 
-		    set session_list [db_list_of_lists get_all_session_ids {
-			select session_id, percent_score
-			from as_sessions
-			where percent_score is not null
-		    }]
-		    foreach session $session_list {
-			as::session_results::new -target_id [lindex $session 0] -points [lindex $session 1]
-		    }
-
-		    content::type::attribute::new -content_type {as_assessments} -attribute_name {password} -datatype {string} -pretty_name {Password} -column_spec {varchar(100)}
-
-		    content::type::attribute::new -content_type {as_item_type_oq} -attribute_name {reference_answer} -datatype {text} -pretty_name {Reference Answer} -column_spec {text}
-		    content::type::attribute::new -content_type {as_item_type_oq} -attribute_name {keywords} -datatype {string} -pretty_name {Keywords} -column_spec {varchar(4000)}
-		}
-	    }
-	    0.10d9 0.10d10 {
-		as::actions::update_checks_after_upgrade
-	    }
-	    0.10d10 0.10d11 {
-		content::type::attribute::new -content_type {as_assessments} -attribute_name {random_p} -datatype {boolean} -pretty_name {Assessment Allow Random} -column_spec {char(1)}
-	    }
-	    0.10d11 0.10d12 {
-		content::type::attribute::new -content_type {as_items} -attribute_name {field_name} -datatype {string} -pretty_name {Item Field Name} -column_spec {varchar(500)}
-	    }
-    
-	    0.11 0.12 {
-		#File Upload new type
-		content::type::new -content_type {as_item_type_fu} -supertype {content_revision} -pretty_name {Assessment Item Type File Upload} -pretty_plural {Assessment Item Type File Upload} -table_name {as_item_type_fu} -id_column {as_item_type_id}
-		content::type::new -content_type {as_item_display_f} -supertype {content_revision} -pretty_name {Assessment Item Display File} -pretty_plural {Assessment Item Display File} -table_name {as_item_display_f} -id_column {as_item_display_id}
-		# File Upload display type
-		content::type::attribute::new -content_type {as_item_display_f} -attribute_name {html_display_options} -datatype {string} -pretty_name {HTML display Options} -column_spec {varchar(50)}
-		content::type::attribute::new -content_type {as_item_display_f} -attribute_name {abs_size} -datatype {string} -pretty_name {Abstraction Real Size} -column_spec {varchar(20)}
-		content::type::attribute::new -content_type {as_item_display_f} -attribute_name {box_orientation} -datatype {string} -pretty_name {Box Orientation} -column_spec {varchar(20)}
-		
-	        db_foreach packages { select package_id from apm_packages where package_key = 'assessment'} { 
-		    set folder_id [as::assessment::folder_id -package_id $package_id]
-		    
-		    # File Upload registration
-		    content::folder::register_content_type -folder_id $folder_id -content_type {as_item_type_fu} -include_subtypes t
-		    content::folder::register_content_type -folder_id $folder_id -content_type {as_item_display_f} -include_subtypes t
-		}
-		
-	    }
-	    0.12 0.13 {
-		content::type::attribute::new -content_type {as_assessments} -attribute_name {type}            -datatype {number}  -pretty_name {Type}  -column_spec {integer}
-		
-	    }
-	    0.13 0.14 {
-		# update as_param_map table to set the item_id  as a cr_item and not a cr_revision id
-		
-		db_foreach as_parameter { select cr.item_id, pm.parameter_id from as_param_map pm, cr_revisions cr where cr.revision_id = pm.item_id} {
-		    db_dml  update_parameters { update as_param_map set item_id=:item_id where parameter_id=:parameter_id}
-		}
-		
-	    }
-	    0.14 0.15 {
-		# update as_inter_item_check_id table to set the check_sql condition using the item_id of a choice instead of using the revision_id
-		
-		db_foreach check  { select inter_item_check_id, check_sql from as_inter_item_checks } {
-		    set cond_list  [split $check_sql "="]
-		    set item_id [lindex [split [lindex $cond_list 2] " "] 0]
-		    set choice_id [lindex [split [lindex $cond_list 1] " "] 0]
-		    set condition [db_string get_item_id {select item_id from cr_revisions where revision_id=:choice_id} -default -1]
-		    set check_sql_updated [as::assessment::check::get_sql -item_id $item_id -condition $condition]
-		    if { $condition != -1 } {
-			db_dml update_check_sql { update as_inter_item_checks set check_sql = :check_sql_updated where inter_item_check_id=:inter_item_check_id}
-		    }
-		}
-		
-	    }
-	    0.15 0.16 {
-		content::type::attribute::new -content_type {as_item_display_sb} -attribute_name {prepend_empty_p} -datatype {string}    -pretty_name {Prepend Empty Item} -column_spec {char(1)}
-	    }
-	    0.16 0.17 {
-		content::type::attribute::new -content_type {as_items} -attribute_name {validate_block} -datatype {text} -pretty_name {Validation Block} -column_spec {text}
-	    }
+                    content::type::attribute::new -content_type {as_item_type_oq} -attribute_name {reference_answer} -datatype {text} -pretty_name {Reference Answer} -column_spec {text}
+                    content::type::attribute::new -content_type {as_item_type_oq} -attribute_name {keywords} -datatype {string} -pretty_name {Keywords} -column_spec {varchar(4000)}
+                }
+            }
+            0.10d9 0.10d10 {
+                as::actions::update_checks_after_upgrade
+            }
+            0.10d10 0.10d11 {
+                content::type::attribute::new -content_type {as_assessments} -attribute_name {random_p} -datatype {boolean} -pretty_name {Assessment Allow Random} -column_spec {char(1)}
+            }
+            0.10d11 0.10d12 {
+                content::type::attribute::new -content_type {as_items} -attribute_name {field_name} -datatype {string} -pretty_name {Item Field Name} -column_spec {varchar(500)}
+            }
+            
+            0.11 0.12 {
+                #File Upload new type
+                content::type::new -content_type {as_item_type_fu} -supertype {content_revision} -pretty_name {Assessment Item Type File Upload} -pretty_plural {Assessment Item Type File Upload} -table_name {as_item_type_fu} -id_column {as_item_type_id}
+                content::type::new -content_type {as_item_display_f} -supertype {content_revision} -pretty_name {Assessment Item Display File} -pretty_plural {Assessment Item Display File} -table_name {as_item_display_f} -id_column {as_item_display_id}
+                # File Upload display type
+                content::type::attribute::new -content_type {as_item_display_f} -attribute_name {html_display_options} -datatype {string} -pretty_name {HTML display Options} -column_spec {varchar(50)}
+                content::type::attribute::new -content_type {as_item_display_f} -attribute_name {abs_size} -datatype {string} -pretty_name {Abstraction Real Size} -column_spec {varchar(20)}
+                content::type::attribute::new -content_type {as_item_display_f} -attribute_name {box_orientation} -datatype {string} -pretty_name {Box Orientation} -column_spec {varchar(20)}
+                
+                db_foreach packages { select package_id from apm_packages where package_key = 'assessment'} { 
+                    set folder_id [as::assessment::folder_id -package_id $package_id]
+                    
+                    # File Upload registration
+                    content::folder::register_content_type -folder_id $folder_id -content_type {as_item_type_fu} -include_subtypes t
+                    content::folder::register_content_type -folder_id $folder_id -content_type {as_item_display_f} -include_subtypes t
+                }
+                
+            }
+            0.12 0.13 {
+                content::type::attribute::new -content_type {as_assessments} -attribute_name {type}            -datatype {number}  -pretty_name {Type}  -column_spec {integer}
+                
+            }
+            0.13 0.14 {
+                # update as_param_map table to set the item_id  as a cr_item and not a cr_revision id
+                
+                db_foreach as_parameter { select cr.item_id, pm.parameter_id from as_param_map pm, cr_revisions cr where cr.revision_id = pm.item_id} {
+                    db_dml  update_parameters { update as_param_map set item_id=:item_id where parameter_id=:parameter_id}
+                }
+                
+            }
+            0.14 0.15 {
+                # update as_inter_item_check_id table to set the check_sql condition using the item_id of a choice instead of using the revision_id
+                
+                db_foreach check  { select inter_item_check_id, check_sql from as_inter_item_checks } {
+                    set cond_list  [split $check_sql "="]
+                    set item_id [lindex [split [lindex $cond_list 2] " "] 0]
+                    set choice_id [lindex [split [lindex $cond_list 1] " "] 0]
+                    set condition [db_string get_item_id {select item_id from cr_revisions where revision_id=:choice_id} -default -1]
+                    set check_sql_updated [as::assessment::check::get_sql -item_id $item_id -condition $condition]
+                    if { $condition != -1 } {
+                        db_dml update_check_sql { update as_inter_item_checks set check_sql = :check_sql_updated where inter_item_check_id=:inter_item_check_id}
+                    }
+                }
+                
+            }
+            0.15 0.16 {
+                content::type::attribute::new -content_type {as_item_display_sb} -attribute_name {prepend_empty_p} -datatype {string}    -pretty_name {Prepend Empty Item} -column_spec {char(1)}
+            } 
+            0.16 0.17 {
+                content::type::attribute::new -content_type {as_items} -attribute_name {validate_block} -datatype {text} -pretty_name {Validation Block} -column_spec {text}
+            }
 	    0.22d5 0.22d6 {
 		# upgrade already done in SQL just add the attributes for
 		# completeness
 		content::type::attribute::new -content_type {as_item_data} -attribute_name {as_item_cr_item_id} -datatype {number} -pretty_name {as_item cr_item_id} -column_spec {integer}
 		content::type::attribute::new -content_type {as_item_data} -attribute_name {choice_value} -datatype {text} -pretty_name {Choice Value}
 	    }
-	    0.22d7 0.22d8 {
+   
+            0.22d6 0.22d7 {
+                if { ![acs_sc_binding_exists_p NotificationType assessment_response_notif_type] } {
+                    as::install::notifications
+                }
+            }
+    	    0.22d7 0.22d8 {
                 content::type::attribute::new -content_type {as_sessions} -attribute_name {elapsed_seconds}            -datatype {number}  -pretty_name {Elapsed Seconds}  -column_spec {integer}
 		content::type::attribute::new -content_type {as_item_type_mc} -attribute_name {allow_other_p} -datatype {boolean}    -pretty_name {Allow Other?} -column_spec {char(1) default 'f'}
 	    }
@@ -480,3 +477,33 @@
     # reset the RegistrationId parameter
     as::parameter::reset_parameter -package_id $package_id -node_id $node_id
 }
+
+ad_proc -private as::install::notifications {  
+} { 
+    Create notif implementation for type assessment_response
+} { 
+
+    db_transaction {
+        set impl_id [acs_sc::impl::new -contract_name NotificationType -name assessment_response_notif_type -owner assessment]
+        acs_sc::impl::alias::new -contract_name NotificationType -impl_name assessment_response_notif_type -operation GetURL -alias as::notification::get_url -language TCL
+        acs_sc::impl::alias::new -contract_name NotificationType -impl_name assessment_response_notif_type -operation ProcessReply -alias as::notification::process_reply -language TCL
+        acs_sc::impl::binding::new -contract_name NotificationType -impl_name assessment_response_notif_type
+
+        set type_id [notification::type::new -sc_impl_id $impl_id -short_name assessment_response_notif -pretty_name "Survey Response Notification" -description "Notifications for Assessment"]
+
+        db_dml insert_intervals {
+            insert into notification_types_intervals
+            (type_id, interval_id)
+            select :type_id as type_id, interval_id
+            from notification_intervals
+            where name in ('instant','hourly','daily')
+        }
+        db_dml insert_delivery_method {
+            insert into notification_types_del_methods
+            (type_id, delivery_method_id)
+            select :type_id as type_id, delivery_method_id
+            from notification_delivery_methods
+            where short_name = 'email'
+        }
+    }
+}
Index: openacs-4/packages/assessment/www/assessment-consent.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-consent.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/assessment/www/assessment-consent.adp	12 Jun 2006 02:49:51 -0000	1.4
+++ openacs-4/packages/assessment/www/assessment-consent.adp	1 Dec 2008 16:57:02 -0000	1.5
@@ -2,13 +2,15 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<blockquote>
+<p>
   @assessment_data.consent_page;noquote@
-</blockquote>
+</p>
 
 <form action="assessment" method="get">
+  <div>
   <input type="hidden" name="assessment_id" value="@assessment_id@">
   <input type="hidden" name="session_id" value="@session_id@">
   <input type="hidden" name="password" value="@password@">
   <input type="submit" name="ok" value="       OK       ">
+  </div>
 </form>
Index: openacs-4/packages/assessment/www/assessment-password.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-password.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/www/assessment-password.adp	12 Jun 2006 02:49:51 -0000	1.3
+++ openacs-4/packages/assessment/www/assessment-password.adp	1 Dec 2008 16:57:02 -0000	1.4
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<blockquote>
   <formtemplate id="assessment_password"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/assessment-section-submit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-section-submit.adp,v
diff -u -N -r1.25 -r1.26
--- openacs-4/packages/assessment/www/assessment-section-submit.adp	2 Sep 2008 17:43:17 -0000	1.25
+++ openacs-4/packages/assessment/www/assessment-section-submit.adp	1 Dec 2008 16:57:02 -0000	1.26
@@ -32,11 +32,11 @@
          <if @items.content@ not nil><p>@items.content;noquote@</p></if>
          <if @items.presentation_type@ ne fitb><b>@items.question_text;noquote@<if @assessment_data.show_item_name_p@ eq f and @items.required_p@ eq t> <span style="color: #f00;">*</span></if></b></if>
      
-<group column=title>
+<group column=as_item_id>
          <div class="form-widget">
 
            <if @items.presentation_type@ eq rb or @items.presentation_type@ eq cb>
-             <if @items.title@ eq @items.next_title@ and @items.groupnum@ eq 1>
+             <if @items.as_item_id@ eq @items.next_as_item_id@ and @items.groupnum@ eq 1>
                <if @items.presentation_type@ eq @items.next_pr_type@ or @items.choice_orientation@ eq horizontal>
                  <formgroup id="response_to_item.@items.as_item_id@">
                    <label for="show_item_form:elements:response_to_item.@items.as_item_id@:@formgroup.option@">@formgroup.label;noquote@</label>
@@ -54,7 +54,7 @@
 </label>
                  </formgroup>
                </if>
-               <elseif @items.title@ ne @items.next_title@ and @items.groupnum@ eq 1>
+               <elseif @items.as_item_id@ ne @items.next_as_item_id@ and @items.groupnum@ eq 1>
                  <formgroup id="response_to_item.@items.as_item_id@">
                    @formgroup.widget;noquote@ <label for="show_item_form:elements:response_to_item.@items.as_item_id@:@formgroup.option@">@formgroup.label;noquote@</label>
                  </formgroup>
Index: openacs-4/packages/assessment/www/assessment-single-submit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-single-submit.adp,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/assessment/www/assessment-single-submit.adp	12 Jun 2006 02:49:51 -0000	1.8
+++ openacs-4/packages/assessment/www/assessment-single-submit.adp	1 Dec 2008 16:57:02 -0000	1.9
@@ -4,7 +4,7 @@
 
 <table width="100%" cellpadding="3" cellspacing="0" border="0">
 <tr><th colspan="3"><!-- @assessment_data.html_title;noquote@ --></th></tr>
-<tr><td><i><font size="1">@assessment_data.instructions;noquote@</font></i></td></tr>
+<tr><td><em>@assessment_data.instructions;noquote@</em></td></tr>
 <tr><td align=right>
 <!--#assessment.section_counter#
 <br>#assessment.item_counter#-->
@@ -37,7 +37,7 @@
       <if @items.content@ not nil><tr><if @assessment_data.show_item_name_p@ eq t><td colspan="4"></if><else><td colspan="3"></else>@items.content;noquote@</td></tr></if>
 
       <tr><if @assessment_data.show_item_name_p@ eq t><td colspan="4"></if><else><td colspan="3"></else>
-        <blockquote><table>
+        <table>
           <tr class="form-widget">
           <if @items.description@ not nil><td valign=top>@items.description;noquote@</td></if><td>
           <if @items.presentation_type@ eq rb or @items.presentation_type@ eq cb>
@@ -68,7 +68,6 @@
           </td></tr><tr class="form-widget"><td>
             <if @items.submitted_p@ eq f><br><input type=submit value="#assessment.Submit#"></if>
           </td></tr></table>
-        </blockquote>
         <hr>
       </td></tr>
     </formtemplate>
Index: openacs-4/packages/assessment/www/finish.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/finish.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/assessment/www/finish.adp	15 May 2007 20:14:17 -0000	1.5
+++ openacs-4/packages/assessment/www/finish.adp	1 Dec 2008 16:57:02 -0000	1.6
@@ -8,5 +8,7 @@
 
 @assessment_data.exit_page;noquote@
 
+<if @user_id@ ne 0>
   <p><a href="session?session_id=@session_id@">#assessment.View_results#</a></p>
+</if>
 
Index: openacs-4/packages/assessment/www/finish.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/finish.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/assessment/www/finish.tcl	15 May 2007 20:14:17 -0000	1.8
+++ openacs-4/packages/assessment/www/finish.tcl	1 Dec 2008 16:57:02 -0000	1.9
@@ -27,7 +27,11 @@
 as::assessment::data -assessment_id $assessment_id
 
 if {$assessment_data(exit_page) eq ""} {
-    set assessment_data(exit_page) "[_ assessment.lt_default_exit_page]"
+    if {$user_id == 0} {
+      set assessment_data(exit_page) "[_ assessment.lt_default_exit_page_anonymous_user]"
+    } else {
+      set assessment_data(exit_page) "[_ assessment.lt_default_exit_page]"
+    }
 }
 
 set page_title "[_ assessment.Response_Submitted]"
Index: openacs-4/packages/assessment/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/index.adp,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/assessment/www/index.adp	18 Apr 2005 12:30:27 -0000	1.14
+++ openacs-4/packages/assessment/www/index.adp	1 Dec 2008 16:57:02 -0000	1.15
@@ -2,7 +2,7 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<if @admin_p@ eq "1"><p style="text-align: right;"><a href="asm-admin/"><img src="/resources/assessment/admin.gif" border="0" alt="Administer Assessments"></a></p></if>
+<if @admin_p@ eq "1"><p style="text-align: right;"><a href="asm-admin/"><img src="/resources/assessment/admin.gif" style="border:0" alt="#acs-kernel.common_Administration#"></a></p></if>
 
 <listtemplate name="assessments"></listtemplate>
 
Index: openacs-4/packages/assessment/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/index.tcl,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/assessment/www/index.tcl	22 Feb 2008 23:42:33 -0000	1.19
+++ openacs-4/packages/assessment/www/index.tcl	1 Dec 2008 16:57:02 -0000	1.20
@@ -30,8 +30,6 @@
 	    label "[_ assessment.View_results]"
 	    display_template {<a href="asm-admin/results-users?assessment_id=@assessments.assessment_id@">\#assessment.View_results\#</a>}
 	}
-    } -main_class {
-        narrow
     }
 
 # get the information of all open assessments
@@ -62,8 +60,6 @@
             label "[_ assessment.Sessions]"
             link_url_eval {[export_vars -base "sessions" {assessment_id}]}
         }
-    } -main_class {
-        narrow
     }
 
 # get the information of all assessments store in the database
Index: openacs-4/packages/assessment/www/instructions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/instructions.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/www/instructions.adp	7 Oct 2007 22:36:54 -0000	1.3
+++ openacs-4/packages/assessment/www/instructions.adp	1 Dec 2008 16:57:02 -0000	1.4
@@ -11,7 +11,7 @@
     #assessment.Resume_Assessment_Title#
   </if> 
   <else>
-    <if @completed_session_count@ gt 0>
+    <if @completed_session_count@ gt 0 and @user_id@ ne 0>
       #assessment.Retake_Assessment_Title#
     </if>
     <else>
Index: openacs-4/packages/assessment/www/instructions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/instructions.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/instructions.tcl	15 May 2007 20:14:17 -0000	1.2
+++ openacs-4/packages/assessment/www/instructions.tcl	1 Dec 2008 16:57:02 -0000	1.3
@@ -16,6 +16,11 @@
     -privilege read
 
 as::assessment::data -assessment_id $assessment_id
+if { $assessment_data(publish_status) ne "live" } {
+    ad_return_complaint 1 [_ assessment.Requested_assess_is_no_longer_available]
+    return
+}
+
 if {$assessment_data(instructions) eq ""} {
     set assessment_data(instructions) "[_ assessment.lt_default_instructions]"
 }
Index: openacs-4/packages/assessment/www/session-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/session-oracle.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/session-oracle.xql	24 Feb 2005 09:22:12 -0000	1.2
+++ openacs-4/packages/assessment/www/session-oracle.xql	1 Dec 2008 16:57:02 -0000	1.3
@@ -12,4 +12,19 @@
       </querytext>
 </fullquery>
 
+  <fullquery name="get_latest_session">
+    <querytext>
+      select * from (select max(o.creation_date), s.session_id 
+        from as_sessions s, 
+        acs_objects o,
+        cr_revisions cr
+      where s.subject_id=:user_id
+        and s.assessment_id in (select revision_id from cr_revisions where item_id= :assessment_id)
+        and o.object_id = cr.item_id
+        and s.session_id = cr.revision_id
+      group by assessment_id, subject_id, session_id)
+      where rownum=1
+    </querytext>
+  </fullquery>
+
 </queryset>
Index: openacs-4/packages/assessment/www/session-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/session-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/www/session-postgresql.xql	21 Feb 2005 14:32:56 -0000	1.1
+++ openacs-4/packages/assessment/www/session-postgresql.xql	1 Dec 2008 16:57:02 -0000	1.2
@@ -12,4 +12,19 @@
       </querytext>
 </fullquery>
 
+  <fullquery name="get_latest_session">
+    <querytext>
+      select max(o.creation_date), s.session_id 
+        from as_sessions s, 
+        acs_objects o,
+        cr_revisions cr
+      where s.subject_id=:user_id
+        and s.assessment_id in (select revision_id from cr_revisions where item_id= :assessment_id)
+        and o.object_id = cr.item_id
+        and s.session_id = cr.revision_id
+      group by assessment_id, subject_id, session_id
+      limit 1
+    </querytext>
+  </fullquery>
+
 </queryset>
Index: openacs-4/packages/assessment/www/session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/session.adp,v
diff -u -N -r1.32 -r1.33
--- openacs-4/packages/assessment/www/session.adp	19 Dec 2007 11:55:07 -0000	1.32
+++ openacs-4/packages/assessment/www/session.adp	1 Dec 2008 16:57:02 -0000	1.33
@@ -1,4 +1,4 @@
 <master>
 <property name="title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-<include src="/packages/assessment/lib/session">
+<property name="context">@context;noquote@</property>
+<include src="/packages/assessment/lib/session" session_id="@session_id@">
Index: openacs-4/packages/assessment/www/session.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/session.tcl,v
diff -u -N -r1.39 -r1.40
--- openacs-4/packages/assessment/www/session.tcl	21 Jan 2008 20:25:35 -0000	1.39
+++ openacs-4/packages/assessment/www/session.tcl	1 Dec 2008 16:57:02 -0000	1.40
@@ -6,15 +6,39 @@
      @date   2004-12-24
      @cvs-id $Id: 
  } {
+    {session_id:integer 0}
+    {assessment_id:integer 0}
+    {next_url ""}
  } -properties {
-     context_bar:onevalue
+     context:onevalue
      page_title:onevalue
  }
 
+set user_id [ad_conn user_id]
 
- set page_title "[_ assessment.View_Results]"
- set context_bar [ad_context_bar [list [export_vars -base sessions {assessment_id}] "[_ assessment.Show_Sessions]"] $page_title]
+if {$session_id == 0} {
+    # require assessment_id if session_id is blank
+    if {$assessment_id == 0} {
+	ad_return_complaint 1 "Session_id or Assessment_id is required"
+    }
+    #find the latest session
+    if {![db_0or1row get_latest_session "" -column_array latest_session]} {
+	ad_return_complaint 1 "You have not completed this assessment yet."
+    }
+    set session_id $latest_session(session_id)
+}
 
+db_1row find_assessment {}
+
+permission::require_permission -object_id $assessment_id -privilege read
+
+if {$subject_id != $user_id} {
+    permission::require_permission -object_id $assessment_id -privilege admin
+}
+
+set page_title "[_ assessment.View_Results]"
+set context [list [list [export_vars -base sessions {assessment_id}] "[_ assessment.Show_Sessions]"] $page_title]
+
 template::head::add_css -href "/resources/assessment/assessment.css"
 
 ad_return_template
Index: openacs-4/packages/assessment/www/admin/asm-action-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-admin.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/assessment/www/admin/asm-action-admin.adp	2 Feb 2008 10:18:46 -0000	1.7
+++ openacs-4/packages/assessment/www/admin/asm-action-admin.adp	1 Dec 2008 16:57:02 -0000	1.8
@@ -2,7 +2,5 @@
 <property name="title">#assessment.action_admin#</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
 <listtemplate name="actions"></listtemplate>
 <div><a href="asm-action-new">#assessment.add_new_action#</a></div>
-</blockquote>
Index: openacs-4/packages/assessment/www/admin/asm-action-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-delete.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/assessment/www/admin/asm-action-delete.adp	12 Jun 2006 02:49:51 -0000	1.5
+++ openacs-4/packages/assessment/www/admin/asm-action-delete.adp	1 Dec 2008 16:57:02 -0000	1.6
@@ -2,6 +2,4 @@
 <property name="title">Action Delete</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<blockquote>
   <formtemplate id="action_delete"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/admin/asm-action-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-new.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/assessment/www/admin/asm-action-new.adp	12 Jun 2006 02:49:51 -0000	1.5
+++ openacs-4/packages/assessment/www/admin/asm-action-new.adp	1 Dec 2008 16:57:02 -0000	1.6
@@ -2,11 +2,9 @@
 <property name="title">@page_title@</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<blockquote>
   <formtemplate id="action_admin"></formtemplate>
 
 <if @parameter_exist@ eq "y">
 	<include src=asm-action-param-list action_id=@action_id@>
 </if>
-</blockquote>
 
Index: openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp	12 Jun 2006 02:49:51 -0000	1.6
+++ openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp	1 Dec 2008 16:57:02 -0000	1.7
@@ -2,11 +2,9 @@
 <property name="title">@page_title@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="parameter_admin"></formtemplate>
-</blockquote>
 
 
 <include src=asm-action-param-list action_id=@action_id@> &nbsp;
 
-<a href=/assessment/admin>#assessment.return#</a>
+<p><a href=/assessment/admin>#assessment.return#</a></p>
Index: openacs-4/packages/assessment/www/admin/asm-action-param-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-delete.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/assessment/www/admin/asm-action-param-delete.adp	12 Jun 2006 02:49:51 -0000	1.5
+++ openacs-4/packages/assessment/www/admin/asm-action-param-delete.adp	1 Dec 2008 16:57:02 -0000	1.6
@@ -2,7 +2,5 @@
 <property name="title">Param Delete</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<blockquote>
   <formtemplate id="parameter_delete"></formtemplate>
-</blockquote>
 
Index: openacs-4/packages/assessment/www/admin/asm-action-param-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-list.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/assessment/www/admin/asm-action-param-list.adp	14 Feb 2005 23:39:59 -0000	1.4
+++ openacs-4/packages/assessment/www/admin/asm-action-param-list.adp	1 Dec 2008 16:57:02 -0000	1.5
@@ -1,2 +1,4 @@
 <listtemplate name="parameter_list"></listtemplate>
-<a href= asm-action-param-admin?action_id=@action_id@>#assessment.add_parameter#</a>
+<p>
+<a href="asm-action-param-admin?action_id=@action_id@">#assessment.add_parameter#</a>
+</p>
\ No newline at end of file
Index: openacs-4/packages/assessment/www/admin/set-reg-assessment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/set-reg-assessment.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/set-reg-assessment.adp	12 Jun 2006 02:49:51 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/set-reg-assessment.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -8,8 +8,5 @@
 <a href="../asm-admin/assessment-new?permission_p=1" class="button">#acs-subsite.create_asm#</a>
 <br>
 <br>
-<formtemplate id="get_assessment">
-</formtemplate>
+<formtemplate id="get_assessment"></formtemplate>
 </else>
-
-
Index: openacs-4/packages/assessment/www/asm-admin/assessment-copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/assessment-copy.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/assessment-copy.adp	8 Apr 2005 00:48:16 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/assessment-copy.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="assessment_copy_confirm"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/assessment-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/assessment-delete.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/assessment-delete.adp	8 Apr 2005 00:45:42 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/assessment-delete.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="assessment_delete_confirm"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/catalog-browse.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-browse.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/catalog-browse.adp	11 Apr 2005 19:01:55 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/catalog-browse.adp	1 Dec 2008 16:57:02 -0000	1.4
@@ -4,4 +4,4 @@
 
 <listtemplate name="objects"></listtemplate>
 
-#assessment.unhappy_search# <a href=@search_again_url@>#assessment.try_again#</a>
\ No newline at end of file
+<p>#assessment.unhappy_search# <a href="@search_again_url@">#assessment.try_again#</a></p>
\ No newline at end of file
Index: openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp	25 Apr 2005 13:40:33 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp	1 Dec 2008 16:57:02 -0000	1.5
@@ -19,7 +19,7 @@
     <tr class="even">
   </else>
 
-<td valign="top">@items.rownum@. @items.field_name@<if @items.required_p@ eq t> <font color=red>*</font> </if>
+<td valign="top">@items.rownum@. @items.field_name@<if @items.required_p@ eq t> <span style="color:red">*</span> </if>
 <if @items.max_time_to_complete@ not nil> (#assessment.max_time# @items.max_time_to_complete@) </if>
 (@items.points@ #assessment.points#)
 </td></tr>
@@ -32,7 +32,6 @@
   </else>
 
 <td>
-  <blockquote>
     <if @items.presentation_type@ ne fitb>@items.title;noquote@<br><if @items.description@ not nil>@items.description;noquote@<br></if></if>
     <if @items.presentation_type@ eq rb or @items.presentation_type@ eq cb>
       <if @items.choice_orientation@ ne horizontal>
@@ -55,11 +54,10 @@
     </else>
     <if @items.subtext@ not nil>
       <div class="form-help-text">
-      <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" title="Help text" border="0">
+      <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" title="Help text" style="border:0">
       <noparse>@items.subtext@</noparse>
       </div>
     </if>
-  </blockquote>
 </td></tr>
 
 </multiple>
Index: openacs-4/packages/assessment/www/asm-admin/catalog-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-search.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/catalog-search.adp	7 Apr 2005 21:37:46 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/catalog-search.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="catalog_search"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/catalog-section-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-section-add.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/catalog-section-add.adp	11 Apr 2005 19:01:13 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/catalog-section-add.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -21,17 +21,12 @@
     <tr class="even">
   </else>
 <td>
-  <blockquote>
     @sections.title@
-  </blockquote>
 </td></tr>
 </table>      
 
-<blockquote>
   <include src="/packages/assessment/lib/section-show" assessment_id="@assessment_id@" section_id="@sections.section_id@">
-</blockquote>
 
 </multiple>
 
-<formtemplate id="catalog_section_add">
-</formtemplate>
+<formtemplate id="catalog_section_add"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/index.adp,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/assessment/www/asm-admin/index.adp	31 Jan 2008 16:06:26 -0000	1.11
+++ openacs-4/packages/assessment/www/asm-admin/index.adp	1 Dec 2008 16:57:02 -0000	1.12
@@ -1,16 +1,16 @@
 <master>
 <property name="context">@context;noquote@</property>
 
+<p>
 <if @package_admin_p@ eq 1>
 <a
 href="@categories_url@cadmin/one-object?object_id=@package_id@">#assessment.admin_categories#</a>
 |<if @sw_admin_p@ eq 1> <a href="../admin/asm-action-admin">#assessment.admin_actions#</a> |</if> <a href="../asm-admin/admin-request">#assessment.admin_requests#</a> | <a href="permissions?object_id=@package_id@">#assessment.permissions#</a> | <a href="sessions">#assessment.View_Sessions#</a>
 </if> <else>
 <a href="../asm-admin/admin-request">#assessment.admin_requests#</a>
 </else>
+</p>
 
-<p>
-
 <formtemplate id="form_upload_file"></formtemplate>
-<p>
+
 <listtemplate name="assessments"></listtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-cb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-cb.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-add-display-cb.adp	7 Apr 2005 22:22:11 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-add-display-cb.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_add_display_cb"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-f.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-f.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-add-display-f.adp	12 Jun 2006 02:49:51 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-add-display-f.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_add_display_f"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-rb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-rb.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-add-display-rb.adp	7 Apr 2005 22:26:28 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-add-display-rb.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_add_display_rb"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-sa.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-sa.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-add-display-sa.adp	7 Apr 2005 22:39:19 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-add-display-sa.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_add_display_sa"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.adp	7 Apr 2005 22:24:02 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_add_display_sb"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-ta.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-ta.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-add-display-ta.adp	7 Apr 2005 22:30:41 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-add-display-ta.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_add_display_ta"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-tb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-tb.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-add-display-tb.adp	7 Apr 2005 22:14:02 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-add-display-tb.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_add_display_tb"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-fu.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-fu.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-add-fu.adp	12 Jun 2006 02:49:51 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-add-fu.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_add_fu"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.adp	7 Apr 2005 22:20:24 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_add_mc_choices"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-mc-existing.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-mc-existing.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/item-add-mc-existing.adp	12 Jun 2006 02:49:51 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/item-add-mc-existing.adp	1 Dec 2008 16:57:02 -0000	1.5
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_add_mc_existing"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-mc.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-mc.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-add-mc.adp	7 Apr 2005 22:15:37 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-add-mc.adp	1 Dec 2008 16:57:02 -0000	1.4
@@ -2,7 +2,8 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<a href="@add_existing_link@">#assessment.add_item_type_mc_existing#</a>
-<blockquote>
-  <formtemplate id="item_add_mc"></formtemplate>
-</blockquote>
+    <p>
+      <a href="@add_existing_link@">#assessment.add_item_type_mc_existing#</a>
+    </p>
+
+    <formtemplate id="item_add_mc"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-oq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-oq.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-add-oq.adp	7 Apr 2005 22:28:52 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-add-oq.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_add_oq"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-sa.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-sa.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-add-sa.adp	7 Apr 2005 22:11:28 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-add-sa.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_add_sa"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-copy.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-copy.adp	28 Apr 2005 18:00:18 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-copy.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_copy_confirm"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-create-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-create-2.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/item-create-2.adp	1 Feb 2005 22:00:10 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/item-create-2.adp	1 Dec 2008 16:57:02 -0000	1.2
@@ -4,7 +4,3 @@
 
 
 <formtemplate id="item-add-2"></formtemplate>
-
-
-
-</master>
\ No newline at end of file
Index: openacs-4/packages/assessment/www/asm-admin/item-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-create.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/item-create.adp	1 Feb 2005 22:00:10 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/item-create.adp	1 Dec 2008 16:57:02 -0000	1.2
@@ -2,5 +2,3 @@
 <property name="context">@context;noquote@</property>
 <property name="title">Create a new Item</property>
 <formtemplate id="item-add"></formtemplate>
-
-</master>
\ No newline at end of file
Index: openacs-4/packages/assessment/www/asm-admin/item-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-delete.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-delete.adp	12 Jun 2006 02:49:51 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-delete.adp	1 Dec 2008 16:57:02 -0000	1.4
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_delete_confirm"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.adp	7 Apr 2005 21:52:04 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_edit_display_cb"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.adp	12 Jun 2006 02:49:51 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_edit_display_f"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-rb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-rb.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-edit-display-rb.adp	7 Apr 2005 21:54:01 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-rb.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_edit_display_rb"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.adp	12 Jun 2006 02:49:51 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.adp	1 Dec 2008 16:57:02 -0000	1.4
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_edit_display_sa"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.adp	7 Apr 2005 21:54:50 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_edit_display_sb"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.adp	12 Jun 2006 02:49:51 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.adp	1 Dec 2008 16:57:02 -0000	1.4
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_edit_display_ta"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-tb.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-tb.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-edit-display-tb.adp	7 Apr 2005 21:49:54 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-tb.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_edit_display_tb"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-fu.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-fu.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-edit-fu.adp	12 Jun 2006 02:49:51 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-fu.adp	1 Dec 2008 16:57:02 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_edit_fu"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.adp	29 Aug 2008 19:13:34 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.adp	1 Dec 2008 16:57:02 -0000	1.5
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_edit_mc_choices"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-mc-existing.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-mc-existing.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-edit-mc-existing.adp	12 Jun 2006 02:49:51 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-mc-existing.adp	1 Dec 2008 16:57:02 -0000	1.4
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_edit_mc_existing"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-oq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-oq.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-edit-oq.adp	12 Jun 2006 02:49:51 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-oq.adp	1 Dec 2008 16:57:03 -0000	1.4
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_edit_oq"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-sa.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-sa.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-edit-sa.adp	7 Apr 2005 21:48:35 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-sa.adp	1 Dec 2008 16:57:03 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_edit_sa"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-edit.adp	7 Apr 2005 21:46:16 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-edit.adp	1 Dec 2008 16:57:03 -0000	1.4
@@ -2,12 +2,10 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="item_edit"></formtemplate>
-</blockquote>
 
 <include src="/packages/assessment/lib/item-show-@item_type@" assessment_id="@assessment_id@" section_id="@section_id@" as_item_id="@as_item_id@">
 
 <include src="/packages/assessment/lib/item-show-display-@display_type@" assessment_id="@assessment_id@" section_id="@section_id@" as_item_id="@as_item_id@">
 
-<a href="one-a?assessment_id=@assessment_id@">@assessment_data.title@</a>
+<p><a href="one-a?assessment_id=@assessment_id@">@assessment_data.title@</a></p>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/assessment/www/asm-admin/item-edit.tcl	29 Aug 2008 19:13:34 -0000	1.12
+++ openacs-4/packages/assessment/www/asm-admin/item-edit.tcl	1 Dec 2008 16:57:03 -0000	1.13
@@ -58,7 +58,7 @@
 	if {$object(object_type) eq "content_revision"} {
 	    set link_type file
 	}
-	append links "<a href='/${link_type}/$l'>$object(title)</a><br />"
+	append links "<a href='/${link_type}/$l'>$object(title)</a><br>"
     }
     ad_form -extend -name item_edit -form {
 	{content:text(inform),optional {label "[_ assessment.item_display_Content]"} {value {$links}} {help_text "[_ assessment.item_Content_help]"}}
Index: openacs-4/packages/assessment/www/asm-admin/item-stats.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-stats.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-stats.adp	29 Aug 2008 19:11:55 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-stats.adp	1 Dec 2008 16:57:03 -0000	1.3
@@ -2,14 +2,13 @@
   <property name="title">#assessment.Question_Statistics#</property>
 
   <p><a href="@return_url;noquote@" class="button">#assessment.Back_to_Sessions#</a></p>
-  <p>
     <multiple name="items">
 	<h2>@items.section_title@</h2>
 	<group column="section_id">
       <p><b>@items.rownum@. @items.title;noquote@</b></p>
-      <blockquote>
+      <p>
 	@items.stats;noquote@
-      </blockquote>
 	</group>
+      </p>
     </multiple>
-  </p>
+
Index: openacs-4/packages/assessment/www/asm-admin/item-stats.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-stats.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/assessment/www/asm-admin/item-stats.tcl	29 Aug 2008 19:11:55 -0000	1.5
+++ openacs-4/packages/assessment/www/asm-admin/item-stats.tcl	1 Dec 2008 16:57:03 -0000	1.6
@@ -154,7 +154,7 @@
 
 		    append stats "<tr>"
 		    if { $r(correct_answer_p) && $assessment_data(type) ne "survey"} {
-			append stats "<td><img src=/resources/assessment/correct.gif /></td>"
+			append stats "<td><img src=\"/resources/assessment/correct.gif\"></td>"
 		    } else {
 			append stats "<td>&nbsp;</td>"
 		    }
@@ -163,7 +163,7 @@
 		    if { $first_p } {
 			append stats "
 <td rowspan=$total_choices>
-<b>[_ assessment.Total_Responses]</b> $total_responses<br />"
+<b>[_ assessment.Total_Responses]</b> $total_responses<br>"
 			if {$assessment_data(type) ne "survey"} {
 			    append stats "
 <b>[_ assessment.Total_Correct]</b> $total_correct"
@@ -239,7 +239,7 @@
 
 			    append stats "
 <td rowspan=$total_responses valign=\"middle\">
-[_ assessment.Mean] $mean<br />
+[_ assessment.Mean] $mean<br>
 [_ assessment.Standard_Deviation] $standard_deviation
 </td>
 "
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 -N -r1.20 -r1.21
--- openacs-4/packages/assessment/www/asm-admin/one-a.adp	31 Jan 2008 16:06:26 -0000	1.20
+++ openacs-4/packages/assessment/www/asm-admin/one-a.adp	1 Dec 2008 16:57:03 -0000	1.21
@@ -18,7 +18,7 @@
 <if @is_reg_asm_p@ not nil>
   <tr class="even">
     <th colspan="2">
-      <font color="red">#assessment.reg_asm#</font>
+      <span style="color:red">#assessment.reg_asm#</span>
     </th>
   </tr>
 </if>
Index: openacs-4/packages/assessment/www/asm-admin/one-section.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/one-section.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/one-section.adp	15 May 2007 20:14:18 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/one-section.adp	1 Dec 2008 16:57:03 -0000	1.3
@@ -33,7 +33,6 @@
     <tr class="odd">
     <tr class="even">
 <td colspan="3">
-  <blockquote>
     @title@ 
 <img src="/resources/assessment/spacer.gif" border="0" alt="" width="10">
 <a href="section-form?section_id=@section_id@&assessment_id=@assessment_id@">#assessment.Edit#</a> 
@@ -47,13 +46,9 @@
 
 <a href="section-delete?section_id=@section_id@&assessment_id=@assessment_id@"><img src="/resources/acs-subsite/Delete16.gif" border="0" alt="#assessment.remove_section#"></a>
 
-  </blockquote>
-
 </td></tr>
 </table>      
 
-<blockquote>
   <include src="/packages/assessment/lib/section-items" assessment_id="@assessment_id@" section_id="@section_id@">
-</blockquote>
 
 </multiple>
Index: openacs-4/packages/assessment/www/asm-admin/questions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/questions.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/assessment/www/asm-admin/questions.adp	5 Sep 2008 16:39:26 -0000	1.5
+++ openacs-4/packages/assessment/www/asm-admin/questions.adp	1 Dec 2008 16:57:03 -0000	1.6
@@ -4,36 +4,31 @@
 
 <include src="/packages/assessment/lib/section-links" assessment_id="@assessment_id@" tab="@tab@">
 
-<if @sections:rowcount@ eq 0>
-<p>
-<font color=red><b>#assessment.add_section_first#</b></font>
-<br><a class="button" href="section-form?assessment_id=@assessment_id@&after=0">Create a new section</a>
-</p>
-</if>
-<else>
+<if @sections:rowcount@ eq 0><br><a class="button" href="section-form?assessment_id=@assessment_id@">#assessment.add_new_section#</a></if>
+
 <multiple name="sections">
-<a name="S@sections.section_id@"><h3>#assessment.Section_Number#</h3>
-  <a class="button" href="section-form?section_id=@sections.section_id@&assessment_id=@assessment_id@">#assessment.Edit#</a> 
+<h3><a name="@sections.sort_order@">#assessment.Section_Number#: @sections.title@</a></h3>
+  <a class="button" href="@sections.section_form_edit_url@">#assessment.Edit#</a> 
 
-  <a class=button href="@section_form_add_url@">#assessment.add_new_section#</a>
-  <a class=button href="@catalog_section_url@">#assessment.Search_Section#</a>
-  <if @sections.display_type_id@ not nil><a class=button href="@section_display_form_url@">#assessment.edit_section_display#</a></if>
-  <a class=button href="@section_preview_url@">#assessment.section_preview#</a>
+  <a class="button" href="@sections.section_form_add_url@">#assessment.add_new_section#</a>
+  <a class="button" href="@sections.catalog_section_url@">#assessment.Search_Section#</a>
+  <if @sections.display_type_id@ not nil><a class="button" href="@sections.section_display_form_url@">#assessment.edit_section_display#</a></if>
+  <a class="button" href="@sections.section_preview_url@">#assessment.section_preview#</a>
 
   <if @sections.sort_order@ lt @max_sort_order@>
-  <a  href="@section_swap_down_url@"><img src="/resources/assessment/down.gif" style="border: 0;" alt="#assessment.Move_Down#"></a>
+  <a  href="@sections.section_swap_down_url@"><img src="/resources/assessment/down.gif" style="border: 0;" alt="#assessment.Move_Down#"></a>
   </if>
   <if @sections.sort_order@ gt 1>
-  <a href="@section_swap_up_url@"><img src="/resources/assessment/up.gif" style="border: 0;" alt="#assessment.Move_Up#"></a>
+  <a href="@sections.section_swap_up_url@"><img src="/resources/assessment/up.gif" style="border: 0;" alt="#assessment.Move_Up#"></a>
   </if>
 
-  <a href="@section_delete_url@"><img src="/resources/acs-subsite/Delete16.gif" style="border: 0;" alt="#assessment.remove_section#"></a>
+  <a href="@sections.section_delete_url@"><img src="/resources/acs-subsite/Delete16.gif" style="border: 0;" alt="#assessment.remove_section#"></a>
   <if @sections.max_time_to_complete@ not nil> (#assessment.max_time# @sections.max_time_to_complete@) </if>
   (@sections.points@ #assessment.points#)
 
 <if @admin_trigger_p@>
-  <a class=button href="@checks_admin_url@">#assessment.admin_triggers#</a>
-  <a class=button href="@add_edit_section_check_url@">#assessment.add_section_trigger#</a>
+  <a class="button" href="@sections.checks_admin_url@">#assessment.admin_triggers#</a>
+  <a class="button" href="@sections.add_edit_section_check_url@">#assessment.add_section_trigger#</a>
 </if>
 
   <img src="/resources/assessment/spacer.gif" style="border: 0;" alt="" width="10">
Index: openacs-4/packages/assessment/www/asm-admin/questions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/questions.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/questions.tcl	31 Jan 2008 16:06:26 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/questions.tcl	1 Dec 2008 16:57:03 -0000	1.4
@@ -35,8 +35,8 @@
     set section_delete_url [export_vars -base section-delete {section_id assessment_id}]
     set checks_admin_url [export_vars -base checks-admin {assessment_id section_id}]
     set add_edit_section_check_url [export_vars -base add-edit-section-checks {assessment_id section_id}]
-    set section_swap_down_url [export_vars -base section-swap {assessment_id section_id {direction down}}]
-    set section_swap_up_url [export_vars -base section-swap {assessment_id section_id {direction up}}]
+    set section_swap_down_url [export_vars -base section-swap {assessment_id section_id {direction down} sort_order}]
+    set section_swap_up_url [export_vars -base section-swap {assessment_id section_id {direction up} sort_order}]
 }
 
 
Index: openacs-4/packages/assessment/www/asm-admin/results-export.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-export.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/results-export.adp	15 Apr 2005 17:26:46 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/results-export.adp	1 Dec 2008 16:57:03 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="assessment_export"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/results-session.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-session.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/assessment/www/asm-admin/results-session.tcl	19 Dec 2007 11:55:07 -0000	1.7
+++ openacs-4/packages/assessment/www/asm-admin/results-session.tcl	1 Dec 2008 16:57:03 -0000	1.8
@@ -63,15 +63,22 @@
 set session_score 0
 set assessment_score 0
 db_multirow sections sections {} {
-    if {[empty_string_p $points]} {
-	set points 0
+    if {$session_finish ne ""} {
+        set session_score [db_string get_session_score {} -default ""]
+        set assessment_score [db_string get_max_points {} -default ""]
+        #set max_time_to_complete [as::assessment::pretty_time -seconds $assessment_data(max_time_to_complete)]
+        set max_time_to_complete ""
+        if {$session_score ne "" && $assessment_score ne "" && $assessment_score > 0} {
+            set percent_score "[format "%3.2f" [expr {$session_score / ($assessment_score + 0.0) * 100}]]"
+        } else {
+            set percent_score ""
+        }
+        set showpoints [parameter::get -parameter "ShowPoints" -default 1 ]
+    } else {
+        set percent_score ""
+        set showpoints 0
     }
-    if {[empty_string_p $max_points]} {
-	set max_points 0
-    }
-    set max_time_to_complete [as::assessment::pretty_time -seconds $max_time_to_complete]
-    incr session_score $points
-    incr assessment_score $max_points
+
 }
 
 set showpoints [parameter::get -parameter "ShowPoints" -default 1 ]
Index: openacs-4/packages/assessment/www/asm-admin/results-session.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-session.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/results-session.xql	21 Feb 2005 14:32:56 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/results-session.xql	1 Dec 2008 16:57:03 -0000	1.2
@@ -40,4 +40,17 @@
       </querytext>
 </fullquery>
 
+<fullquery name="get_session_score">
+      <querytext>
+            select sum(coalesce(points,0)) from as_item_data where session_id=:session_id
+      </querytext>
+</fullquery>
+
+<fullquery name="get_max_points">
+      <querytext>
+            select sum(coalesce(i.points,0)) from as_items i, as_item_data d 
+                where d.session_id = :session_id and i.as_item_id = d.as_item_id
+      </querytext>
+</fullquery>
+
 </queryset>
Index: openacs-4/packages/assessment/www/asm-admin/results-users.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-users.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/assessment/www/asm-admin/results-users.tcl	31 Jan 2008 16:06:26 -0000	1.12
+++ openacs-4/packages/assessment/www/asm-admin/results-users.tcl	1 Dec 2008 16:57:03 -0000	1.13
@@ -84,7 +84,7 @@
     -elements {
 	session_id {
 	    label {[_ assessment.View_Results]}
-	    display_template {<if @results.result_url@ not nil><a href="@results.result_url@">View</a></if><else></else>}
+	    display_template {<if @results.session_id@ not nil><a href="@results.result_url@">View</a></if><else></else>}
 	}
 	subject_name {
 	    label {[_ assessment.Name]}
@@ -99,7 +99,7 @@
 	percent_score {
 	    label {[_ assessment.Percent_Score]}
 	    html {align right style white-space:nowrap}
-	    display_template {<if @results.result_url@ not nil><a href="@results.result_url@">@results.percent_score@</a></if><else></else>}
+        display_template {<if @results.result_url@ not nil><a href="@results.result_url@">@results.percent@<if @results.percent@ not nil>%</if></a></if><else></else>}
 	}
     } -filters {
 	assessment_id {
@@ -124,7 +124,7 @@
 
 template::multirow create subjects subject_id subject_url subject_name
 
-db_multirow -extend { result_url subject_url status delete_url } results assessment_results {} {
+db_multirow -extend { result_url subject_url status delete_url session_score assessment_score percent } results assessment_results {} {
     # to display list of users who answered the assessment if anonymous
     template::multirow append subjects $subject_id [acs_community_member_url -user_id $subject_id] $subject_name
 
@@ -135,10 +135,23 @@
 	set subject_url [acs_community_member_url -user_id $subject_id]
     }
     set result_url [export_vars -base "results-session" {session_id}]
-    if {$completed_datetime eq ""} {
-        set status "Incomplete"
+    if { $completed_datetime eq "" && $session_id eq "" } {
+        set status [_ assessment.Not_Taken]
+    } elseif { $completed_datetime eq "" && $session_id ne "" } {
+        set status [_ assessment.Incomplete]
+        set session_score ""
+        set assessment_score ""
     } else {
-        set status "Complete"
+        set status [_ assessment.Complete]
+        set session_score [db_string get_session_score {} -default ""]
+        set assessment_score [db_string get_max_points {}]
+        if { $assessment_score > 0 } {
+            set percent [format "%3.2f" [expr double([expr double($session_score)*100] / [expr double($assessment_score)])]]
+        } else {
+            set percent ""
+        }
+
+
     }
     set delete_url [export_vars -base session-delete {assessment_id subject_id session_id}]
 }
Index: openacs-4/packages/assessment/www/asm-admin/results-users.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-users.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/results-users.xql	7 Oct 2007 22:36:54 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/results-users.xql	1 Dec 2008 16:57:03 -0000	1.5
@@ -22,4 +22,17 @@
 	</querytext>
 </fullquery>
 
+<fullquery name="get_session_score">
+    <querytext>
+        select sum(coalesce(points,0))
+         from as_item_data where session_id=:session_id
+    </querytext>
+</fullquery>
+
+<fullquery name="get_max_points">
+    <querytext>
+        select sum(coalesce(i.points,0)) from as_items i, as_item_data d where d.session_id = :session_id and i.as_item_id = d.as_item_id
+    </querytext>
+</fullquery>
+
 </queryset>
Index: openacs-4/packages/assessment/www/asm-admin/section-copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-copy.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/section-copy.adp	12 Jun 2006 02:49:51 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/section-copy.adp	1 Dec 2008 16:57:03 -0000	1.4
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<blockquote>
   <formtemplate id="section_copy_confirm"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/section-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-delete.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/section-delete.adp	12 Jun 2006 02:49:51 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/section-delete.adp	1 Dec 2008 16:57:03 -0000	1.4
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<blockquote>
   <formtemplate id="section_delete_confirm"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/section-display-form.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-display-form.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/section-display-form.adp	7 Apr 2005 21:40:45 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/section-display-form.adp	1 Dec 2008 16:57:03 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="section_display_form"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/section-form.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-form.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/section-form.adp	7 Apr 2005 21:34:45 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/section-form.adp	1 Dec 2008 16:57:03 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="section_form"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/section-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-form.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/assessment/www/asm-admin/section-form.tcl	7 Oct 2007 22:36:54 -0000	1.8
+++ openacs-4/packages/assessment/www/asm-admin/section-form.tcl	1 Dec 2008 16:57:03 -0000	1.9
@@ -6,7 +6,7 @@
 } {
     assessment_id:integer
     section_id:integer,optional
-    after:integer,optional
+    {after:integer,optional 1}
     {__new_p 0}
 } -properties {
     context:onevalue
Index: openacs-4/packages/assessment/www/asm-admin/section-preview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-preview.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/assessment/www/asm-admin/section-preview.adp	31 Jan 2008 16:06:26 -0000	1.5
+++ openacs-4/packages/assessment/www/asm-admin/section-preview.adp	1 Dec 2008 16:57:03 -0000	1.6
@@ -29,10 +29,10 @@
       <if @items.title@ ne @items.next_title@>
         </td></tr>
         <tr class="form-widget"><if @assessment_data.show_item_name_p@ eq t><td colspan=4></if><else><td colspan=3></else>
-          <blockquote><table>
+          <table>
       </if>
       <else>
-        <td><blockquote><table>
+        <td><table>
       </else>
 <group column=title>
           <tr class="form-widget">
@@ -83,7 +83,6 @@
 </td></tr>
 </group></table>
 
-        </blockquote>
         </td></tr>
         <tr><td colspan=4><hr></td></tr>
       </multiple>
Index: openacs-4/packages/assessment/www/asm-admin/send-mail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/send-mail.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/send-mail.adp	8 Apr 2005 00:50:35 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/send-mail.adp	1 Dec 2008 16:57:03 -0000	1.3
@@ -2,6 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<blockquote>
   <formtemplate id="send-mail"></formtemplate>
-</blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/sessions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/sessions.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/assessment/www/asm-admin/sessions.tcl	31 Jan 2008 16:06:26 -0000	1.5
+++ openacs-4/packages/assessment/www/asm-admin/sessions.tcl	1 Dec 2008 16:57:03 -0000	1.6
@@ -113,7 +113,7 @@
 		<if @sessions.percent_score@ not nil>
 		@sessions.percent_score@%
 		</if>
-		<img src="/resources/right.gif" border=0 /></a>
+		<img src="/resources/right.gif" style="border:0"></a>
 		</if>
 	    }
 	    hide_p {[expr {[info exists assessment_data(type)] && $assessment_data(type) != "test"}]}
Index: openacs-4/packages/assessment/www/asm-admin/unzip-file.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/unzip-file.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/unzip-file.adp	1 Feb 2005 22:00:10 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/unzip-file.adp	1 Dec 2008 16:57:03 -0000	1.2
@@ -1,7 +1,8 @@
 <master>
 <property name="title">Assessment</property>
 <property name="context">@context;noquote@</property>
+<p>
 #assessment.Assessment_Imported_Correctly#
 <br>
 <a href="index">#assessment.Upload_files#</a>
-</master>
+</p>
Index: openacs-4/packages/assessment/www/asm-admin/view-item-responses.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/view-item-responses.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/view-item-responses.adp	12 Jun 2006 12:14:58 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/view-item-responses.adp	1 Dec 2008 16:57:03 -0000	1.2
@@ -2,6 +2,4 @@
   <property name="title">#assessment.Item_Responses#</property>
 
   <p><a href="@return_url;noquote@" class="button">#assessment.Back_to_Summary#</a></p>
-  <p>
-    <listtemplate name="responses"></listtemplate>
-  </p>
\ No newline at end of file
+  <listtemplate name="responses"></listtemplate>