Index: assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
===================================================================
--- assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java	(revision 310737)
+++ assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java	(working copy)
@@ -6700,8 +6700,14 @@
 			    }
 			}
 		}
-		else
+		else if (!Integer.valueOf(Assignment.NON_ELECTRONIC_ASSIGNMENT_SUBMISSION).equals(state.getAttribute(NEW_ASSIGNMENT_SUBMISSION_TYPE)))
 		{
+			/* 
+			 * SAK-26640	--bbailla2
+			 * If the instructor switches to non-electronic by mistake, the resubmissions settings should persist so they can be easily retrieved.
+			 * So we only reset resubmit params for electronic assignments.
+			 */
+
 			resetAllowResubmitParams(state);
 		}
 		
Index: assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_new_edit_assignment.vm
===================================================================
--- assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_new_edit_assignment.vm	(revision 310737)
+++ assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_new_edit_assignment.vm	(working copy)
@@ -163,6 +163,52 @@
 			excludePercentages.disabled = false;
 		}
 	}
+
+	## handles the Student Submissions dropdown	--bbailla2
+	function switchAssignmentSubmissionType()
+	{
+		var useReview = document.getElementById('$name_UseReviewService');
+		var lblUseReview=document.getElementById('lblReviewService');
+		var reviewSwitchNe1 = document.getElementById('review.switch.ne.1');
+		var reviewSwitchNe2 = document.getElementById('review.switch.ne.2');
+		if(document.getElementById('subType').value != 4)
+		{
+			#if ($allowReviewService)
+				reviewSwitchNe1.style.display='none';
+				lblReviewService.className='';
+				reviewSwitchNe2.style.display='none';
+				useReview.disabled=false;
+			#end
+			## SAK-26640	--bbailla2
+			document.getElementById('tempAllowRes').style.display = 'block';
+			if (document.getElementById('allowResToggle').checked)
+			{
+				document.getElementById('allowResubmitNumber').style.display = 'block';
+				document.getElementById('allowResubmitTime').style.display = 'block';
+				document.getElementById('resubmitNotification').style.display = 'block';
+				resizeFrame();
+			}
+		}
+		else
+		{ 
+			#if ($allowReviewService)
+				if (useReview.checked)
+				{
+					reviewSwitchNe2.style.removeProperty('display');
+					toggleReviewServiceOptions(this.checked);
+				}
+				useReview.checked=false;
+				useReview.disabled=true;
+				lblUseReview.className='instruction';
+				reviewSwitchNe1.style.removeProperty('display');
+			#end
+			## SAK-26640	--bbailla2
+			document.getElementById('tempAllowRes').style.display = 'none';
+			document.getElementById('allowResubmitNumber').style.display = 'none';
+			document.getElementById('allowResubmitTime').style.display = 'none'; 
+			document.getElementById('resubmitNotification').style.display = 'none';
+		}
+	}
 </script>
 <script type="text/javascript">
 	focus_path = [ '$fField' ];
@@ -438,7 +484,7 @@
 			<label for="subType">
 				$tlang.getString("gen.stusub")
 			</label>
-			<select name="$name_SubmissionType" id="subType" title="$tlang.getString("gen.subformat")" onchange="var useReview = document.getElementById('$name_UseReviewService'); var lblUseReview = document.getElementById('lblReviewService'); var reviewSwitchNe1 = document.getElementById('review.switch.ne.1'); var reviewSwitchNe2 = document.getElementById('review.switch.ne.2'); if (document.getElementById('subType').value != 4) { reviewSwitchNe1.style.display='none'; lblReviewService.className=''; reviewSwitchNe2.style.display='none'; useReview.disabled=false; document.getElemenbById('tempAllowRes').style.display = 'block'; resizeFrame(); } else{ if (useReview.checked) { reviewSwitchNe2.style.removeProperty('display'); toggleReviewServiceOptions(this.checked); } useReview.checked=false; useReview.disabled=true; lblUseReview.className='instruction'; reviewSwitchNe1.style.removeProperty('display'); document.getElementById('tempAllowRes').style.display = 'none'; document.getElementById('allowResToggle').checked=false; document.getElementById('allowResubmitNumber').style.display = 'none'; document.getElementById('allowResubmitTime').style.display = 'none'; }" /> >
+			<select name="$name_SubmissionType" id="subType" onchange="switchAssignmentSubmissionType();" >
 				#foreach ($i in [1..$!value_totalSubmissionTypes])
 					#if ($i == $value_SubmissionType)
 						<option value="$i" selected="selected">$submissionTypeTable.get($i)</option>
@@ -456,7 +502,7 @@
 			#set($resubmitStyle="display:none")
 		#end
 		<p class="checkbox" id="tempAllowRes" #if ($value_SubmissionType == 4) style = "display:none"#end>
-			<input type="checkbox" id="allowResToggle" name ="allowResToggle" #if($!value_allowResubmitNumber && $value_SubmissionType != 4) checked="checked"#end onclick="if(checked){document.getElementById('allowResubmitNumber').style.display = 'block';document.getElementById('allowResubmitTime').style.display = 'block';document.getElementById('resubmitNotification').style.display = 'block';resizeFrame();}else{document.getElementById('allowResubmitNumber').style.display = 'none';document.getElementById('allowResubmitTime').style.display = 'none';document.getElementById('resubmitNotification').style.display = 'none';}" /> 
+			<input type="checkbox" id="allowResToggle" name ="allowResToggle" #if($!value_allowResubmitNumber) checked="checked"#end onclick="if(checked){document.getElementById('allowResubmitNumber').style.display = 'block';document.getElementById('allowResubmitTime').style.display = 'block';document.getElementById('resubmitNotification').style.display = 'block';resizeFrame();}else{document.getElementById('allowResubmitNumber').style.display = 'none';document.getElementById('allowResubmitTime').style.display = 'none';document.getElementById('resubmitNotification').style.display = 'none';}" /> 
 			<label for="allowResToggle">$tlang.getString("allowResubmit")</label>
 	    </p>
 		<p class="shorttext" id="allowResubmitNumber" style="$!resubmitStyle">
Index: assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_preview_grading_submission.vm
===================================================================
--- assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_preview_grading_submission.vm	(revision 310737)
+++ assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_preview_grading_submission.vm	(working copy)
@@ -230,13 +230,15 @@
 				#end
 			</div>
 			<br />
-			<p>
-				$tlang.getString("allow.resubmit.number"): $!allowResubmitNumber
-			</p>
-			#if ($!allowResubmitCloseTime)
+			#if ($!submissionType != 4)
 				<p>
-					$tlang.getString("gen.acesubunt"): $!allowResubmitCloseTime
+					$tlang.getString("allow.resubmit.number"): $!allowResubmitNumber
 				</p>
+				#if ($!allowResubmitCloseTime)
+					<p>
+						$tlang.getString("gen.acesubunt"): $!allowResubmitCloseTime
+					</p>
+				#end
 			#end
 			<p class="act">
 				<input accesskey="d" name="eventSubmit_doSave_preview_grade_submission" type="submit" value="$tlang.getString("gen.savdragra")" title="$tlang.getString("gen.savdratit")" class="active" />
Index: assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_view_assignment.vm
===================================================================
--- assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_view_assignment.vm	(revision 310737)
+++ assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_view_assignment.vm	(working copy)
@@ -132,24 +132,26 @@
 					$submissionTypeTable.get($assignment.getContent().getTypeOfSubmission())
 				</td>
 			</tr>
-			##resubmit number
-			#if($!resubmitNumber)
-				<tr>
-					<th>
-						$tlang.getString("allow.resubmit.number")
-					</th>
-					<td>	
-						$resubmitNumber
-					</td>
-				</tr>
-				<tr>
-					<th>
-						$tlang.getString("allow.resubmit.closeTime")
-					</th>
-					<td>
-						$resubmitCloseTime
-					</td>
-				</tr>
+			#if($assignment.getContent().getTypeOfSubmission() != 4)
+				##resubmit number
+				#if($!resubmitNumber)
+					<tr>
+						<th>
+							$tlang.getString("allow.resubmit.number")
+						</th>
+						<td>	
+							$resubmitNumber
+						</td>
+					</tr>
+					<tr>
+						<th>
+							$tlang.getString("allow.resubmit.closeTime")
+						</th>
+						<td>
+							$resubmitCloseTime
+						</td>
+					</tr>
+				#end
 			#end
 			<tr> 
 				<th>
@@ -281,27 +283,29 @@
 							$!assignment.getDueTime().toStringLocalFull()
 						</td>
 					</tr>
-					##resubmit number
-					#if($!resubmitNumber)
-						<tr>
-							<th>
-								$tlang.getString("allow.resubmit.number")
-							</th>
-							<td>
-							$resubmitNumber
-						</td>
-					</tr>
-					#end
-					## resubmit close time
-					#if ($!resubmitCloseTime)
-						<tr>
-							<th>
-								$tlang.getString("allow.resubmit.closeTime")
-							</th>
-							<td>
-								$resubmitCloseTime
+					#if($assignment.getContent().getTypeOfSubmission() != 4)
+						##resubmit number
+						#if($!resubmitNumber)
+							<tr>
+								<th>
+									$tlang.getString("allow.resubmit.number")
+								</th>
+								<td>
+								$resubmitNumber
 							</td>
 						</tr>
+						#end
+						## resubmit close time
+						#if ($!resubmitCloseTime)
+							<tr>
+								<th>
+									$tlang.getString("allow.resubmit.closeTime")
+								</th>
+								<td>
+									$resubmitCloseTime
+								</td>
+							</tr>
+						#end
 					#end
 					<tr>
 						<th>
Index: assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_preview_submission.vm
===================================================================
--- assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_preview_submission.vm	(revision 310737)
+++ assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_preview_submission.vm	(working copy)
@@ -29,28 +29,30 @@
                 #end
 			</td>
 		</tr>
-		##resubmit number
-		#if($!resubmitNumber)
-			<tr>
-				<th>
-					$tlang.getString("allow.resubmit.number")
-				</th>
-				<td>
-					$resubmitNumber
-				</td>
-			</tr>
+		#if($assignment.getContent().getTypeOfSubmission() != 4)
+			##resubmit number
+			#if($!resubmitNumber)
+				<tr>
+					<th>
+						$tlang.getString("allow.resubmit.number")
+					</th>
+					<td>
+						$resubmitNumber
+					</td>
+				</tr>
+			#end
+			## resubmit close time
+			#if ($!resubmitCloseTime)
+				<tr>
+					<th>
+						$tlang.getString("allow.resubmit.closeTime")
+					</th>
+					<td>
+						$resubmitCloseTime
+					</td>
+				</tr>
+			#end
 		#end
-		## resubmit close time
-		#if ($!resubmitCloseTime)
-			<tr>
-				<th>
-					$tlang.getString("allow.resubmit.closeTime")
-				</th>
-				<td>
-					$resubmitCloseTime
-				</td>
-			</tr>
-		#end
 		#if ($withGrade)	
 			<tr>
 				<th>
Index: assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_view_assignment.vm
===================================================================
--- assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_view_assignment.vm	(revision 310737)
+++ assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_view_assignment.vm	(working copy)
@@ -72,28 +72,30 @@
 					</td>
 				</tr>
 			#end
-			##resubmit number
-			#if($!resubmitNumber)
-				<tr>
-					<th>
-						$tlang.getString("allow.resubmit.number")
-					</th>
-					<td>
-						$resubmitNumber
-					</td>
-				</tr>
+			#if ($submissionType != 4)
+				##resubmit number
+				#if($!resubmitNumber)
+					<tr>
+						<th>
+							$tlang.getString("allow.resubmit.number")
+						</th>
+						<td>
+							$resubmitNumber
+						</td>
+					</tr>
+				#end
+				## resubmit close time
+				#if ($!resubmitCloseTime)
+					<tr>
+						<th>
+							$tlang.getString("allow.resubmit.closeTime")
+						</th>
+						<td>
+							$resubmitCloseTime
+						</td>
+					</tr>
+				#end
 			#end
-			## resubmit close time
-			#if ($!resubmitCloseTime)
-				<tr>
-					<th>
-						$tlang.getString("allow.resubmit.closeTime")
-					</th>
-					<td>
-						$resubmitCloseTime
-					</td>
-				</tr>
-			#end
 			<tr> 
 				<th>
                                         $tlang.getString("gen.groupassignment")
Index: assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm
===================================================================
--- assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm	(revision 310737)
+++ assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm	(working copy)
@@ -232,25 +232,27 @@
 					#end
 					</td>
 				</tr>
-				##resubmit number
-				#if($!resubmitNumber && !$!resubmitNumber.equals("0") )
-					<tr>
-						<th>
-							$tlang.getString("allow.resubmit.number")
-						</th>
-						<td>
-							$resubmitNumber
-						</td>
-					</tr>
-					## resubmit close time
-					<tr>
-						<th>
-							$tlang.getString("allow.resubmit.closeTime")
-						</th>
-						<td>
-							$resubmitCloseTime
-						</td>
-					</tr>
+				#if ($submissionType != 4)
+					#if($!resubmitNumber && !$!resubmitNumber.equals("0") )
+						##resubmit number
+						<tr>
+							<th>
+								$tlang.getString("allow.resubmit.number")
+							</th>
+							<td>
+								$resubmitNumber
+							</td>
+						</tr>
+						## resubmit close time
+						<tr>
+							<th>
+								$tlang.getString("allow.resubmit.closeTime")
+							</th>
+							<td>
+								$resubmitCloseTime
+							</td>
+						</tr>
+					#end
 				#end
 				## no need to show status if this is for an non-electronic submission type of assignment
 					#if (!$!nonElectronicType)