Changeset 953

Timestamp:

03/07/06 12:22:23 (3 years ago)

Author:

fabien

Message:

upgraded to scriptaculous 1.5.3

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/data/web/sf/js/prototype/controls.js (modified) (9 diffs)
• trunk/data/web/sf/js/prototype/dragdrop.js (modified) (13 diffs)
• trunk/data/web/sf/js/prototype/effects.js (modified) (8 diffs)
• trunk/data/web/sf/js/prototype/scriptaculous.js (modified) (1 diff)
• trunk/data/web/sf/js/prototype/slider.js (modified) (1 diff)
• trunk/lib/helper/FormHelper.php (modified) (1 diff)

trunk/CHANGELOG

@@ -5 +5 @@
--------------
-
+* [fabien] lot of bugs fixes
+* [faiben] updated scriptaculous to 1.5.3
+* [fabien] added a new sfFileValidator validator
+* [fabien] lots of bug fixes and new features in the admin generator (file upload, credentials, ...)
-* [fabien] stylesheets, javascripts, ... are now part of the sfWebResponse object
-           DEPRECATED methods:

trunk/data/web/sf/js/prototype/controls.js

@@ -153 +153 @@
-  },
-
+  activate: function() {
+    this.changed = false;
+    this.hasFocus = true;
+    this.getUpdatedChoices();
+  },
+
-  onHover: function(event) {
-    var element = Event.findElement(event, 'LI');
@@ -311 +317 @@
-Object.extend(Object.extend(Ajax.Autocompleter.prototype, Autocompleter.Base.prototype), {
-  initialize: function(element, update, url, options) {
- 
+  
-    this.options.asynchronous  = true;
-    this.options.onComplete    = this.onComplete.bind(this);
@@ -478 +484 @@
-      highlightcolor: Ajax.InPlaceEditor.defaultHighlightColor,
-      highlightendcolor: "#FFFFFF",
- 
+ 
-      submitOnBlur: false,
-
+
+
-    }, options || {});
-
@@ -549 +556 @@
-      okButton.type = "submit";
-      okButton.value = this.options.okText;
+      okButton.className = 'editor_ok_button';
-      this.form.appendChild(okButton);
-    }
@@ -557 +565 @@
-      cancelLink.appendChild(document.createTextNode(this.options.cancelText));
-      cancelLink.onclick = this.onclickCancel.bind(this);
+      cancelLink.className = 'editor_cancel';      
-      this.form.appendChild(cancelLink);
-    }
@@ -585 +594 @@
-      textField.value = text;
-      textField.style.backgroundColor = this.options.highlightcolor;
+      textField.className = 'editor_field';
-      var size = this.options.size || this.options.cols || 0;
-      if (size != 0) textField.size = size;
@@ -598 +608 @@
-      textArea.rows = this.options.rows;
-      textArea.cols = this.options.cols || 40;
+      textArea.className = 'editor_field';      
-      if (this.options.submitOnBlur)
-        textArea.onblur = this.onSubmit.bind(this);
@@ -650 +661 @@
-    this.onLoading();
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // stop the event to avoid a page refresh in Safari
-    if (arguments.length > 1) {
@@ -743 +761 @@
-  }
-};
+
+Ajax.InPlaceCollectionEditor = Class.create();
+Object.extend(Ajax.InPlaceCollectionEditor.prototype, Ajax.InPlaceEditor.prototype);
+Object.extend(Ajax.InPlaceCollectionEditor.prototype, {
+  createEditField: function() {
+    if (!this.cached_selectTag) {
+      var selectTag = document.createElement("select");
+      var collection = this.options.collection || [];
+      var optionTag;
+      collection.each(function(e,i) {
+        optionTag = document.createElement("option");
+        optionTag.value = (e instanceof Array) ? e[0] : e;
+        if(this.options.value==optionTag.value) optionTag.selected = true;
+        optionTag.appendChild(document.createTextNode((e instanceof Array) ? e[1] : e));
+        selectTag.appendChild(optionTag);
+      }.bind(this));
+      this.cached_selectTag = selectTag;
+    }
+
+    this.editField = this.cached_selectTag;
+    if(this.options.loadTextURL) this.loadExternalText();
+    this.form.appendChild(this.editField);
+    this.options.callback = function(form, value) {
+      return "value=" + encodeURIComponent(value);
+    }
+  }
+});
-
-// Delayed observer, like Form.Element.Observer, 

trunk/data/web/sf/js/prototype/dragdrop.js

@@ -129 +129 @@
-  },
-  
-draggbale
+
-    this.activeDraggable = null;
-  },
@@ -200 +200 @@
-      zindex: 1000,
-      revert: false,
+      scroll: false,
+      scrollSensitivity: 20,
+      scrollSpeed: 15,
-      snap: false   // false, or xy or [x,y] or function(x,y){ return [x,y] }
-    }, arguments[1] || {});
@@ -209 +212 @@
-    if(!this.handle) this.handle = $(options.handle);
-    if(!this.handle) this.handle = this.element;
+    
+    if(options.scroll) options.scroll = $(options.scroll);
-
-    Element.makePositioned(this.element); // fix IE    
@@ -240 +245 @@
-        src.tagName=='INPUT' ||
-        src.tagName=='SELECT' ||
+        src.tagName=='OPTION' ||
-        src.tagName=='BUTTON' ||
-        src.tagName=='TEXTAREA')) return;
@@ -271 +277 @@
-    }
-    
+    if(this.options.scroll) {
+      this.originalScrollLeft = this.options.scroll.scrollLeft;
+      this.originalScrollTop = this.options.scroll.scrollTop;
+    }
+    
-    Draggables.notify('onStart', this, event);
-    if(this.options.starteffect) this.options.starteffect(this.element);
@@ -283 +294 @@
-    if(this.options.change) this.options.change(this);
-    
+    if(this.options.scroll) {
+      //if(this.scrollInterval) this.scroll();
+      this.stopScrolling();
+      var p = Position.page(this.options.scroll);
+      p[0] += this.options.scroll.scrollLeft;
+      p[1] += this.options.scroll.scrollTop;
+      p.push(p[0]+this.options.scroll.offsetWidth);
+      p.push(p[1]+this.options.scroll.offsetHeight);
+      var speed = [0,0];
+      if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity);
+      if(pointer[1] < (p[1]+this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[1]+this.options.scrollSensitivity);
+      if(pointer[0] > (p[2]-this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[2]-this.options.scrollSensitivity);
+      if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
+      this.startScrolling(speed);
+    }
+    
-    // fix AppleWebKit rendering
-    if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);
+    
-    Event.stop(event);
-  },
@@ -322 +350 @@
-  
-  keyPress: function(event) {
-!event.keyCode=
+event.keyCode!
-    this.finishDrag(event, false);
-    Event.stop(event);
@@ -329 +357 @@
-  endDrag: function(event) {
-    if(!this.dragging) return;
+    this.stopScrolling();
-    this.finishDrag(event, true);
-    Event.stop(event);
@@ -338 +367 @@
-    pos[0] -= d[0]; pos[1] -= d[1];
-    
-
+
+
+
+
+
+
+
+
-    
-    if(this.options.snap) {
@@ -359 +395 @@
-      style.top  = p[1] + "px";
-    if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
+  },
+  
+  stopScrolling: function() {
+    if(this.scrollInterval) {
+      clearInterval(this.scrollInterval);
+      this.scrollInterval = null;
+    }
+  },
+  
+  startScrolling: function(speed) {
+    this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
+    this.lastScrolled = new Date();
+    this.scrollInterval = setInterval(this.scroll.bind(this), 10);
+  },
+  
+  scroll: function() {
+    var current = new Date();
+    var delta = current - this.lastScrolled;
+    this.lastScrolled = current;
+    this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
+    this.options.scroll.scrollTop  += this.scrollSpeed[1] * delta / 1000;
+    
+    Position.prepare();
+    Droppables.show(Draggables._lastPointer, this.element);
+    Draggables.notify('onDrag', this);
+    this.draw(Draggables._lastPointer);    
+    
+    if(this.options.change) this.options.change(this);
-  }
-}
@@ -415 +479 @@
-      hoverclass:  null,
-      ghosting:    false,
-
+
+
-      onChange:    Prototype.emptyFunction,
-      onUpdate:    Prototype.emptyFunction
@@ -426 +491 @@
-    var options_for_draggable = {
-      revert:      true,
+      scroll:      options.scroll,
-      ghosting:    options.ghosting,
-      constraint:  options.constraint,
@@ -569 +635 @@
-  },
-
+  sequence: function(element) {
+    element = $(element);
+    var options = Object.extend(this.options(element), arguments[1] || {});
+    
+    return $(this.findElements(element, options) || []).map( function(item) {
+      return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
+    });
+  },
+
+  setSequence: function(element, new_sequence) {
+    element = $(element);
+    var options = Object.extend(this.options(element), arguments[2] || {});
+    
+    var nodeMap = {};
+    this.findElements(element, options).each( function(n) {
+        if (n.id.match(options.format))
+            nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
+        n.parentNode.removeChild(n);
+    });
+   
+    new_sequence.each(function(ident) {
+        var n = nodeMap[ident];
+        if (n) {
+            n[1].appendChild(n[0]);
+            delete nodeMap[ident];
+        }
+    });
+  },
+
-  serialize: function(element) {
-    element = $(element);
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-  }
-}

trunk/data/web/sf/js/prototype/effects.js

@@ -36 +36 @@
-    return (node.nodeType==3 ? node.nodeValue : 
-      ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? 
-(nod
+IgnoreClass(node, classNam
-  }).flatten().join('');
-}
@@ -138 +138 @@
-    effect = (effect || 'appear').toLowerCase();
-    var options = Object.extend({
-
+, limit: 1
-    }, arguments[2] || {});
-    Effect[Element.visible(element) ? 
@@ -210 +210 @@
-    effect.startOn  += timestamp;
-    effect.finishOn += timestamp;
-
+
+
+
+
-    if(!this.interval) 
-      this.interval = setInterval(this.loop.bind(this), 40);
@@ -582 +585 @@
-Effect.BlindDown = function(element) {
-  element = $(element);
-  var oldHeight = Element.getStyle(element, 'height');
-  var elementDimensions = Element.getDimensions(element);
-  return new Effect.Scale(element, 100, 
@@ -595 +597 @@
-        show(effect.element); 
-      }},  
-
-
-
-
+
+
+
-    }, arguments[1] || {})
-  );
@@ -691 +692 @@
-    afterFinishInternal: function(effect) { with(Element) {
-      undoClipping(effect.element); 
-
-
+
+
+
+
+
+
+
+
-      setStyle(effect.element.firstChild, {bottom: oldInnerBottom}); }}
-    }, arguments[1] || {})
@@ -742 +749 @@
-  var options = Object.extend({
-    direction: 'center',
-s
+
-    scaleTransition: Effect.Transitions.sinoidal,
-    opacityTransition: Effect.Transitions.full
@@ -818 +825 @@
-  var options = Object.extend({
-    direction: 'center',
-s
+
-    scaleTransition: Effect.Transitions.sinoidal,
-    opacityTransition: Effect.Transitions.none

trunk/data/web/sf/js/prototype/scriptaculous.js

@@ -21 +21 @@
-
-var Scriptaculous = {
-1
+3
-  require: function(libraryName) {
-    // inserting via DOM fails in Safari 2.0, so brute force approach

trunk/data/web/sf/js/prototype/slider.js

@@ -201 +201 @@
-    if(this.isVertical()) {
-      span.style.top = this.translateToPx(range.start);
-
+ + this.range.start
-    } else {
-      span.style.left = this.translateToPx(range.start);
-
+ + this.range.start
-    }
-  },

trunk/lib/helper/FormHelper.php

@@ -537 +537 @@
-}
-
+function select_day_tag($name, $value, $options = array(), $html_options = array())
+{
+  $select_options = array();
+
+  if (_get_option($options, 'include_blank'))
+  {
+    $select_options[''] = '';
+  }
+  else if ($include_custom = _get_option($options, 'include_custom'))
+  {
+    $select_options[''] = $include_custom;
+  }
+
+  for ($x = 1; $x < 32; $x++)
+  {
+    $select_options[$x] = _add_zeros($x, 2);
+  }
+
+  $option_tags = options_for_select($select_options, $value);
+
+  return select_tag($name, $option_tags, $html_options);
+}
+
+function select_month_tag($name, $value, $options = array(), $html_options = array())
+{
+
+  $culture = _get_option($options, 'culture', sfContext::getInstance()->getUser()->getCulture());
+
+  $I18n_arr = _get_I18n_date_locales($culture);
+
+  $select_options = array();
+
+  if (_get_option($options, 'include_blank'))
+  {
+    $select_options[''] = '';
+  }
+  else if ($include_custom = _get_option($options, 'include_custom'))
+  {
+    $select_options[''] = $include_custom;
+  }
+
+  if (_get_option($options, 'use_month_numbers')) 
+  {
+    for ($k = 1; $k < 13; $k++) 
+    {
+      $select_options[$k] = _add_zeros($k, 2);
+    }
+  }
+  else
+  {  
+    if (_get_option($options, 'use_short_month')) 
+    {
+      $month_names = $I18n_arr['dateFormatInfo']->getAbbreviatedMonthNames();
+    }
+    else
+    {
+      $month_names = $I18n_arr['dateFormatInfo']->getMonthNames();
+    }
+
+    $add_month_numbers = _get_option($options, 'add_month_numbers');
+    foreach ($month_names as $k => $v) 
+    {
+      $select_options[$k + 1] = ($add_month_numbers) ? ($k + 1 . ' - ' . $v) : $v;
+    }
+  }
+
+  $option_tags = options_for_select($select_options, $value);
+
+  return select_tag($name, $option_tags, $html_options);
+}
+
+function select_year_tag($name, $value, $options = array(), $html_options = array())
+{
+  $select_options = array();
+
+  if (_get_option($options, 'include_blank'))
+  {
+    $select_options[''] = '';
+  }
+  else if ($include_custom = _get_option($options, 'include_custom'))
+  {
+    $select_options[''] = $include_custom;
+  }
+
+  if (strlen($value) > 0 && is_numeric($value))
+  {
+    $year_origin = $value;
+  }
+  else
+  {
+    $year_origin = date('Y');
+  }
+
+  $year_start = _get_option($options, 'year_start', $year_origin - 5);
+  $year_end = _get_option($options, 'year_end', $year_origin + 5);
+
+  $ascending = ($year_start < $year_end);
+  $until_year = ($ascending) ? $year_end + 1 : $year_end - 1;
+
+  for ($x = $year_start; $x != $until_year; ($ascending) ? $x++ : $x--)
+  {
+    $select_options[$x] = $x;
+  }
+
+  $option_tags = options_for_select($select_options, $value);
+
+  return select_tag($name, $option_tags, $html_options);
+}
+
+/**
+ * Enter description here...
+ *
+ * @param string $name
+ * @param string $value (proper date format: array('year'=>2005, 'month'=>1, 'day'=1) or timestamp or english date text)
+ * @param array $options
+ * @return string
+ */
+function select_date_tag($name, $value, $options = array(), $html_options = array())
+{
+  $html_options = _parse_attributes($html_options);
+  $options = _parse_attributes($options);
+
+  $culture = _get_option($options, 'culture', sfContext::getInstance()->getUser()->getCulture());
+  //set it back for month tag
+  $option['culture'] = $culture;
+
+  $I18n_arr = _get_I18n_date_locales($culture);
+
+  $date_seperator = _get_option($options, 'date_seperator', $I18n_arr['date_seperator']);
+
+  $discard_month = _get_option($options, 'discard_month');
+  $discard_day = _get_option($options, 'discard_day');
+  $discard_year = _get_option($options, 'discard_year');
+
+  //discarding month automatically discards day
+  if ($discard_month) 
+    $discard_day = true;
+
+  $order = _get_option($options, 'order');
+
+  $tags = array();
+
+  if (is_array($order) && count($order) == 3)
+  {
+    foreach ($order as $k => $v)
+    {
+      $tags[] = $v[0]; //'day' => 'd' | 'month' => 'm'
+    }
+  }
+  else
+  {
+    $tags = $I18n_arr['date_order'];
+  }
+
+  if ($include_custom = _get_option($options, 'include_custom'))
+  {
+    $include_custom_month = (is_array($include_custom))
+        ? ((isset($include_custom['month'])) ? array('include_custom'=>$include_custom['month']) : array()) 
+        : array('include_custom'=>$include_custom);
+
+    $include_custom_day = (is_array($include_custom))
+        ? ((isset($include_custom['day'])) ? array('include_custom'=>$include_custom['day']) : array()) 
+        : array('include_custom'=>$include_custom);
+
+    $include_custom_year = (is_array($include_custom))
+        ? ((isset($include_custom['year'])) ? array('include_custom'=>$include_custom['year']) : array()) 
+        : array('include_custom'=>$include_custom);
+  }
+  else
+  {
+    $include_custom_month = array();
+    $include_custom_day = array();
+    $include_custom_year = array();
+  }
+
+  $html_options['id'] = $name . '_month';
+  $m = ($discard_month != true) ? select_month_tag($name . '[month]', _parse_value_for_date($value, 'month', 'm'), $options + $include_custom_month, $html_options) : '';
+
+  $html_options['id'] = $name . '_day';
+  $d = ($discard_day != true) ? select_day_tag($name . '[day]', _parse_value_for_date($value, 'day', 'd'), $options + $include_custom_day, $html_options) : '';
+
+  $html_options['id'] = $name . '_year';
+  $y = ($discard_year != true) ? select_year_tag($name . '[year]', _parse_value_for_date($value, 'year', 'Y'), $options + $include_custom_year, $html_options) : '';
+
+  //we have $tags = array ('m','d','y')
+  foreach ($tags as $k => $v)
+  {
+    $tags[$k] = $$v;
+  }
+
+  return implode($date_seperator, $tags);
+}
+
+function select_second_tag($name, $value, $options = array(), $html_options = array())
+{
+  $select_options = array();
+
+  if (_get_option($options, 'include_blank'))
+  {
+    $select_options[''] = '';
+  }
+  else if ($include_custom = _get_option($options, 'include_custom'))
+  {
+    $select_options[''] = $include_custom;
+  }
+
+  $second_step = _get_option($options, 'second_step', 1);
+  for ($x = 0; $x < 60; $x += $second_step)
+  {
+    $select_options[$x] = _add_zeros($x, 2);
+  }
+
+  $option_tags = options_for_select($select_options, $value);
+
+  return select_tag($name, $option_tags, $html_options);
+}
+
+function select_minute_tag($name, $value, $options = array(), $html_options = array())
+{
+  $select_options = array();
+
+  if (_get_option($options, 'include_blank'))
+  {
+    $select_options[''] = '';
+  }
+  else if ($include_custom = _get_option($options, 'include_custom'))
+  {
+    $select_options[''] = $include_custom;
+  }
+
+  $minute_step = _get_option($options, 'minute_step', 1);
+  for ($x = 0; $x < 60; $x += $minute_step)
+  {
+    $select_options[$x] = _add_zeros($x, 2);
+  }
+
+  $option_tags = options_for_select($select_options, $value);
+
+  return select_tag($name, $option_tags, $html_options);
+}
+
+function select_hour_tag($name, $value, $options = array(), $html_options = array())
+{
+  $select_options = array();
+
+  if (_get_option($options, 'include_blank'))
+  {
+    $select_options[''] = '';
+  }
+  else if ($include_custom = _get_option($options, 'include_custom'))
+  {
+    $select_options[''] = $include_custom;
+  }
+
+  $_12hour_time = _get_option($options, '12hour_time');
+
+  $start_hour = ($_12hour_time) ? 1 : 0;
+  $end_hour = ($_12hour_time) ? 12 : 23;
+
+  for ($x = $start_hour; $x <= $end_hour; $x++)
+  {
+    $select_options[$x] = _add_zeros($x, 2);
+  }
+
+  $option_tags = options_for_select($select_options, $value);
+
+  return select_tag($name, $option_tags, $html_options);
+}
+
+function select_ampm_tag($name, $value, $options = array(), $html_options = array())
+{
+  $select_options = array();
+
+  if (_get_option($options, 'include_blank'))
+  {
+    $select_options[''] = '';
+  }
+  else if ($include_custom = _get_option($options, 'include_custom'))
+  {
+    $select_options[''] = $include_custom;
+  }
+
+  $select_options['AM'] = 'AM';
+  $select_options['PM'] = 'PM';
+
+  $option_tags = options_for_select($select_options, $value);
+
+  return select_tag($name, $option_tags, $html_options);
+}
+
+/**
+ * Enter description here...
+ *
+ * @param string $name
+ * @param string $value (proper time format: array('hour'=>0, 'minute'=>0, 'second'=0) or timestamp or english date text)
+ * @param array $options
+ * @return string
+ */
+function select_time_tag($name, $value, $options = array(), $html_options = array())
+{
+  $html_options = _parse_attributes($html_options);
+  $options = _parse_attributes($options);
+
+  $time_seperator = _get_option($options, 'time_seperator', ':');
+  $ampm_seperator = _get_option($options, 'ampm_seperator', '');
+  $include_second = _get_option($options, 'include_second');
+  $_12hour_time = _get_option($options, '12hour_time');
+
+  $options['12hour_time'] = $_12hour_time; //set it back. hour tag needs it.
+
+  if ($include_custom = _get_option($options, 'include_custom'))
+  {
+    $include_custom_hour = (is_array($include_custom))
+        ? ((isset($include_custom['hour'])) ? array('include_custom'=>$include_custom['hour']) : array()) 
+        : array('include_custom'=>$include_custom);
+
+    $include_custom_minute = (is_array($include_custom))
+        ? ((isset($include_custom['minute'])) ? array('include_custom'=>$include_custom['minute']) : array()) 
+        : array('include_custom'=>$include_custom);
+
+    $include_custom_second = (is_array($include_custom))
+        ? ((isset($include_custom['second'])) ? array('include_custom'=>$include_custom['second']) : array()) 
+        : array('include_custom'=>$include_custom);
+
+    $include_custom_ampm = (is_array($include_custom))
+        ? ((isset($include_custom['ampm'])) ? array('include_custom'=>$include_custom['ampm']) : array()) 
+        : array('include_custom'=>$include_custom);
+  }
+  else
+  {
+    $include_custom_hour = array();
+    $include_custom_minute = array();
+    $include_custom_second = array();
+    $include_custom_ampm = array();
+  }
+
+  $tags = array();
+
+  $html_options['id'] = $name . '_hour';
+  $tags[] = select_hour_tag($name . '[hour]', _parse_value_for_date($value, 'hour', ($_12hour_time) ? 'h' : 'H'), $options + $include_custom_hour, $html_options);
+
+  $html_options['id'] = $name . '_minute';
+  $tags[] = select_minute_tag($name . '[minute]', _parse_value_for_date($value, 'minute', 'i'), $options + $include_custom_minute, $html_options);
+
+  if ($include_second)
+  {
+    $html_options['id'] = $name . '_second';
+    $tags[] = select_second_tag($name . "[second]" , _parse_value_for_date($value, 'second', 's'), $options + $include_custom_second, $html_options);
+  }
+
+  $time = implode($time_seperator, $tags);
+
+  if ($_12hour_time)
+  {
+    $html_options['id'] = $name . '_ampm';
+    $time .=  $ampm_seperator . select_ampm_tag($name . "[ampm]" , _parse_value_for_date($value, 'ampm', 'A'), $options + $include_custom_ampm, $html_options);
+  }
+
+  return $time;
+}
+
+/**
+ * Enter description here...
+ *
+ * @param string $name
+ * @param string $value (proper datetime format YYYY-MM-DD HH:MM:SS)
+ * @param array $options
+ * @return string
+ */
+function select_datetime_tag($name, $value, $options = array(), $html_options = array())
+{
+  $options = _parse_attributes($options);
+  $datetime_seperator = _get_option($options, 'datetime_seperator', '');
+
+  $date = select_date_tag($name, $value, $options, $html_options);
+  $time = select_time_tag($name, $value, $options, $html_options);
+
+  return $date.$datetime_seperator.$time;
+}
+
+function _add_zeros($string, $strlen)
+{
+  if ($strlen > strlen($string))
+  {
+    for ($x = strlen($string); $x < $strlen; $x++)
+    {
+      $string = '0'.$string;
+    }
+  }
+
+  return $string;
+}
+
+function _get_I18n_date_locales($culture = '')
+{
+  if (empty($culture))
+  {
+    $culture = sfContext::getInstance()->getUser()->getCulture();
+  }
+
+  $ret_val = array();
+  $ret_val['culture'] = $culture;
+
+  $dateFormatInfo = sfDateTimeFormatInfo::getInstance($culture);
+  $date_format = strtolower($dateFormatInfo->getShortDatePattern());
+
+  $ret_val['dateFormatInfo'] = $dateFormatInfo;
+    
+  $match_pattern = "/([dmy]+)(.*?)([dmy]+)(.*?)([dmy]+)/";
+  if (!preg_match($match_pattern, $date_format, $match_arr))
+  {
+    //if matching fails use en shortdate
+    preg_match($match_pattern, 'm/d/yy', $match_arr);
+  }
+
+  $ret_val['date_seperator'] = $match_arr[2];
+
+  //unset all but [dmy]+
+  unset($match_arr[0], $match_arr[2], $match_arr[4]);
+  
+  $cnt = 0;
+  foreach ($match_arr as $k => $v)
+  {
+    $ret_val['date_order'][$cnt++] = $v[0]; //$arr[date_order][0] = 'm'; [1] = 'd'; [2] = 'y';
+  }
+  
+  return $ret_val;
+}
+
+/**
+* _parse_value_for_date function can parse any date field from $value given as:
+*  - an array('year'=>2000, 'month'=> 1, ..
+*  - a timestamp
+*  - english text presentation of date (i.e '14:23', '03:30 AM', '2005-12-25' Refer to strtotime function in PHP manual)
+*/
+function _parse_value_for_date($value, $name, $format_char)
+{
+  if (is_array($value))
+  {
+    return (isset($value[$name])) ? $value[$name] : '';
+  }
+  else if (is_numeric($value))
+  {
+    return date($format_char, $value);
+  }
+  else if ($value == '' || ($name == 'ampm' && ($value == 'AM' || $value == 'PM')))
+  {
+    return $value;
+  }
+
+  return date($format_char, strtotime($value));
+}
+
-function _convert_options($options)
-{