From 1b1908d4c05392d07b0a0af086a567cbc53606ba Mon Sep 17 00:00:00 2001 From: Evan Winslow Date: Thu, 19 May 2011 15:59:07 -0700 Subject: Cleaned up all the input views --- views/default/input/color.php | 13 ++++++++++++- views/default/input/datetime-local.php | 10 +++++++++- views/default/input/datetime.php | 11 ++++++++++- views/default/input/email.php | 13 ++++++++++++- views/default/input/image.php | 12 +++++++++++- views/default/input/month.php | 11 ++++++++++- views/default/input/number.php | 12 +++++++++++- views/default/input/range.php | 7 +++++-- views/default/input/search.php | 7 +++++-- views/default/input/tel.php | 7 +++++-- views/default/input/time.php | 7 +++++-- views/default/input/url.php | 7 +++++-- views/default/input/week.php | 9 ++++++--- 13 files changed, 106 insertions(+), 20 deletions(-) diff --git a/views/default/input/color.php b/views/default/input/color.php index 8bc4ad2a3..be8154fc9 100644 --- a/views/default/input/color.php +++ b/views/default/input/color.php @@ -1 +1,12 @@ - /> \ No newline at end of file + 'elgg-input-color', +); + +$vars = array_merge($defaults, $vars); + +$vars['type'] = 'color'; + +?> + + /> \ No newline at end of file diff --git a/views/default/input/datetime-local.php b/views/default/input/datetime-local.php index 52902f543..468843901 100644 --- a/views/default/input/datetime-local.php +++ b/views/default/input/datetime-local.php @@ -1,6 +1,14 @@ 'elgg-input-datetime-local', +); + +$vars = array_merge($defaults, $vars); + if (isset($vars['value']) && is_int($vars['value'])) { $vars['value'] = date("Y-m-d\TH:i:s", $vars['value']); } + +$vars['type'] = 'datetime-local'; ?> - /> \ No newline at end of file + /> \ No newline at end of file diff --git a/views/default/input/datetime.php b/views/default/input/datetime.php index 61262f234..69e4bd7f7 100644 --- a/views/default/input/datetime.php +++ b/views/default/input/datetime.php @@ -1,6 +1,15 @@ 'elgg-input-datetime', +); + +$vars = array_merge($defaults, $vars); + if (isset($vars['value']) && is_int($vars['value'])) { $vars['value'] = date("c", $vars['value']); } + +$vars['type'] = 'datetime'; + ?> - /> + /> diff --git a/views/default/input/email.php b/views/default/input/email.php index 15e36f145..de98d9c4f 100644 --- a/views/default/input/email.php +++ b/views/default/input/email.php @@ -1 +1,12 @@ - /> \ No newline at end of file + 'elgg-input-email', +); + +$vars = array_merge($defaults, $vars); + +$vars['type'] = 'email'; + +?> + + /> \ No newline at end of file diff --git a/views/default/input/image.php b/views/default/input/image.php index bb6a44045..cf740f782 100644 --- a/views/default/input/image.php +++ b/views/default/input/image.php @@ -1 +1,11 @@ - /> \ No newline at end of file + 'elgg-input-image', +); + +$vars = array_merge($defaults, $vars); + +$vars['type'] = 'image'; + +?> + /> \ No newline at end of file diff --git a/views/default/input/month.php b/views/default/input/month.php index 4eaf91048..c99b3f34c 100644 --- a/views/default/input/month.php +++ b/views/default/input/month.php @@ -1,7 +1,16 @@ 'elgg-input-month', +); + +$vars = array_merge($defaults, $vars); + if (isset($vars['value']) && is_int($vars['value'])) { $vars['value'] = date("Y-m", $vars['value']); } + +$vars['type'] = 'month'; + ?> - /> \ No newline at end of file + /> \ No newline at end of file diff --git a/views/default/input/number.php b/views/default/input/number.php index 908e9382e..ec4938734 100644 --- a/views/default/input/number.php +++ b/views/default/input/number.php @@ -1 +1,11 @@ - /> \ No newline at end of file + 'elgg-input-number', +); + +$vars = array_merge($defaults, $vars); + +$vars['type'] = 'number'; + +?> + /> \ No newline at end of file diff --git a/views/default/input/range.php b/views/default/input/range.php index 8d4d7f13d..235687257 100644 --- a/views/default/input/range.php +++ b/views/default/input/range.php @@ -1,10 +1,13 @@ 'elgg-input-range', ); $vars = array_merge($defaults, $vars); + +$vars['type'] = 'range'; + ?> - /> \ No newline at end of file + /> \ No newline at end of file diff --git a/views/default/input/search.php b/views/default/input/search.php index 29adba5fc..becf8a11b 100644 --- a/views/default/input/search.php +++ b/views/default/input/search.php @@ -1,10 +1,13 @@ elgg_echo('placeholder:search'), + 'class' => 'elgg-input-search', ); $vars = array_merge($defaults, $vars); + +$vars['type'] = 'search'; + ?> - /> \ No newline at end of file + /> \ No newline at end of file diff --git a/views/default/input/tel.php b/views/default/input/tel.php index 329554501..0704344a8 100644 --- a/views/default/input/tel.php +++ b/views/default/input/tel.php @@ -1,9 +1,12 @@ elgg_echo('placeholder:tel'), + 'class' => 'elgg-input-tel', ); $vars = array_merge($defaults, $vars); + +$vars['type'] = 'tel'; + ?> - /> \ No newline at end of file + /> \ No newline at end of file diff --git a/views/default/input/time.php b/views/default/input/time.php index 58c8b0928..6bb557266 100644 --- a/views/default/input/time.php +++ b/views/default/input/time.php @@ -1,10 +1,13 @@ elgg_echo('placeholder:time'), + 'class' => 'elgg-input-time', ); $vars = array_merge($defaults, $vars); + +$vars['type'] = 'time'; + ?> - /> \ No newline at end of file + /> \ No newline at end of file diff --git a/views/default/input/url.php b/views/default/input/url.php index d42d7c056..ed3cd08a2 100644 --- a/views/default/input/url.php +++ b/views/default/input/url.php @@ -1,10 +1,13 @@ elgg_echo('placeholder:url'), + 'class' => 'elgg-input-url', ); $vars = array_merge($defaults, $vars); + +$vars['type'] = 'url'; + ?> - /> \ No newline at end of file + /> \ No newline at end of file diff --git a/views/default/input/week.php b/views/default/input/week.php index 59cf5d7f1..3d09ba07f 100644 --- a/views/default/input/week.php +++ b/views/default/input/week.php @@ -1,10 +1,13 @@ elgg_echo('placeholder:week'), +$defaults = array( + 'class' => 'elgg-input-week', ); $vars = array_merge($defaults, $vars); + +$vars['type'] = 'week'; + ?> - /> \ No newline at end of file + /> \ No newline at end of file -- cgit v1.2.3