Updated to new directory structure

diff --git a/views/default/html/form.php b/views/default/html/form.php
new file mode 100644 (file)
index 0000000..b93c620
--- /dev/null
+++ b/views/default/html/form.php
@@ -0,0 +1,11 @@
+<?php
+$defaults = array(
+       'method' => 'POST',
+       'body' => '',
+);
+
+$overrides = array(
+       'tag' => 'form',
+);
+
+echo elgg_view('html/tag', array_merge($defaults, $vars, $overrides));
\ No newline at end of file

diff --git a/views/default/html/input.php b/views/default/html/input.php
new file mode 100644 (file)
index 0000000..7350ae3
--- /dev/null
+++ b/views/default/html/input.php
@@ -0,0 +1,12 @@
+<?php
+$defaults = array(
+       'type' => 'text',
+);
+
+$overrides = array(
+       'tag' => 'input',
+);
+
+$args = array_merge($defaults, $vars, $overrides);
+
+echo elgg_view('html/tag', $args);
\ No newline at end of file

diff --git a/views/default/html/option.php b/views/default/html/option.php
new file mode 100644 (file)
index 0000000..b3d9bbc
--- /dev/null
+++ b/views/default/html/option.php
@@ -0,0 +1 @@
+<?php

diff --git a/views/default/html/tag.php b/views/default/html/tag.php
index c8a49dd61905c3d36259f241d4f337d6c93aef12..b4875d9530c1e2935322142919ba387af9fd1d71 100644 (file)
--- a/views/default/html/tag.php
+++ b/views/default/html/tag.php
@@ -12,17 +12,20 @@ foreach ($_SESSION as $key=>$value) {
 
 // backwards compatibility code
 if (isset($vars['internalname'])) {
+       //@todo put deprecated notice
        $vars['name'] = $vars['internalname'];
        unset($vars['internalname']);
 }
 
 if (isset($vars['internalid'])) {
+       //@todo put deprecated notice
        $vars['id'] = $vars['internalid'];
        unset($vars['internalid']);
 }
 
 $js = '';
 if (isset($vars['js'])) {
+       //@todo put deprecated notice
        $js = $vars['js'];
        unset($vars['js']);
 }

diff --git a/views/default/html/textarea.php b/views/default/html/textarea.php
new file mode 100644 (file)
index 0000000..0c38132
--- /dev/null
+++ b/views/default/html/textarea.php
@@ -0,0 +1,16 @@
+<?php
+$defaults = array(
+       'body' => '',
+       'class' => 'input-textarea',
+);
+
+$overrides = array(
+       'tag' => 'textarea',
+);
+
+if (isset($vars['value'])) {
+       $vars['body'] = $vars['value'];
+       unset($vars['value']);
+}
+
+echo elgg_view('html/tag', array_merge($defaults, $vars, $overrides));
\ No newline at end of file

diff --git a/views/default/input/button.php b/views/default/input/button.php
index 6fc1fb76235f354f8c8a343bb63de8852da45ff7..bda1d7bb3bc71910c6a0e61d380cbf0d32b135e5 100644 (file)
--- a/views/default/input/button.php
+++ b/views/default/input/button.php
@@ -6,4 +6,4 @@ $overrides = array(
 \r
 $args = array_merge($vars, $overrides);\r
 \r
-echo elgg_view('input/default', $args);
\ No newline at end of file
+echo elgg_view('html/input', $args);
\ No newline at end of file

diff --git a/views/default/input/checkbox.php b/views/default/input/checkbox.php
index ff9a4b4335372d071119771332c839999cb5ae0a..c9a2c64985610fef736e2153e1c494e4dd497069 100644 (file)
--- a/views/default/input/checkbox.php
+++ b/views/default/input/checkbox.php
@@ -6,4 +6,4 @@ $overrides = array(
 \r
 $args = array_merge($vars, $overrides);\r
 \r
-echo elgg_view('input/default', $args);
\ No newline at end of file
+echo elgg_view('html/input', $args);
\ No newline at end of file

diff --git a/views/default/input/color.php b/views/default/input/color.php
index f67212d471c099bd9a26408b47e906fad08d26cc..07a364b50f204646c3ee8a0a1930097a134ac706 100644 (file)
--- a/views/default/input/color.php
+++ b/views/default/input/color.php
@@ -8,4 +8,4 @@ $overrides = array(
        'type' => 'color',\r
 );\r
 \r
-echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file
+echo elgg_view('html/input', 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 8987d3e4a6226ebe06cdc82582dea2b8ed362c2a..62014cb92d259df7ddb3c44e477767781bb83c36 100644 (file)
--- a/views/default/input/date.php
+++ b/views/default/input/date.php
@@ -11,4 +11,4 @@ if (isset($vars['value']) && is_int($vars['value'])) {
        $vars['value'] = date("Y-m-d", $vars['value']);\r
 }\r
 \r
-echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file
+echo elgg_view('html/input', array_merge($defaults, $vars, $overrides));
\ No newline at end of file

diff --git a/views/default/input/datetime-local.php b/views/default/input/datetime-local.php
index af5573120cf890bbedb79973768360a6b86acea9..c9f0b32f9cc8c882c79b237038ff15d9eb468658 100644 (file)
--- a/views/default/input/datetime-local.php
+++ b/views/default/input/datetime-local.php
@@ -11,4 +11,4 @@ if (isset($vars['value']) && is_int($vars['value'])) {
        $vars['value'] = date("Y-m-d\TH:i:s", $vars['value']);\r
 }\r
 \r
-echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file
+echo elgg_view('html/input', array_merge($defaults, $vars, $overrides));
\ No newline at end of file

diff --git a/views/default/input/datetime.php b/views/default/input/datetime.php
index a9b2fe418da22235a3017c7e84bf4618aef437de..7eecb62e8ea07957b43d90ae1d5e28e441649c37 100644 (file)
--- a/views/default/input/datetime.php
+++ b/views/default/input/datetime.php
@@ -11,4 +11,4 @@ if (isset($vars['value']) && is_int($vars['value'])) {
        $vars['value'] = date("c", $vars['value']);\r
 }\r
 \r
-echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file
+echo elgg_view('html/input', array_merge($defaults, $vars, $overrides));
\ No newline at end of file

diff --git a/views/default/input/default.php b/views/default/input/default.php
index 4f4eecc596324bc9084f9179534ee810c1db3b47..cf9f640973dde1fb0c6443f665fa1db7d464acd9 100644 (file)
--- a/views/default/input/default.php
+++ b/views/default/input/default.php
@@ -15,15 +15,5 @@
  * including javascript event attributes such as onclick.\r
  */\r
 \r
-// default attributes\r
-$defaults = array(\r
-       'type' => 'text',\r
-);\r
-\r
-$overrides = array(\r
-       'tag' => 'input',\r
-);\r
-\r
-$args = array_merge($defaults, $vars, $overrides);\r
-\r
-echo elgg_view('html/tag', $args);
\ No newline at end of file
+//@todo put deprecated notice\r
+echo elgg_view('html/input', $vars);
\ No newline at end of file

diff --git a/views/default/input/email.php b/views/default/input/email.php
index e6d05be672fa85f24accb23459b2addee27677e3..6d1bed19cfd76bfeebd537a6411dade91b8acd7c 100644 (file)
--- a/views/default/input/email.php
+++ b/views/default/input/email.php
@@ -9,4 +9,4 @@ $overrides = array(
 \r
 $args = array_merge($defaults, $vars, $overrides);\r
 \r
-echo elgg_view('input/default', $args);
\ No newline at end of file
+echo elgg_view('html/input', $args);
\ No newline at end of file

diff --git a/views/default/input/file.php b/views/default/input/file.php
index a90eed9455569a4f99cc4f9823434292ae07e551..ef7223a80346fecbfbedb0262488d256ca016225 100644 (file)
--- a/views/default/input/file.php
+++ b/views/default/input/file.php
@@ -8,4 +8,4 @@ $overrides = array(
        'type' => 'file',\r
 );\r
 \r
-echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file
+echo elgg_view('html/input', array_merge($defaults, $vars, $overrides));
\ No newline at end of file

diff --git a/views/default/input/form.php b/views/default/input/form.php
index e6b4f299eb774991dd59214f52f88a2b4dd11be7..c30dd5c9a2e5d49d9384e600180dd285221773ad 100644 (file)
--- a/views/default/input/form.php
+++ b/views/default/input/form.php
@@ -17,23 +17,10 @@
  *
  */
 
+if ($vars['disable_security'] != TRUE) {
+       $vars['body'] .= elgg_view('input/securitytoken');
+}
 
-$defaults = array(
-       'method' => 'POST',
-       'body' => '',
-);
-
-$overrides = array(
-       'tag' => 'form',
-);
-
-$disable_security = $vars['disable_security'];
 unset($vars['disable_security']);
 
-$args = array_merge($defaults, $vars, $overrides);
-
-if ($disable_security != TRUE) {
-       $args['body'] .= elgg_view('input/securitytoken');
-}
-
-echo elgg_view('html/tag', $args);
+echo elgg_view('html/form', $vars);

diff --git a/views/default/input/hidden.php b/views/default/input/hidden.php
index 0cc5c6db4924d648fa8ee5f431ac4bbd45d1719e..da1e9bd005e179f92ee895e633344aaa02be9fda 100644 (file)
--- a/views/default/input/hidden.php
+++ b/views/default/input/hidden.php
@@ -8,4 +8,4 @@ $overrides = array(
        'type' => 'hidden',\r
 );\r
 \r
-echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file
+echo elgg_view('html/input', 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 bf0a4de819c37a5dfe17900861a1c16df1c37c20..f1b07cb8e3c02b5ea947f6b4c0296bfd1ba7de03 100644 (file)
--- a/views/default/input/image.php
+++ b/views/default/input/image.php
@@ -8,4 +8,4 @@ $overrides = array(
        'type' => 'image',\r
 );\r
 \r
-echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file
+echo elgg_view('html/input', array_merge($defaults, $vars, $overrides));
\ No newline at end of file

diff --git a/views/default/input/longtext.php b/views/default/input/longtext.php
index a19c7dde8b1888ff0db487a2825558b4ffc2551c..6366f8a3da1aa3a13cc4b88596c97880f0a4d88a 100644 (file)
--- a/views/default/input/longtext.php
+++ b/views/default/input/longtext.php
@@ -15,19 +15,7 @@
  */
 
 $defaults = array(
-       'class' => 'input-textarea',
+       'class' => 'input-richtext',
 );
 
-$overrides = array(
-       'tag' => 'textarea',
-);
-
-$args = array_merge($defaults, $vars, $overrides);
-
-if (isset($args['value'])) {
-       $args['body'] = $args['value'];
-}
-
-$args['class'] = $args['class'].' input-richtext';
-
-echo elgg_view('html/tag', $args);
\ No newline at end of file
+echo elgg_view('html/textarea', array_merge($defaults, $vars));
\ No newline at end of file

diff --git a/views/default/input/month.php b/views/default/input/month.php
index b00db0309df2f04534a6f8c3809e52f74e0d4c82..071d4026219ab2ff38370e350fbe0889f51a1d2e 100644 (file)
--- a/views/default/input/month.php
+++ b/views/default/input/month.php
@@ -11,4 +11,4 @@ if (isset($vars['value']) && is_int($vars['value'])) {
        $vars['value'] = date("Y-m", $vars['value']);\r
 }\r
 \r
-echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file
+echo elgg_view('html/input', array_merge($defaults, $vars, $overrides));
\ No newline at end of file

diff --git a/views/default/input/number.php b/views/default/input/number.php
index e996e4e9634a3c5ebc034468406d044f795ee91e..fbd1bec7295c3a240abe6425b4abe4af556e4ede 100644 (file)
--- a/views/default/input/number.php
+++ b/views/default/input/number.php
@@ -8,4 +8,4 @@ $overrides = array(
        'type' => 'number',\r
 );\r
 \r
-echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file
+echo elgg_view('html/input', array_merge($defaults, $vars, $overrides));
\ No newline at end of file

diff --git a/views/default/input/password.php b/views/default/input/password.php
index 22374c8d9d341d47da5fcc4012194c542dd14249..609b39faa950f8a882386d02219a004f08b1e90b 100644 (file)
--- a/views/default/input/password.php
+++ b/views/default/input/password.php
@@ -8,4 +8,4 @@ $overrides = array(
        'type' => 'password',\r
 );\r
 \r
-echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file
+echo elgg_view('html/input', array_merge($defaults, $vars, $overrides));
\ No newline at end of file

diff --git a/views/default/input/plaintext.php b/views/default/input/plaintext.php
index 4c8cdac57fd972644c7558c587c2d3c27dc319ba..1d907dcfcce83b3e629f4c4a4e35bd8056eec1aa 100644 (file)
--- a/views/default/input/plaintext.php
+++ b/views/default/input/plaintext.php
@@ -3,16 +3,4 @@
  * 
  */
 
-$defaults = array(
-       'class' => 'input-textarea',
-);
-
-$overrides = array(
-       'tag' => 'textarea',
-);
-
-if (isset($vars['value'])) {
-       $vars['body'] = $value;
-}
-
-echo elgg_view('html/tag', array_merge($defaults, $vars, $overrides));
\ No newline at end of file
+echo elgg_view('html/textarea', $vars);
\ No newline at end of file

diff --git a/views/default/input/range.php b/views/default/input/range.php
index 48965f662eb4a03b6c03155c6c6854ef203f2b77..8fedf067a8b3a0c87d357baf1d7e861e8c7eab00 100644 (file)
--- a/views/default/input/range.php
+++ b/views/default/input/range.php
@@ -8,4 +8,4 @@ $overrides = array(
        'type' => 'range',\r
 );\r
 \r
-echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file
+echo elgg_view('html/input', 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 023a6d7b62a88f83aea19f857dbdfda7da649d7a..911c6671b9557ef329903625468a3bd375b2246d 100644 (file)
--- a/views/default/input/reset.php
+++ b/views/default/input/reset.php
@@ -8,4 +8,4 @@ $overrides = array(
        'type' => 'reset',\r
 );\r
 \r
-echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file
+echo elgg_view('html/input', 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 65c252bfc25a4faf3f9ab96ea9a2664095f3c6a5..457c45999c0a275c2cf28d3d27478c8d531f7711 100644 (file)
--- a/views/default/input/search.php
+++ b/views/default/input/search.php
@@ -2,10 +2,10 @@
 \r
 $defaults = array(\r
        'placeholder' => elgg_echo('placeholder:search'),\r
-)\r
+);\r
 \r
 $overrides = array(\r
        'type' => 'search',\r
 );\r
 \r
-echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file
+echo elgg_view('html/input', 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 741062edee2aa9aed3bd2d06747a63bfcd652983..a0cd1cfac5fca2188573bcd799b0edfb11508f8c 100644 (file)
--- a/views/default/input/submit.php
+++ b/views/default/input/submit.php
@@ -10,4 +10,4 @@ $overrides = array(
 \r
 $args = array_merge($vars, $overrides);\r
 \r
-echo elgg_view('input/default', $args);
\ No newline at end of file
+echo elgg_view('html/input', $args);
\ No newline at end of file

diff --git a/views/default/input/tel.php b/views/default/input/tel.php
index 174b4967dba50cefb243d73b5f90804051da5074..1bb146ce507b9d8b55e29f406689e60574ad173f 100644 (file)
--- a/views/default/input/tel.php
+++ b/views/default/input/tel.php
@@ -8,4 +8,4 @@ $overrides = array(
        'type' => 'tel',\r
 );\r
 \r
-echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file
+echo elgg_view('html/input', 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 77e66625cdf5e13e5e3525ce34b20ffcf0483bf3..0993d1f2bcbab36544557b783711916c80169d1e 100644 (file)
--- a/views/default/input/text.php
+++ b/views/default/input/text.php
@@ -8,4 +8,4 @@ $overrides = array(
        'type' => 'text',\r
 );\r
 \r
-echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file
+echo elgg_view('html/input', 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 f0ba3d1691a159a8f963061586bb991e99079412..3d714ccc1ffd1cb3f8dfedf9a298c571002db566 100644 (file)
--- a/views/default/input/time.php
+++ b/views/default/input/time.php
@@ -8,4 +8,4 @@ $overrides = array(
        'type' => 'time',\r
 );\r
 \r
-echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file
+echo elgg_view('html/input', 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 0d3bf0273b59654f2e6bcf41eceb8edbae0b0751..60d8820e7140afa38327315327678ce4827ae91c 100644 (file)
--- a/views/default/input/url.php
+++ b/views/default/input/url.php
@@ -10,4 +10,4 @@ $overrides = array(
 \r
 $args = array_merge($vars, $overrides);\r
 \r
-echo elgg_view('input/default', $args);
\ No newline at end of file
+echo elgg_view('html/input', $args);
\ No newline at end of file

diff --git a/views/default/input/week.php b/views/default/input/week.php
index 3e025e345a8c3cc516657c1098a71adb72e8e0cb..294811aee3c6eadb884ed0e28a435f64b6cc2a1a 100644 (file)
--- a/views/default/input/week.php
+++ b/views/default/input/week.php
@@ -8,4 +8,4 @@ $overrides = array(
        'type' => 'week',\r
 );\r
 \r
-echo elgg_view('input/default', array_merge($defaults, $vars, $overrides));
\ No newline at end of file
+echo elgg_view('html/input', array_merge($defaults, $vars, $overrides));
\ No newline at end of file