Added default placeholders for most inputs -- tried to make code more consistent. Still needs documentation

22 files changed, 87 insertions, 46 deletions

diff --git a/views/default/input/color.php b/views/default/input/color.php
index fa8dc7497..f67212d47 100644
--- a/views/default/input/color.php
+++ b/views/default/input/color.php
@@ -1,9 +1,11 @@
 <?php

 

+$defaults = array(

+	'placeholder' => elgg_echo('placeholder:color'),

+);

+

 $overrides = array(

 	'type' => 'color',

 );

 

-$args = array_merge($vars, $overrides);

-

-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/date.php b/views/default/input/date.php
index 7e35c7beb..8987d3e4a 100644
--- a/views/default/input/date.php
+++ b/views/default/input/date.php
@@ -1,6 +1,6 @@
 <?php

 $defaults = array(

-	'placeholder' => 'yyyy-mm-dd',

+	'placeholder' => elgg_echo('placeholder:date'), //'yyyy-mm-dd',

 );

 

 $overrides = array(

diff --git a/views/default/input/datetime-local.php b/views/default/input/datetime-local.php
index 14bcac633..af5573120 100644
--- a/views/default/input/datetime-local.php
+++ b/views/default/input/datetime-local.php
@@ -1,6 +1,6 @@
 <?php

 $defaults = array(

-	'placeholder' => 'yyyy-mm-ddThh:mm:ss',

+	'placeholder' => elgg_echo('placeholder:datetime-local'), //'yyyy-mm-ddThh:mm:ss',

 );

 

 $overrides = array(

diff --git a/views/default/input/datetime.php b/views/default/input/datetime.php
index 3a5f39bcb..a9b2fe418 100644
--- a/views/default/input/datetime.php
+++ b/views/default/input/datetime.php
@@ -1,6 +1,6 @@
 <?php

 $defaults = array(

-	'placeholder' => 'yyyy-mm-ddThh:mm:ss+hh:mm',

+	'placeholder' => elgg_echo('placeholder:datetime'), //'yyyy-mm-ddThh:mm:ss+hh:mm',

 );

 

 $overrides = array(

diff --git a/views/default/input/email.php b/views/default/input/email.php
index 2b1dcfe7b..e6d05be67 100644
--- a/views/default/input/email.php
+++ b/views/default/input/email.php
@@ -1,9 +1,12 @@
 <?php

+$defaults = array(

+	'placeholder' => elgg_echo('placeholder:email'),

+);

 

 $overrides = array(

 	'type' => 'email',

 );

 

-$args = array_merge($vars, $overrides);

+$args = array_merge($defaults, $vars, $overrides);

 

 echo elgg_view('input/default', $args);
\ No newline at end of file
diff --git a/views/default/input/file.php b/views/default/input/file.php
index 4fdc24947..a90eed945 100644
--- a/views/default/input/file.php
+++ b/views/default/input/file.php
@@ -1,10 +1,11 @@
 <?php

 

+$defaults = array(

+

+);

+

 $overrides = array(

 	'type' => 'file',

-	'value' => FALSE,

 );

 

-$args = array_merge($vars, $overrides);

-

-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/hidden.php b/views/default/input/hidden.php
index 422d6449a..0cc5c6db4 100644
--- a/views/default/input/hidden.php
+++ b/views/default/input/hidden.php
@@ -1,9 +1,11 @@
 <?php

 

+$defaults = array(

+

+);

+

 $overrides = array(

 	'type' => 'hidden',

 );

 

-$args = array_merge($vars, $overrides);

-

-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/image.php b/views/default/input/image.php
index 8b0a6728d..bf0a4de81 100644
--- a/views/default/input/image.php
+++ b/views/default/input/image.php
@@ -1,9 +1,11 @@
 <?php

 

+$defaults = array(

+

+);

+

 $overrides = array(

 	'type' => 'image',

 );

 

-$args = array_merge($vars, $overrides);

-

-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 01ecae384..b00db0309 100644
--- a/views/default/input/month.php
+++ b/views/default/input/month.php
@@ -1,6 +1,6 @@
 <?php

 $defaults = array(

-	'placeholder' => 'yyyy-mm',

+	'placeholder' => elgg_echo('placeholder:month'),

 );

 

 $overrides = array(

diff --git a/views/default/input/number.php b/views/default/input/number.php
index 0944f8034..e996e4e96 100644
--- a/views/default/input/number.php
+++ b/views/default/input/number.php
@@ -1,9 +1,11 @@
 <?php

 

+$defaults = array(

+

+);

+

 $overrides = array(

 	'type' => 'number',

 );

 

-$args = array_merge($vars, $overrides);

-

-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/option.php b/views/default/input/option.php
index eab1dc4d2..2955f1cb9 100644
--- a/views/default/input/option.php
+++ b/views/default/input/option.php
@@ -1,10 +1,14 @@
 <?php
 
+$defaults = array(
+
+);
+
 $overrides = array(
 	'tag' => 'option',
 );
 
-$args = array_merge($vars, $overrides);
+$args = array_merge($defaults, $vars, $overrides);
 
 if (!isset($args['body'])) {
 	$args['body'] = $args['value'];
diff --git a/views/default/input/password.php b/views/default/input/password.php
index 21ed2bea0..22374c8d9 100644
--- a/views/default/input/password.php
+++ b/views/default/input/password.php
@@ -1,9 +1,11 @@
 <?php

 

+$defaults = array(

+	'placeholder' => elgg_echo('placeholder:password'),

+);

+

 $overrides = array(

 	'type' => 'password',

 );

 

-$args = array_merge($vars, $overrides);

-

-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/range.php b/views/default/input/range.php
index 3c93d49c2..48965f662 100644
--- a/views/default/input/range.php
+++ b/views/default/input/range.php
@@ -1,9 +1,11 @@
 <?php

 

+$defaults = array(

+

+);

+

 $overrides = array(

 	'type' => 'range',

 );

 

-$args = array_merge($vars, $overrides);

-

-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/reset.php b/views/default/input/reset.php
index eb92982c6..023a6d7b6 100644
--- a/views/default/input/reset.php
+++ b/views/default/input/reset.php
@@ -1,9 +1,11 @@
 <?php

 

+$defaults = array(

+	'value' => elgg_echo('reset'),

+);

+

 $overrides = array(

 	'type' => 'reset',

 );

 

-$args = array_merge($vars, $overrides);

-

-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/search.php b/views/default/input/search.php
index 33fa4d4ff..65c252bfc 100644
--- a/views/default/input/search.php
+++ b/views/default/input/search.php
@@ -1,9 +1,11 @@
 <?php

 

+$defaults = array(

+	'placeholder' => elgg_echo('placeholder:search'),

+)

+

 $overrides = array(

 	'type' => 'search',

 );

 

-$args = array_merge($vars, $overrides);

-

-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/submit.php b/views/default/input/submit.php
index 32ffb8087..741062ede 100644
--- a/views/default/input/submit.php
+++ b/views/default/input/submit.php
@@ -1,5 +1,9 @@
 <?php

 

+$defaults = array(

+	'value' => elgg_echo('submit'),

+);

+

 $overrides = array(

 	'type' => 'submit',

 );

diff --git a/views/default/input/tags.php b/views/default/input/tags.php
index 92e163e5e..952134db0 100644
--- a/views/default/input/tags.php
+++ b/views/default/input/tags.php
@@ -19,6 +19,7 @@
 
 $defaults = array(
 	'class' => 'input-tags',
+	'placeholder' => elgg_echo('placeholder:tags'),
 );
 
 if (isset($vars['value']) && is_array($vars['value'])) {
diff --git a/views/default/input/tel.php b/views/default/input/tel.php
index 973bb9311..174b4967d 100644
--- a/views/default/input/tel.php
+++ b/views/default/input/tel.php
@@ -1,9 +1,11 @@
 <?php

 

+$defaults = array(

+	'placeholder' => elgg_echo('placeholder:tel'),

+);

+

 $overrides = array(

 	'type' => 'tel',

 );

 

-$args = array_merge($vars, $overrides);

-

-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/text.php b/views/default/input/text.php
index b952108f4..77e66625c 100644
--- a/views/default/input/text.php
+++ b/views/default/input/text.php
@@ -1,9 +1,11 @@
 <?php

 

+$defaults = array(

+	'placeholder' => elgg_echo('placeholder:text'),

+);

+

 $overrides = array(

 	'type' => 'text',

 );

 

-$args = array_merge($vars, $overrides);

-

-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/time.php b/views/default/input/time.php
index c6b1c458b..f0ba3d169 100644
--- a/views/default/input/time.php
+++ b/views/default/input/time.php
@@ -1,9 +1,11 @@
 <?php

 

+$defaults = array(

+	'placeholder' => elgg_echo('placeholder:time'),

+);

+

 $overrides = array(

 	'type' => 'time',

 );

 

-$args = array_merge($vars, $overrides);

-

-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/url.php b/views/default/input/url.php
index 5068da207..0d3bf0273 100644
--- a/views/default/input/url.php
+++ b/views/default/input/url.php
@@ -1,5 +1,9 @@
 <?php

 

+$defaults = array(

+	'placeholder' => elgg_echo('placeholder:url'),

+);

+

 $overrides = array(

 	'type' => 'url',

 );

diff --git a/views/default/input/week.php b/views/default/input/week.php
index d34758eca..3e025e345 100644
--- a/views/default/input/week.php
+++ b/views/default/input/week.php
@@ -1,9 +1,11 @@
 <?php

 

+$defauts = array(

+	'placeholder' => elgg_echo('placeholder:week'),

+);

+

 $overrides = array(

 	'type' => 'week',

 );

 

-$args = array_merge($vars, $overrides);

-

-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