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

diff --git a/languages/en.php b/languages/en.php
new file mode 100644 (file)
index 0000000..e810da8
--- /dev/null
+++ b/languages/en.php
@@ -0,0 +1,19 @@
+<?php
+$english = array(
+       'placeholder:date' => '',
+       'placeholder:color' => '',
+       'placeholder:datetime-local' => '',
+       'placeholder:datetime' => '',
+       'placeholder:email' => '',
+       'placeholder:month' => '',
+       'placeholder:number' => '',
+       'placeholder:password' => '',
+       'placeholder:search' => '',
+       'placeholder:tags' => '',
+       'placeholder:tel' => '',
+       'placeholder:time' => '',
+       'placeholder:url' => '',
+       'placeholder:week' => '',
+);
+
+add_translation('en', $english);
\ No newline at end of file

diff --git a/views/default/input/color.php b/views/default/input/color.php
index fa8dc749784d42bf21ce68414f8ca81b1b39b075..f67212d471c099bd9a26408b47e906fad08d26cc 100644 (file)
--- a/views/default/input/color.php
+++ b/views/default/input/color.php
@@ -1,9 +1,11 @@
 <?php\r
 \r
+$defaults = array(\r
+       'placeholder' => elgg_echo('placeholder:color'),\r
+);\r
+\r
 $overrides = array(\r
        'type' => 'color',\r
 );\r
 \r
-$args = array_merge($vars, $overrides);\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/date.php b/views/default/input/date.php
index 7e35c7beb9c686d19cd5cc5ff1330ea0d4ade2e5..8987d3e4a6226ebe06cdc82582dea2b8ed362c2a 100644 (file)
--- a/views/default/input/date.php
+++ b/views/default/input/date.php
@@ -1,6 +1,6 @@
 <?php\r
 $defaults = array(\r
-       'placeholder' => 'yyyy-mm-dd',\r
+       'placeholder' => elgg_echo('placeholder:date'), //'yyyy-mm-dd',\r
 );\r
 \r
 $overrides = array(\r

diff --git a/views/default/input/datetime-local.php b/views/default/input/datetime-local.php
index 14bcac63336290a3c1687acf573861e7d7d385c5..af5573120cf890bbedb79973768360a6b86acea9 100644 (file)
--- a/views/default/input/datetime-local.php
+++ b/views/default/input/datetime-local.php
@@ -1,6 +1,6 @@
 <?php\r
 $defaults = array(\r
-       'placeholder' => 'yyyy-mm-ddThh:mm:ss',\r
+       'placeholder' => elgg_echo('placeholder:datetime-local'), //'yyyy-mm-ddThh:mm:ss',\r
 );\r
 \r
 $overrides = array(\r

diff --git a/views/default/input/datetime.php b/views/default/input/datetime.php
index 3a5f39bcbdf45f38282fb0da759bc78ba979c53e..a9b2fe418da22235a3017c7e84bf4618aef437de 100644 (file)
--- a/views/default/input/datetime.php
+++ b/views/default/input/datetime.php
@@ -1,6 +1,6 @@
 <?php\r
 $defaults = array(\r
-       'placeholder' => 'yyyy-mm-ddThh:mm:ss+hh:mm',\r
+       'placeholder' => elgg_echo('placeholder:datetime'), //'yyyy-mm-ddThh:mm:ss+hh:mm',\r
 );\r
 \r
 $overrides = array(\r

diff --git a/views/default/input/email.php b/views/default/input/email.php
index 2b1dcfe7bf2549124ecbe8d4bd76b318fba0815b..e6d05be672fa85f24accb23459b2addee27677e3 100644 (file)
--- a/views/default/input/email.php
+++ b/views/default/input/email.php
@@ -1,9 +1,12 @@
 <?php\r
+$defaults = array(\r
+       'placeholder' => elgg_echo('placeholder:email'),\r
+);\r
 \r
 $overrides = array(\r
        'type' => 'email',\r
 );\r
 \r
-$args = array_merge($vars, $overrides);\r
+$args = array_merge($defaults, $vars, $overrides);\r
 \r
 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 4fdc249476e38031c2d7766b1d4891e52843cebe..a90eed9455569a4f99cc4f9823434292ae07e551 100644 (file)
--- a/views/default/input/file.php
+++ b/views/default/input/file.php
@@ -1,10 +1,11 @@
 <?php\r
 \r
+$defaults = array(\r
+\r
+);\r
+\r
 $overrides = array(\r
        'type' => 'file',\r
-       'value' => FALSE,\r
 );\r
 \r
-$args = array_merge($vars, $overrides);\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/hidden.php b/views/default/input/hidden.php
index 422d6449a0862234095bcbcb3cbd8dacb41675a9..0cc5c6db4924d648fa8ee5f431ac4bbd45d1719e 100644 (file)
--- a/views/default/input/hidden.php
+++ b/views/default/input/hidden.php
@@ -1,9 +1,11 @@
 <?php\r
 \r
+$defaults = array(\r
+\r
+);\r
+\r
 $overrides = array(\r
        'type' => 'hidden',\r
 );\r
 \r
-$args = array_merge($vars, $overrides);\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/image.php b/views/default/input/image.php
index 8b0a6728d7eb7e8b770961181b8aadccfbe86b83..bf0a4de819c37a5dfe17900861a1c16df1c37c20 100644 (file)
--- a/views/default/input/image.php
+++ b/views/default/input/image.php
@@ -1,9 +1,11 @@
 <?php\r
 \r
+$defaults = array(\r
+\r
+);\r
+\r
 $overrides = array(\r
        'type' => 'image',\r
 );\r
 \r
-$args = array_merge($vars, $overrides);\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 01ecae384d512d6384f941fb5787f8ce59f1fafb..b00db0309df2f04534a6f8c3809e52f74e0d4c82 100644 (file)
--- a/views/default/input/month.php
+++ b/views/default/input/month.php
@@ -1,6 +1,6 @@
 <?php\r
 $defaults = array(\r
-       'placeholder' => 'yyyy-mm',\r
+       'placeholder' => elgg_echo('placeholder:month'),\r
 );\r
 \r
 $overrides = array(\r

diff --git a/views/default/input/number.php b/views/default/input/number.php
index 0944f803498f46151c53fe853055c6bc9b450c5f..e996e4e9634a3c5ebc034468406d044f795ee91e 100644 (file)
--- a/views/default/input/number.php
+++ b/views/default/input/number.php
@@ -1,9 +1,11 @@
 <?php\r
 \r
+$defaults = array(\r
+\r
+);\r
+\r
 $overrides = array(\r
        'type' => 'number',\r
 );\r
 \r
-$args = array_merge($vars, $overrides);\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/option.php b/views/default/input/option.php
index eab1dc4d29078eb2a9734778cf39496cbc98ad07..2955f1cb95b87d8c46204ba72e16561a3420b6d5 100644 (file)
--- 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 21ed2bea030ea658b16b4c8359ec1a8fc0968ca8..22374c8d9d341d47da5fcc4012194c542dd14249 100644 (file)
--- a/views/default/input/password.php
+++ b/views/default/input/password.php
@@ -1,9 +1,11 @@
 <?php\r
 \r
+$defaults = array(\r
+       'placeholder' => elgg_echo('placeholder:password'),\r
+);\r
+\r
 $overrides = array(\r
        'type' => 'password',\r
 );\r
 \r
-$args = array_merge($vars, $overrides);\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/range.php b/views/default/input/range.php
index 3c93d49c20dff851fe99b5956ec94157d3403e1d..48965f662eb4a03b6c03155c6c6854ef203f2b77 100644 (file)
--- a/views/default/input/range.php
+++ b/views/default/input/range.php
@@ -1,9 +1,11 @@
 <?php\r
 \r
+$defaults = array(\r
+\r
+);\r
+\r
 $overrides = array(\r
        'type' => 'range',\r
 );\r
 \r
-$args = array_merge($vars, $overrides);\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/reset.php b/views/default/input/reset.php
index eb92982c6c0e13210c8f440589a547426762459d..023a6d7b62a88f83aea19f857dbdfda7da649d7a 100644 (file)
--- a/views/default/input/reset.php
+++ b/views/default/input/reset.php
@@ -1,9 +1,11 @@
 <?php\r
 \r
+$defaults = array(\r
+       'value' => elgg_echo('reset'),\r
+);\r
+\r
 $overrides = array(\r
        'type' => 'reset',\r
 );\r
 \r
-$args = array_merge($vars, $overrides);\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/search.php b/views/default/input/search.php
index 33fa4d4ffdb9f227e34bdd49a5e7875634d8b178..65c252bfc25a4faf3f9ab96ea9a2664095f3c6a5 100644 (file)
--- a/views/default/input/search.php
+++ b/views/default/input/search.php
@@ -1,9 +1,11 @@
 <?php\r
 \r
+$defaults = array(\r
+       'placeholder' => elgg_echo('placeholder:search'),\r
+)\r
+\r
 $overrides = array(\r
        'type' => 'search',\r
 );\r
 \r
-$args = array_merge($vars, $overrides);\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/submit.php b/views/default/input/submit.php
index 32ffb808731731fff5e83dd68d022f11ec73c24d..741062edee2aa9aed3bd2d06747a63bfcd652983 100644 (file)
--- a/views/default/input/submit.php
+++ b/views/default/input/submit.php
@@ -1,5 +1,9 @@
 <?php\r
 \r
+$defaults = array(\r
+       'value' => elgg_echo('submit'),\r
+);\r
+\r
 $overrides = array(\r
        'type' => 'submit',\r
 );\r

diff --git a/views/default/input/tags.php b/views/default/input/tags.php
index 92e163e5edea6a4c10af06ef5425b2bbe7af0610..952134db036f909800e95eec8ab404aae2c9d097 100644 (file)
--- 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 973bb93114c8958f37c5a402216fc2160c174f86..174b4967dba50cefb243d73b5f90804051da5074 100644 (file)
--- a/views/default/input/tel.php
+++ b/views/default/input/tel.php
@@ -1,9 +1,11 @@
 <?php\r
 \r
+$defaults = array(\r
+       'placeholder' => elgg_echo('placeholder:tel'),\r
+);\r
+\r
 $overrides = array(\r
        'type' => 'tel',\r
 );\r
 \r
-$args = array_merge($vars, $overrides);\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/text.php b/views/default/input/text.php
index b952108f4fe1740e41f6647294db4102c6646eab..77e66625cdf5e13e5e3525ce34b20ffcf0483bf3 100644 (file)
--- a/views/default/input/text.php
+++ b/views/default/input/text.php
@@ -1,9 +1,11 @@
 <?php\r
 \r
+$defaults = array(\r
+       'placeholder' => elgg_echo('placeholder:text'),\r
+);\r
+\r
 $overrides = array(\r
        'type' => 'text',\r
 );\r
 \r
-$args = array_merge($vars, $overrides);\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/time.php b/views/default/input/time.php
index c6b1c458b3a8d5a6d4ab93dae8292601266e6f27..f0ba3d1691a159a8f963061586bb991e99079412 100644 (file)
--- a/views/default/input/time.php
+++ b/views/default/input/time.php
@@ -1,9 +1,11 @@
 <?php\r
 \r
+$defaults = array(\r
+       'placeholder' => elgg_echo('placeholder:time'),\r
+);\r
+\r
 $overrides = array(\r
        'type' => 'time',\r
 );\r
 \r
-$args = array_merge($vars, $overrides);\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/url.php b/views/default/input/url.php
index 5068da207ac198c9817d2fccfdf6471ab39ce4f4..0d3bf0273b59654f2e6bcf41eceb8edbae0b0751 100644 (file)
--- a/views/default/input/url.php
+++ b/views/default/input/url.php
@@ -1,5 +1,9 @@
 <?php\r
 \r
+$defaults = array(\r
+       'placeholder' => elgg_echo('placeholder:url'),\r
+);\r
+\r
 $overrides = array(\r
        'type' => 'url',\r
 );\r

diff --git a/views/default/input/week.php b/views/default/input/week.php
index d34758eca17b84c5dd1343b9cca88691a0a67bbb..3e025e345a8c3cc516657c1098a71adb72e8e0cb 100644 (file)
--- a/views/default/input/week.php
+++ b/views/default/input/week.php
@@ -1,9 +1,11 @@
 <?php\r
 \r
+$defauts = array(\r
+       'placeholder' => elgg_echo('placeholder:week'),\r
+);\r
+\r
 $overrides = array(\r
        'type' => 'week',\r
 );\r
 \r
-$args = array_merge($vars, $overrides);\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