diff options
| author | Evan Winslow <evan.b.winslow@gmail.com> | 2010-08-04 17:57:18 +0000 |
|---|---|---|
| committer | Evan Winslow <evan.b.winslow@gmail.com> | 2010-08-04 17:57:18 +0000 |
| commit | d29340b0fda7a768f6941088808de7e9e41aa616 (patch) | |
| tree | e5c2f6bb72c995d2d8ca4d085d9f9359a85b0fca | |
| parent | 73d0be2e63fdeed67193e1e89c859a09468a3c4d (diff) | |
| download | elgg-d29340b0fda7a768f6941088808de7e9e41aa616.tar.gz elgg-d29340b0fda7a768f6941088808de7e9e41aa616.tar.bz2 | |
Updating date-related inputs to accept timestamps as well as string input
| -rw-r--r-- | views/default/input/date.php | 4 | ||||
| -rw-r--r-- | views/default/input/datetime-local.php | 9 | ||||
| -rw-r--r-- | views/default/input/datetime.php | 9 | ||||
| -rw-r--r-- | views/default/input/month.php | 9 |
4 files changed, 25 insertions, 6 deletions
diff --git a/views/default/input/date.php b/views/default/input/date.php index b347f835d..7e35c7beb 100644 --- a/views/default/input/date.php +++ b/views/default/input/date.php @@ -7,4 +7,8 @@ $overrides = array( 'type' => 'date',
);
+if (isset($vars['value']) && is_int($vars['value'])) {
+ $vars['value'] = date("Y-m-d", $vars['value']);
+}
+
echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file diff --git a/views/default/input/datetime-local.php b/views/default/input/datetime-local.php index e3f7e1915..9b67a7b67 100644 --- a/views/default/input/datetime-local.php +++ b/views/default/input/datetime-local.php @@ -1,9 +1,14 @@ <?php
+$defaults = array(
+ 'placeholder' => 'yyyy-mm-ddThh:mm:ss+hh:mm',
+);
$overrides = array(
'type' => 'datetime-local',
);
-$args = array_merge($vars, $overrides);
+if (isset($vars['value']) && is_int($vars['value'])) {
+ $vars['value'] = date("c", $vars['value']);
+}
-echo elgg_view('input/default', $args);
\ No newline at end of file +echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file diff --git a/views/default/input/datetime.php b/views/default/input/datetime.php index 8cc9d9087..d7d0a4291 100644 --- a/views/default/input/datetime.php +++ b/views/default/input/datetime.php @@ -1,9 +1,14 @@ <?php
+$defaults = array(
+ 'placeholder' => 'yyyy-mm-ddThh:mm:ss',
+);
$overrides = array(
'type' => 'datetime',
);
-$args = array_merge($vars, $overrides);
+if (isset($vars['value']) && is_int($vars['value'])) {
+ $vars['value'] = date("Y-m-d\TH:i:s", $vars['value']);
+}
-echo elgg_view('input/default', $args);
\ No newline at end of file +echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file diff --git a/views/default/input/month.php b/views/default/input/month.php index cad6562a9..01ecae384 100644 --- a/views/default/input/month.php +++ b/views/default/input/month.php @@ -1,9 +1,14 @@ <?php
+$defaults = array(
+ 'placeholder' => 'yyyy-mm',
+);
$overrides = array(
'type' => 'month',
);
-$args = array_merge($vars, $overrides);
+if (isset($vars['value']) && is_int($vars['value'])) {
+ $vars['value'] = date("Y-m", $vars['value']);
+}
-echo elgg_view('input/default', $args);
\ No newline at end of file +echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file |