Index: tool/src/webapp/js/signupScript.js
===================================================================
--- tool/src/webapp/js/signupScript.js	(revision 313903)
+++ tool/src/webapp/js/signupScript.js	(working copy)
@@ -605,10 +605,12 @@
 	
 	//get offset
 	//need special selector syntax because of the :
-	var signupBeginsOffset = jQuery('[id=meeting:signupBegins]').val();
+	var signBeginTag = document.getElementById('meeting:signupBegins');
+	var signupBeginsOffset = jQuery(signBeginTag).val();
 	
 	//get offset type
-	var signupBeginsOffsetType = jQuery('[id=meeting:signupBeginsType]').val();
+	var signBeginTypeTag = document.getElementById('meeting:signupBeginsType');
+	var signupBeginsOffsetType = jQuery(signBeginTypeTag).val();
 	
 	//calculate actual signupBegin time
 	var signupBeginsExact = '';
@@ -626,7 +628,8 @@
 	}	
 	
 	//set the new date into the fields
-	jQuery('[id=meeting:signupBeginsExact]').text(displayDateTime(signupBeginsExact));
+	var signBExtTag = document.getElementById('meeting:signupBeginsExact');
+	jQuery(signBExtTag).text(displayDateTime(signupBeginsExact));
 }
 
 sakai.updateSignupEndsExact = function() {
@@ -635,10 +638,12 @@
 	var endTime = new Date(getSignupDateTime('endTime'));
 	
 	//get offset
-	var signupEndsOffset = jQuery('[id=meeting:signupDeadline]').val();
+	var signDdLineTag = document.getElementById('meeting:signupDeadline');
+	var signupEndsOffset = jQuery(signDdLineTag).val();
 	
 	//get offset type
-	var signupEndsOffsetType = jQuery('[id=meeting:signupDeadlineType]').val();
+	var signDdLineTypeTag = document.getElementById('meeting:signupDeadlineType');
+	var signupEndsOffsetType = jQuery(signDdLineTypeTag).val();
 	
 	//calculate actual signupEnd time
 	var signupEndsExact = '';
@@ -659,19 +664,23 @@
 	 */
 	
 	//set the new date into the fields
-	jQuery('[id=meeting:signupEndsExact]').text(displayDateTime(signupEndsExact));
+	var signEndExtTag = document.getElementById('meeting:signupEndsExact');
+	jQuery(signEndExtTag).text(displayDateTime(signupEndsExact));
 }
 
 sakai.toggleExactDateVisibility = function() {
 	
 	//only visible when the meeting is once only, so check for that.
-	var recurrence = jQuery('[id=meeting:recurSelector]').val();
+	var recurSelTag = document.getElementById('meeting:recurSelector');
+	var signBExtTag = document.getElementById('meeting:signupBeginsExact');
+	var signEndExtTag = document.getElementById('meeting:signupEndsExact');
+	var recurrence = jQuery(recurSelTag).val();
 	if(recurrence == 'no_repeat') {
-		jQuery('[id=meeting:signupBeginsExact]').show();
-		jQuery('[id=meeting:signupEndsExact]').show();
+		jQuery(signBExtTag).show();
+		jQuery(signEndExtTag).show();
 	} else {
-		jQuery('[id=meeting:signupBeginsExact]').hide();
-		jQuery('[id=meeting:signupEndsExact]').hide();
+		jQuery(signBExtTag).hide();
+		jQuery(signEndExtTag).hide();
 	}
 	
 	
Index: tool/src/webapp/signup/attendanceView.jsp
===================================================================
--- tool/src/webapp/signup/attendanceView.jsp	(revision 313903)
+++ tool/src/webapp/signup/attendanceView.jsp	(working copy)
@@ -14,18 +14,21 @@
 		</style>
 		<script TYPE="text/javascript" LANGUAGE="JavaScript"
 			src="/sakai-signup-tool/js/signupScript.js"></script>
-		<script type="text/javascript" src="/library/js/jquery.js"></script>
+		<script type="text/javascript" src="/library/js/jquery/jquery-1.9.1.min.js"></script>
 		<script type="text/javascript">
-        $(document).ready(function(){
-            sakai.setupSelectListMultiple('availableSpots', 'selectAllThese', 'selectedSelected');
-            sakai.setupPrintPreview();
-						sakai.setupWaitListed();
-            $('a.print-window').click(function(){
-								javascript:window.print();
-                return false;
-            });
-        });
-    </script>
+			jQuery.noConflict();
+			
+			jQuery(document).ready(function(){
+	            sakai.setupSelectListMultiple('availableSpots', 'selectAllThese', 'selectedSelected');
+	            sakai.setupPrintPreview();
+				sakai.setupWaitListed();
+				jQuery('a.print-window').click(function(){
+					javascript:window.print();
+	                return false;
+	            });
+	        });
+	    </script>
+	    
 		<ul class="navIntraTool actionToolbar">
 			<li class="firstToolBarItem" role="menuitem"><span>
 				<a
Index: tool/src/webapp/signup/signupMeetings.jsp
===================================================================
--- tool/src/webapp/signup/signupMeetings.jsp	(revision 313903)
+++ tool/src/webapp/signup/signupMeetings.jsp	(working copy)
@@ -10,8 +10,159 @@
 		<style type="text/css">
 				@import url("/sakai-signup-tool/css/signupStyle.css");
 		</style>
-		<script TYPE="text/javascript" src="/library/js/jquery/jquery-1.9.1.min.js"></script>
-		<script TYPE="text/javascript" src="/sakai-signup-tool/js/signupScript.js"></script>	
+		<script type="text/javascript" src="/library/js/jquery/jquery-1.9.1.min.js"></script>
+		<script TYPE="text/javascript" src="/sakai-signup-tool/js/signupScript.js"></script>
+		
+		<script type="text/javascript">
+			jQuery.noConflict();
+	         //initialization of the page
+	         jQuery(document).ready(function() {
+		         //due to recuring meetings, make sure even/odd Rows display correctly
+		         reprocessEvenOddRowClasses();
+
+				});
+	         var origClassNames=new Array();
+	         var lastActiveId;
+	         var previousBgColor; 
+	         var recurRowClass="recurRow";//defined in css
+	         var evenRowClass = "evenRow";
+	         var oddRowClass = "oddRow";
+	         function reprocessEvenOddRowClasses(){
+		         	var trRowTags = document.getElementsByTagName("tr");
+		         	rowNum=0;
+		         	if (!trRowTags)
+		         		return;
+		         		
+		         	for(i=0; i<trRowTags.length;i++){
+		         		if(trRowTags[i].style.display !="none"
+		         			&& (trRowTags[i].className == evenRowClass || trRowTags[i].className == oddRowClass) ){
+		         			if(rowNum % 2 == 0)
+		         				trRowTags[i].className = oddRowClass;
+		         			else
+		         				trRowTags[i].className = evenRowClass;
+		         			
+		         			rowNum++;
+		         		}
+
+		         	}
+
+		         }
+
+		         function showAllRelatedRecurMeetings(id,iFrameId) {
+		         	var activeOne = document.getElementById(id);
+		         	if (!activeOne)
+		         		return;
+
+		         	if ( activeOne.className != recurRowClass)
+		         		updateOrigClassNames(id,activeOne.className)					
+		         		
+
+		         	if (activeOne.className!=recurRowClass) 
+		         		activeOne.className=recurRowClass;
+		         	else
+		         		activeOne.className=origClassNames[id];
+		         	
+		         	//hide last active one
+		         	if (lastActiveId && lastActiveId !=id){
+		         		resetRecurRows(lastActiveId);
+		         	}
+		         	lastActiveId = id;
+		         						
+		         	var i=0
+		         	//alert("id:" +id);
+		         	while (document.getElementById(id+"_" + i)!=null){					
+		         		var row = document.getElementById(id+"_" +i)
+		         		if (row !=null){					
+		         			if (row.style.display == "none"){
+		         				row.className=recurRowClass;
+		         				row.style.display = "";
+		         			}else
+		         				row.style.display = "none";
+		         		}
+		         		i++;
+		         	}
+		         	//reSize the iFrame
+		         	//signup_resetIFrameHeight(iFrameId);//no refresh			
+		         }
+
+		         function resetRecurRows(recurRowId){
+		         	row = document.getElementById(recurRowId);
+		         	if (row)
+		         		row.className=origClassNames[recurRowId];
+
+		         	var i=0;
+		         	while (document.getElementById(recurRowId+"_" + i)!=null){					
+		         		var row = document.getElementById(recurRowId+"_" +i)
+		         		if (row !=null){					
+		         			if (row.style.display == "")
+		         				row.style.display = "none";
+		         		}
+		         		i++;
+		         	}
+		         	
+		         	document.getElementById('imageOpen_RM_'+ recurRowId).style.display="none";
+		         	document.getElementById('imageClose_RM_'+ recurRowId).style.display="";				
+		         }
+
+		         function updateOrigClassNames(id, className){
+		         	if (!origClassNames[id])				
+		         		origClassNames[id]=className;
+		         }
+
+		         //IE browser will not show the disabled option item
+		         var orignSelectorTag=document.getElementById('items:viewByRange');
+		         var origSelectorIndex = orignSelectorTag? orignSelectorTag.selectedIndex : 2;//default
+		         function validateIEDisabledItem(selector){
+		         	if(!orignSelectorTag)
+		         		return true;
+
+		         	if (selector.value !="none"){
+		         		origSelectorIndex = orignSelectorTag.selectedIndex;
+		         		return true;
+		         	}else{
+		         		selector.selectedIndex = origSelectorIndex;//restore				
+		         	}
+		         	
+		         	return false;
+		         }
+
+		         /* Determines what delete message to use in the confirm box. 
+		          * If we are only deleting singles then you get the normal message, but if any of the selections are the first one in a recurring meeting
+		          * then the msg changes.
+		          */
+		         var deleteMultipleCount = 0;
+		         function determineDeleteMessage(elem, multiple) {
+		         	
+		         	if(multiple) {
+		         		if (elem.checked == true) {
+		         			deleteMultipleCount++;
+		         		} else {
+		         			deleteMultipleCount--;
+		         		}
+		         	}
+		         }
+
+		         /* If we have selected one or more checkboxes that contain multiples to delete, then return the appropriate message */
+		         function getDeleteMessage() {
+		         	
+		         	if(deleteMultipleCount > 0) {
+		         		return '<h:outputText escape="false" value="#{msgs.meeting_confirmation_to_remove_multiple}" />';
+		         	}
+		         	return '<h:outputText escape="false" value="#{msgs.meeting_confirmation_to_remove}" />';
+		         };
+
+		         // Provide user a chance to cancel or confirm the deletion of meetings. 
+		         function confirmDelete(el) {
+		         	var answer = confirm(getDeleteMessage());
+
+		         	if (answer == true){
+		         		displayProcessingIndicator(el);
+		         		return true;
+		         	}
+		         	return false;
+		         };		         	
+		</script>
+			
 		<h:form id="addMeeting">
 			<h:panelGroup>
 				<f:verbatim><ul class="navIntraTool actionToolbar" role="menu"></f:verbatim> 
@@ -242,155 +393,5 @@
   		</sakai:view_content>	
 	</sakai:view_container>
 	
-	<f:verbatim>
-		<script>
-					
-			var origClassNames=new Array();
-			var lastActiveId;
-			var previousBgColor; 
-			var recurRowClass="recurRow";//defined in css
-			var evenRowClass = "evenRow";
-			var oddRowClass = "oddRow";
-			//due to recuring meetings, make sure even/odd Rows display correctly
-			reprocessEvenOddRowClasses();
 
-			function reprocessEvenOddRowClasses(){
-				var trRowTags = document.getElementsByTagName("tr");
-				rowNum=0;
-				if (!trRowTags)
-					return;
-					
-				for(i=0; i<trRowTags.length;i++){
-					if(trRowTags[i].style.display !="none"
-						&& (trRowTags[i].className == evenRowClass || trRowTags[i].className == oddRowClass) ){
-						if(rowNum % 2 == 0)
-							trRowTags[i].className = oddRowClass;
-						else
-							trRowTags[i].className = evenRowClass;
-						
-						rowNum++;
-					}
-
-				}
-
-			}
-			
-			function showAllRelatedRecurMeetings(id,iFrameId) {
-				var activeOne = document.getElementById(id);
-				if (!activeOne)
-					return;
-
-				if ( activeOne.className != recurRowClass)
-					updateOrigClassNames(id,activeOne.className)					
-					
-
-				if (activeOne.className!=recurRowClass) 
-					activeOne.className=recurRowClass;
-				else
-					activeOne.className=origClassNames[id];
-				
-				//hide last active one
-				if (lastActiveId && lastActiveId !=id){
-					resetRecurRows(lastActiveId);
-				}
-				lastActiveId = id;
-									
-				var i=0
-				//alert("id:" +id);
-				while (document.getElementById(id+"_" + i)!=null){					
-					var row = document.getElementById(id+"_" +i)
-					if (row !=null){					
-						if (row.style.display == "none"){
-							row.className=recurRowClass;
-							row.style.display = "";
-						}else
-							row.style.display = "none";
-					}
-					i++;
-				}
-				//reSize the iFrame
-				//signup_resetIFrameHeight(iFrameId);//no refresh			
-			}
-			
-			function resetRecurRows(recurRowId){
-				row = document.getElementById(recurRowId);
-				if (row)
-					row.className=origClassNames[recurRowId];
-
-				var i=0;
-				while (document.getElementById(recurRowId+"_" + i)!=null){					
-					var row = document.getElementById(recurRowId+"_" +i)
-					if (row !=null){					
-						if (row.style.display == "")
-							row.style.display = "none";
-					}
-					i++;
-				}
-				
-				document.getElementById('imageOpen_RM_'+ recurRowId).style.display="none";
-				document.getElementById('imageClose_RM_'+ recurRowId).style.display="";				
-			}
-
-
-			function updateOrigClassNames(id, className){
-				if (!origClassNames[id])				
-					origClassNames[id]=className;
-			}
-			
-			
-			//IE browser will not show the disabled option item
-			var orignSelectorTag=document.getElementById('items:viewByRange');
-			var origSelectorIndex = orignSelectorTag? orignSelectorTag.selectedIndex : 2;//default
-			function validateIEDisabledItem(selector){
-				if(!orignSelectorTag)
-					return true;
-
-				if (selector.value !="none"){
-					origSelectorIndex = orignSelectorTag.selectedIndex;
-					return true;
-				}else{
-					selector.selectedIndex = origSelectorIndex;//restore				
-				}
-				
-				return false;
-			}
-			
-			/* Determines what delete message to use in the confirm box. 
-			 * If we are only deleting singles then you get the normal message, but if any of the selections are the first one in a recurring meeting
-			 * then the msg changes.
-			 */
-			var deleteMultipleCount = 0;
-			function determineDeleteMessage(elem, multiple) {
-				
-				if(multiple) {
-					if (elem.checked == true) {
-						deleteMultipleCount++;
-					} else {
-						deleteMultipleCount--;
-					}
-				}
-			}
-			
-			/* If we have selected one or more checkboxes that contain multiples to delete, then return the appropriate message */
-			function getDeleteMessage() {
-				
-				if(deleteMultipleCount > 0) {
-					return '<h:outputText escape="false" value="#{msgs.meeting_confirmation_to_remove_multiple}" />';
-				}
-				return '<h:outputText escape="false" value="#{msgs.meeting_confirmation_to_remove}" />';
-			};
-			
-			// Provide user a chance to cancel or confirm the deletion of meetings. 
-			function confirmDelete(el) {
-				var answer = confirm(getDeleteMessage());
-
-				if (answer == true){
-					displayProcessingIndicator(el);
-					return true;
-				}
-				return false;
-			};
-			
-		</script>
-	</f:verbatim>
 </f:view> 
Index: tool/src/webapp/signup/attendee/addSignupAttendee.jsp
===================================================================
--- tool/src/webapp/signup/attendee/addSignupAttendee.jsp	(revision 313903)
+++ tool/src/webapp/signup/attendee/addSignupAttendee.jsp	(working copy)
@@ -11,6 +11,9 @@
 			@import url("/sakai-signup-tool/css/signupStyle.css");
 		</style>
 		<script TYPE="text/javascript" LANGUAGE="JavaScript" src="/sakai-signup-tool/js/signupScript.js"></script>
+		<script type="text/javascript">
+			jQuery.noConflict();
+		</script>	
 		
 		<sakai:view_content>
 			<h:outputText value="#{msgs.event_error_alerts} #{messageUIBean.errorMessage}" styleClass="alertMessage" escape="false" rendered="#{messageUIBean.error}"/> 
Index: tool/src/webapp/signup/attendee/signupMeeting.jsp
===================================================================
--- tool/src/webapp/signup/attendee/signupMeeting.jsp	(revision 313903)
+++ tool/src/webapp/signup/attendee/signupMeeting.jsp	(working copy)
@@ -16,8 +16,53 @@
 				@import url("/sakai-signup-tool/css/print.css");
 		</style>
 		<script TYPE="text/javascript" LANGUAGE="JavaScript" src="/sakai-signup-tool/js/signupScript.js"></script>
-		<script TYPE="text/javascript" LANGUAGE="JavaScript" src="/sakai-signup-tool/js/jquery.js"></script>
+		<script type="text/javascript" src="/library/js/jquery/jquery-1.9.1.min.js"></script>
+		
+		<script type="text/javascript">
+			var hiddenInputCollapeMInfo;
+			var showMInfoTitleTag;
 			
+			jQuery.noConflict();
+			jQuery(document).ready(function() {
+				hiddenInputCollapeMInfo =document.getElementById("meeting:meetingInfoCollapseExpand");
+				showMInfoTitleTag =document.getElementById("meeting:showMeetingTitleOnly");
+				//initialize
+				initMeetingInfoDetail();			
+				});
+			
+			
+			function initMeetingInfoDetail(){
+				var collapseMInfoTag =document.getElementById("meeting:meetingInfoDetails");				
+				if(collapseMInfoTag && hiddenInputCollapeMInfo && hiddenInputCollapeMInfo.value == 'true'){
+					collapseMInfoTag.style.display="none";
+					showMInfoTitleTag.style.display="";
+					//reverse the default:show when page refreshed
+					showDetails('meeting:imageOpen_meetingInfoDetail','meeting:imageClose_meetingInfoDetail');
+				}else{
+					collapseMInfoTag.style.display="";
+					showMInfoTitleTag.style.display="none";
+				}	
+			}
+			
+			function setMeetingCollapseInfo(val){				
+				hiddenInputCollapeMInfo.value=val;
+				if(val)				  
+				  	showMInfoTitleTag.style.display="";
+				 else
+				  	showMInfoTitleTag.style.display="none";				  
+			}
+			
+			//just introduce jquery slideUp/Down visual effect to overwrite top function
+			function switchShowOrHide(tag){
+				if(tag){
+					if(tag.style.display=="none")
+						jQuery(tag).slideDown("fast");
+					else
+						jQuery(tag).slideUp("fast");
+				}
+			}								
+		</script>
+			
 		<h:form id="signupMeeting">
 		   <h:panelGroup>
 				<f:verbatim><ul class="navIntraTool actionToolbar" role="menu"></f:verbatim> 
@@ -371,44 +416,5 @@
 			</h:form>
 		</sakai:view_content>
 	</sakai:view_container>
-	
-	<f:verbatim>
-		<script>
-			var hiddenInputCollapeMInfo =document.getElementById("meeting:meetingInfoCollapseExpand");
-			var showMInfoTitleTag =document.getElementById("meeting:showMeetingTitleOnly");
-			//initialize
-			initMeetingInfoDetail();
-			
-			function initMeetingInfoDetail(){
-				var collapseMInfoTag =document.getElementById("meeting:meetingInfoDetails");				
-				if(collapseMInfoTag && hiddenInputCollapeMInfo && hiddenInputCollapeMInfo.value == 'true'){
-					collapseMInfoTag.style.display="none";
-					showMInfoTitleTag.style.display="";
-					//reverse the default:show when page refreshed
-					showDetails('meeting:imageOpen_meetingInfoDetail','meeting:imageClose_meetingInfoDetail');
-				}else{
-					collapseMInfoTag.style.display="";
-					showMInfoTitleTag.style.display="none";
-				}	
-			}
-			
-			function setMeetingCollapseInfo(val){				
-				hiddenInputCollapeMInfo.value=val;
-				if(val)				  
-				  	showMInfoTitleTag.style.display="";
-				 else
-				  	showMInfoTitleTag.style.display="none";				  
-			}
-			
-			//just introduce jquery slideUp/Down visual effect to overwrite top function
-			function switchShowOrHide(tag){
-				if(tag){
-					if(tag.style.display=="none")
-						$(tag).slideDown("fast");
-					else
-						$(tag).slideUp("fast");
-				}
-			}								
-		</script>
-	</f:verbatim>
+
 </f:view>
Index: tool/src/webapp/signup/download/downloadSelections.jsp
===================================================================
--- tool/src/webapp/signup/download/downloadSelections.jsp	(revision 313903)
+++ tool/src/webapp/signup/download/downloadSelections.jsp	(working copy)
@@ -10,11 +10,162 @@
 		<style type="text/css">
 				@import url("/sakai-signup-tool/css/signupStyle.css");
 		</style>
-		<script type="text/javascript" src="/library/js/jquery/1.4.2/jquery-1.4.2.min.js"></script>
+		<script type="text/javascript" src="/library/js/jquery/jquery-1.9.1.min.js"></script>
 		<script TYPE="text/javascript" LANGUAGE="JavaScript" src="/sakai-signup-tool/js/signupScript.js"></script>
 		<script type="text/javascript">
-			jQuery.noConflict();			
-    	</script>
+				jQuery.noConflict();
+									
+				var origClassNames=new Array();
+				var lastActiveId;
+				var previousBgColor; 
+				var recurRowClass="recurRow";//defined in css
+				var evenRowClass = "evenRow";
+				var oddRowClass = "oddRow";
+				//IE browser will not show the disabled option item
+				var orignSelectorTag;
+				var origSelectorIndex;
+				
+				jQuery(document).ready(function() {
+					//IE browser will not show the disabled option item
+					orignSelectorTag=document.getElementById('items:viewByRange');
+					origSelectorIndex = orignSelectorTag? orignSelectorTag.selectedIndex : 2;//default
+					
+					//due to recuring meetings, make sure even/odd Rows display correctly
+					reprocessEvenOddRowClasses();
+					
+					});
+				
+
+				function reprocessEvenOddRowClasses(){
+					var trRowTags = document.getElementsByTagName("tr");
+					rowNum=0;
+					if (!trRowTags)
+						return;
+						
+					for(i=0; i<trRowTags.length;i++){
+						if(trRowTags[i].style.display !="none"
+							&& (trRowTags[i].className == evenRowClass || trRowTags[i].className == oddRowClass) ){
+							if(rowNum % 2 == 0)
+								trRowTags[i].className = oddRowClass;
+							else
+								trRowTags[i].className = evenRowClass;
+							
+							rowNum++;
+						}
+
+					}
+
+				}
+				
+				function showAllRelatedRecurMeetings(id,iFrameId) {
+					var activeOne = document.getElementById(id);
+					if (!activeOne)
+						return;
+
+					if ( activeOne.className != recurRowClass)
+						updateOrigClassNames(id,activeOne.className)					
+						
+
+					if (activeOne.className!=recurRowClass) 
+						activeOne.className=recurRowClass;
+					else
+						activeOne.className=origClassNames[id];
+					
+					//hide last active one
+					if (lastActiveId && lastActiveId !=id){
+						resetRecurRows(lastActiveId);
+					}
+					lastActiveId = id;
+										
+					var i=0
+					//alert("id:" +id);
+					while (document.getElementById(id+"_" + i)!=null){					
+						var row = document.getElementById(id+"_" +i)
+						if (row !=null){					
+							if (row.style.display == "none"){
+								row.className=recurRowClass;
+								row.style.display = "";
+							}else
+								row.style.display = "none";
+						}
+						i++;
+					}
+					//reSize the iFrame
+					//signup_resetIFrameHeight(iFrameId);			
+				}
+				
+				function resetRecurRows(recurRowId){
+					row = document.getElementById(recurRowId);
+					if (row)
+						row.className=origClassNames[recurRowId];
+
+					var i=0;
+					while (document.getElementById(recurRowId+"_" + i)!=null){					
+						var row = document.getElementById(recurRowId+"_" +i)
+						if (row !=null){					
+							if (row.style.display == "")
+								row.style.display = "none";
+						}
+						i++;
+					}
+					
+					document.getElementById('imageOpen_RM_'+ recurRowId).style.display="none";
+					document.getElementById('imageClose_RM_'+ recurRowId).style.display="";				
+				}
+
+
+				function updateOrigClassNames(id, className){
+					if (!origClassNames[id])				
+						origClassNames[id]=className;
+				}
+				
+				
+				function validateIEDisabledItem(selector){
+					if(!orignSelectorTag)
+						return true;
+
+					if (selector.value !="none"){
+						origSelectorIndex = orignSelectorTag.selectedIndex;
+						return true;
+					}else{
+						selector.selectedIndex = origSelectorIndex;//restore				
+					}
+					
+					return false;
+				}
+				
+				function signup_SetAllCheckBoxes(){
+					var inputTags = document.getElementsByTagName("input");	
+					var checkBoxAllTag = document.getElementById("items:eventlist:selectAll");
+					if (!inputTags || !checkBoxAllTag)
+						return;
+					var checkValue = checkBoxAllTag.checked;	
+					signup_setAllChkBoxes(checkValue);
+				}
+				
+				function signup_setAllChkBoxes(value){
+					var inputTags = document.getElementsByTagName("input");					
+					if (!inputTags)
+						return;
+					//ignore the first expanding events chkBox
+					for(i=1; i<inputTags.length;i++){
+						if(inputTags[i].type=='checkbox')
+							inputTags[i].checked = value;					
+					}
+
+				}
+				
+				// find all of the sub meetings and check each one
+				// no uncheck here as wel want to allow the individual check of the parent meeting
+				function checkAllRecurring(recurRowId, total) {
+					var i=0;
+					while (i<total){					
+						jQuery('.'+recurRowId+'_' +i).attr('checked', true);
+						i++;
+					}
+				}
+
+		</script>
 		
 		<sakai:view_content>
 			<h:outputText value="#{msgs.event_error_alerts} #{messageUIBean.errorMessage}" styleClass="alertMessage" escape="false" rendered="#{messageUIBean.error}"/> 
@@ -237,150 +388,4 @@
   		</sakai:view_content>	
 	</sakai:view_container>
 	
-	<f:verbatim>
-		<script>
-					
-			var origClassNames=new Array();
-			var lastActiveId;
-			var previousBgColor; 
-			var recurRowClass="recurRow";//defined in css
-			var evenRowClass = "evenRow";
-			var oddRowClass = "oddRow";
-			//due to recuring meetings, make sure even/odd Rows display correctly
-			reprocessEvenOddRowClasses();
-
-			function reprocessEvenOddRowClasses(){
-				var trRowTags = document.getElementsByTagName("tr");
-				rowNum=0;
-				if (!trRowTags)
-					return;
-					
-				for(i=0; i<trRowTags.length;i++){
-					if(trRowTags[i].style.display !="none"
-						&& (trRowTags[i].className == evenRowClass || trRowTags[i].className == oddRowClass) ){
-						if(rowNum % 2 == 0)
-							trRowTags[i].className = oddRowClass;
-						else
-							trRowTags[i].className = evenRowClass;
-						
-						rowNum++;
-					}
-
-				}
-
-			}
-			
-			function showAllRelatedRecurMeetings(id,iFrameId) {
-				var activeOne = document.getElementById(id);
-				if (!activeOne)
-					return;
-
-				if ( activeOne.className != recurRowClass)
-					updateOrigClassNames(id,activeOne.className)					
-					
-
-				if (activeOne.className!=recurRowClass) 
-					activeOne.className=recurRowClass;
-				else
-					activeOne.className=origClassNames[id];
-				
-				//hide last active one
-				if (lastActiveId && lastActiveId !=id){
-					resetRecurRows(lastActiveId);
-				}
-				lastActiveId = id;
-									
-				var i=0
-				//alert("id:" +id);
-				while (document.getElementById(id+"_" + i)!=null){					
-					var row = document.getElementById(id+"_" +i)
-					if (row !=null){					
-						if (row.style.display == "none"){
-							row.className=recurRowClass;
-							row.style.display = "";
-						}else
-							row.style.display = "none";
-					}
-					i++;
-				}
-				//reSize the iFrame
-				//signup_resetIFrameHeight(iFrameId);			
-			}
-			
-			function resetRecurRows(recurRowId){
-				row = document.getElementById(recurRowId);
-				if (row)
-					row.className=origClassNames[recurRowId];
-
-				var i=0;
-				while (document.getElementById(recurRowId+"_" + i)!=null){					
-					var row = document.getElementById(recurRowId+"_" +i)
-					if (row !=null){					
-						if (row.style.display == "")
-							row.style.display = "none";
-					}
-					i++;
-				}
-				
-				document.getElementById('imageOpen_RM_'+ recurRowId).style.display="none";
-				document.getElementById('imageClose_RM_'+ recurRowId).style.display="";				
-			}
-
-
-			function updateOrigClassNames(id, className){
-				if (!origClassNames[id])				
-					origClassNames[id]=className;
-			}
-			
-			
-			//IE browser will not show the disabled option item
-			var orignSelectorTag=document.getElementById('items:viewByRange');
-			var origSelectorIndex = orignSelectorTag? orignSelectorTag.selectedIndex : 2;//default
-			function validateIEDisabledItem(selector){
-				if(!orignSelectorTag)
-					return true;
-
-				if (selector.value !="none"){
-					origSelectorIndex = orignSelectorTag.selectedIndex;
-					return true;
-				}else{
-					selector.selectedIndex = origSelectorIndex;//restore				
-				}
-				
-				return false;
-			}
-			
-			function signup_SetAllCheckBoxes(){
-				var inputTags = document.getElementsByTagName("input");	
-				var checkBoxAllTag = document.getElementById("items:eventlist:selectAll");
-				if (!inputTags || !checkBoxAllTag)
-					return;
-				var checkValue = checkBoxAllTag.checked;	
-				signup_setAllChkBoxes(checkValue);
-			}
-			
-			function signup_setAllChkBoxes(value){
-				var inputTags = document.getElementsByTagName("input");					
-				if (!inputTags)
-					return;
-				//ignore the first expanding events chkBox
-				for(i=1; i<inputTags.length;i++){
-					if(inputTags[i].type=='checkbox')
-						inputTags[i].checked = value;					
-				}
-
-			}
-			
-			// find all of the sub meetings and check each one
-			// no uncheck here as wel want to allow the individual check of the parent meeting
-			function checkAllRecurring(recurRowId, total) {
-				var i=0;
-				while (i<total){					
-					jQuery('.'+recurRowId+'_' +i).attr('checked', true);
-					i++;
-				}
-			}
-
-		</script>
-	</f:verbatim>
 </f:view> 
Index: tool/src/webapp/signup/newMeeting/assignStudents.jsp
===================================================================
--- tool/src/webapp/signup/newMeeting/assignStudents.jsp	(revision 313903)
+++ tool/src/webapp/signup/newMeeting/assignStudents.jsp	(working copy)
@@ -12,7 +12,45 @@
 			@import url("/sakai-signup-tool/css/signupStyle.css");
 		</style>
 		<script TYPE="text/javascript" src="/library/js/jquery/jquery-1.9.1.min.js"></script>
-		<script TYPE="text/javascript" src="/sakai-signup-tool/js/signupScript.js"></script>
+		<script TYPE="text/javascript" src="/sakai-signup-tool/js/signupScript.js"></script>		
+		<script TYPE="text/javascript">			
+			jQuery.noConflict();
+			
+			var lastActivePanel;
+			var lastClickedAddImage;
+			var lastUserInputEid;
+			var defaultColor='black';
+			var predefinedByJSF = "meeting:preSignup:";//tag prefix-id form.name + datatable name
+						
+			
+			
+			function showHideAddPanel(timeslotId, attendeeIndex){				
+				clearPanel();
+				//hide addImage block
+				lastClickedAddImage= document.getElementById(predefinedByJSF + timeslotId +":addAttendee");	
+				lastClickedAddImage.style.display = "none";
+				
+				var addPanel = document.getElementById(predefinedByJSF + timeslotId +":addPanel");
+    			addPanel.style.display = "block";   			   			
+    			lastActivePanel=addPanel;    			
+    			lastUserInputEid=document.getElementById(predefinedByJSF + timeslotId +":addAttendeeEidInput");
+			}
+															
+			function clearPanel(){
+				if(lastActivePanel)
+					lastActivePanel.style.display = "none";				
+				if (lastUserInputEid)		
+					lastUserInputEid.value="";
+				if (lastClickedAddImage)
+					lastClickedAddImage.style.display = "block";
+			}
+			
+			//Remove any "white space" (spaces, form feeds, line feeds, carriage returns, tabs, vertical tabs) before and trailing a string
+			function trim(s){
+				if((s==null)||(typeof(s)!='string')||!s.length)return'';return s.replace(/^\s+/,'').replace(/\s+$/,'')
+				}
+
+		</script>
 		
 		<h:outputText value="#{msgs.event_error_alerts} #{messageUIBean.errorMessage}" styleClass="alertMessage" escape="false" rendered="#{messageUIBean.error}"/>      			
 						
@@ -166,44 +204,5 @@
 			 </h:form>
   		</sakai:view_content>	
 	</sakai:view_container>
-	<f:verbatim>
-		<script>			
-						
-			var lastActivePanel;
-			var lastClickedAddImage;
-			var lastUserInputEid;
-			var defaultColor='black';
-			var predefinedByJSF = "meeting:preSignup:";//tag prefix-id form.name + datatable name
-						
-			
-			
-			function showHideAddPanel(timeslotId, attendeeIndex){				
-				clearPanel();
-				//hide addImage block
-				lastClickedAddImage= document.getElementById(predefinedByJSF + timeslotId +":addAttendee");	
-				lastClickedAddImage.style.display = "none";
-				
-				var addPanel = document.getElementById(predefinedByJSF + timeslotId +":addPanel");
-    			addPanel.style.display = "block";   			   			
-    			lastActivePanel=addPanel;    			
-    			lastUserInputEid=document.getElementById(predefinedByJSF + timeslotId +":addAttendeeEidInput");
-			}
-															
-			function clearPanel(){
-				if(lastActivePanel)
-					lastActivePanel.style.display = "none";				
-				if (lastUserInputEid)		
-					lastUserInputEid.value="";
-				if (lastClickedAddImage)
-					lastClickedAddImage.style.display = "block";
-			}
-			
-			//Remove any "white space" (spaces, form feeds, line feeds, carriage returns, tabs, vertical tabs) before and trailing a string
-			function trim(s){
-				if((s==null)||(typeof(s)!='string')||!s.length)return'';return s.replace(/^\s+/,'').replace(/\s+$/,'')
-				}
 
-		</script>
-	</f:verbatim>
-
 </f:view> 
Index: tool/src/webapp/signup/newMeeting/step1.jsp
===================================================================
--- tool/src/webapp/signup/newMeeting/step1.jsp	(revision 313903)
+++ tool/src/webapp/signup/newMeeting/step1.jsp	(working copy)
@@ -13,17 +13,39 @@
             @import url("/sakai-signup-tool/css/signupStyle.css");
         </style>
         
-        <script type="text/javascript" src="/library/js/jquery/1.4.2/jquery-1.4.2.min.js"></script>
+        <script type="text/javascript" src="/library/js/jquery/jquery-1.9.1.min.js"></script>
         <script type="text/javascript" src="/sakai-signup-tool/js/signupScript.js"></script>
         <script type="text/javascript" src="/sakai-signup-tool/js/newMeetingStep1.js"></script>  
         
-		<script type="text/javascript">
-			jQuery.noConflict();
-			jQuery(document).ready(function(){
-        		sakai.toggleExactDateVisibility();
-        		sakai.initSignupBeginAndEndsExact();
-        	});
-    	</script>
+    	<script type="text/javascript">
+	         //initialization of the page
+	         jQuery.noConflict();
+	         jQuery(document).ready(function() {
+	        	 initialLayoutsSetup();
+		         otherUserSitesSelection();
+		         replaceCalendarImageIcon(); 
+		         userDefinedTsChoice();
+		         //setIframeHeight_DueTo_Ckeditor();
+		         
+		         initDropDownAndInput('meeting:customLocationLabel','meeting:customLocationLabel_undo','meeting:customLocation','meeting:selectedLocation');
+		         initDropDownAndInput('meeting:customCategoryLabel','meeting:customCategoryLabel_undo','meeting:customCategory','meeting:selectedCategory');
+				
+		         sakai.toggleExactDateVisibility();
+	        		sakai.initSignupBeginAndEndsExact();
+	         });
+	         
+	         //void enter Key on inputField to cause refresh the page
+	         jQuery(function(){
+	        	 jQuery('form').on('keypress', function(event){
+	        	    if(event.which === 13 && jQuery(event.target).is(':input')){
+	        	        event.preventDefault();
+	        	        jQuery('#save').trigger('click');
+	        	    }
+	        	  });
+	        	});
+			 
+		</script>
+
     	
         <sakai:view_content>
      		<h:outputText value="#{msgs.event_error_alerts} #{messageUIBean.errorMessage}" styleClass="alertMessage" escape="false" rendered="#{messageUIBean.error}"/>
@@ -410,18 +432,6 @@
 			</h:form>
 		</sakai:view_content> 
 	</sakai:view_container>
-	<f:verbatim>
-		<script>
-	         //initialization of the page
-			 initialLayoutsSetup();
-	         otherUserSitesSelection();
-	         replaceCalendarImageIcon(); 
-	         userDefinedTsChoice();
-	         setIframeHeight_DueTo_Ckeditor();
-	         
-	         initDropDownAndInput('meeting:customLocationLabel','meeting:customLocationLabel_undo','meeting:customLocation','meeting:selectedLocation');
-	         initDropDownAndInput('meeting:customCategoryLabel','meeting:customCategoryLabel_undo','meeting:customCategory','meeting:selectedCategory');
-		</script>
-    </f:verbatim>
+
 </f:view>
 
Index: tool/src/webapp/signup/newMeeting/step2.jsp
===================================================================
--- tool/src/webapp/signup/newMeeting/step2.jsp	(revision 313903)
+++ tool/src/webapp/signup/newMeeting/step2.jsp	(working copy)
@@ -15,6 +15,24 @@
 	
 	  <script TYPE="text/javascript" src="/library/js/jquery/jquery-1.9.1.min.js"></script>
 	  <script TYPE="text/javascript" src="/sakai-signup-tool/js/signupScript.js"></script>
+	  <script TYPE="text/javascript">
+	  		jQuery.noConflict();
+			//init
+			jQuery(document).ready(function() {
+				isShowEmailChoice();
+	         });
+
+			//just introduce jquery slideUp/Down visual effect to overwrite top function
+			function switchShowOrHide(tag){
+				if(tag){
+					if(tag.style.display=="none")
+						jQuery(tag).slideDown("fast");
+					else
+						jQuery(tag).slideUp("fast");
+				}
+			}			
+						
+		</script>
 	  
 		
 		<sakai:view_content>
@@ -369,20 +387,4 @@
   		</sakai:view_content>	
 	</sakai:view_container>
 	
-	<f:verbatim>
-	<script>
-			//init
-			isShowEmailChoice();
-			//just introduce jquery slideUp/Down visual effect to overwrite top function
-			function switchShowOrHide(tag){
-				if(tag){
-					if(tag.style.display=="none")
-						$(tag).slideDown("fast");
-					else
-						$(tag).slideUp("fast");
-				}
-			}			
-						
-		</script>
-	</f:verbatim>
 </f:view> 
Index: tool/src/webapp/signup/organizer/copyMeeting.jsp
===================================================================
--- tool/src/webapp/signup/organizer/copyMeeting.jsp	(revision 313903)
+++ tool/src/webapp/signup/organizer/copyMeeting.jsp	(working copy)
@@ -11,15 +11,124 @@
 		<style type="text/css">
 			@import url("/sakai-signup-tool/css/signupStyle.css");
 		</style>
-		<script type="text/javascript" src="/library/js/jquery/1.4.2/jquery-1.4.2.min.js"></script>	
+		<script type="text/javascript" src="/library/js/jquery/jquery-1.9.1.min.js"></script>	
 		<script TYPE="text/javascript" LANGUAGE="JavaScript" src="/sakai-signup-tool/js/signupScript.js"></script>
-		<script type="text/javascript">
-			jQuery.noConflict();
-			jQuery(document).ready(function(){
-        		sakai.initSignupBeginAndEndsExact();
-        	});
-    	</script>
 		
+    	<script type="text/javascript">
+    		 jQuery.noConflict();
+    		 
+		     var timeslotTag; 
+		     var maxAttendeeTag;
+		     var originalTsVal; 
+		   	 var originalMaxAttendees;
+		   	 var keepAttendeesTag;
+		   	 var groupMaxAttendeeTag;
+		   	 var origGroupMaxAttendees;
+		   	 var untilCalendarTag;
+		   	 
+		   	 //init signupBegin
+			 var signupBeginTag;
+    	 	//initialization of the page
+    	 	jQuery(document).ready(function() {
+    	 		timeslotTag = document.getElementById("meeting:numberOfSlot");
+   	         	maxAttendeeTag = document.getElementById("meeting:numberOfAttendees");
+   	         	originalTsVal = timeslotTag? timeslotTag.value : 0;
+   	    	 	originalMaxAttendees = maxAttendeeTag? maxAttendeeTag.value : 0;
+   	    	 	keepAttendeesTag = document.getElementById('meeting:keepAttendees');
+   	    	 	groupMaxAttendeeTag = document.getElementById('meeting:maxAttendee');
+   	    	 	origGroupMaxAttendees = groupMaxAttendeeTag? groupMaxAttendeeTag.value : 0;
+   	    	 	untilCalendarTag = document.getElementById('meeting:utilCalendar');
+    	    	 
+	   	    	 //init signupBegin
+	   			 signupBeginTag = document.getElementById("meeting:signupBeginsType");
+	   			 if(signupBeginTag)
+	   			 	isSignUpBeginStartNow(signupBeginTag.value);
+   	 		
+				 currentSiteSelection();
+	   	         otherUserSitesSelection();	         
+	   	         replaceCalendarImageIcon();
+	   	         initGroupTypeRadioButton();
+	   	         userDefinedTsChoice();
+	   	         isShowEmailChoice();
+		         //setIframeHeight_DueTo_Ckeditor();
+		         
+	   	      	 initDropDownAndInput('meeting:customLocationLabel','meeting:customLocationLabel_undo','meeting:customLocation','meeting:selectedLocation');
+			     initDropDownAndInput('meeting:customCategoryLabel','meeting:customCategoryLabel_undo','meeting:customCategory','meeting:selectedCategory');
+				
+			     initRepeatCalendar();
+		    	 isShowAssignToAllChoice();
+		    	 
+		    	 sakai.initSignupBeginAndEndsExact();
+    	 	});
+    	 				 	         	         	    	 
+	         function alertTruncatedAttendees(alertMsg,hasTruncated){         	
+	         	if(!keepAttendeesTag || keepAttendeesTag && !keepAttendeesTag.checked)
+	         		return true;
+	         	
+	         	
+				var groupRadiosTag = getElementsByName_iefix("input","meeting:groupSubradio");
+				if(groupRadiosTag){
+					if(groupRadiosTag[0] && !groupRadiosTag[0].checked)//unlimited
+						return true;												
+				}
+	
+	         	if (!timeslotTag && !maxAttendeeTag && !groupRadiosTag)
+	         		return true;
+	         	
+	         	if (hasTruncated=='true' || timeslotTag && (timeslotTag.value < originalTsVal) || maxAttendeeTag && (maxAttendeeTag.value < originalMaxAttendees) 
+	         			|| groupMaxAttendeeTag && (groupMaxAttendeeTag.value < origGroupMaxAttendees) ){
+	         		return confirm(alertMsg);
+	         		}
+	         	
+	         	return true;
+	         } 
+	         
+	         function isShowAssignToAllChoice(){
+	        	var assignToAllTag = document.getElementById('meeting:assignToAllRecurrences');
+				var keepAttendeeCheckBoxTag = document.getElementById('meeting:keepAttendees');
+				var assignToAllChkBoxTag = document.getElementById('meeting:assignToAllChkBox');	
+
+
+        		if(!assignToAllTag || !keepAttendeeCheckBoxTag || !assignToAllChkBoxTag || !untilCalendarTag)
+        			return;
+			
+        		if(!keepAttendeeCheckBoxTag.checked || 
+					keepAttendeeCheckBoxTag.checked && untilCalendarTag.style.display =="none"){
+        			assignToAllTag.style.display = "none";
+        				
+        			if(!keepAttendeeCheckBoxTag.checked)				
+						assignToAllChkBoxTag.checked = false;
+						
+				}else if(untilCalendarTag.style.display !="none"){
+        				assignToAllTag.style.display = "";
+        		}
+	        }
+	        
+	        function isCopyRecurEvents(value){
+	        	var recurWarnTag1 = document.getElementById('meeting:recurWarnLabel_1');
+	        	var recurWarnTag2 = document.getElementById('meeting:recurWarnLabel_2');
+	        	if(recurWarnTag1 && recurWarnTag2){
+		        	if(value == 'no_repeat'){
+		        		recurWarnTag1.style.display="none";
+		        		recurWarnTag2.style.display="none";
+	        		}
+	        		else{
+	        			recurWarnTag1.style.display="";
+		        		recurWarnTag2.style.display="";
+	        		}
+        		}
+	        }
+	        
+	        function initRepeatCalendar(){
+				var recurSelectorTag = document.getElementById("meeting:recurSelector");
+				if( recurSelectorTag && recurSelectorTag.value !='no_repeat')
+					document.getElementById('meeting:utilCalendar').style.display="";
+				else
+					document.getElementById('meeting:utilCalendar').style.display="none";
+			}
+			
+		</script>
+		
 		<sakai:view_content>
 			<h:outputText value="#{msgs.event_error_alerts} #{messageUIBean.errorMessage}" styleClass="alertMessage" escape="false" rendered="#{messageUIBean.error}"/>      			
 			<h:outputText id="iframeId" value="#{CopyMeetingSignupMBean.iframeId}" style="display:none"/>	
@@ -514,103 +623,4 @@
   		</sakai:view_content>	
 	</sakai:view_container>
 	
-	<f:verbatim>
-    	<script>
-    	 	//initialization of the page
-			 currentSiteSelection();
-	         otherUserSitesSelection();	         
-	         replaceCalendarImageIcon();
-	         initGroupTypeRadioButton();
-	         userDefinedTsChoice();
-	         isShowEmailChoice();
-	         setIframeHeight_DueTo_Ckeditor();
-			 initDropDownAndInput('meeting:customLocationLabel','meeting:customLocationLabel_undo','meeting:customLocation','meeting:selectedLocation');
-		     initDropDownAndInput('meeting:customCategoryLabel','meeting:customCategoryLabel_undo','meeting:customCategory','meeting:selectedCategory');
-
-	         	         
-	         var timeslotTag = document.getElementById("meeting:numberOfSlot");
-	         var maxAttendeeTag = document.getElementById("meeting:numberOfAttendees");
-	         var originalTsVal = timeslotTag? timeslotTag.value : 0;
-	    	 var originalMaxAttendees = maxAttendeeTag? maxAttendeeTag.value : 0;
-	    	 var keepAttendeesTag = document.getElementById('meeting:keepAttendees');
-	    	 var groupMaxAttendeeTag = document.getElementById('meeting:maxAttendee');
-	    	 var origGroupMaxAttendees = groupMaxAttendeeTag? groupMaxAttendeeTag.value : 0;
-	    	 var untilCalendarTag = document.getElementById('meeting:utilCalendar');
-	    	 
-	    	 //init signupBegin
-			 var signupBeginTag = document.getElementById("meeting:signupBeginsType");
-			 if(signupBeginTag)
-			 	isSignUpBeginStartNow(signupBeginTag.value);
-	    	 
-	    	 initRepeatCalendar();
-	    	 isShowAssignToAllChoice();
-	    	 
-	         function alertTruncatedAttendees(alertMsg,hasTruncated){         	
-	         	if(!keepAttendeesTag || keepAttendeesTag && !keepAttendeesTag.checked)
-	         		return true;
-	         	
-	         	
-				var groupRadiosTag = getElementsByName_iefix("input","meeting:groupSubradio");
-				if(groupRadiosTag){
-					if(groupRadiosTag[0] && !groupRadiosTag[0].checked)//unlimited
-						return true;												
-				}
-	
-	         	if (!timeslotTag && !maxAttendeeTag && !groupRadiosTag)
-	         		return true;
-	         	
-	         	if (hasTruncated=='true' || timeslotTag && (timeslotTag.value < originalTsVal) || maxAttendeeTag && (maxAttendeeTag.value < originalMaxAttendees) 
-	         			|| groupMaxAttendeeTag && (groupMaxAttendeeTag.value < origGroupMaxAttendees) ){
-	         		return confirm(alertMsg);
-	         		}
-	         	
-	         	return true;
-	         } 
-	         
-	         function isShowAssignToAllChoice(){
-	        	var assignToAllTag = document.getElementById('meeting:assignToAllRecurrences');
-				var keepAttendeeCheckBoxTag = document.getElementById('meeting:keepAttendees');
-				var assignToAllChkBoxTag = document.getElementById('meeting:assignToAllChkBox');	
-
-
-        		if(!assignToAllTag || !keepAttendeeCheckBoxTag || !assignToAllChkBoxTag || !untilCalendarTag)
-        			return;
-			
-        		if(!keepAttendeeCheckBoxTag.checked || 
-					keepAttendeeCheckBoxTag.checked && untilCalendarTag.style.display =="none"){
-        			assignToAllTag.style.display = "none";
-        				
-        			if(!keepAttendeeCheckBoxTag.checked)				
-						assignToAllChkBoxTag.checked = false;
-						
-				}else if(untilCalendarTag.style.display !="none"){
-        				assignToAllTag.style.display = "";
-        		}
-	        }
-	        
-	        function isCopyRecurEvents(value){
-	        	var recurWarnTag1 = document.getElementById('meeting:recurWarnLabel_1');
-	        	var recurWarnTag2 = document.getElementById('meeting:recurWarnLabel_2');
-	        	if(recurWarnTag1 && recurWarnTag2){
-		        	if(value == 'no_repeat'){
-		        		recurWarnTag1.style.display="none";
-		        		recurWarnTag2.style.display="none";
-	        		}
-	        		else{
-	        			recurWarnTag1.style.display="";
-		        		recurWarnTag2.style.display="";
-	        		}
-        		}
-	        }
-	        
-	        function initRepeatCalendar(){
-				var recurSelectorTag = document.getElementById("meeting:recurSelector");
-				if( recurSelectorTag && recurSelectorTag.value !='no_repeat')
-					document.getElementById('meeting:utilCalendar').style.display="";
-				else
-					document.getElementById('meeting:utilCalendar').style.display="none";
-			}
-			
-		</script>
-    </f:verbatim>
 </f:view> 
Index: tool/src/webapp/signup/organizer/modifyMeeting.jsp
===================================================================
--- tool/src/webapp/signup/organizer/modifyMeeting.jsp	(revision 313903)
+++ tool/src/webapp/signup/organizer/modifyMeeting.jsp	(working copy)
@@ -12,7 +12,7 @@
 			@import url("/sakai-signup-tool/css/signupStyle.css");
 		</style>	
 		
-		<script type="text/javascript" src="/library/js/jquery/1.4.2/jquery-1.4.2.min.js"></script>
+		<script type="text/javascript" src="/library/js/jquery/jquery-1.9.1.min.js"></script>
         <script type="text/javascript" src="/sakai-signup-tool/js/signupScript.js"></script>
         
 		<script type="text/javascript">
@@ -21,6 +21,61 @@
         		sakai.initSignupBeginAndEndsExact();
         	});
     	</script>
+ 
+		<script type="text/javascript">
+			jQuery.noConflict();
+			
+			var recurWarnTag1;
+	        var recurWarnTag2;
+
+			
+	        jQuery(document).ready(function(){
+				recurWarnTag1 = document.getElementById('meeting:rescheduleWarnLabel_1');
+		        recurWarnTag2 = document.getElementById('meeting:rescheduleWarnLabel_2');
+
+        		sakai.initSignupBeginAndEndsExact();
+        		//for IE browser, it does nothing.
+        		initGroupTypeRadioButton();
+    			replaceCalendarImageIcon(); 
+    			userDefinedTsChoice();
+    			isShowEmailChoice();
+    			setIframeHeight_DueTo_Ckeditor();
+    			initDropDownAndInput('meeting:customLocationLabel','meeting:customLocationLabel_undo','meeting:customLocation','meeting:selectedLocation');
+    	        initDropDownAndInput('meeting:customCategoryLabel','meeting:customCategoryLabel_undo','meeting:customCategory','meeting:selectedCategory');
+
+        	});
+	        
+			var wait=false; 
+			var originalTsNumVal = 4;//default
+			var warningMsgs="You may not decrease the number of time slots below the original value:";
+			function delayedValidMimimunTs(originalTsNum,warningMsg){
+				originalTsNumVal = parseInt(originalTsNum);
+				warningMsgs=warningMsg;
+				if (!wait){
+					wait = true;
+				  	setTimeout("validateMimTs();wait=false;", 3000);//3 sec
+				}	
+			}
+			
+			function validateMimTs(){
+				var slotNumTag = document.getElementById("meeting:numberOfSlot");
+				if (!slotNumTag || slotNumTag.value.length == 0)
+ 						return;	 						
+ 						
+				if(slotNumTag.value < originalTsNumVal){
+					alert(warningMsgs +" " + originalTsNumVal);
+					slotNumTag.value = originalTsNumVal;
+					}			
+			}
+			
+			function showRescheduleWarning(){
+	        	if(recurWarnTag1 && recurWarnTag2){	        	
+		        	recurWarnTag1.style.display="";
+		        	recurWarnTag2.style.display="";     		
+        		}
+	        }			
+		</script>
+
 		
 		
 		<sakai:view_content>
@@ -450,49 +505,4 @@
   		</sakai:view_content>	
 	</sakai:view_container>
 	
-	<f:verbatim>
-		<script>
-			//for IE browser, it does nothing.
-			initGroupTypeRadioButton();
-			replaceCalendarImageIcon(); 
-			userDefinedTsChoice();
-			isShowEmailChoice();
-			setIframeHeight_DueTo_Ckeditor();
-			initDropDownAndInput('meeting:customLocationLabel','meeting:customLocationLabel_undo','meeting:customLocation','meeting:selectedLocation');
-	        initDropDownAndInput('meeting:customCategoryLabel','meeting:customCategoryLabel_undo','meeting:customCategory','meeting:selectedCategory');
-
-			var wait=false; 
-			var originalTsNumVal = 4;//default
-			var warningMsgs="You may not decrease the number of time slots below the original value:";
-			function delayedValidMimimunTs(originalTsNum,warningMsg){
-				originalTsNumVal = parseInt(originalTsNum);
-				warningMsgs=warningMsg;
-				if (!wait){
-					wait = true;
-				  	setTimeout("validateMimTs();wait=false;", 3000);//3 sec
-				}	
-			}
-			
-			function validateMimTs(){
-				var slotNumTag = document.getElementById("meeting:numberOfSlot");
-				if (!slotNumTag || slotNumTag.value.length == 0)
- 						return;	 						
- 						
-				if(slotNumTag.value < originalTsNumVal){
-					alert(warningMsgs +" " + originalTsNumVal);
-					slotNumTag.value = originalTsNumVal;
-					}			
-			}
-			
-			var recurWarnTag1 = document.getElementById('meeting:rescheduleWarnLabel_1');
-	        var recurWarnTag2 = document.getElementById('meeting:rescheduleWarnLabel_2');
-			function showRescheduleWarning(){
-	        	if(recurWarnTag1 && recurWarnTag2){	        	
-		        	recurWarnTag1.style.display="";
-		        	recurWarnTag2.style.display="";     		
-        		}
-	        }			
-		</script>
-	</f:verbatim>
-	
 </f:view> 
Index: tool/src/webapp/signup/organizer/orgSignupMeeting.jsp
===================================================================
--- tool/src/webapp/signup/organizer/orgSignupMeeting.jsp	(revision 313903)
+++ tool/src/webapp/signup/organizer/orgSignupMeeting.jsp	(working copy)
@@ -14,7 +14,207 @@
 			@import url("/sakai-signup-tool/css/print.css");
 		</style>
 		<script TYPE="text/javascript" LANGUAGE="JavaScript" src="/sakai-signup-tool/js/signupScript.js"></script>
-		<script TYPE="text/javascript" LANGUAGE="JavaScript" src="/sakai-signup-tool/js/jquery.js"></script>
+		<script type="text/javascript" src="/library/js/jquery/jquery-1.9.1.min.js"></script>
+		<script type="text/javascript">
+			jQuery.noConflict();
+			
+			var firstAttendee; 
+			var userActionType;
+			var lastActivePanel;
+			var lastActionEditPl;
+			var lastTsEditPanel;
+			var lastActiveUserCursor;
+			var lastClickedAddImage;
+			var lastUserInputEid;
+			var defaultColor='black';
+			var predefinedByJSF = "meeting:timeslots:";//tag prefix-id form.name + datatable name
+			var predefMidPartByJSF=":availableSpots:";//tag id for datatable
+			var defaultUserAction ="replaceAction";			
+			var hiddenInputCollapeMInfo;
+			var showMInfoTitleTag;
+			//initialization of the page
+	        jQuery(document).ready(function() {
+	        	initMeetingInfoDetail();
+	        	
+				});
+						
+			function initMeetingInfoDetail(){
+				//initialize here now
+				firstAttendee= document.getElementById("meeting:selectedFirstUser");
+				userActionType=document.getElementById("meeting:userActionType");
+				hiddenInputCollapeMInfo =document.getElementById("meeting:meetingInfoCollapseExpand");
+				showMInfoTitleTag =document.getElementById("meeting:showMeetingTitleOnly");
+				
+				var collapseMInfoTag =document.getElementById("meeting:meetingInfoDetails");				
+				if(collapseMInfoTag && hiddenInputCollapeMInfo && hiddenInputCollapeMInfo.value == 'true'){
+					collapseMInfoTag.style.display="none";
+					showMInfoTitleTag.style.display="";
+					//reverse the default:show when page refreshed
+					showDetails('meeting:imageOpen_meetingInfoDetail','meeting:imageClose_meetingInfoDetail');
+				}else{
+					collapseMInfoTag.style.display="";
+					showMInfoTitleTag.style.display="none";
+				}	
+			}
+			
+			function setMeetingCollapseInfo(val){				
+				hiddenInputCollapeMInfo.value=val;
+				if(val)				  
+				  	showMInfoTitleTag.style.display="";
+				 else
+				  	showMInfoTitleTag.style.display="none";				  
+			}
+			
+			function showHideEditPanel(timeslotId, attendeeIndex, attendee){
+				if(lastActivePanel)
+					lastActivePanel.style.display="none";
+					
+				var editPanel = document.getElementById(predefinedByJSF + timeslotId + predefMidPartByJSF +attendeeIndex + ":editPanel");
+    			editPanel.style.display = "block";
+    			firstAttendee.value = attendee;
+    			//alert("firstUser:" +firstAttendee.value);
+    			lastActivePanel=editPanel;
+    			
+    			if (lastClickedAddImage)
+					lastClickedAddImage.style.display = "block";
+				//pass current AddImageTag
+				lastClickedAddImage= document.getElementById(predefinedByJSF + timeslotId +":addAttendee");	
+				lastClickedAddImage.style.display = "none";
+    			
+    			
+    			showHideActionTypePanel(timeslotId, attendeeIndex, defaultUserAction);
+    			
+    			//change color to highlight selected attendee
+    			if(lastActiveUserCursor)
+					lastActiveUserCursor.style.color=defaultColor;
+
+    			var activeUserCursor = document.getElementById(predefinedByJSF + timeslotId + predefMidPartByJSF +attendeeIndex + ":editLink");
+				defaultColor=activeUserCursor.style.color;
+				activeUserCursor.style.color="blue";
+				lastActiveUserCursor=activeUserCursor;
+				
+				if (lastUserInputEid)
+					lastUserInputEid.value="";
+				lastUserInputEid=document.getElementById(predefinedByJSF + timeslotId +predefMidPartByJSF +attendeeIndex + ":replaceEidInput");
+			}
+			
+			function showHideAddPanel(timeslotId, attendeeIndex){				
+				clearPanels();
+				if (activeUserCursor)
+					activeUserCursor.style.color=defaultColor;
+				
+				lastClickedAddImage= document.getElementById(predefinedByJSF + timeslotId +":addAttendee");	
+				lastClickedAddImage.style.display = "none";
+						
+				var addPanel = document.getElementById(predefinedByJSF + timeslotId +":addPanel");
+    			addPanel.style.display = "block";
+    			var activeUserCursor = document.getElementById(predefinedByJSF + timeslotId +":addAttendee");
+				activeUserCursor.style.color="blue";    			
+    			lastActivePanel=addPanel;
+    			lastActiveUserCursor=activeUserCursor;
+    			lastUserInputEid=document.getElementById(predefinedByJSF + timeslotId +":addAttendeeEidInput");
+			}
+			
+			function showHideActionTypePanel(timeslotId,attendeeIndex,actType){
+				if(lastActionEditPl)
+					lastActionEditPl.style.display="none";
+				if (lastTsEditPanel)
+					lastTsEditPanel.style.display="none";
+					
+				var actTypePanel = document.getElementById(predefinedByJSF + timeslotId +predefMidPartByJSF +attendeeIndex + ":" + actType);
+				actTypePanel.style.display = "block";
+    			userActionType.value=actType;
+    			lastActionEditPl=actTypePanel;
+			}
+			
+			function showHideAddWaiterPanel(timeslotPosIndex){
+				clearPanels();
+				
+				var radiobxns = document.getElementsByName(predefinedByJSF + timeslotPosIndex +":selcetAddWaiterType");
+				if(radiobxns)   
+					radiobxns[0].checked=true;//set radioBxn to bottom
+				
+				lastClickedAddImage= document.getElementById(predefinedByJSF + timeslotPosIndex +":addWaiter");	
+				lastClickedAddImage.style.display = "none";
+				
+							
+				var waiterPanel = document.getElementById(predefinedByJSF + timeslotPosIndex +":addWaiterPanel");
+				waiterPanel.style.display = "block";
+				var activeUserCursor = document.getElementById(predefinedByJSF + timeslotPosIndex +":addWaiter");
+				activeUserCursor.style.color="blue"; 
+				lastActionEditPl=waiterPanel;
+				lastActiveUserCursor=activeUserCursor;
+				lastUserInputEid=document.getElementById(predefinedByJSF + timeslotPosIndex + ":addWaiterEidInput");
+			}
+			
+			function showEditTimeslot(timeslotPosIndex){
+				clearTimeslotPanel();			
+				var tsEditPanel = document.getElementById(predefinedByJSF + timeslotPosIndex +":editTimeSlot");
+				tsEditPanel.style.display == 'none' ? tsEditPanel.style.display = 'block' : tsEditPanel.style.display = 'none';
+				lastTsEditPanel=tsEditPanel;
+			
+			}
+			function clearPanels(){
+				if (lastTsEditPanel)
+					lastTsEditPanel.style.display="none";
+				clearTimeslotPanel();
+			}
+			function clearTimeslotPanel(){
+				if(lastActivePanel)
+					lastActivePanel.style.display = "none";
+				if(lastActionEditPl)
+					lastActionEditPl.style.display="none";
+				if(lastActiveUserCursor)
+					lastActiveUserCursor.style.color=defaultColor;
+				if (lastUserInputEid)		
+					lastUserInputEid.value="";
+				if (lastClickedAddImage)
+					lastClickedAddImage.style.display = "block";
+			}
+			
+			//Due to JSF commandLink don't have onclick() method and this is a way to go around
+			var deleteClick;
+			var deleteMsg='Are you sure to do this?'; //default          
+			function assignDeleteClick(link,msg) {
+			  if (link.onclick == confirmDelete) {
+			    return;
+			  }
+			                
+			  deleteClick = link.onclick;
+			  deleteMsg = msg;
+			  link.onclick = confirmDelete;
+			}
+			            
+			function confirmDelete() {
+			  var ans = confirm(deleteMsg);
+			  if (ans) {
+			    return deleteClick();
+			  } else {
+			    return false;
+			  }
+			}
+			
+			function confirmTsCancel(link,msg){
+			if (link.onclick == confirmDelete) {
+			    return;
+			  }
+			                
+			  deleteClick = link.onclick;
+			  deleteMsg = msg;
+			  link.onclick = confirmDelete;
+			}
+			
+			//just introduce jquery slideUp/Down visual effect to overwrite top function
+			function switchShowOrHide(tag){
+				if(tag){
+					if(tag.style.display=="none")
+						jQuery(tag).slideDown("fast");
+					else
+						jQuery(tag).slideUp("fast");
+				}
+			}			
+						
+		</script>
 		
 		<h:form id="modifyMeeting">
 			<h:panelGroup>
@@ -669,194 +869,6 @@
   		</sakai:view_content>	
 	</sakai:view_container>
 	<f:verbatim>
-		<script>
-			var firstAttendee = document.getElementById("meeting:selectedFirstUser");
-			var userActionType =document.getElementById("meeting:userActionType");
-			var lastActivePanel;
-			var lastActionEditPl;
-			var lastTsEditPanel;
-			var lastActiveUserCursor;
-			var lastClickedAddImage;
-			var lastUserInputEid;
-			var defaultColor='black';
-			var predefinedByJSF = "meeting:timeslots:";//tag prefix-id form.name + datatable name
-			var predefMidPartByJSF=":availableSpots:";//tag id for datatable
-			var defaultUserAction ="replaceAction";			
-			var hiddenInputCollapeMInfo =document.getElementById("meeting:meetingInfoCollapseExpand");
-			var showMInfoTitleTag =document.getElementById("meeting:showMeetingTitleOnly");
-			//initialize
-			initMeetingInfoDetail();
-			
-			function initMeetingInfoDetail(){
-				var collapseMInfoTag =document.getElementById("meeting:meetingInfoDetails");				
-				if(collapseMInfoTag && hiddenInputCollapeMInfo && hiddenInputCollapeMInfo.value == 'true'){
-					collapseMInfoTag.style.display="none";
-					showMInfoTitleTag.style.display="";
-					//reverse the default:show when page refreshed
-					showDetails('meeting:imageOpen_meetingInfoDetail','meeting:imageClose_meetingInfoDetail');
-				}else{
-					collapseMInfoTag.style.display="";
-					showMInfoTitleTag.style.display="none";
-				}	
-			}
-			
-			function setMeetingCollapseInfo(val){				
-				hiddenInputCollapeMInfo.value=val;
-				if(val)				  
-				  	showMInfoTitleTag.style.display="";
-				 else
-				  	showMInfoTitleTag.style.display="none";				  
-			}
-			
-			function showHideEditPanel(timeslotId, attendeeIndex, attendee){
-				if(lastActivePanel)
-					lastActivePanel.style.display="none";
-					
-				var editPanel = document.getElementById(predefinedByJSF + timeslotId + predefMidPartByJSF +attendeeIndex + ":editPanel");
-    			editPanel.style.display = "block";
-    			firstAttendee.value = attendee;
-    			//alert("firstUser:" +firstAttendee.value);
-    			lastActivePanel=editPanel;
-    			
-    			if (lastClickedAddImage)
-					lastClickedAddImage.style.display = "block";
-				//pass current AddImageTag
-				lastClickedAddImage= document.getElementById(predefinedByJSF + timeslotId +":addAttendee");	
-				lastClickedAddImage.style.display = "none";
-    			
-    			
-    			showHideActionTypePanel(timeslotId, attendeeIndex, defaultUserAction);
-    			
-    			//change color to highlight selected attendee
-    			if(lastActiveUserCursor)
-					lastActiveUserCursor.style.color=defaultColor;
 
-    			var activeUserCursor = document.getElementById(predefinedByJSF + timeslotId + predefMidPartByJSF +attendeeIndex + ":editLink");
-				defaultColor=activeUserCursor.style.color;
-				activeUserCursor.style.color="blue";
-				lastActiveUserCursor=activeUserCursor;
-				
-				if (lastUserInputEid)
-					lastUserInputEid.value="";
-				lastUserInputEid=document.getElementById(predefinedByJSF + timeslotId +predefMidPartByJSF +attendeeIndex + ":replaceEidInput");
-			}
-			
-			function showHideAddPanel(timeslotId, attendeeIndex){				
-				clearPanels();
-				if (activeUserCursor)
-					activeUserCursor.style.color=defaultColor;
-				
-				lastClickedAddImage= document.getElementById(predefinedByJSF + timeslotId +":addAttendee");	
-				lastClickedAddImage.style.display = "none";
-						
-				var addPanel = document.getElementById(predefinedByJSF + timeslotId +":addPanel");
-    			addPanel.style.display = "block";
-    			var activeUserCursor = document.getElementById(predefinedByJSF + timeslotId +":addAttendee");
-				activeUserCursor.style.color="blue";    			
-    			lastActivePanel=addPanel;
-    			lastActiveUserCursor=activeUserCursor;
-    			lastUserInputEid=document.getElementById(predefinedByJSF + timeslotId +":addAttendeeEidInput");
-			}
-			
-			function showHideActionTypePanel(timeslotId,attendeeIndex,actType){
-				if(lastActionEditPl)
-					lastActionEditPl.style.display="none";
-				if (lastTsEditPanel)
-					lastTsEditPanel.style.display="none";
-					
-				var actTypePanel = document.getElementById(predefinedByJSF + timeslotId +predefMidPartByJSF +attendeeIndex + ":" + actType);
-				actTypePanel.style.display = "block";
-    			userActionType.value=actType;
-    			lastActionEditPl=actTypePanel;
-			}
-			
-			function showHideAddWaiterPanel(timeslotPosIndex){
-				clearPanels();
-				
-				var radiobxns = document.getElementsByName(predefinedByJSF + timeslotPosIndex +":selcetAddWaiterType");
-				if(radiobxns)   
-					radiobxns[0].checked=true;//set radioBxn to bottom
-				
-				lastClickedAddImage= document.getElementById(predefinedByJSF + timeslotPosIndex +":addWaiter");	
-				lastClickedAddImage.style.display = "none";
-				
-							
-				var waiterPanel = document.getElementById(predefinedByJSF + timeslotPosIndex +":addWaiterPanel");
-				waiterPanel.style.display = "block";
-				var activeUserCursor = document.getElementById(predefinedByJSF + timeslotPosIndex +":addWaiter");
-				activeUserCursor.style.color="blue"; 
-				lastActionEditPl=waiterPanel;
-				lastActiveUserCursor=activeUserCursor;
-				lastUserInputEid=document.getElementById(predefinedByJSF + timeslotPosIndex + ":addWaiterEidInput");
-			}
-			
-			function showEditTimeslot(timeslotPosIndex){
-				clearTimeslotPanel();			
-				var tsEditPanel = document.getElementById(predefinedByJSF + timeslotPosIndex +":editTimeSlot");
-				tsEditPanel.style.display == 'none' ? tsEditPanel.style.display = 'block' : tsEditPanel.style.display = 'none';
-				lastTsEditPanel=tsEditPanel;
-			
-			}
-			function clearPanels(){
-				if (lastTsEditPanel)
-					lastTsEditPanel.style.display="none";
-				clearTimeslotPanel();
-			}
-			function clearTimeslotPanel(){
-				if(lastActivePanel)
-					lastActivePanel.style.display = "none";
-				if(lastActionEditPl)
-					lastActionEditPl.style.display="none";
-				if(lastActiveUserCursor)
-					lastActiveUserCursor.style.color=defaultColor;
-				if (lastUserInputEid)		
-					lastUserInputEid.value="";
-				if (lastClickedAddImage)
-					lastClickedAddImage.style.display = "block";
-			}
-			
-			//Due to JSF commandLink don't have onclick() method and this is a way to go around
-			var deleteClick;
-			var deleteMsg='Are you sure to do this?'; //default          
-			function assignDeleteClick(link,msg) {
-			  if (link.onclick == confirmDelete) {
-			    return;
-			  }
-			                
-			  deleteClick = link.onclick;
-			  deleteMsg = msg;
-			  link.onclick = confirmDelete;
-			}
-			            
-			function confirmDelete() {
-			  var ans = confirm(deleteMsg);
-			  if (ans) {
-			    return deleteClick();
-			  } else {
-			    return false;
-			  }
-			}
-			
-			function confirmTsCancel(link,msg){
-			if (link.onclick == confirmDelete) {
-			    return;
-			  }
-			                
-			  deleteClick = link.onclick;
-			  deleteMsg = msg;
-			  link.onclick = confirmDelete;
-			}
-			
-			//just introduce jquery slideUp/Down visual effect to overwrite top function
-			function switchShowOrHide(tag){
-				if(tag){
-					if(tag.style.display=="none")
-						$(tag).slideDown("fast");
-					else
-						$(tag).slideUp("fast");
-				}
-			}			
-						
-		</script>
 	</f:verbatim>
 </f:view> 
Index: tool/src/webapp/signup/organizer/userDefTsBlocks.jsp
===================================================================
--- tool/src/webapp/signup/organizer/userDefTsBlocks.jsp	(revision 313903)
+++ tool/src/webapp/signup/organizer/userDefTsBlocks.jsp	(working copy)
@@ -11,113 +11,15 @@
 			<style type="text/css">
 				@import url("/sakai-signup-tool/css/signupStyle.css");
 			</style>
-			<script TYPE="text/javascript" LANGUAGE="JavaScript" src="/sakai-signup-tool/js/signupScript.js"></script>
-			<script TYPE="text/javascript" LANGUAGE="JavaScript" src="/sakai-signup-tool/js/jquery.js"></script>	
-			<script>jQuery.noConflict();</script>
-				
-		<sakai:view_content>
-			<h:outputText value="#{msgs.event_error_alerts} #{messageUIBean.errorMessage}" styleClass="alertMessage" escape="false" rendered="#{messageUIBean.error}"/>      			
-				
-			<h:form id="meeting">
-			 	<sakai:view_title value="#{msgs.event_view_userDefined_Timeslot_page_title}"/>
-				
-							
-				<h:panelGrid columns="2" columnClasses="titleColumn,valueColumn" onmouseover="delayedRecalcDate();">
-				
-					<h:outputText value="&nbsp;" escape="false"/>
-					<h:outputText value="&nbsp;" escape="false"/>
+			<script TYPE="text/javascript" LANGUAGE="JavaScript" src="/sakai-signup-tool/js/signupScript.js"></script>			
+			<script type="text/javascript" src="/library/js/jquery/jquery-1.9.1.min.js"></script>	
+			
+		<script TYPE="text/javascript" LANGUAGE="JavaScript">
+			jQuery.noConflict();
+			jQuery(document).ready(function() {				
+				replaceCalendarImageIcon();				
+				});
 					
-					<h:outputText value="&nbsp;" escape="false" rendered="#{UserDefineTimeslotBean.someoneSignedUp}"/>
-					<h:outputText value="#{msgs.warn_reschedule_event}" styleClass="alertMessage" style="width:85%" escape="false" rendered="#{UserDefineTimeslotBean.someoneSignedUp}"/>
-					
-					<h:panelGroup styleClass="titleText">		           			
-					           <h:outputText value ="&nbsp;" escape="false"/>
-					    </h:panelGroup>
-					    <t:dataTable id="userDefinedTS" value="#{UserDefineTimeslotBean.timeSlotWrpList}" 
-					    	var="tsWrapper"
-					    	binding="#{UserDefineTimeslotBean.tsTable}"
-					    	styleClass="userDefineTsTable" 
-							rowClasses="oddRow,evenRow"
-							rowStyle="#{tsWrapper.errorStyle}"
-							columnClasses="delTSCol, startTSCol, endTSCol, numAttnTSCol" >
-								<t:column rendered="#{!tsWrapper.deleted}">
-									<f:facet name="header" >								
-											<h:outputText value="&nbsp;" escape="false"/>
-									</f:facet>
-										<h:commandLink action="#{UserDefineTimeslotBean.deleteTSblock}" rendered="#{tsWrapper.newlyAddedTS || UserDefineTimeslotBean.placeOrderBean == UserDefineTimeslotBean.copyBeanOrderName}">
-											<h:graphicImage value="/images/new.png" alt="New time slot" title="#{msgs.title_tip_delete_this_ts}"  styleClass="openCloseImageIcon" rendered="#{tsWrapper.newTimeslotBlock && UserDefineTimeslotBean.placeOrderBean != UserDefineTimeslotBean.newMeetingBeanOrderName}"/>
-							        		<h:graphicImage value="/images/ts_delete.png" alt="delete slot" title="#{msgs.title_tip_delete_this_ts}" style="border:none;cursor:pointer;" styleClass="openCloseImageIcon"/>
-							        	</h:commandLink>
-							        	<h:commandLink action="#{UserDefineTimeslotBean.deleteTSblock}" rendered="#{!tsWrapper.newlyAddedTS && UserDefineTimeslotBean.placeOrderBean != UserDefineTimeslotBean.copyBeanOrderName }" onmousedown="confirmTsCancel(this,'#{msgs.confirm_cancel}');">
-							        		<h:graphicImage value="/images/ts_delete.png" alt="delete slot" title="#{msgs.title_tip_delete_this_ts}" style="border:none;cursor:pointer;" styleClass="openCloseImageIcon" />
-							        	</h:commandLink>
-								</t:column>
-						    	<t:column rendered="#{!tsWrapper.deleted}">
-						    		<f:facet name="header" >								
-										<h:outputText value="#{msgs.tab_start_time}" escape="false"/>
-									</f:facet>
-						    		<h:panelGrid columns="1">
-							    		<h:panelGroup styleClass="titleText">
-					        				<t:inputDate id="startTime" type="both"  ampm="true" value="#{tsWrapper.timeSlot.startTime}" 
-					        							 style="color:black;" popupCalendar="true" timeZone="#{UserTimeZone.userTimeZoneStr}"/>       						
-										</h:panelGroup>
-										<h:message for="startTime" errorClass="alertMessageInline"/>
-									</h:panelGrid>
-						    	</t:column>
-						    	<t:column rendered="#{!tsWrapper.deleted}">
-						    		<f:facet name="header" >								
-										<h:outputText value="#{msgs.tab_end_time}" escape="false"/>
-									</f:facet>
-									<h:panelGrid columns="1">
-										<h:panelGroup styleClass="titleText">
-					        				<t:inputDate id="endTime" type="both"  ampm="true" value="#{tsWrapper.timeSlot.endTime}"
-					        							 style="color:black;" popupCalendar="true" timeZone="#{UserTimeZone.userTimeZoneStr}" />										
-										</h:panelGroup>
-										<h:message for="endTime" errorClass="alertMessageInline"/>
-									</h:panelGrid>
-						    	</t:column>
-						    	<t:column rendered="#{!tsWrapper.deleted}">
-									<f:facet name="header" >
-											<h:outputText value="#{msgs.tab_max_participants}" escape="false"/>
-									</f:facet>
-										<h:panelGroup styleClass="titleText" >
-							        		<h:inputText id="numOfAtt" value="#{tsWrapper.timeSlot.maxNoOfAttendees}" styleClass="editText numericOnly ranged notblank" size="2" style="margin-left:12px;margin-top:6px;" />
-										</h:panelGroup>
-							</t:column>
-					    </t:dataTable>
-					    
-					    <h:outputText id="addMoreTS_1" value ="&nbsp;" escape="false" styleClass="titleText" />
-					    <h:panelGrid columns="1" id="addMoreTS_2">
-					    	<h:commandLink id="cmdlnk90" action="#{UserDefineTimeslotBean.addOneTSBlock}" styleClass="activeTag" actionListener="#{UserDefineTimeslotBean.validateTimeslots}">
-					    		<h:graphicImage value="/images/plus.gif" alt="close" style="border:none;cursor:pointer;" styleClass="openCloseImageIcon" />
-					    	 	<h:outputLabel value="#{msgs.add_more_ts}"  style="font-weight:bold" styleClass="activeTag"/>
-					    	 </h:commandLink>					    	  
-					    </h:panelGrid>
-					    
-					    <h:outputText value="&nbsp;" escape="false"/>
-					    <h:outputText value="&nbsp;" escape="false"/>
-					    
-					    <h:outputText value="&nbsp;" escape="false"/>
-						<h:panelGroup  styleClass="longtext" >
-								<h:selectBooleanCheckbox value="#{UserDefineTimeslotBean.putInMultipleCalendarBlocks}"/>
-								<h:outputText value="#{msgs.put_In_Multiple_Calendar_Blocks_at_ScheduleTool}" escape="false"/>
-						</h:panelGroup>
-						
-						<h:outputText value="&nbsp;" escape="false"/>
-						<h:outputText value="&nbsp;" escape="false"/>
-				</h:panelGrid>
-				
-				<sakai:button_bar>
-					<h:commandButton id="doSave"  action="#{UserDefineTimeslotBean.doSave}" actionListener="#{UserDefineTimeslotBean.validateTimeslots}"   value="#{msgs.continue_button}"/>			
-					<h:commandButton id="cancel" action="#{UserDefineTimeslotBean.doCancel}" value="#{msgs.cancel_button}"/>
-                </sakai:button_bar>
-
-			 </h:form>
-  		</sakai:view_content>	
-	</sakai:view_container>
-	<f:verbatim>
-		<script>
-			replaceCalendarImageIcon();
 			var prefix="meeting:userDefinedTS:";
 			
 			function setCustomEndtimeMonthDateYear(pos){
@@ -171,9 +73,10 @@
 				    return false;
 				  }
 			}	
-			
-			jQuery(document).ready(function() {
 				
+		</script>
+		<script type="text/javascript">			
+			jQuery(document).ready(function(){
 				var MIN_ATTENDEES = 1;
 				var MAX_ATTENDEES = 500;
 			    
@@ -221,11 +124,108 @@
 					}
 					
 				});
+        	});									
+    	</script>
 				
+		<sakai:view_content>
+			<h:outputText value="#{msgs.event_error_alerts} #{messageUIBean.errorMessage}" styleClass="alertMessage" escape="false" rendered="#{messageUIBean.error}"/>      			
 				
-			});
-	
-		</script>
-	</f:verbatim>
+			<h:form id="meeting">
+			 	<sakai:view_title value="#{msgs.event_view_userDefined_Timeslot_page_title}"/>
+				
+							
+				<h:panelGrid columns="2" columnClasses="titleColumn,valueColumn" onmouseover="delayedRecalcDate();">
+				
+					<h:outputText value="&nbsp;" escape="false"/>
+					<h:outputText value="&nbsp;" escape="false"/>
+					
+					<h:outputText value="&nbsp;" escape="false" rendered="#{UserDefineTimeslotBean.someoneSignedUp}"/>
+					<h:outputText value="#{msgs.warn_reschedule_event}" styleClass="alertMessage" style="width:85%" escape="false" rendered="#{UserDefineTimeslotBean.someoneSignedUp}"/>
+					
+					<h:panelGroup styleClass="titleText">		           			
+					           <h:outputText value ="&nbsp;" escape="false"/>
+					    </h:panelGroup>
+					    <t:dataTable id="userDefinedTS" value="#{UserDefineTimeslotBean.timeSlotWrpList}" 
+					    	var="tsWrapper"
+					    	binding="#{UserDefineTimeslotBean.tsTable}"
+					    	styleClass="userDefineTsTable" 
+							rowClasses="oddRow,evenRow"
+							rowStyle="#{tsWrapper.errorStyle}"
+							columnClasses="delTSCol, startTSCol, endTSCol, numAttnTSCol" >
+								<t:column rendered="#{!tsWrapper.deleted}">
+									<f:facet name="header" >								
+											<h:outputText value="&nbsp;" escape="false"/>
+									</f:facet>
+										<h:commandLink action="#{UserDefineTimeslotBean.deleteTSblock}" rendered="#{tsWrapper.newlyAddedTS || UserDefineTimeslotBean.placeOrderBean == UserDefineTimeslotBean.copyBeanOrderName}">
+											<h:graphicImage value="/images/new.png" alt="New time slot" title="#{msgs.title_tip_delete_this_ts}"  styleClass="openCloseImageIcon" rendered="#{tsWrapper.newTimeslotBlock && UserDefineTimeslotBean.placeOrderBean != UserDefineTimeslotBean.newMeetingBeanOrderName}"/>
+							        		<h:graphicImage value="/images/ts_delete.png" alt="delete slot" title="#{msgs.title_tip_delete_this_ts}" style="border:none;cursor:pointer;" styleClass="openCloseImageIcon"/>
+							        	</h:commandLink>
+							        	<h:commandLink action="#{UserDefineTimeslotBean.deleteTSblock}" rendered="#{!tsWrapper.newlyAddedTS && UserDefineTimeslotBean.placeOrderBean != UserDefineTimeslotBean.copyBeanOrderName }" onmousedown="confirmTsCancel(this,'#{msgs.confirm_cancel}');">
+							        		<h:graphicImage value="/images/ts_delete.png" alt="delete slot" title="#{msgs.title_tip_delete_this_ts}" style="border:none;cursor:pointer;" styleClass="openCloseImageIcon" />
+							        	</h:commandLink>
+								</t:column>
+						    	<t:column rendered="#{!tsWrapper.deleted}">
+						    		<f:facet name="header" >								
+										<h:outputText value="#{msgs.tab_start_time}" escape="false"/>
+									</f:facet>
+						    		<h:panelGrid columns="1">
+							    		<h:panelGroup styleClass="titleText">
+					        				<t:inputDate id="startTime" type="both"  ampm="true" value="#{tsWrapper.timeSlot.startTime}" 
+					        							 style="color:black;" popupCalendar="true" timeZone="#{UserTimeZone.userTimeZoneStr}"/>       						
+										</h:panelGroup>
+										<h:message for="startTime" errorClass="alertMessageInline"/>
+									</h:panelGrid>
+						    	</t:column>
+						    	<t:column rendered="#{!tsWrapper.deleted}">
+						    		<f:facet name="header" >								
+										<h:outputText value="#{msgs.tab_end_time}" escape="false"/>
+									</f:facet>
+									<h:panelGrid columns="1">
+										<h:panelGroup styleClass="titleText">
+					        				<t:inputDate id="endTime" type="both"  ampm="true" value="#{tsWrapper.timeSlot.endTime}"
+					        							 style="color:black;" popupCalendar="true" timeZone="#{UserTimeZone.userTimeZoneStr}" />										
+										</h:panelGroup>
+										<h:message for="endTime" errorClass="alertMessageInline"/>
+									</h:panelGrid>
+						    	</t:column>
+						    	<t:column rendered="#{!tsWrapper.deleted}">
+									<f:facet name="header" >
+											<h:outputText value="#{msgs.tab_max_participants}" escape="false"/>
+									</f:facet>
+										<h:panelGroup styleClass="titleText" >
+							        		<h:inputText id="numOfAtt" value="#{tsWrapper.timeSlot.maxNoOfAttendees}" styleClass="editText numericOnly ranged notblank" size="2" style="margin-left:12px;margin-top:6px;" />
+										</h:panelGroup>
+							</t:column>
+					    </t:dataTable>
+					    
+					    <h:outputText id="addMoreTS_1" value ="&nbsp;" escape="false" styleClass="titleText" />
+					    <h:panelGrid columns="1" id="addMoreTS_2">
+					    	<h:commandLink id="cmdlnk90" action="#{UserDefineTimeslotBean.addOneTSBlock}" styleClass="activeTag" actionListener="#{UserDefineTimeslotBean.validateTimeslots}">
+					    		<h:graphicImage value="/images/plus.gif" alt="close" style="border:none;cursor:pointer;" styleClass="openCloseImageIcon" />
+					    	 	<h:outputLabel value="#{msgs.add_more_ts}"  style="font-weight:bold" styleClass="activeTag"/>
+					    	 </h:commandLink>					    	  
+					    </h:panelGrid>
+					    
+					    <h:outputText value="&nbsp;" escape="false"/>
+					    <h:outputText value="&nbsp;" escape="false"/>
+					    
+					    <h:outputText value="&nbsp;" escape="false"/>
+						<h:panelGroup  styleClass="longtext" >
+								<h:selectBooleanCheckbox value="#{UserDefineTimeslotBean.putInMultipleCalendarBlocks}"/>
+								<h:outputText value="#{msgs.put_In_Multiple_Calendar_Blocks_at_ScheduleTool}" escape="false"/>
+						</h:panelGroup>
+						
+						<h:outputText value="&nbsp;" escape="false"/>
+						<h:outputText value="&nbsp;" escape="false"/>
+				</h:panelGrid>
+				
+				<sakai:button_bar>
+					<h:commandButton id="doSave"  action="#{UserDefineTimeslotBean.doSave}" actionListener="#{UserDefineTimeslotBean.validateTimeslots}"   value="#{msgs.continue_button}"/>			
+					<h:commandButton id="cancel" action="#{UserDefineTimeslotBean.doCancel}" value="#{msgs.cancel_button}"/>
+                </sakai:button_bar>
+
+			 </h:form>
+  		</sakai:view_content>	
+	</sakai:view_container>
 		
 </f:view>