Index: samigo-app/src/webapp/jsf/author/authorSettings.jsp
===================================================================
--- samigo-app/src/webapp/jsf/author/authorSettings.jsp	(revision 306438)
+++ samigo-app/src/webapp/jsf/author/authorSettings.jsp	(working copy)
@@ -489,48 +489,38 @@
         </h:selectOneRadio>
       </h:panelGrid>
   
-     <f:verbatim> <div class="tier3"></f:verbatim>
+     <f:verbatim> <div class="tier3 respChoice"></f:verbatim>
       <h:panelGrid columns="2">
         <h:panelGroup>
-          <h:selectBooleanCheckbox value="#{assessmentSettings.showStudentResponse}" id="feedbackCheckbox1"
-            disabled="#{assessmentSettings.feedbackDelivery==3 || assessmentSettings.feedbackComponentOption ==1}" />
+          <h:selectBooleanCheckbox value="#{assessmentSettings.showStudentResponse}" id="feedbackCheckbox1"/>
           <h:outputText value="#{commonMessages.student_response}" />
         </h:panelGroup>
         <h:panelGroup>
-          <h:selectBooleanCheckbox value="#{assessmentSettings.showQuestionLevelFeedback}" id="feedbackCheckbox2"
-            disabled="#{assessmentSettings.feedbackDelivery==3 || assessmentSettings.feedbackComponentOption ==1}" />
+          <h:selectBooleanCheckbox value="#{assessmentSettings.showQuestionLevelFeedback}" id="feedbackCheckbox2"/>
           <h:outputText value="#{commonMessages.question_level_feedback}" />
         </h:panelGroup>
         <h:panelGroup>
-          <h:selectBooleanCheckbox value="#{assessmentSettings.showCorrectResponse}" id="feedbackCheckbox3"
-            disabled="#{assessmentSettings.feedbackDelivery==3 || assessmentSettings.feedbackComponentOption ==1}" />
+          <h:selectBooleanCheckbox value="#{assessmentSettings.showCorrectResponse}" id="feedbackCheckbox3"/>
           <h:outputText value="#{commonMessages.correct_response}" />
         </h:panelGroup>
         <h:panelGroup>
-          <h:selectBooleanCheckbox value="#{assessmentSettings.showSelectionLevelFeedback}" id="feedbackCheckbox4"
-            disabled="#{assessmentSettings.feedbackDelivery==3 || assessmentSettings.feedbackComponentOption ==1}" />
+          <h:selectBooleanCheckbox value="#{assessmentSettings.showSelectionLevelFeedback}" id="feedbackCheckbox4"/>
           <h:outputText value="#{commonMessages.selection_level_feedback}" />
         </h:panelGroup>
         <h:panelGroup>
-          <h:selectBooleanCheckbox value="#{assessmentSettings.showStudentScore}" id="feedbackCheckbox5"
-            disabled="#{assessmentSettings.feedbackDelivery==3 || assessmentSettings.feedbackComponentOption ==1}" />
+          <h:selectBooleanCheckbox value="#{assessmentSettings.showStudentScore}" id="feedbackCheckbox5"/>
           <h:outputText value="#{assessmentSettingsMessages.student_assessment_score}" />
         </h:panelGroup>
         <h:panelGroup>
-          <h:selectBooleanCheckbox value="#{assessmentSettings.showGraderComments}" id="feedbackCheckbox6"
-            disabled="#{assessmentSettings.feedbackDelivery==3 || assessmentSettings.feedbackComponentOption ==1}" />
+          <h:selectBooleanCheckbox value="#{assessmentSettings.showGraderComments}" id="feedbackCheckbox6"/>
           <h:outputText value="#{assessmentSettingsMessages.grader_comments}" />
         </h:panelGroup>
-
         <h:panelGroup>
-          <h:selectBooleanCheckbox value="#{assessmentSettings.showStudentQuestionScore}" id="feedbackCheckbox7"
-            disabled="#{assessmentSettings.feedbackDelivery==3 || assessmentSettings.feedbackComponentOption ==1}" />
+          <h:selectBooleanCheckbox value="#{assessmentSettings.showStudentQuestionScore}" id="feedbackCheckbox7"/>
           <h:outputText value="#{assessmentSettingsMessages.student_question_score}" />
         </h:panelGroup>
-       
         <h:panelGroup>
-          <h:selectBooleanCheckbox value="#{assessmentSettings.showStatistics}" id="feedbackCheckbox8"
-            disabled="#{assessmentSettings.feedbackDelivery==3 || assessmentSettings.feedbackComponentOption ==1}" />
+          <h:selectBooleanCheckbox value="#{assessmentSettings.showStatistics}" id="feedbackCheckbox8"/>
           <h:outputText value="#{commonMessages.statistics_and_histogram}" />
         </h:panelGroup>
 
Index: samigo-app/src/webapp/jsf/author/publishedSettings.jsp
===================================================================
--- samigo-app/src/webapp/jsf/author/publishedSettings.jsp	(revision 306438)
+++ samigo-app/src/webapp/jsf/author/publishedSettings.jsp	(working copy)
@@ -499,7 +499,7 @@
         </h:selectOneRadio>
       </h:panelGrid>
   
-   <f:verbatim> <div class="tier3"></f:verbatim>
+   <f:verbatim> <div class="tier3 respChoice"></f:verbatim>
     <h:panelGroup rendered="#{publishedSettings.valueMap.feedbackComponents_isInstructorEditable!=true}">
       <h:panelGrid columns="2">
        <h:panelGroup>
@@ -552,45 +552,35 @@
     <h:panelGroup rendered="#{publishedSettings.valueMap.feedbackComponents_isInstructorEditable==true}">
       <h:panelGrid columns="2"  >
        <h:panelGroup>
-          <h:selectBooleanCheckbox id="feedbackCheckbox21" disabled="#{publishedSettings.feedbackDelivery==3 || publishedSettings.feedbackComponentOption ==1}"
-              value="#{publishedSettings.showStudentResponse}"/>
+          <h:selectBooleanCheckbox id="feedbackCheckbox21" value="#{publishedSettings.showStudentResponse}"/>
           <h:outputText value="#{commonMessages.student_response}" />
         </h:panelGroup>
        <h:panelGroup>
-          <h:selectBooleanCheckbox id="feedbackCheckbox22" disabled="#{publishedSettings.feedbackDelivery==3 || publishedSettings.feedbackComponentOption ==1}"
-              value="#{publishedSettings.showQuestionLevelFeedback}"/>
+          <h:selectBooleanCheckbox id="feedbackCheckbox22" value="#{publishedSettings.showQuestionLevelFeedback}"/>
           <h:outputText value="#{commonMessages.question_level_feedback}" />
        </h:panelGroup>
         <h:panelGroup>
-          <h:selectBooleanCheckbox id="feedbackCheckbox23" disabled="#{publishedSettings.feedbackDelivery==3 || publishedSettings.feedbackComponentOption ==1}"
-              value="#{publishedSettings.showCorrectResponse}"/>
+          <h:selectBooleanCheckbox id="feedbackCheckbox23" value="#{publishedSettings.showCorrectResponse}"/>
           <h:outputText value="#{commonMessages.correct_response}" />
         </h:panelGroup>
        <h:panelGroup>
-          <h:selectBooleanCheckbox id="feedbackCheckbox24" disabled="#{publishedSettings.feedbackDelivery==3 || publishedSettings.feedbackComponentOption ==1}"
-             value="#{publishedSettings.showSelectionLevelFeedback}"/>
+          <h:selectBooleanCheckbox id="feedbackCheckbox24" value="#{publishedSettings.showSelectionLevelFeedback}"/>
           <h:outputText value="#{commonMessages.selection_level_feedback}" />
         </h:panelGroup>
         <h:panelGroup>
-          <h:selectBooleanCheckbox id="feedbackCheckbox25" disabled="#{publishedSettings.feedbackDelivery==3 || publishedSettings.feedbackComponentOption ==1}"
-              value="#{publishedSettings.showStudentScore}"/>
+          <h:selectBooleanCheckbox id="feedbackCheckbox25" value="#{publishedSettings.showStudentScore}"/>
           <h:outputText value="#{assessmentSettingsMessages.student_assessment_score}" />
         </h:panelGroup>
         <h:panelGroup>
-          <h:selectBooleanCheckbox id="feedbackCheckbox26" disabled="#{publishedSettings.feedbackDelivery==3 || publishedSettings.feedbackComponentOption ==1}"
-              value="#{publishedSettings.showGraderComments}"/>
+          <h:selectBooleanCheckbox id="feedbackCheckbox26" value="#{publishedSettings.showGraderComments}"/>
           <h:outputText value="#{assessmentSettingsMessages.grader_comments}" />
         </h:panelGroup>
-
         <h:panelGroup>
-          <h:selectBooleanCheckbox id="feedbackCheckbox27" disabled="#{publishedSettings.feedbackDelivery==3 || publishedSettings.feedbackComponentOption ==1}"
-              value="#{publishedSettings.showStudentQuestionScore}"/>
+          <h:selectBooleanCheckbox id="feedbackCheckbox27" value="#{publishedSettings.showStudentQuestionScore}"/>
           <h:outputText value="#{assessmentSettingsMessages.student_question_score}" />
         </h:panelGroup>
-       
         <h:panelGroup>
-          <h:selectBooleanCheckbox id="feedbackCheckbox28" disabled="#{publishedSettings.feedbackDelivery==3 || publishedSettings.feedbackComponentOption ==1}"
-              value="#{publishedSettings.showStatistics}"/>
+          <h:selectBooleanCheckbox id="feedbackCheckbox28" value="#{publishedSettings.showStatistics}"/>
           <h:outputText value="#{commonMessages.statistics_and_histogram}" />
         </h:panelGroup>
    
Index: samigo-app/src/webapp/js/authoring.js
===================================================================
--- samigo-app/src/webapp/js/authoring.js	(revision 306438)
+++ samigo-app/src/webapp/js/authoring.js	(working copy)
@@ -328,52 +328,23 @@
 // if a different radio button is selected, we reenable feedback checkboxes & text.
 function disableAllFeedbackCheck(feedbackType)
 {
-  // By convention we start all feedback JSF ids with "feedback".
-  var feedbackIdFlag = "assessmentSettingsAction:feedback";
-  var feedbackComponentOptionFlag = "assessmentSettingsAction:feedbackComponentOption";
-  var noFeedback = "3";
-  var feedbacks = document.getElementsByTagName('INPUT');
-  var feedbackComponentOptions =document.getElementsByName(feedbackComponentOptionFlag);
-
-  for (i=0; i<feedbacks.length; i++)
-  {
-    if (feedbacks[i].name.indexOf(feedbackIdFlag)==0)
-    {
-      if (feedbackType == noFeedback)
-      {
-        if (feedbacks[i].type == 'checkbox')
-        {
-          feedbacks[i].checked = false;
-          feedbacks[i].disabled = true;
-        }
-        else if (feedbacks[i].type == 'text')
-        {
-          feedbacks[i].value = "";
-          feedbacks[i].disabled = true;
-        }
-        else if ((feedbacks[i].type == 'radio') && (feedbacks[i].name.indexOf(feedbackComponentOptionFlag)==0))
-        {
-            if(feedbacks[i].value == 2) {
-                feedbacks[i].checked = true;
-            }
-            if(feedbacks[i].value == 1) {
-                feedbacks[i].checked = false;
-                feedbacks[i].disabled = true;
-            }
-        }
-      }
-      else
-      {
-         if(feedbackComponentOptions[0].value==1 && feedbackComponentOptions[0].checked == true && feedbacks[i].type=='checkbox')
-         {
-            feedbacks[i].disabled = true;
-         }
-         if(feedbackComponentOptions[1].value==2 && feedbackComponentOptions[1].checked == true){
-            feedbacks[i].disabled = false;
-         }
-      }
+	var noFeedback = 3;
+	
+    if (feedbackType == noFeedback){
+     	$("#assessmentSettingsAction\\:feedbackComponentOption input").prop({disabled:true, checked:false});
+		$(".respChoice input").prop({disabled:true, checked:false});
 	}
-  }
+	else
+	{
+		$("#assessmentSettingsAction\\:feedbackComponentOption input").prop("disabled", false);
+		if($("#assessmentSettingsAction\\:feedbackComponentOption input:checked").val() == 1)
+			$(".respChoice input").prop("disabled", true);
+		else 
+		{
+			$("#assessmentSettingsAction\\:feedbackComponentOption input")[1].checked = true;
+			$(".respChoice input").prop("disabled", false);
+		}
+	}
 }
 
 function disableAllFeedbackCheckTemplate(feedbackType)
@@ -418,29 +389,25 @@
 	}
 }
 
-function disableOtherFeedbackComponentOption(field)
-{
-  var fieldValue = field.getAttribute("value");
-  var feedbacks = document.getElementsByTagName('INPUT');
-  var feedbackComponentIdFlag = "assessmentSettingsAction:feedbackCheckbox";
+$(document).ready(function(){
+	checkNoFeedbackOnLoad();
+})
 
-  for (i=0; i<feedbacks.length; i++)
-  {
-    if (feedbacks[i].name.indexOf(feedbackComponentIdFlag)==0)
+function checkNoFeedbackOnLoad(){
+	var noFeedback = 3;
+	if($("#assessmentSettingsAction\\:feedbackDelivery input:checked").val() == noFeedback || $("#assessmentSettingsAction\\:feedbackDelivery2 input:checked").val() == noFeedback) {
+		$("#assessmentSettingsAction\\:feedbackComponentOption input").prop({disabled:true, checked:false});
+		$(".respChoice input").prop('disabled', true);
+	}
+}
 
-    {
-         if (feedbacks[i].type == 'checkbox')
-        {
-             if(fieldValue ==1 ){
-                  feedbacks[i].checked = false;
-                  feedbacks[i].disabled = true;
-             }
-             if(fieldValue == 2){
-	              feedbacks[i].disabled = false;
-             }
-        }
-     }
-  }
+function disableOtherFeedbackComponentOption(field)
+{
+	var fieldValue = field.getAttribute("value");
+	if(fieldValue ==1 )
+		$(".respChoice input").prop({disabled:true, checked:false});
+	else
+		$(".respChoice input").prop("disabled", false);
 }
 
 function validateUrl(){