Index: samigo-app/src/webapp/css/tool_sam.css
===================================================================
--- samigo-app/src/webapp/css/tool_sam.css	(revision 309183)
+++ samigo-app/src/webapp/css/tool_sam.css	(working copy)
@@ -569,11 +569,6 @@
 	height: 100%;
 }
 
-.mcAnswerText {
-	display:inline-table;
-	width: 80%;
-}
-
 #timer-expired-warning{
 	text-align: center;	
 }
@@ -907,3 +902,25 @@
 }
 
 
+/* rte fixup */ 
+.samMcAnswerTable td {
+    vertical-align: top;
+}
+
+.samMcAnswerTable p {
+    margin-top: 0;
+}
+
+.samMcAnswerTable input[type="checkbox"],
+.samMcAnswerTable input[type="radio"] {
+    margin-top: 0;
+    padding-top: 0; 
+}
+
+.samMcCheckboxImg {
+    margin-top: -3px;
+}
+
+.samMcRadioImg {
+    margin-top: -1px;
+}
Index: samigo-app/src/webapp/jsf/author/preview_item/MultipleChoiceMultipleCorrect.jsp
===================================================================
--- samigo-app/src/webapp/jsf/author/preview_item/MultipleChoiceMultipleCorrect.jsp	(revision 309183)
+++ samigo-app/src/webapp/jsf/author/preview_item/MultipleChoiceMultipleCorrect.jsp	(working copy)
@@ -27,19 +27,22 @@
   <!-- ATTACHMENTS -->
   <%@ include file="/jsf/author/preview_item/attachment.jsp" %>
 
-  <h:dataTable value="#{question.itemData.itemTextArraySorted}" var="itemText" width="100%">
+  <h:dataTable value="#{question.itemData.itemTextArraySorted}" var="itemText">
     <h:column>
-      <h:dataTable value="#{itemText.answerArraySorted}" var="answer" width="100%">
+      <h:dataTable value="#{itemText.answerArraySorted}" var="answer" styleClass="samMcAnswerTable">
         <h:column> 
          <h:panelGroup rendered="#{answer.text != null && answer.text ne ''}">
           <h:graphicImage id="image1" rendered="#{answer.isCorrect}"
-             alt="#{authorMessages.correct}" url="/images/checked.gif" />         
+             alt="#{authorMessages.correct}" url="/images/checked.gif" styleClass="samMcCheckboxImg" />         
           <h:graphicImage id="image2" rendered="#{!answer.isCorrect}"
-             alt="#{authorMessages.not_correct}" url="/images/unchecked.gif"/>      
+             alt="#{authorMessages.not_correct}" url="/images/unchecked.gif" styleClass="samMcCheckboxImg" />      
+         </h:panelGroup>
+        </h:column>
+        <h:column rendered="#{answer.text != null && answer.text ne ''}">
           <h:outputText escape="false" value="#{answer.label}. " />
-          <h:outputText escape="false" value="#{answer.text}" styleClass="mcAnswerText"/>
-
-        </h:panelGroup>
+        </h:column>
+        <h:column rendered="#{answer.text != null && answer.text ne ''}">
+          <h:outputText escape="false" value="#{answer.text} " /> 
         </h:column><h:column>
         <h:panelGroup rendered="#{answer.text ne null && answer.text ne '' && author.isEditPendingAssessmentFlow && assessmentSettings.feedbackAuthoring ne '1' && answer.generalAnswerFbIsNotEmpty}">    
          <h:outputLabel value=" #{commonMessages.feedback}: " />
Index: samigo-app/src/webapp/jsf/author/preview_item/MultipleChoiceSingleCorrect.jsp
===================================================================
--- samigo-app/src/webapp/jsf/author/preview_item/MultipleChoiceSingleCorrect.jsp	(revision 309183)
+++ samigo-app/src/webapp/jsf/author/preview_item/MultipleChoiceSingleCorrect.jsp	(working copy)
@@ -28,18 +28,21 @@
   <!-- ATTACHMENTS -->
   <%@ include file="/jsf/author/preview_item/attachment.jsp" %>
 
-  <h:dataTable value="#{question.itemData.itemTextArraySorted}" var="itemText" width="100%">
+  <h:dataTable value="#{question.itemData.itemTextArraySorted}" var="itemText">
     <h:column>
-      <h:dataTable value="#{itemText.answerArraySorted}" var="answer" width="100%">
+      <h:dataTable value="#{itemText.answerArraySorted}" var="answer" styleClass="samMcAnswerTable">
         <h:column>
          <h:panelGroup rendered="#{answer.text !=null && answer.text!=''}">
-          <h:graphicImage id="image1" rendered="#{answer.isCorrect}" alt="#{authorMessages.correct}" url="/images/radiochecked.gif"/>
+          <h:graphicImage id="image1" rendered="#{answer.isCorrect}" alt="#{authorMessages.correct}" url="/images/radiochecked.gif" styleClass="samMcRadioImg" />
          
-          <h:graphicImage id="image2" rendered="#{!answer.isCorrect}" alt="#{authorMessages.not_correct}" url="/images/radiounchecked.gif"/>
-        
+          <h:graphicImage id="image2" rendered="#{!answer.isCorrect}" alt="#{authorMessages.not_correct}" url="/images/radiounchecked.gif" styleClass="samMcRadioImg" />
+         </h:panelGroup>
+        </h:column>
+        <h:column rendered="#{answer.text != null && answer.text ne ''}">
           <h:outputText escape="false" value="#{answer.label}. " />
-          <h:outputText escape="false" value="#{answer.text}" styleClass="mcAnswerText"/>
-</h:panelGroup>
+        </h:column>
+        <h:column rendered="#{answer.text !=null && answer.text!=''}">        
+          <h:outputText escape="false" value="#{answer.text}" />
 </h:column><h:column>
  
           <h:panelGroup rendered="#{answer.text ne null && answer.text ne '' && author.isEditPendingAssessmentFlow && assessmentSettings.feedbackAuthoring ne '1' && answer.generalAnswerFbIsNotEmpty}">
Index: samigo-app/src/webapp/jsf/delivery/item/deliverMultipleChoiceMultipleCorrect.jsp
===================================================================
--- samigo-app/src/webapp/jsf/delivery/item/deliverMultipleChoiceMultipleCorrect.jsp	(revision 309183)
+++ samigo-app/src/webapp/jsf/delivery/item/deliverMultipleChoiceMultipleCorrect.jsp	(working copy)
@@ -27,7 +27,7 @@
   <!-- ATTACHMENTS -->
   <%@ include file="/jsf/delivery/item/attachment.jsp" %>
 
-  <h:dataTable value="#{question.selectionArray}" var="selection" width="100%">
+  <h:dataTable value="#{question.selectionArray}" var="selection" styleClass="samMcAnswerTable">
     <h:column rendered="#{delivery.feedback eq 'true' &&
        delivery.feedbackComponent.showCorrectResponse && !delivery.noFeedback=='true'}">
       <h:graphicImage id="image"
@@ -41,16 +41,18 @@
       </h:graphicImage>
     </h:column>
     <h:column>
-     <f:verbatim><label></f:verbatim>
      <h:selectBooleanCheckbox value="#{selection.response}"
         disabled="#{delivery.actionString=='reviewAssessment'
                  || delivery.actionString=='gradeAssessment'}" />
+    </h:column>
+    <h:column>
      <h:outputText value=" #{selection.answer.label}" escape="false" />
      <h:outputText value="#{deliveryMessages.dot}" rendered="#{selection.answer.label ne ''}" />
-     <h:outputText value=" #{selection.answer.text}" styleClass="mcAnswerText" escape="false" />
-     <f:verbatim></label></f:verbatim>
     </h:column>
     <h:column>
+     <h:outputText value=" #{selection.answer.text}" escape="false" />
+    </h:column>
+    <h:column>
       <h:panelGroup rendered="#{delivery.feedback eq 'true' &&
        delivery.feedbackComponent.showSelectionLevel &&
 	   selection.answer.generalAnswerFeedback != 'null' && selection.answer.generalAnswerFeedback != null && selection.answer.generalAnswerFeedback != ''&& selection.response}" > 
Index: samigo-app/src/webapp/jsf/delivery/item/deliverMultipleChoiceSingleCorrect.jsp
===================================================================
--- samigo-app/src/webapp/jsf/delivery/item/deliverMultipleChoiceSingleCorrect.jsp	(revision 309183)
+++ samigo-app/src/webapp/jsf/delivery/item/deliverMultipleChoiceSingleCorrect.jsp	(working copy)
@@ -50,7 +50,7 @@
   <f:verbatim></div></f:verbatim>
 
 
-  <h:dataTable value="#{question.selectionArray}" var="selection" width="100%">
+  <h:dataTable value="#{question.selectionArray}" var="selection" styleClass="samMcAnswerTable">
     <h:column rendered="#{delivery.feedback eq 'true' &&
        delivery.feedbackComponent.showCorrectResponse && !delivery.noFeedback=='true'}">
       <h:graphicImage id="image"
@@ -67,8 +67,10 @@
 	</h:column> 	 
 	<h:column> 	 
 	  <h:outputText value=" #{selection.answer.label}" escape="false" /> 	 
-	  <h:outputText value=". " rendered="#{selection.answer.label ne ''}" /> 	 
-	  <h:outputText value="#{selection.answer.text}" styleClass="mcAnswerText" escape="false" >
+	  <h:outputText value="." rendered="#{selection.answer.label ne ''}" /> 	 
+	</h:column>
+	<h:column>
+	  <h:outputText value="#{selection.answer.text}" escape="false" >
      	<f:converter converterId="org.sakaiproject.tool.assessment.jsf.convert.AnswerSurveyConverter" />
       </h:outputText>
     </h:column>
@@ -85,7 +87,7 @@
   </h:dataTable>
 
   <f:verbatim></div></f:verbatim>
-  <f:verbatim><script>$('div.mcscFixUp').each(function(index1,elBlockToFix){$(elBlockToFix).find('div.mcscFixUpSource label').each(function(index,elLabelAndInputToMove){$(elBlockToFix).find('div.mcscFixUpTarget:first').replaceWith($(elLabelAndInputToMove));$(elLabelAndInputToMove).parent('td').next('td').contents().appendTo(elLabelAndInputToMove);$(elLabelAndInputToMove).parent('td').next('td').remove();});$(elBlockToFix).find('div.mcscFixUpSource').remove();});</script></f:verbatim>
+  <f:verbatim><script>$('div.mcscFixUp').each(function(index1,elBlockToFix){$(elBlockToFix).find('div.mcscFixUpSource label').each(function(index,elLabelAndInputToMove){$(elBlockToFix).find('div.mcscFixUpTarget:first').replaceWith($(elLabelAndInputToMove));});$(elBlockToFix).find('div.mcscFixUpSource').remove();});</script></f:verbatim>
 
   <h:panelGroup
     rendered="#{question.itemData.hasRationale && question.itemData.typeId != 3}" >
Index: samigo-app/src/webapp/jsf/evaluation/item/displayMultipleChoiceMultipleCorrect.jsp
===================================================================
--- samigo-app/src/webapp/jsf/evaluation/item/displayMultipleChoiceMultipleCorrect.jsp	(revision 309183)
+++ samigo-app/src/webapp/jsf/evaluation/item/displayMultipleChoiceMultipleCorrect.jsp	(working copy)
@@ -26,7 +26,7 @@
   <h:outputText value="#{question.text}"  escape="false"/>
   <h:dataTable value="#{question.itemTextArray}" var="itemText">
    <h:column>
-   <h:dataTable value="#{itemText.answerArraySorted}" var="answer" width="100%">
+   <h:dataTable value="#{itemText.answerArraySorted}" var="answer" styleClass="samMcAnswerTable">
     <h:column rendered="#{answer.text!=null && answer.text!=''}">
       <h:graphicImage id="image6" rendered="#{answer.isCorrect}"
         alt="#{evaluationMessages.alt_correct}" url="/images/delivery/checkmark.gif" >
@@ -47,7 +47,7 @@
       </h:selectManyCheckbox>
     </h:column>
     <h:column rendered="#{answer.text!=null && answer.text!=''}">
-      <h:outputText styleClass="mcAnswerText" value="#{answer.text}" escape="false" />
+      <h:outputText value="#{answer.text}" escape="false" />
     </h:column>
    </h:dataTable>
    </h:column>
Index: samigo-app/src/webapp/jsf/evaluation/item/displayMultipleChoiceSingleCorrect.jsp
===================================================================
--- samigo-app/src/webapp/jsf/evaluation/item/displayMultipleChoiceSingleCorrect.jsp	(revision 309183)
+++ samigo-app/src/webapp/jsf/evaluation/item/displayMultipleChoiceSingleCorrect.jsp	(working copy)
@@ -26,7 +26,7 @@
   <h:outputText value="#{question.text}"  escape="false"/>
   <h:dataTable value="#{question.itemTextArray}" var="itemText">
    <h:column>
-   <h:dataTable value="#{itemText.answerArraySorted}" var="answer" width="100%">
+   <h:dataTable value="#{itemText.answerArraySorted}" var="answer" styleClass="samMcAnswerTable">
     <h:column rendered="#{answer.text!=null && answer.text!=''}">
       <h:graphicImage id="image8" rendered="#{answer.isCorrect || (question.partialCreditFlag && answer.partialCredit gt 0)}"
          alt="#{evaluationMessages.alt_correct}" url="/images/delivery/checkmark.gif" >
@@ -47,7 +47,7 @@
       </h:selectOneRadio>
     </h:column>
     <h:column rendered="#{answer.text!=null && answer.text!=''}">
-      <h:outputText styleClass="mcAnswerText" value="#{answer.text}" escape="false" >
+      <h:outputText value="#{answer.text}" escape="false" >
       	<f:converter converterId="org.sakaiproject.tool.assessment.jsf.convert.AnswerSurveyConverter" />
       </h:outputText>
     </h:column>
Index: samigo-app/src/webapp/jsf/evaluation
===================================================================
--- samigo-app/src/webapp/jsf/evaluation	(revision 309183)
+++ samigo-app/src/webapp/jsf/evaluation	(working copy)

Property changes on: samigo-app/src/webapp/jsf/evaluation
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /sam/branches/SAM-2066-uva/samigo-app/src/webapp/jsf/evaluation:r309176-309183
Index: samigo-app/src/webapp/jsf/print/preview_item/MultipleChoiceMultipleCorrect.jsp
===================================================================
--- samigo-app/src/webapp/jsf/print/preview_item/MultipleChoiceMultipleCorrect.jsp	(revision 309183)
+++ samigo-app/src/webapp/jsf/print/preview_item/MultipleChoiceMultipleCorrect.jsp	(working copy)
@@ -32,21 +32,22 @@
   <h:outputText value="<br />" escape="false" />    
   <%@ include file="/jsf/delivery/item/attachment.jsp" %>
 
-  <h:dataTable value="#{question.itemData.itemTextArraySorted}" var="itemText" width="100%">
+  <h:dataTable value="#{question.itemData.itemTextArraySorted}" var="itemText" styleClass="samMcAnswerTable">
     <h:column>
-      <h:dataTable value="#{itemText.answerArraySorted}" var="answer" width="100%">
+      <h:dataTable value="#{itemText.answerArraySorted}" var="answer">
         <h:column> 
-          <%-- inputBlock --%>
-          <h:panelGroup styleClass="inputBlock" rendered="#{answer.text != null && answer.text ne ''}">
-                     
-            <%-- Show answer text --%>
-            <h:graphicImage id="image1" url="/images/unchecked.gif"/>
-            <h:outputText escape="false" value="#{answer.label}. " />
-            <h:outputText escape="false" value="#{answer.text}" styleClass="mcAnswerText"/>
-            
-          </h:panelGroup>
+            <%-- Show answer button --%>
+            <h:graphicImage id="image1" url="/images/unchecked.gif" rendered="#{answer.text !=null && answer.text!=''}" styleClass="samMcCheckboxImg" />
         </h:column>
         <h:column>
+            <%-- show answer label --%>
+            <h:outputText escape="false" value="#{answer.label}. " rendered="#{answer.text !=null && answer.text!=''}" />
+        </h:column>
+        <h:column>
+            <%-- show answer text --%>
+            <h:outputText escape="false" value="#{answer.text}" rendered="#{answer.text !=null && answer.text!=''}" />
+        </h:column>
+        <h:column>
           <%-- Show feedback answer --%>
           <h:panelGroup styleClass="feedbackBlock" rendered="#{printSettings.showKeysFeedback && answer.text !=null && answer.text!=''}">
   			<h:outputLabel value="#{commonMessages.feedback}: " />
Index: samigo-app/src/webapp/jsf/print/preview_item/MultipleChoiceSingleCorrect.jsp
===================================================================
--- samigo-app/src/webapp/jsf/print/preview_item/MultipleChoiceSingleCorrect.jsp	(revision 309183)
+++ samigo-app/src/webapp/jsf/print/preview_item/MultipleChoiceSingleCorrect.jsp	(working copy)
@@ -33,18 +33,21 @@
   <h:outputText value="<br />" escape="false" />    
   <%@ include file="/jsf/delivery/item/attachment.jsp" %> 
   
-  <h:dataTable value="#{question.itemData.itemTextArraySorted}" var="itemText" width="100%">
+  <h:dataTable value="#{question.itemData.itemTextArraySorted}" var="itemText" styleClass="samMcAnswerTable">
     <h:column>
-     <h:dataTable value="#{itemText.answerArraySorted}" var="answer" width="100%">
+     <h:dataTable value="#{itemText.answerArraySorted}" var="answer">
         <h:column>
-          <%-- inputBlock --%>
-          <h:panelGroup rendered="#{answer.text !=null && answer.text!=''}" styleClass="inputBlock">
-		    <%-- Show answer text --%>
-		    <h:graphicImage id="image1" url="/images/radiounchecked.gif"/>
-		    <h:outputText escape="false" value="#{answer.label}. " />
-			<h:outputText escape="false" value="#{answer.text}" styleClass="mcAnswerText"/>
-          </h:panelGroup>
+		    <%-- Show answer checkbox --%>
+		    <h:graphicImage id="image1" url="/images/radiounchecked.gif" rendered="#{answer.text !=null && answer.text!=''}" styleClass="samMcRadioImg" />
         </h:column>
+        <h:column>
+		    <%-- show answer label --%>
+		    <h:outputText styleClass="inputBlock" escape="false" value="#{answer.label}. " rendered="#{answer.text !=null && answer.text!=''}" />
+        </h:column>
+        <h:column rendered="#{answer.text !=null && answer.text!=''}">
+          <%-- show answer text --%>
+          <h:outputText styleClass="inputBlock" escape="false" value="#{answer.text}" />
+        </h:column>
 		<h:column>
 		  <%-- Show feedback answer --%>
 		  <h:panelGroup styleClass="feedbackBlock" rendered="#{printSettings.showKeysFeedback && answer.text !=null && answer.text!=''}">
Index: .
===================================================================
--- .	(revision 309183)
+++ .	(working copy)

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /sam/branches/SAM-2066-uva:r309176-309183