Index: classes/submission/trackDirector/TrackDirectorAction.inc.php
===================================================================
RCS file: /cvs/ocs2/classes/submission/trackDirector/TrackDirectorAction.inc.php,v
retrieving revision 1.46.2.2
diff -u -r1.46.2.2 TrackDirectorAction.inc.php
--- classes/submission/trackDirector/TrackDirectorAction.inc.php	29 Oct 2008 03:34:20 -0000	1.46.2.2
+++ classes/submission/trackDirector/TrackDirectorAction.inc.php	11 Nov 2008 01:11:21 -0000
@@ -1446,18 +1446,54 @@
 						if ($reviewAssignment->getDateCompleted() != null && !$reviewAssignment->getCancelled()) {
 							// Get the comments associated with this review assignment
 							$paperComments = &$paperCommentDao->getPaperComments($trackDirectorSubmission->getPaperId(), COMMENT_TYPE_PEER_REVIEW, $reviewAssignment->getReviewId());
-							$body .= "------------------------------------------------------\n";
-							$body .= Locale::translate('submission.comments.importPeerReviews.reviewerLetter', array('reviewerLetter' => chr(ord('A') + $reviewIndexes[$reviewAssignment->getReviewId()]))) . "\n";
-							if (is_array($paperComments)) {
-								foreach ($paperComments as $comment) {
-									// If the comment is viewable by the presenter, then add the comment.
-									if ($comment->getViewable()) {
-										$body .= $comment->getComments() . "\n\n";
-										$hasBody = true;
+							
+							if ($paperComments) {
+								$body .= "------------------------------------------------------\n";
+								$body .= Locale::translate('submission.comments.importPeerReviews.reviewerLetter', array('reviewerLetter' => chr(ord('A') + $reviewIndexes[$reviewAssignment->getReviewId()]))) . "\n";
+								if (is_array($paperComments)) {
+									foreach ($paperComments as $comment) {
+										// If the comment is viewable by the presenter, then add the comment.
+										if ($comment->getViewable()) {
+											$body .= $comment->getComments() . "\n\n";
+											$hasBody = true;
+										}
 									}
 								}
+								$body .= "------------------------------------------------------\n\n";
+							} 
+							if ($reviewFormId = $reviewAssignment->getReviewFormId()){
+								$reviewId = $reviewAssignment->getReviewId();
+								
+								$reviewFormResponseDao =& DAORegistry::getDAO('ReviewFormResponseDAO');
+								$reviewFormElementDao =& DAORegistry::getDAO('ReviewFormElementDAO');
+								$reviewFormElements =& $reviewFormElementDao->getReviewFormElements($reviewFormId);
+								if (!$paperComments) {
+									$body .= "------------------------------------------------------\n";
+									$body .= Locale::translate('submission.comments.importPeerReviews.reviewerLetter', array('reviewerLetter' => chr(ord('A') + $reviewIndexes[$reviewAssignment->getReviewId()]))) . "\n\n";
+								}
+								foreach ($reviewFormElements as $reviewFormElement) {
+									$body .= $reviewFormElement->getReviewFormElementQuestion() . ": \n";
+									$reviewFormResponse = $reviewFormResponseDao->getReviewFormResponse($reviewId, $reviewFormElement->getReviewFormElementId());
+			
+									if ($reviewFormResponse) {	
+										$possibleResponses = $reviewFormElement->getReviewFormElementPossibleResponses();
+										if (in_array($reviewFormElement->getElementType(), $reviewFormElement->getMultipleResponsesElementTypes())) {
+											if ($reviewFormElement->getElementType() == REVIEW_FORM_ELEMENT_TYPE_CHECKBOXES) {
+												foreach ($reviewFormResponse->getValue() as $value) {
+													$body .= "\t" . String::html2utf(strip_tags($possibleResponses[$value-1]['content'])) . "\n";
+												}
+											} else {
+												$body .= "\t" . String::html2utf(strip_tags($possibleResponses[$reviewFormResponse->getValue()-1]['content'])) . "\n";
+											}
+											$body .= "\n";
+										} else {
+											$body .= "\t" . String::html2utf(strip_tags($reviewFormResponse->getValue())) . "\n\n";
+										}
+									}								
+								}
+								$body .= "------------------------------------------------------\n\n";
+								$hasBody = true;
 							}
-							$body .= "------------------------------------------------------\n\n";
 						} // if
 					} // foreach
 					if ($hasBody) {
Index: templates/reviewer/submission.tpl
===================================================================
RCS file: /cvs/ocs2/templates/reviewer/submission.tpl,v
retrieving revision 1.26.2.1
diff -u -r1.26.2.1 submission.tpl
--- templates/reviewer/submission.tpl	29 Oct 2008 03:34:21 -0000	1.26.2.1
+++ templates/reviewer/submission.tpl	11 Nov 2008 01:11:23 -0000
@@ -259,24 +259,7 @@
 		<td colspan="2">&nbsp;</td>
 	</tr>
 {/if}{* $reviewAssignment->getReviewFormId() *}
-<tr valign="top">
-	<td>{$currentStep|escape}.{assign var="currentStep" value=$currentStep+1}</td>
-	<td><span class="instruct">{translate key="reviewer.paper.enterReviewA"}</span></td>
-</tr>
-<tr valign="top">
-	<td>&nbsp;</td>
-	<td>
-		{translate key="submission.review"} 
-		{if $confirmedStatus and not $declined}
-			<a href="javascript:openComments('{url op="viewPeerReviewComments" path=$paperId|to_array:$reviewId}');" class="icon">{icon name="comment"}</a>
-		{else}
-			 {icon name="comment" disabled="disabled"}
-		{/if}
-	</td>
-</tr>
-<tr>
-	<td colspan="2">&nbsp;</td>
-</tr>
+
 <tr valign="top">
 	<td>{$currentStep|escape}.{assign var="currentStep" value=$currentStep+1}</td>
 	<td><span class="instruct">{translate key="reviewer.paper.uploadFile"}</span></td>