Index: openacs-4/packages/assessment/lib/assessment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/assessment.tcl,v
diff -u -r1.18.2.1 -r1.18.2.2
--- openacs-4/packages/assessment/lib/assessment.tcl	26 Jan 2007 00:33:57 -0000	1.18.2.1
+++ openacs-4/packages/assessment/lib/assessment.tcl	2 Feb 2007 17:07:35 -0000	1.18.2.2
@@ -43,7 +43,10 @@
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
 permission::require_permission -object_id $assessment_id -privilege read
-
+if {$assessment_data(publish_status) ne "live" && ![permission::permission_p -object_id $assessment_id -party_id [ad_conn user_id] -privilege "admin"]} {
+    ad_return_complaint 1 "[_ assessment.Requested_assess_is_no_longer_available]"
+    ad_script_abort
+}
 if {![info exists assessment_data(assessment_id)]} {
     ad_return_complaint 1 "[_ assessment.Requested_assess_does]"
     ad_script_abort
Index: openacs-4/packages/assessment/www/asm-admin/one-a.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/one-a.adp,v
diff -u -r1.17.2.3 -r1.17.2.4
--- openacs-4/packages/assessment/www/asm-admin/one-a.adp	1 Feb 2007 21:47:56 -0000	1.17.2.3
+++ openacs-4/packages/assessment/www/asm-admin/one-a.adp	2 Feb 2007 17:07:35 -0000	1.17.2.4
@@ -53,7 +53,13 @@
         (<a href="@toggle_type_url@">#assessment.Change_type#</a>)
     </td>
   </tr>
+  <tr class="odd">
+    <td>&nbsp;</td><td>
+	<a href="../assessment?assessment_id=@assessment_id@">Preview Assessment</a> (your responses will be recorded)
+    </td>
+  </tr>
 
+
 <tr class="even">
   <td>#assessment.View_Responses# </td>
   <td>
@@ -63,7 +69,7 @@
 </tr>
 
 <tr class="odd">
-  <td valign="top" rowspan="8"><nobr>#assessment.Response_Options# </nobr></td>
+  <td valign="top" rowspan="7"><nobr>#assessment.Response_Options# </nobr></td>
 </tr>
 
 <tr class="odd">
@@ -100,9 +106,7 @@
 	[ <a href="@edit_url@">#assessment.Edit#</a> ]</td>
 </tr>
 
-<tr class="even"><td valign="top" rowspan="2">#assessment.Email_Options#</td><td >@notification_chunk;noquote@</td></tr>
-
-<tr class="even"><td ><a href="send-mail?assessment_id=@assessment_id@">#assessment.Send_bulkmail#</a> #assessment.regarding_this_assess# </td></tr>
+<tr class="even"><td valign="top">#assessment.Email_Options#</td><td >@notification_chunk;noquote@ <br /><a href="send-mail?assessment_id=@assessment_id@">#assessment.Send_bulkmail#</a> #assessment.regarding_this_assess# </td></tr>
 	
 <tr class="odd">
 	<td>#assessment.Extreme_Actions# </td>