Updating date-related inputs to accept timestamps as well as string input

diff --git a/views/default/input/date.php b/views/default/input/date.php
index b347f835df33c4027d1109e98e5bd2e767907939..7e35c7beb9c686d19cd5cc5ff1330ea0d4ade2e5 100644 (file)
--- a/views/default/input/date.php
+++ b/views/default/input/date.php
@@ -7,4 +7,8 @@ $overrides = array(
        'type' => 'date',\r
 );\r
 \r
+if (isset($vars['value']) && is_int($vars['value'])) {\r
+       $vars['value'] = date("Y-m-d", $vars['value']);\r
+}\r
+\r
 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 e3f7e1915aa75b0d40200e9891a3b21397757982..9b67a7b6733f35c22b01d2bc9a84e2b9dc4e2e07 100644 (file)
--- a/views/default/input/datetime-local.php
+++ b/views/default/input/datetime-local.php
@@ -1,9 +1,14 @@
 <?php\r
+$defaults = array(\r
+       'placeholder' => 'yyyy-mm-ddThh:mm:ss+hh:mm',\r
+);\r
 \r
 $overrides = array(\r
        'type' => 'datetime-local',\r
 );\r
 \r
-$args = array_merge($vars, $overrides);\r
+if (isset($vars['value']) && is_int($vars['value'])) {\r
+       $vars['value'] = date("c", $vars['value']);\r
+}\r
 \r
-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 8cc9d9087a088dca4f6fec35b9b6c061aa0ca9a5..d7d0a4291fedd576db38083d59e787d4c55db10e 100644 (file)
--- a/views/default/input/datetime.php
+++ b/views/default/input/datetime.php
@@ -1,9 +1,14 @@
 <?php\r
+$defaults = array(\r
+       'placeholder' => 'yyyy-mm-ddThh:mm:ss',\r
+);\r
 \r
 $overrides = array(\r
        'type' => 'datetime',\r
 );\r
 \r
-$args = array_merge($vars, $overrides);\r
+if (isset($vars['value']) && is_int($vars['value'])) {\r
+       $vars['value'] = date("Y-m-d\TH:i:s", $vars['value']);\r
+}\r
 \r
-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 cad6562a9eb714e31b95479187ac12fe05bae150..01ecae384d512d6384f941fb5787f8ce59f1fafb 100644 (file)
--- a/views/default/input/month.php
+++ b/views/default/input/month.php
@@ -1,9 +1,14 @@
 <?php\r
+$defaults = array(\r
+       'placeholder' => 'yyyy-mm',\r
+);\r
 \r
 $overrides = array(\r
        'type' => 'month',\r
 );\r
 \r
-$args = array_merge($vars, $overrides);\r
+if (isset($vars['value']) && is_int($vars['value'])) {\r
+       $vars['value'] = date("Y-m", $vars['value']);\r
+}\r
 \r
-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