aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-26 15:48:28 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-26 15:48:28 +0000
commit31c5b57b92b2b2442527cc601eab113e047b0e93 (patch)
tree7cae2e88ab91dde44dce8fbdaded4e1e977b0cf8 /views/default
parent6bb9e16e357eb718e954255b59681d519cda57ae (diff)
downloadelgg-31c5b57b92b2b2442527cc601eab113e047b0e93.tar.gz
elgg-31c5b57b92b2b2442527cc601eab113e047b0e93.tar.bz2
Unified user settings form
git-svn-id: https://code.elgg.org/elgg/trunk@1149 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default')
-rw-r--r--views/default/notifications/settings/usersettings.php11
-rw-r--r--views/default/user/settings/email.php10
-rw-r--r--views/default/user/settings/language.php10
-rw-r--r--views/default/user/settings/name.php10
-rw-r--r--views/default/user/settings/password.php10
-rw-r--r--views/default/usersettings/form.php12
6 files changed, 13 insertions, 50 deletions
diff --git a/views/default/notifications/settings/usersettings.php b/views/default/notifications/settings/usersettings.php
index 71c12fdc5..af7c6cf54 100644
--- a/views/default/notifications/settings/usersettings.php
+++ b/views/default/notifications/settings/usersettings.php
@@ -13,7 +13,6 @@
global $NOTIFICATION_HANDLERS;
$notification_settings = get_user_notification_settings();
?>
-<form action="<?php echo $vars['url']; ?>action/notifications/settings/usersettings/save" method="post">
<h2><?php echo elgg_echo('notifications:usersettings'); ?></h2>
<p><?php echo elgg_echo('notifications:methods'); ?>
@@ -35,12 +34,4 @@
<?php
}
?>
- </table>
- <p>
- <input type="submit" value="<?php
-
- echo elgg_echo('save');
-
- ?>" />
- </p>
-</form> \ No newline at end of file
+ </table> \ No newline at end of file
diff --git a/views/default/user/settings/email.php b/views/default/user/settings/email.php
index fdd509cba..24fcc7a0d 100644
--- a/views/default/user/settings/email.php
+++ b/views/default/user/settings/email.php
@@ -15,18 +15,8 @@
if ($user) {
?>
<h2><?php echo elgg_echo('email:settings'); ?></h2>
- <form action="<?php echo $vars['url']; ?>action/email/save" method="post">
<p>
<?php echo elgg_echo('email:address:label'); ?> : <input type="text" name="email" value="<?php echo $user->email; ?>" />
</p>
-
- <p>
- <input type="submit" value="<?php
-
- echo elgg_echo('save');
-
- ?>" />
- </p>
- </form>
<?php } ?> \ No newline at end of file
diff --git a/views/default/user/settings/language.php b/views/default/user/settings/language.php
index 476f21924..dcc20e8ef 100644
--- a/views/default/user/settings/language.php
+++ b/views/default/user/settings/language.php
@@ -16,7 +16,6 @@
if ($user) {
?>
<h2><?php echo elgg_echo('user:set:language'); ?></h2>
- <form action="<?php echo $vars['url']; ?>action/user/language" method="post">
<p>
<?php echo elgg_echo('user:language:label'); ?> : <input type="text" name="language" value="<?php
if ($user->language)
@@ -25,14 +24,5 @@
echo $CONFIG->language;
?>" />
</p>
-
- <p>
- <input type="submit" value="<?php
-
- echo elgg_echo('save');
-
- ?>" />
- </p>
- </form>
<?php } ?> \ No newline at end of file
diff --git a/views/default/user/settings/name.php b/views/default/user/settings/name.php
index 3525dc958..da0ded99a 100644
--- a/views/default/user/settings/name.php
+++ b/views/default/user/settings/name.php
@@ -15,18 +15,8 @@
if ($user) {
?>
<h2><?php echo elgg_echo('user:set:name'); ?></h2>
- <form action="<?php echo $vars['url']; ?>action/user/name" method="post">
<p>
<?php echo elgg_echo('user:name:label'); ?> : <input type="text" name="name" value="<?php echo $user->name; ?>" />
</p>
-
- <p>
- <input type="submit" value="<?php
-
- echo elgg_echo('save');
-
- ?>" />
- </p>
- </form>
<?php } ?> \ No newline at end of file
diff --git a/views/default/user/settings/password.php b/views/default/user/settings/password.php
index 27b48e63d..b40a131e6 100644
--- a/views/default/user/settings/password.php
+++ b/views/default/user/settings/password.php
@@ -15,19 +15,9 @@
if ($user) {
?>
<h2><?php echo elgg_echo('user:set:password'); ?></h2>
- <form action="<?php echo $vars['url']; ?>action/user/password" method="post">
<p>
<?php echo elgg_echo('user:password:label'); ?> : <input type="password" name="password" value="" />
<?php echo elgg_echo('user:password2:label'); ?> : <input type="password" name="password2" value="" />
</p>
-
- <p>
- <input type="submit" value="<?php
-
- echo elgg_echo('save');
-
- ?>" />
- </p>
- </form>
<?php } ?> \ No newline at end of file
diff --git a/views/default/usersettings/form.php b/views/default/usersettings/form.php
new file mode 100644
index 000000000..c6f2f4968
--- /dev/null
+++ b/views/default/usersettings/form.php
@@ -0,0 +1,12 @@
+<form action="<?php echo $vars['url']; ?>action/usersettings/save" method="post" >
+<?php
+
+ echo elgg_view("usersettings/user");
+
+?>
+
+ <p>
+ <input type="submit" value="<?php echo elgg_echo('save'); ?>" />
+ </p>
+
+</form> \ No newline at end of file