Index: podcasts-api/src/bundle/org/sakaiproject/api/podcasts/bundle/Messages_es.properties
===================================================================
--- podcasts-api/src/bundle/org/sakaiproject/api/podcasts/bundle/Messages_es.properties	(revision 93753)
+++ podcasts-api/src/bundle/org/sakaiproject/api/podcasts/bundle/Messages_es.properties	(working copy)
@@ -38,7 +38,7 @@
 description_prompt=Descripci\u00F3n
 role=Rol
 quota_alert=Ha accedido el espacio de sus Recursos. Borre elementos y pruebe otra vez.
-date_picker_format=MM/dd/yyyy hh\:mm\:ss a
+date_picker_format=dd/MM/yyyy hh\:mm\:ss a
 internal_date_format=yyyyMMddhhmmssSSS
 subscribe=Subscibir\:
 current_date=Fecha/Hora de Publicaci\u00F3n Actual
Index: podcasts-app/pom.xml
===================================================================
--- podcasts-app/pom.xml	(revision 93749)
+++ podcasts-app/pom.xml	(working copy)
@@ -54,6 +54,11 @@
       <groupId>org.sakaiproject</groupId>
       <artifactId>sakai-dav-common</artifactId>
     </dependency>
+    <dependency>
+        <groupId>org.apache.myfaces.tomahawk</groupId>
+        <artifactId>tomahawk</artifactId>
+        <version>1.1.6</version>
+    </dependency>    
   </dependencies>
 <!-- needed so it will compile the java files,
 		process the properties bundles,
Index: podcasts-app/src/java/org/sakaiproject/tool/podcasts/podHomeBean.java
===================================================================
--- podcasts-app/src/java/org/sakaiproject/tool/podcasts/podHomeBean.java	(revision 93749)
+++ podcasts-app/src/java/org/sakaiproject/tool/podcasts/podHomeBean.java	(working copy)
@@ -1,5 +1,4 @@
 /**********************************************************************************
- * $URL$
  * $Id$
  ***********************************************************************************
  *
@@ -78,6 +77,9 @@
 import org.sakaiproject.util.ResourceLoader;
 import org.sakaiproject.util.Validator;
 
+import org.sakaiproject.tool.podcasts.jsf.renderer.util.TimeUtil;
+
+
 public class podHomeBean {
 	// Message Bundle handles
 	private static final String QUOTA_ALERT = "quota_alert";
@@ -154,7 +156,8 @@
 			this.displayDateRevise = displayDateRevise;
 		}
 
-		/** Returns the revised display date for this podcast **/
+		/** Returns the revised display 
+ for this podcast **/
 		public String getDisplayDateRevise() {
 			String dispDate = null;
 			
@@ -345,6 +348,13 @@
 	
 	private static final String MB_NUMBER_FORMAT = "#.#";
 	private static final String BYTE_NUMBER_FORMAT = "#,###";
+	private Date addDate;
+	private boolean isValidDate = true;
+	private boolean isValidAddDate = true;
+	private String originalAddDateString;
+	private String displayDateFormat;
+	private SimpleDateFormat displayFormat;
+	private static boolean error;
 
 	// Permissions prefix
 	private final String CONTENT = "content.";
@@ -373,8 +383,8 @@
 
 	/** Used to pull message bundle */
 //        String bundle = FacesContext.getCurrentInstance().getApplication().getMessageBundle();
- //       toolBundle = new ResourceLoader(bundle);
-	private ResourceLoader rb;
+ //       toolBundle = new ResourceLoader(bundle);	
+	private ResourceLoader rb = new ResourceLoader("org.sakaiproject.api.podcasts.bundle.Messages");
 
 	// inject the services needed
 	private PodcastService podcastService;
@@ -404,6 +414,8 @@
 			new SelectItem("high", "High - All participants") };
 
 	public podHomeBean() {
+		  this.displayDateFormat = rb.getString("date_picker_format");
+	      this.displayFormat = new SimpleDateFormat(this.displayDateFormat);
 	}
 
 	/**
@@ -1993,5 +2005,203 @@
 	    }
 	    return rb.getString(key);
 	}
+	  /**
+	   * format according to internal requirements of calendar widget
+	   * @param dateString "MM-dd-yyyy hh:mm:ss a"
+	   * @return Date object
+	   */
+	  private Date getDateFromDisplayFormat(String dateString) {
+	    Date date = null;
+	    this.isValidDate = true;
+	    if (dateString == null || dateString.trim().equals("")) {
+	      return date;
+	    }
 
+	     try {
+	    	 if (!dateValidation(dateString)) {
+	    		 this.isValidDate = false;
+	    		 return null;
+	    	 }
+
+	      //Date date= (Date) displayFormat.parse(dateString);
+	// dateString is in client timezone, change it to server time zone
+	      TimeUtil tu = new TimeUtil();
+	      date = tu.getServerDateTime(displayFormat, dateString);
+	    }
+	    catch (Exception ex) {
+	      // we will leave it as a null date
+	    	LOG.warn("Unable to format date.");
+	    	FacesContext context=FacesContext.getCurrentInstance();
+	    	String err;
+
+	    	err=rb.getString("deliveryDate_error");
+	    	context.addMessage(null,new FacesMessage(err));
+
+	    	error=true;
+	      //ex.printStackTrace();
+	    }
+	    return date;
+	  }
+	  
+	  private boolean dateValidation(String dateString) {
+		  int date = 0;
+		  int month = 0;
+		  int year = 0;
+		  int hour = 0;
+		  int minute = 0;
+		  int second = 0;
+		  String amPM = "";
+		  
+		  String [] splittedDateString = dateString.split(" ");
+		  if (splittedDateString.length != 3) {
+			  return false;
+		  }
+		  // Verify for MM/dd/yyyy format or dd/MM/yyyy format
+		  String [] dateArray = splittedDateString[0].split("/");
+		  if (dateArray.length != 3) {
+			  return false;
+		  }
+		  try {
+			  if (displayDateFormat.toLowerCase().startsWith("dd")) {
+				  date = Integer.parseInt(dateArray[0]);
+				  month = Integer.parseInt(dateArray[1]);
+				  year = Integer.parseInt(dateArray[2].substring(0, 4));
+			  }
+			  else {
+				  date = Integer.parseInt(dateArray[1]);
+				  month = Integer.parseInt(dateArray[0]);
+				  year = Integer.parseInt(dateArray[2].substring(0, 4));
+			  }
+		  }
+		  catch(NumberFormatException  ne){
+			  LOG.error("NumberFormatException: " + ne.getMessage());
+			  return false;
+		  }
+		  catch(IndexOutOfBoundsException ie) {
+			  LOG.error("IndexOutOfBoundsException: " + ie.getMessage());
+			  return false;
+		  }
+		  if (month > 12 || month < 1) {
+			  return false;
+		  }
+		  if ((month == 1 || month == 3 || month == 5 || month == 7 || month == 8 || month == 10 || month == 12) && (date > 31 || date < 1)) {
+			  return false;
+		  }
+		  if ((month == 4 || month == 6 || month == 9 || month == 11) && (date > 30 || date < 1)) {
+			  return false;
+		  }
+		  if (month == 2) {
+			  if (date < 1) {
+				  return false;
+			  }
+			  if (isLeapYear(year) == true) {
+				  if (date > 29) {
+					  return false;
+				  }
+			  }
+			  else {
+				  if (date > 28) {
+					  return false;
+				  }
+			  }
+		  }  
+		  
+		  // Verify for hh:mm:ss format
+		  String [] time = splittedDateString[1].split(":");
+		  if (splittedDateString.length != 3) {
+			  return false;
+		  }
+		  hour = Integer.parseInt(time[0]);
+		  minute = Integer.parseInt(time[1]);
+		  second = Integer.parseInt(time[2]);
+		  if (hour < 0 || hour > 24) {
+			  return false;
+		  }
+		  if (minute < 0 || minute > 60) {
+			  return false;
+		  }
+		  if (second < 0 || second > 60) {
+			  return false;
+		  }
+		  
+		  // Verify for AM or PM format
+		  amPM = splittedDateString[2];
+		  if (!(amPM.toUpperCase().equals("AM") || amPM.toUpperCase().equals("PM"))) {
+			  return false;
+		  }
+		  return true;
+	  }
+	  
+	  private boolean isLeapYear(int year) {
+		  if (year % 100 == 0) {
+			  if (year % 400 == 0) { 
+				  return true; 
+			  }
+		  }
+		  else {
+			  if ((year % 4) == 0) { 
+				  return true; 
+			  }
+		  }
+		  return false;
+	  }
+	  
+	  public String getAddDateString()
+	  {
+			if (!this.isValidAddDate) {
+				return this.originalAddDateString;
+			}
+			else {
+				return getDisplayFormatFromDate(addDate);
+			}
+	  }
+	   
+	  public void setAddDateString(String addDateString)
+	  {
+		this.isValidAddDate = true;  
+		Date tempDate = getDateFromDisplayFormat(addDateString);
+		if (!this.isValidDate) {
+			this.isValidAddDate = false;
+			this.originalAddDateString = addDateString;
+		}
+		else {
+			this.addDate= tempDate;
+		}
+	  }
+	  public Date getAddDate() {
+		    return this.addDate;
+		  }
+
+	  public void setAddDate(Date addDate) {
+	    this.addDate = addDate;
+	  }
+	  public boolean getIsValidAddDate()
+	  {
+		  return this.isValidAddDate;
+	  }
+	  /**
+	   * date from internal string of calendar widget
+	   * @param date Date object
+	   * @return date String "MM-dd-yyyy hh:mm:ss a"
+	   */
+	  private String getDisplayFormatFromDate(Date date) {
+	    String dateString = "";
+	    if (date == null) {
+	      return dateString;
+	    }
+
+	    try {
+	      //dateString = displayFormat.format(date);
+	      TimeUtil tu = new TimeUtil();
+	      dateString = tu.getDisplayDateTime(displayFormat, date);
+	    }
+	    catch (Exception ex) {
+	      // we will leave it as an empty string
+	      LOG.warn("Unable to format date.");
+	      ex.printStackTrace();
+	    }
+	    return dateString;
+	  }
+
+	
 }
Index: podcasts-app/src/java/org/sakaiproject/tool/podcasts/jsf/renderer/DatePickerRenderer.java
===================================================================
--- podcasts-app/src/java/org/sakaiproject/tool/podcasts/jsf/renderer/DatePickerRenderer.java	(revision 93749)
+++ podcasts-app/src/java/org/sakaiproject/tool/podcasts/jsf/renderer/DatePickerRenderer.java	(working copy)
@@ -34,8 +34,10 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.render.Renderer;
+import org.sakaiproject.util.ResourceLoader;
 
 import org.sakaiproject.tool.podcasts.jsf.renderer.util.RendererUtil;
+import org.sakaiproject.tool.podcasts.jsf.renderer.util.ContextUtil;
 
 /**
  * <p>Description: </p>
@@ -107,6 +109,7 @@
   public void encodeEnd(FacesContext context,
     UIComponent component) throws IOException
   {
+	ResourceLoader rb= new ResourceLoader("org.sakaiproject.api.podcasts.bundle.Messages");
     ResponseWriter writer = context.getResponseWriter();
     String contextPath = context.getExternalContext()
                          .getRequestContextPath();
@@ -143,12 +146,23 @@
 
       // script creates unique calendar object with input object
     }
+    String display_dateFormat= ContextUtil.getLocalizedString("org.sakaiproject.api.podcasts.bundle.Messages","date_picker_format");
+    String genDate = null;
+    String prsDate = null;
+    if (display_dateFormat.toLowerCase().startsWith("dd")) {
+    	genDate = "cal_gen_date2_dm";
+    	prsDate = "cal_prs_date2_dm";
+    }
+    else {
+    	genDate = "cal_gen_date2_md";
+    	prsDate = "cal_prs_date2_md";
+    }
     String calRand = "cal" + ("" + Math.random()).substring(2);
     String calScript =
-      "var " + calRand + " = new calendar2(" +
-      "document.getElementById('" + id + "'));" +
-      "" + calRand + ".year_scroll = true;" +
-      "" + calRand + ".time_comp = true;";
+        "var " + calRand + " = new calendar2(" +
+        "document.getElementById('" + id + "'), " + genDate + ", " + prsDate + ");" +
+        "" + calRand + ".year_scroll = true;" +
+        "" + calRand + ".time_comp = true;";
 
     writer.write("<input type=\"" + type + "\" name=\"" + id +
       "\" id=\"" + id + "\" size=\"" + size + "\" value=");
Index: podcasts-app/src/java/org/sakaiproject/tool/podcasts/jsf/renderer/util/ContextUtil.java
===================================================================
--- podcasts-app/src/java/org/sakaiproject/tool/podcasts/jsf/renderer/util/ContextUtil.java	(revision 0)
+++ podcasts-app/src/java/org/sakaiproject/tool/podcasts/jsf/renderer/util/ContextUtil.java	(revision 0)
@@ -0,0 +1,397 @@
+/**********************************************************************************
+ * $URL: https://source.sakaiproject.org/svn/sam/trunk/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/util/ContextUtil.java $
+ * $Id: ContextUtil.java 71511 2010-01-15 22:35:10Z ktsao@stanford.edu $
+ ***********************************************************************************
+ *
+ * Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009 The Sakai Foundation
+ *
+ * Licensed under the Educational Community License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.osedu.org/licenses/ECL-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ **********************************************************************************/
+
+
+package org.sakaiproject.tool.podcasts.jsf.renderer.util;
+
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.sakaiproject.util.ResourceLoader;
+import java.util.Locale;
+
+import java.text.NumberFormat;
+
+import javax.faces.context.FacesContextFactory;
+import javax.faces.lifecycle.Lifecycle;
+import javax.faces.lifecycle.LifecycleFactory;
+import javax.faces.FactoryFinder;
+import javax.faces.application.Application;
+import javax.faces.application.ApplicationFactory; 
+import javax.faces.context.FacesContext;
+import java.util.ArrayList;
+import javax.servlet.*;
+import javax.servlet.http.*;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.sakaiproject.component.cover.ServerConfigurationService; 
+
+/**
+ * <p>Description: Action Listener helper utility</p>
+ * <p>Copyright: Copyright (c) 2004</p>
+ * <p>Organization: Sakai Project</p>
+ * @author Ed Smiley
+ * @version $Id: ContextUtil.java 71511 2010-01-15 22:35:10Z ktsao@stanford.edu $
+ */
+
+public class ContextUtil
+{
+
+  private static Log log = LogFactory.getLog(ContextUtil.class);
+
+  private static ServletContext M_servletContext = null;
+  /**
+   * Determine if we have been passed a parameter ending in the param string,
+   * else null.  We are doing an endsWith test, since the default JSF renderer
+   * embeds the parent identity in the HTML id string; we look for the id that was
+   * specified in the JSF.
+   *
+   *
+   * @param lookup JSF id String
+   * @return String the full parameter
+   */
+  public static String lookupParam(String lookup)
+  {
+    FacesContext context = FacesContext.getCurrentInstance();
+    Map requestParams = context.getExternalContext().
+                        getRequestParameterMap();
+
+    for (Iterator it = requestParams.entrySet().iterator(); it.hasNext();) {
+    	   Map.Entry entry = (Map.Entry) it.next();
+    	   String currKey = (String)entry.getKey();
+    	      if (currKey.endsWith(lookup))
+    	      {
+    	        return (String) entry.getValue();
+    	      }
+    	}
+
+    return null;
+  }
+  /**
+   * Determine if we have been passed a parameter that contains a given string,
+   * else null. Typically this would be where you want to check for one of a set
+   * of similar commandLinks or commandButtons, such as the sortBy headings in
+   * evaluation.
+   *
+   * @param paramPart String to look for
+   * @return String last part of full parameter, corresponding to JSF id
+   */
+  public static String paramLike(String paramPart)
+  {
+    FacesContext context = FacesContext.getCurrentInstance();
+    Map requestParams = context.getExternalContext().
+                        getRequestParameterMap();
+
+    Iterator iter = requestParams.keySet().iterator();
+    while (iter.hasNext())
+    {
+      String currKey = (String) iter.next();
+
+      int location = currKey.indexOf(paramPart);
+      if (location > -1)
+      {
+        return currKey.substring(location);
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Determine if we have been passed a parameter that contains a given string,
+   * return ArrayList of these Strings, else return empty list.
+   *
+   * Typically this would be where you want to check for one of a set
+   * of similar radio buttons commandLinks or commandButtons.
+   *
+   * @param paramPart String to look for
+   * @return ArrayList of last part Strings of full parameter, corresponding to JSF id
+   */
+  public static ArrayList paramArrayLike(String paramPart)
+  {
+    FacesContext context = FacesContext.getCurrentInstance();
+    Map requestParams = context.getExternalContext().
+                        getRequestParameterMap();
+    ArrayList list = new ArrayList();
+
+    Iterator iter = requestParams.keySet().iterator();
+    while (iter.hasNext())
+    {
+      String currKey = (String) iter.next();
+
+      int location = currKey.indexOf(paramPart);
+      if (location > -1)
+      {
+        list.add(currKey.substring(location));
+      }
+    }
+    return list;
+
+  }
+
+  /**
+ * Determine if we have been passed a parameter that contains a given string,
+ * else null. Typically this would be where you want to check for one of a set
+ * of similar commandLinks or commandButtons, such as the sortBy headings in
+ * evaluation.
+ *
+ * @param paramPart String to look for
+ * @return String the value of the first hit
+ */
+public static String paramValueLike(String paramPart)
+{
+  FacesContext context = FacesContext.getCurrentInstance();
+  Map requestParams = context.getExternalContext().
+                      getRequestParameterMap();
+
+  for (Iterator it = requestParams.entrySet().iterator(); it.hasNext();) {
+	   Map.Entry entry = (Map.Entry) it.next();
+	   String currKey = (String) entry.getKey();
+	    int location = currKey.indexOf(paramPart);
+	    if (location > -1)
+	    {
+	    	return (String) entry.getValue();
+	    }
+	}
+  
+  return null;
+}
+
+/**
+ * Determine if we have been passed a parameter that contains a given string,
+ * return ArrayList of the corresponding values, else return empty list.
+ *
+ * Typically this would be where you want to check for one of a set
+ * of similar radio buttons commandLinks or commandButtons.
+ *
+ * @param paramPart String to look for
+ * @return ArrayList of corresponding values
+ */
+public static ArrayList paramArrayValueLike(String paramPart)
+{
+  FacesContext context = FacesContext.getCurrentInstance();
+  Map requestParams = context.getExternalContext().
+                      getRequestParameterMap();
+  ArrayList list = new ArrayList();
+  
+  for (Iterator it = requestParams.entrySet().iterator(); it.hasNext();) {
+	   Map.Entry entry = (Map.Entry) it.next();
+	   String currKey = (String)  entry.getKey();
+	   
+	    int location = currKey.indexOf(paramPart);
+	    if (location > -1)
+	    {
+	      list.add((String) entry.getValue());
+	    }
+	}
+  return list;
+
+}
+
+
+
+  /**
+   * Helper method to look up backing bean.
+   * Don't forget to cast!
+   *   e.g. (TemplateBean) ContextUtil.lookupBean("template")
+   * @param context the faces context
+   * @return the backing bean
+   * @throws FacesException
+   */
+  public static Serializable lookupBean(String beanName)
+  {
+    FacesContext facesContext = FacesContext.getCurrentInstance();
+    ApplicationFactory factory = (ApplicationFactory) FactoryFinder.
+                                 getFactory(
+                                 FactoryFinder.APPLICATION_FACTORY);
+    Application application = factory.getApplication();
+    Serializable bean = (Serializable)
+                        application.getVariableResolver().resolveVariable(
+                        facesContext, beanName);
+    return bean;
+  }
+
+  /**
+   * Helper method to look up backing bean, when OUTSIDE faces in a servlet.
+   * Don't forget to cast!
+   *   e.g. (TemplateBean) ContextUtil.lookupBean("template")
+   *
+   * @param beanName
+   * @param request servlet request
+   * @param response servlet response
+   * @return the backing bean
+   */
+  public static Serializable lookupBeanFromExternalServlet(String beanName,
+    HttpServletRequest request, HttpServletResponse response)
+  {
+    // prepare lifecycle
+    LifecycleFactory lFactory = (LifecycleFactory)
+        FactoryFinder.getFactory(FactoryFinder.LIFECYCLE_FACTORY);
+    Lifecycle lifecycle =
+        lFactory.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE);
+
+    FacesContextFactory fcFactory = (FacesContextFactory)
+        FactoryFinder.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
+
+    // in the integrated environment, we can't get the ServletContext from the
+    // HttpSession of the request - because the HttpSession is webcontainer-wide,
+    // its not tied to a particular servlet.
+    ServletContext servletContext = M_servletContext;
+     if (servletContext == null)
+    {
+    	servletContext = request.getSession().getServletContext();
+    }
+
+    FacesContext facesContext =
+        fcFactory.getFacesContext(servletContext, request, response, lifecycle);
+
+    ApplicationFactory factory = (ApplicationFactory) FactoryFinder.
+                                 getFactory(
+                                 FactoryFinder.APPLICATION_FACTORY);
+    Application application = factory.getApplication();
+    Serializable bean = (Serializable)
+                        application.getVariableResolver().resolveVariable(
+                        facesContext, beanName);
+    return bean;
+  }
+	/**
+	 * Called by LoginServlet
+	 */
+	public static void setServletContext(ServletContext context)
+	{
+		M_servletContext = context;
+	}
+
+
+  /**
+  * Gets a localized message string based on the locale determined by the
+  * FacesContext.
+  * @param key The key to look up the localized string
+  */
+  public static String getLocalizedString(String bundleName, String key) {
+	  //Locale locale = FacesContext.getCurrentInstance().getViewRoot().getLocale();
+	  ResourceLoader rb = new ResourceLoader(bundleName);
+    return rb.getString(key);
+  }
+
+  public static String getLocalizedString(HttpServletRequest request,
+                                          String bundleName, String key) {
+	  //Locale locale = request.getLocale();
+	  ResourceLoader rb = new ResourceLoader(bundleName);
+    return rb.getString(key);
+  }
+
+  public static String getStringInUnicode(String string)
+  {
+    StringBuilder buf = new StringBuilder();
+     
+    char[] charArray = string.toCharArray();
+    for (int i=0; i<charArray.length;i++){
+	char ch = charArray[i];
+      buf.append(toUnicode(ch));
+    }
+    
+    String s = buf.toString();
+    log.debug("***unicode="+s);
+    return s;
+  }
+
+  private static char hexdigit(int v) {
+    String symbs = "0123456789ABCDEF";
+    return symbs.charAt(v & 0x0f);
+  }
+
+  private static String hexval(int v) {
+    return String.valueOf(hexdigit(v >>> 12)) + String.valueOf(hexdigit(v >>> 8))
+      + String.valueOf(hexdigit(v >>> 4)) + String.valueOf(hexdigit(v));
+  }
+
+  private static String toUnicode(char ch) {
+    int val = (int) ch;
+    if (val == 10) return "\\n";
+    else if (val == 13) return "\\r";
+    else if (val == 92) return "\\\\";
+    else if (val == 34) return "\\\"";
+    else if (val == 39) return "\\\'";
+    else if (val < 32 || val > 126) return "\\u" + hexval(val);
+    else return String.valueOf(ch);
+  }
+
+  public static String getRoundedValue(String orig, int maxdigit) {
+    Float origfloat = new Float(orig); 
+    return getRoundedValue(origfloat, maxdigit);
+  }
+  public static String getRoundedValue(Float orig, int maxdigit) {
+      NumberFormat nf = NumberFormat.getInstance();
+      nf.setMaximumFractionDigits(maxdigit);
+      String newscore = nf.format(orig);
+      return newscore;
+  }
+
+  public static String escapeApostrophe(String input) {
+   // this is needed to escape the ' in some firstname and lastname,  that caused javascript error , SAK-4121
+   // no longer needed because we don't pass firstname and lastname in f:param.  but we'll keep this method here
+        String regex = "'";
+        String replacement = "\\\\'";
+	String output = input.replaceAll(regex, replacement);
+   	return output;
+  }
+
+  public static String getProtocol(){
+    return ServerConfigurationService.getServerUrl();
+  }
+ 
+  public static String stringWYSIWYG(String s){// this is to detect an empty in WYSIWYG FF1.5
+    
+    if((s!=null) && ("&nbsp;".equals(s.trim())))
+        s="";
+    return s;
+  }
+
+
+  public static String getRelativePath(String url){
+    // replace whitespace with %20
+    String protocol = getProtocol();
+    url = replaceSpace(url);
+    String location = url;
+    int index = url.lastIndexOf(protocol);
+    if (index == 0){
+      location = url.substring(protocol.length());
+    }
+    return location;
+  }
+
+  private static  String replaceSpace(String tempString){
+    String newString = "";
+    char[] oneChar = new char[1];
+    for(int i=0; i<tempString.length(); i++){
+      if (tempString.charAt(i) != ' '){
+        oneChar[0] = tempString.charAt(i);
+        String concatString = new String(oneChar);
+        newString = newString.concat(concatString);
+      }
+      else {
+        newString = newString.concat("%20");
+      }
+    }
+    return newString;
+  }
+}
Index: podcasts-app/src/java/org/sakaiproject/tool/podcasts/jsf/renderer/util/TimeUtil.java
===================================================================
--- podcasts-app/src/java/org/sakaiproject/tool/podcasts/jsf/renderer/util/TimeUtil.java	(revision 0)
+++ podcasts-app/src/java/org/sakaiproject/tool/podcasts/jsf/renderer/util/TimeUtil.java	(revision 0)
@@ -0,0 +1,150 @@
+/**********************************************************************************
+ * $URL: https://source.sakaiproject.org/svn/sam/trunk/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/util/TimeUtil.java $
+ * $Id: TimeUtil.java 59684 2009-04-03 23:33:27Z arwhyte@umich.edu $
+ ***********************************************************************************
+ *
+ * Copyright (c) 2006, 2008 The Sakai Foundation
+ *
+ * Licensed under the Educational Community License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.osedu.org/licenses/ECL-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ **********************************************************************************/
+
+
+package org.sakaiproject.tool.podcasts.jsf.renderer.util;
+
+import java.io.Serializable;
+import java.util.Map;
+import java.util.Locale;
+import java.util.Date;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+//import org.springframework.web.context.WebApplicationContext;
+
+import java.util.TimeZone;
+// need to move this out to support standalone,  using spring injection 
+
+import org.sakaiproject.time.cover.TimeService;
+
+/**
+ * <p>Description: Time conversion utility class</p>
+ */
+
+public class TimeUtil 
+{
+
+  private static Log log = LogFactory.getLog(TimeUtil.class);
+
+  private TimeZone m_client_timezone= null;
+  private TimeZone m_server_timezone= null;
+
+  public TimeUtil() {
+    m_client_timezone= TimeService.getLocalTimeZone();
+    m_server_timezone= TimeZone.getDefault();
+  }
+
+
+  /**
+  * Convert a String reprepsentation of date and time in the client TimeZone 
+  * to Date representation of date and time  in server TimeZone
+  * before saving to DB.
+  * tz1 is the client timezone,  tz2 is the server timezone
+  */
+
+  public Date convertFromTimeZone1StringToServerDate
+        (SimpleDateFormat ndf, String tz1string, TimeZone tz1){
+    Date serverDate= null;
+    try {
+      ndf.setTimeZone(tz1);
+      serverDate= ndf.parse(tz1string);
+    }
+    catch(Exception e){
+      e.printStackTrace();
+    }
+
+     return serverDate;
+
+  }
+
+
+  /**
+  * Convert a Date reprepsentation of date and time in the server TimeZone 
+  * to String representation of date and time  in client TimeZone
+  * used for display. 
+  * tz1 is the client timezone,  tz2 is the server timezone
+  */
+
+  public String convertFromServerDateToTimeZone2String 
+    (SimpleDateFormat ndf, Date tz2Date, TimeZone tz1){
+    // for display
+    Calendar cal1= new GregorianCalendar(tz1);
+    ndf.setCalendar(cal1);
+    String clientStr= ndf.format(tz2Date);
+
+    return clientStr;
+  }
+
+  /**
+  * Convert a String reprepsentation of date and time to Date on the server timezone 
+  */
+
+  public Date getServerDateTime(SimpleDateFormat ndf, String clientString){
+    Date serverDate = null;
+    try {
+      if ((m_client_timezone !=null) && (m_server_timezone!=null) 
+	&& (!m_client_timezone.hasSameRules(m_server_timezone))) {
+
+        serverDate =convertFromTimeZone1StringToServerDate 
+                        (ndf, clientString, m_client_timezone);
+      }
+      else {
+        serverDate= ndf.parse(clientString);
+      }
+    }
+    catch (ParseException e) {
+    	log.warn("can not parse the string into a Date");
+	}
+    return serverDate;
+  }
+
+
+  /**
+  * Convert a Date reprepsentation of date and time to String in the client timezone for display
+  */
+
+  public String getDisplayDateTime(SimpleDateFormat ndf, Date serverDate ){
+    String displayDate = "";
+    try {
+      if ((m_client_timezone !=null) && (m_server_timezone!=null) 
+	&& (!m_client_timezone.hasSameRules(m_server_timezone))) {
+
+        displayDate = convertFromServerDateToTimeZone2String
+			(ndf, serverDate, m_client_timezone);
+      }
+      else {
+        displayDate= ndf.format(serverDate);
+      }
+    }
+    catch (RuntimeException e){
+      log.warn("can not format the Date to a string");
+    }
+    return displayDate;
+  }
+
+
+
+}
Index: podcasts-app/src/webapp/jsf/widget/datepicker/calendar.html
===================================================================
--- podcasts-app/src/webapp/jsf/widget/datepicker/calendar.html	(revision 93749)
+++ podcasts-app/src/webapp/jsf/widget/datepicker/calendar.html	(working copy)
@@ -1,170 +0,0 @@
-<!--
-Title: Tigra Calendar
-URL: http://www.softcomplex.com/products/tigra_calendar/
-Version: 3.2
-Date: 10/14/2002 (mm/dd/yyyy)
-Feedback: feedback@softcomplex.com (specify product title in the subject)
-Note: Permission given to use this script in ANY kind of applications if
-   header lines are left unchanged.
-Note: Script consists of two files: calendar?.js and calendar.html
-About us: Our company provides offshore IT consulting services.
-    Contact us at sales@softcomplex.com if you have any programming task you
-    want to be handled by professionals. Our typical hourly rate is $20.
--->
-<html>
-<head>
-<title>Select Date, Please.</title>
-<style>
-	td {font-family: Tahoma, Verdana, sans-serif; font-size: 12px;}
-</style>
-<script language="JavaScript">
-
-// months as they appear in the calendar's title
-var ARR_MONTHS = ["January", "February", "March", "April", "May", "June",
-		"July", "August", "September", "October", "November", "December"];
-// week day titles as they appear on the calendar, --sakai modified to 3 digit
-var ARR_WEEKDAYS = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
-// day week starts from (normally 0-Su or 1-Mo)
-var NUM_WEEKSTART = 0;// --sakai, modified from 1
-// path to the directory where calendar images are stored. trailing slash req.
-var STR_ICONPATH = '../images/calendar/';
-
-var re_url = new RegExp('datetime=(\\-?\\d+)');
-var dt_current = (re_url.exec(String(window.location))
-	? new Date(new Number(RegExp.$1)) : new Date());
-var re_id = new RegExp('id=(\\d+)');
-var num_id = (re_id.exec(String(window.location))
-	? new Number(RegExp.$1) : 0);
-var obj_caller = (window.opener ? window.opener.calendars[num_id] : null);
-var root_url = new RegExp('root=(\\S+)');
-var root = (root_url.exec(String(window.location)) ? new String(RegExp.$1) : "")
-
-if (obj_caller && obj_caller.year_scroll) {
-	// get same date in the previous year
-	var dt_prev_year = new Date(dt_current);
-	dt_prev_year.setFullYear(dt_prev_year.getFullYear() - 1);
-	if (dt_prev_year.getDate() != dt_current.getDate())
-		dt_prev_year.setDate(0);
-
-	// get same date in the next year
-	var dt_next_year = new Date(dt_current);
-	dt_next_year.setFullYear(dt_next_year.getFullYear() + 1);
-	if (dt_next_year.getDate() != dt_current.getDate())
-		dt_next_year.setDate(0);
-}
-
-// get same date in the previous month
-var dt_prev_month = new Date(dt_current);
-dt_prev_month.setMonth(dt_prev_month.getMonth() - 1);
-if (dt_prev_month.getDate() != dt_current.getDate())
-	dt_prev_month.setDate(0);
-
-// get same date in the next month
-var dt_next_month = new Date(dt_current);
-dt_next_month.setMonth(dt_next_month.getMonth() + 1);
-if (dt_next_month.getDate() != dt_current.getDate())
-	dt_next_month.setDate(0);
-
-// get first day to display in the grid for current month
-var dt_firstday = new Date(dt_current);
-dt_firstday.setDate(1);
-dt_firstday.setDate(1 - (7 + dt_firstday.getDay() - NUM_WEEKSTART) % 7);
-
-// function passing selected date to calling window
-function set_datetime(n_datetime, b_close) {
-	if (!obj_caller) return;
-
-	var dt_datetime = obj_caller.prs_time(
-		(document.cal ? document.cal.time.value : ''),
-		new Date(n_datetime)
-	);
-
-	if (!dt_datetime) return;
-	if (b_close) {
-		window.close();
-		obj_caller.target.value = (document.cal
-			? obj_caller.gen_tsmp(dt_datetime)
-			: obj_caller.gen_date(dt_datetime)
-		);
-	}
-	else obj_caller.popup(dt_datetime.valueOf());
-}
-
-function set_datetime_update(n_datetime, with_root) {
-  if (!obj_caller) return;
-
-  var dt_datetime = obj_caller.prs_time(
-    (document.cal ? document.cal.time.value : ''),
-    new Date(n_datetime)
-  );
-
-  if (!dt_datetime) return;
-  obj_caller.popup(dt_datetime.valueOf(), with_root);
-}
-</script>
-</head>
-<body bgcolor="#FFFFFF" marginheight="5" marginwidth="5" topmargin="5" leftmargin="5" rightmargin="5">
-<table class="clsOTable" cellspacing="0" border="0" width="100%">
-<tr><td bgcolor="#4682B4">
-<table cellspacing="1" cellpadding="3" border="0" width="100%">
-<tr><td colspan="7"><table cellspacing="0" cellpadding="0" border="0" width="100%">
-<tr>
-<script language="JavaScript">
-document.write(
-'<td>'+(obj_caller&&obj_caller.year_scroll?'<a href="javascript:set_datetime_update('+dt_prev_year.valueOf()+', root)"><img src="'+STR_ICONPATH+'prev_year.gif" width="16" height="16" border="0" alt="previous year"></a>&nbsp;':'')+'<a href="javascript:set_datetime_update('+dt_prev_month.valueOf()+', root)"><img src="'+STR_ICONPATH+'prev.gif" width="16" height="16" border="0" alt="previous month"></a></td>'+
-'<td align="center" width="100%"><font color="#ffffff">'+ARR_MONTHS[dt_current.getMonth()]+' '+dt_current.getFullYear() + '</font></td>'+
-'<td><a href="javascript:set_datetime_update('+dt_next_month.valueOf()+', root)"><img src="'+STR_ICONPATH+'next.gif" width="16" height="16" border="0" alt="next month"></a>'+(obj_caller && obj_caller.year_scroll?'&nbsp;<a href="javascript:set_datetime_update('+dt_next_year.valueOf()+', root)"><img src="'+STR_ICONPATH+'next_year.gif" width="16" height="16" border="0" alt="next year"></a>':'')+'</td>'
-);
-</script>
-</tr>
-</table></td></tr>
-<tr>
-<script language="JavaScript">
-
-// print weekdays titles
-for (var n=0; n<7; n++)
-	document.write('<td bgcolor="#87cefa" align="center"><font color="#ffffff">'+ARR_WEEKDAYS[(NUM_WEEKSTART+n)%7]+'</font></td>');
-document.write('</tr>');
-
-// print calendar table
-var dt_current_day = new Date(dt_firstday);
-while (dt_current_day.getMonth() == dt_current.getMonth() ||
-	dt_current_day.getMonth() == dt_firstday.getMonth()) {
-	// print row heder
-	document.write('<tr>');
-	for (var n_current_wday=0; n_current_wday<7; n_current_wday++) {
-		if (dt_current_day.getDate() == dt_current.getDate() &&
-			dt_current_day.getMonth() == dt_current.getMonth())
-			// print current date
-			document.write('<td bgcolor="#ffb6c1" align="center" width="14%">');
-		else if (dt_current_day.getDay() == 0 || dt_current_day.getDay() == 6)
-			// weekend days
-			document.write('<td bgcolor="#dbeaf5" align="center" width="14%">');
-		else
-			// print working days of current month
-			document.write('<td bgcolor="#ffffff" align="center" width="14%">');
-
-		document.write('<a href="javascript:set_datetime('+dt_current_day.valueOf() +', true);">');
-
-		if (dt_current_day.getMonth() == this.dt_current.getMonth())
-			// print days of current month
-			document.write('<font color="#000000">');
-		else
-			// print days of other months
-			document.write('<font color="#606060">');
-
-		document.write(dt_current_day.getDate()+'</font></a></td>');
-		dt_current_day.setDate(dt_current_day.getDate()+1);
-	}
-	// print row footer
-	document.write('</tr>');
-}
-if (obj_caller && obj_caller.time_comp)
-	document.write('<form onsubmit="javascript:set_datetime('+dt_current.valueOf()+', true)" name="cal"><tr><td colspan="7" bgcolor="#87CEFA"><font color="White" face="tahoma, verdana" size="2">Time: <input type="text" name="time" value="'+obj_caller.gen_time(this.dt_current)+'" size="8" maxlength="8"></font>');
-  document.write('</td></tr></form>');
-</script>
-</table></tr></td>
-</table>
-</body>
-</html>
-
Index: podcasts-app/src/webapp/jsf/widget/datepicker/datepicker.js
===================================================================
--- podcasts-app/src/webapp/jsf/widget/datepicker/datepicker.js	(revision 93749)
+++ podcasts-app/src/webapp/jsf/widget/datepicker/datepicker.js	(working copy)
@@ -1,190 +0,0 @@
-// Title: Tigra Calendar
-// URL: http://www.softcomplex.com/products/tigra_calendar/
-// Version: 3.2 (American date format)
-// Date: 10/14/2002 (mm/dd/yyyy)
-// Feedback: feedback@softcomplex.com (specify product title in the subject)
-// Note: Permission given to use this script in ANY kind of applications if
-//    header lines are left unchanged.
-// Note: Script consists of two files: calendar?.js and calendar.html
-// About us: Our company provides offshore IT consulting services.
-//    Contact us at sales@softcomplex.com if you have any programming task you
-//    want to be handled by professionals. Our typical hourly rate is $20.
-
-// Sakai project: $Id$
-
-// if two digit year input dates after this year considered 20 century.
-var NUM_CENTYEAR = 90;// sakai, changed to 90
-// is time input control required by default
-var BUL_TIMECOMPONENT = false;
-// are year scrolling buttons required by default
-var BUL_YEARSCROLL = true;
-
-// sakai, AM/PM
-var ampm = "AM";
-
-var calendars = [];
-var RE_NUM = /^\-?\d+$/;
-
-function calendar2(obj_target) {
-
-	// assing methods
-	this.gen_date = cal_gen_date2;
-	this.gen_time = cal_gen_time2;
-	this.gen_tsmp = cal_gen_tsmp2;
-	this.prs_date = cal_prs_date2;
-	this.prs_time = cal_prs_time2;
-	this.prs_tsmp = cal_prs_tsmp2;
-	this.popup    = cal_popup2;
-
-	// validate input parameters
-	if (!obj_target)
-		return cal_error("Error calling the calendar: no target control specified");
-	if (obj_target.value == null)
-		return cal_error("Error calling the calendar: parameter specified is not valid tardet control");
-	this.target = obj_target;
-	this.time_comp = BUL_TIMECOMPONENT;
-	this.year_scroll = BUL_YEARSCROLL;
-
-	// register in global collections
-	this.id = calendars.length;
-	calendars[this.id] = this;
-}
-
-function cal_popup2 (str_datetime,root) {
-	this.dt_current = this.prs_tsmp(str_datetime ? str_datetime : this.target.value);
-	if (!this.dt_current) return;
-
-	var obj_calwindow = window.open(
-// sakai modification
-		root+'calendar.html?datetime=' + this.dt_current.valueOf()+ '&id=' + this.id + '&root=' + root,
-//		root+'datepicker.faces?datetime=' + this.dt_current.valueOf()+ '&id=' + this.id + '&root=' + root,
-		'Calendar', 'width=200,height='+(this.time_comp ? 215 : 190)+
-		',status=no,resizable=no,top=200,left=200,dependent=yes,alwaysRaised=yes'
-	);
-	obj_calwindow.opener = window;
-	obj_calwindow.focus();
-}
-
-// timestamp generating function
-function cal_gen_tsmp2 (dt_datetime) {
-	return(this.gen_date(dt_datetime) + ' ' + this.gen_time(dt_datetime) +
-        // sakai mod
-        ' ' + ampm
-         );
-}
-
-// date generating function, --sakai modified to use dashes
-function cal_gen_date2 (dt_datetime) {
-	return (
-		(dt_datetime.getMonth() < 9 ? '0' : '') + (dt_datetime.getMonth() + 1) + "/"
-		+ (dt_datetime.getDate() < 10 ? '0' : '') + dt_datetime.getDate() + "/"
-		+ dt_datetime.getFullYear()
-	);
-}
-
-
-// time generating function
-function cal_gen_time2 (dt_datetime) {
-  //sakai mod, calculate AM/PM
-  if (dt_datetime.getHours() < 12)
-  {
-    ampm = "AM";
-    hourPart = (dt_datetime.getHours() < 10 ? '0' : '') + dt_datetime.getHours();
-    if (dt_datetime.getHours() == 0)
-      hourPart = 12; 
-  }
-  else
-  {
-    ampm = "PM";
-    if (dt_datetime.getHours() >12)
-      hourPart = dt_datetime.getHours() - 12;
-    else
-      hourPart = dt_datetime.getHours();
-    hourPart = (hourPart < 10 ? '0' : '') + hourPart;
-  }
-	return (
-// sakai mod -- was (dt_datetime.getHours() < 10 ? '0' : '') + dt_datetime.getHours() + ":"
-		hourPart + ":"
-		+ (dt_datetime.getMinutes() < 10 ? '0' : '') + (dt_datetime.getMinutes()) + ":"
-		+ (dt_datetime.getSeconds() < 10 ? '0' : '') + (dt_datetime.getSeconds())
-// sakai mod
-//    + ' ' + ampm
-	);
-}
-
-// timestamp parsing function
-function cal_prs_tsmp2 (str_datetime) {
-	// if no parameter specified return current timestamp
-	if (!str_datetime)
-		return (new Date());
-
-	// if positive integer treat as milliseconds from epoch
-	if (RE_NUM.exec(str_datetime))
-		return new Date(str_datetime);
-
-	// else treat as date in string format
-	var arr_datetime = str_datetime.split(' ');
-	return this.prs_time(arr_datetime[1], this.prs_date(arr_datetime[0]));
-}
-
-// date parsing function
-function cal_prs_date2 (str_date) {
-
-	var arr_date = str_date.split('/');// sakai mod from '/'
-
-	if (arr_date.length != 3) return alert ("Invalid date format: '" + str_date + "'.\nFormat accepted is mm/dd/yyyy hh:mm:ss a.");
-	if (!arr_date[1]) return alert ("Invalid date format: '" + str_date + "'.\nNo day of month value can be found.");
-	if (!RE_NUM.exec(arr_date[1])) return alert ("Invalid day of month value: '" + arr_date[1] + "'.\nAllowed values are unsigned integers.");
-	if (!arr_date[0]) return alert ("Invalid date format: '" + str_date + "'.\nNo month value can be found.");
-	if (!RE_NUM.exec(arr_date[0])) return alert ("Invalid month value: '" + arr_date[0] + "'.\nAllowed values are unsigned integers.");
-	if (!arr_date[2]) return alert ("Invalid date format: '" + str_date + "'.\nNo year value can be found.");
-	if (!RE_NUM.exec(arr_date[2])) return alert ("Invalid year value: '" + arr_date[2] + "'.\nAllowed values are unsigned integers.");
-
-	var dt_date = new Date();
-	dt_date.setDate(1);
-
-	if (arr_date[0] < 1 || arr_date[0] > 12) return alert ("Invalid month value: '" + arr_date[0] + "'.\nAllowed range is 01-12.");
-	dt_date.setMonth(arr_date[0]-1);
-
-	if (arr_date[2] < 100) arr_date[2] = Number(arr_date[2]) + (arr_date[2] < NUM_CENTYEAR ? 2000 : 1900);
-	dt_date.setFullYear(arr_date[2]);
-
-	var dt_numdays = new Date(arr_date[2], arr_date[0], 0);
-	dt_date.setDate(arr_date[1]);
-	if (dt_date.getMonth() != (arr_date[0]-1)) return alert ("Invalid day of month value: '" + arr_date[1] + "'.\nAllowed range is 01-"+dt_numdays.getDate()+".");
-
-	return (dt_date)
-}
-
-// time parsing function
-function cal_prs_time2 (str_time, dt_date) {
-
-	if (!dt_date) return null;
-	var arr_time = String(str_time ? str_time : '').split(':');
-
-	if (!arr_time[0]) dt_date.setHours(0);
-	else if (RE_NUM.exec(arr_time[0]))
-		if (arr_time[0] < 24) dt_date.setHours(arr_time[0]);
-     		else return cal_error ("Invalid hours value: '" + arr_time[0] + "'.\nAllowed range is 00-23.");
-	else return cal_error ("Invalid hours value: '" + arr_time[0] + "'.\nAllowed values are unsigned integers.");
-
-	if (!arr_time[1]) dt_date.setMinutes(0);
-	else if (RE_NUM.exec(arr_time[1]))
-		if (arr_time[1] < 60) dt_date.setMinutes(arr_time[1]);
-		else return cal_error ("Invalid minutes value: '" + arr_time[1] + "'.\nAllowed range is 00-59.");
-	else return cal_error ("Invalid minutes value: '" + arr_time[1] + "'.\nAllowed values are unsigned integers.");
-
-	if (!arr_time[2]) dt_date.setSeconds(0);
-	else if (RE_NUM.exec(arr_time[2]))
-		if (arr_time[2] < 60) dt_date.setSeconds(arr_time[2]);
-		else return cal_error ("Invalid seconds value: '" + arr_time[2] + "'.\nAllowed range is 00-59.");
-	else return cal_error ("Invalid seconds value: '" + arr_time[2] + "'.\nAllowed values are unsigned integers.");
-
-	dt_date.setMilliseconds(0);
-	return dt_date;
-}
-
-function cal_error (str_message) {
-	alert (str_message);
-	return null;
-}
Index: podcasts-app/src/webapp/podcasts/podAdd.jsp
===================================================================
--- podcasts-app/src/webapp/podcasts/podAdd.jsp	(revision 93749)
+++ podcasts-app/src/webapp/podcasts/podAdd.jsp	(working copy)
@@ -12,8 +12,7 @@
     <link href="./css/podcaster.css" type="text/css" rel="stylesheet" media="all" />
 
   <sakai:view>
-      <script type="text/javascript" src="jsf/widget/datepicker/datepicker.js" language="JavaScript" ></script> 
-      
+      <script type="text/javascript" src="./jsf/widget/datepicker/datepicker.js" language="JavaScript" ></script> 
   <h:form id="podAdd" enctype="multipart/form-data">
 
     <div>  <!-- Page title and Instructions -->
@@ -51,7 +50,7 @@
       		<td class="reqStarInline">*</td>
 	      	<td><label for="podAdd:addDate"><h:outputText value="#{msgs.date_prompt}" /></label>&nbsp;&nbsp;&nbsp;</td>
 			<td>
-	      		<podcasts:datePicker value="#{podHomeBean.date}" id="addDate" size="28" />
+	      		<podcasts:datePicker value="#{podHomeBean.addDateString}" id="addDate" size="28" />
 	  			<h:outputText value="#{msgs.date_picker_format_string}" />
 	  		</td>
 	  	  </tr>