Index: messageforums-app/src/webapp/js/messages.js
===================================================================
--- messageforums-app/src/webapp/js/messages.js	(revision 133012)
+++ messageforums-app/src/webapp/js/messages.js	(working copy)
@@ -77,11 +77,14 @@
 		    });
 	  }
 	  // I need UI js
-	  if (!$.progressbar) {
-		$.getScript("/library/js/jquery-ui-latest/js/jquery-ui.min.js",loadUI);
-	  } else {
-		loadUI();  
-	  }
+	  // But we'll assume its already on the page so we don't break other scripts by loading an outdated version
+	  loadUI();  
+	 //  if (!$.progressbar) {
+		// $.getScript("/library/js/jquery-ui-latest/js/jquery-ui.min.js",loadUI);
+	 //  } else {
+	 //  	loadUI();  
+
+	 //  }
 });
 
 //This is the profile display on user's names.
Index: messageforums-app/src/webapp/jsp/dfReviseForumSettingsAttach.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/dfReviseForumSettingsAttach.jsp	(revision 133012)
+++ messageforums-app/src/webapp/jsp/dfReviseForumSettingsAttach.jsp	(working copy)
@@ -17,6 +17,8 @@
 	<sakai:script contextBase="/messageforums-tool" path="/js/forum.js"/>
 	<sakai:script contextBase="/messageforums-tool" path="/js/messages.js"/>
 	<sakai:script contextBase="/messageforums-tool" path="/js/datetimepicker.js"/>
+	<script type="text/javascript" src="/library/js/lang-datepicker/lang-datepicker.js"></script>
+	<link href="/library/js/jquery/ui/1.10.3/css/ui-lightness/jquery-ui-1.10.3.custom.min.css" rel="stylesheet" type="text/css" />
 	<%
 	  	String thisId = request.getParameter("panel");
   		if (thisId == null) 
@@ -207,27 +209,34 @@
                </h:panelGroup>
                <h:panelGroup id="openDateSpan" styleClass="indnt2 openDateSpan calWidget" style="display: #{ForumTool.selectedForum.availabilityRestricted ? '' : 'none'}">
                	   <h:outputLabel value="#{msgs.openDate}: " for="openDate"/>
-	               <h:inputText id="openDate" value="#{ForumTool.selectedForum.openDate}"/>
-	               <f:verbatim>
-	               	<a id="openCal" href="javascript:openDateCal();">
-	               </f:verbatim>
-	               <h:graphicImage url="/images/calendar.png" title="#{msgs.pickDate}" alt="#{msgs.pickDate}"/>
-	               <f:verbatim>
-	               </a>
-	               </f:verbatim>
+
+	               <h:inputText id="openDate" styleClass="openDate" value="#{ForumTool.selectedForum.openDate}"/>
+
+              	</h:panelGroup>
+               <h:panelGroup id="closeDateSpan" styleClass="indnt2 closeDateSpan calWidget" style="display: #{ForumTool.selectedForum.availabilityRestricted ? '' : 'none'}">
               		<h:outputLabel value="#{msgs.closeDate}: " for="closeDate" />
-	               <h:inputText id="closeDate" value="#{ForumTool.selectedForum.closeDate}"/>
-	               <f:verbatim>
-	               	<a id="closeCal" href="javascript:closeDateCal();">
-	               </f:verbatim>
-	               <h:graphicImage url="/images/calendar.png" title="#{msgs.pickDate}" alt="#{msgs.pickDate}"/>
-	               <f:verbatim>
-	               </a>
-	               </f:verbatim>
+	               <h:inputText id="closeDate" styleClass="closeDate" value="#{ForumTool.selectedForum.closeDate}"/>
+
               	</h:panelGroup>
            </h:panelGrid>
  		</div>
 
+
+ 		
+
+ 		<script type="text/javascript">
+ 		      localDatePicker({
+ 		      	input:'.openDate', 
+ 		      	useTime:1 
+ 		      });
+
+ 		      localDatePicker({
+ 		      	input:'.closeDate', 
+ 		      	useTime:1 
+ 		      });
+ 		</script>
+
+
 		<h4><h:outputText value="#{msgs.cdfm_forum_mark_read}"/></h4>
 			<table><tr><td>
 			<p class="indnt1 checkbox"><h:selectBooleanCheckbox
Index: messageforums-app/src/webapp/jsp/dfReviseTopicSettingsAttach.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/dfReviseTopicSettingsAttach.jsp	(revision 133012)
+++ messageforums-app/src/webapp/jsp/dfReviseTopicSettingsAttach.jsp	(working copy)
@@ -16,7 +16,10 @@
 	<sakai:script contextBase="/messageforums-tool" path="/js/permissions_header.js"/>
 	<sakai:script contextBase="/messageforums-tool" path="/js/forum.js"/>
 	<sakai:script contextBase="/messageforums-tool" path="/js/messages.js"/>
-	<sakai:script contextBase="/messageforums-tool" path="/js/datetimepicker.js"/>             		             		
+	<sakai:script contextBase="/messageforums-tool" path="/js/datetimepicker.js"/>
+	<script type="text/javascript" src="/library/js/lang-datepicker/lang-datepicker.js"></script>
+	<link href="/library/js/jquery/ui/1.10.3/css/ui-lightness/jquery-ui-1.10.3.custom.min.css" rel="stylesheet" type="text/css" />
+	
 	<%
 	  	String thisId = request.getParameter("panel");
   		if (thisId == null) 
@@ -203,28 +206,40 @@
                </h:selectOneRadio>
                </h:panelGroup>
                <h:panelGroup id="openDateSpan" styleClass="indnt2 openDateSpan  calWidget" style="display: #{ForumTool.selectedTopic.availabilityRestricted ? '' : 'none'}">
+
                	   <h:outputLabel value="#{msgs.openDate}: " for="openDate"/>
-	               <h:inputText id="openDate" value="#{ForumTool.selectedTopic.openDate}"/>
-	               <f:verbatim>
-	               	<a id="openCal" href="javascript:openDateCal();">
-	               </f:verbatim>
-	               <h:graphicImage url="/images/calendar.png" title="#{msgs.pickDate}" alt="#{msgs.pickDate}"/>
-	               <f:verbatim>
-	               </a>
-	               </f:verbatim>
+
+	               <h:inputText id="openDate" styleClass="openDate2" value="#{ForumTool.selectedTopic.openDate}"/>
+
+
+              	</h:panelGroup>
+               <h:panelGroup id="closeDateSpan" styleClass="indnt2 openDateSpan  calWidget" style="display: #{ForumTool.selectedTopic.availabilityRestricted ? '' : 'none'}">
+
+					
               		<h:outputLabel value="#{msgs.closeDate}: " for="closeDate"/>
-	               <h:inputText id="closeDate" value="#{ForumTool.selectedTopic.closeDate}"/>
-	               <f:verbatim>
-	               	<a id="closeCal" href="javascript:closeDateCal();">
-	               </f:verbatim>
-	               <h:graphicImage url="/images/calendar.png" title="#{msgs.pickDate}" alt="#{msgs.pickDate}"/>
-	               <f:verbatim>
-	               </a>
-	               </f:verbatim>
+
+	               <h:inputText id="closeDate" styleClass="closeDate" value="#{ForumTool.selectedTopic.closeDate}"/>
+
               	</h:panelGroup>
            </h:panelGrid>
 
 			</div>
+
+
+			
+
+			<script type="text/javascript">
+			      localDatePicker({
+			      	input:'[id="revise:openDate"]', 
+			      	useTime:1
+			      });
+			      
+			      localDatePicker({
+			      	input:'[id="revise:closeDate"]', 
+			      	useTime:1
+			      });
+			</script>
+
 		<%--
 		   <h4><h:outputText  value="Confidential Responses"/></h4>
 		   <h:selectBooleanCheckbox   title= "#{msgs.cdfm_topic_allow_anonymous_postings}"  value="false" />
Index: messageforums-app/src/webapp/jsp/discussionForum/area/dfTemplateSettings.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/discussionForum/area/dfTemplateSettings.jsp	(revision 133012)
+++ messageforums-app/src/webapp/jsp/discussionForum/area/dfTemplateSettings.jsp	(working copy)
@@ -18,6 +18,9 @@
 		<sakai:script contextBase="/messageforums-tool" path="/js/permissions_header.js"/>
 		<sakai:script contextBase="/messageforums-tool" path="/js/forum.js"/>
 		<sakai:script contextBase="/messageforums-tool" path="/js/messages.js"/>
+		<link href="/library/js/jquery/ui/1.10.3/css/ui-lightness/jquery-ui-1.10.3.custom.min.css" rel="stylesheet" type="text/css" />
+		<script type="text/javascript" src="/library/js/lang-datepicker/lang-datepicker.js"></script>
+
 <%
 	  	String thisId = request.getParameter("panel");
   		if (thisId == null) 
@@ -83,28 +86,32 @@
                </h:panelGroup>
                <h:panelGroup id="openDateSpan" styleClass="indnt2 openDateSpan" style="display: #{ForumTool.template.availabilityRestricted ? '' : 'none'}">
                	   <h:outputText value="#{msgs.openDate}: "/>
-	               <h:inputText id="openDate" value="#{ForumTool.template.openDate}"/>
-	               <f:verbatim>
-	               	<a id="openCal" href="javascript:openDateCal();">
-	               </f:verbatim>
-	               <h:graphicImage url="/images/calendar.png" title="#{msgs.pickDate}" alt="#{msgs.pickDate}"/>
-	               <f:verbatim>
-	               </a>
-	               </f:verbatim>
+	               <h:inputText id="openDate" styleClass="openDate" value="#{ForumTool.template.openDate}"/>
+	               
+
               	</h:panelGroup>
               	<h:panelGroup id="closeDateSpan" styleClass="indnt2 closeDateSpan" style="display: #{ForumTool.template.availabilityRestricted ? '' : 'none'}">
               		<h:outputText value="#{msgs.closeDate}: "/>
-	               <h:inputText id="closeDate" value="#{ForumTool.template.closeDate}"/>
-	               <f:verbatim>
-	               	<a id="closeCal" href="javascript:closeDateCal();">
-	               </f:verbatim>
-	               <h:graphicImage url="/images/calendar.png" title="#{msgs.pickDate}" alt="#{msgs.pickDate}"/>
-	               <f:verbatim>
-	               </a>
-	               </f:verbatim>
+	               <h:inputText id="closeDate" styleClass="closeDate" value="#{ForumTool.template.closeDate}"/>
+	               
+
               	</h:panelGroup>              	
            </h:panelGrid>
 
+           
+            <script type="text/javascript">
+                  localDatePicker({
+                  	input:'.openDate', 
+                  	useTime:1 
+                  });
+
+                  localDatePicker({
+                  	input:'.closeDate', 
+                  	useTime:1 
+                  });
+            </script>
+
+
 				<div class="instruction" style="padding: 0.5em;"><h4>
 					<h:outputText  value="#{msgs.cdfm_forum_mark_read}" />
 				</h4></div>