diff options
| -rw-r--r-- | js/lib/ui.js | 2 | ||||
| -rw-r--r-- | views/default/input/date.php | 30 | ||||
| -rw-r--r-- | views/default/input/datepicker.php | 37 | ||||
| -rw-r--r-- | views/default/output/calendar.php | 8 | ||||
| -rw-r--r-- | views/default/output/date.php | 2 |
5 files changed, 38 insertions, 41 deletions
diff --git a/js/lib/ui.js b/js/lib/ui.js index 3118bb408..6da7e7470 100644 --- a/js/lib/ui.js +++ b/js/lib/ui.js @@ -19,6 +19,8 @@ elgg.ui.init = function () { $('.elgg-like-toggle').live('click', elgg.ui.toggleLikes); $('.elgg-requires-confirmation').live('click', elgg.ui.requiresConfirmation); + + $('.elgg-input-date').datepicker(); } /** 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 @@ +<?php +/** + * Elgg date input + * Displays a text field with a popup date picker. + * + * @package Elgg + * @subpackage Core + * + * @uses $vars['value'] The current value, if any (as a unix timestamp) + * + */ + +$defaults = array( + 'value' => '', + '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); + +?> +<input type="text" <?php echo $attributes; ?> />
\ 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 @@ <?php /** - * Elgg datepicker input - * Displays a text field with a popup date picker. - * - * @package Elgg - * @subpackage Core - * - * @uses $vars['value'] The current value, if any - * @uses $vars['js'] Any Javascript to enter into the input tag - * @uses $vars['name'] The name of the input field - * + * @deprecated use input/date instead */ - -$cal_name = sanitise_string($vars['name']); - -if (isset($vars['class'])) { - $class = "{$vars['class']} popup_calendar"; -} else { - $class = 'popup_calendar'; -} - -if ($vars['value'] > 86400) { - //$val = date("F j, Y", $vars['value']); - $val = date('n/d/Y', $vars['value']); -} else { - $val = $vars['value']; -} - -?> -<input type="text" name="<?php echo $vars['name']; ?>" value="<?php echo $val; ?>" /> -<?php //@todo JS 1.8: no ?> -<script type="text/javascript"> - $(document).ready(function() { - $('input[type=text][name=<?php echo $cal_name; ?>]').datepicker(); - }); -</script> +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 |