From 5d9f88a89ac15608edbc1f7076409108368c6028 Mon Sep 17 00:00:00 2001 From: ewinslow Date: Sat, 5 Mar 2011 06:23:18 +0000 Subject: Fixes #2321: Deprecated input/datepicker and output/calendar in favor of input/date and output/date git-svn-id: http://code.elgg.org/elgg/trunk@8582 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/input/date.php | 30 ++++++++++++++++++++++++++++++ views/default/input/datepicker.php | 37 +++---------------------------------- views/default/output/calendar.php | 8 ++------ views/default/output/date.php | 2 +- 4 files changed, 36 insertions(+), 41 deletions(-) create mode 100644 views/default/input/date.php (limited to 'views') diff --git a/views/default/input/date.php b/views/default/input/date.php new file mode 100644 index 000000000..afc40e899 --- /dev/null +++ b/views/default/input/date.php @@ -0,0 +1,30 @@ + '', + 'class' => '', +); + +$vars = array_merge($defaults, $vars); + +//@todo popup_calendar deprecated in 1.8. Remove in 2.0 +$vars['class'] = trim("elgg-input-date popup_calendar {$vars['class']}"); + +if ($vars['value'] > 86400) { + $vars['value'] = date('n/d/Y', $vars['value']); +} + +$attributes = elgg_format_attributes($vars); + +?> + /> \ No newline at end of file diff --git a/views/default/input/datepicker.php b/views/default/input/datepicker.php index 4af54096b..8955e6e53 100644 --- a/views/default/input/datepicker.php +++ b/views/default/input/datepicker.php @@ -1,37 +1,6 @@ 86400) { - //$val = date("F j, Y", $vars['value']); - $val = date('n/d/Y', $vars['value']); -} else { - $val = $vars['value']; -} - -?> - - - +elgg_deprecated_notice('input/datepicker was deprecated in favor of input/date', 1.8); +echo elgg_view('input/date', $vars); \ No newline at end of file diff --git a/views/default/output/calendar.php b/views/default/output/calendar.php index 8729fa1c5..fa0bd0c04 100644 --- a/views/default/output/calendar.php +++ b/views/default/output/calendar.php @@ -9,9 +9,5 @@ * @uses $vars['value'] The current value, if any * */ - -if (is_int($vars['value'])) { - echo date("F j, Y", $vars['value']); -} else { - echo htmlspecialchars($vars['value'], ENT_QUOTES, 'UTF-8'); -} \ No newline at end of file +elgg_deprecated_notice('output/calendar was deprecated in favor of output/date', 1.8); +echo elgg_view('output/date', $vars); \ No newline at end of file diff --git a/views/default/output/date.php b/views/default/output/date.php index bd8a65714..fda7668e7 100644 --- a/views/default/output/date.php +++ b/views/default/output/date.php @@ -11,5 +11,5 @@ */ if ($vars['value'] > 86400) { - echo date("F j, Y",$vars['value']); + echo date("n/d/Y", $vars['value']); } \ No newline at end of file -- cgit v1.2.3