aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/default/notifications/settings/usersettings.php14
-rw-r--r--views/default/page_elements/elgg_topbar.php2
-rw-r--r--views/default/user/settings/email.php7
-rw-r--r--views/default/user/settings/language.php2
-rw-r--r--views/default/user/settings/name.php7
-rw-r--r--views/default/user/settings/password.php11
-rw-r--r--views/default/usersettings/form.php3
-rw-r--r--views/default/usersettings/statistics.php3
-rw-r--r--views/default/usersettings/statistics_opt/numentities.php24
-rw-r--r--views/default/usersettings/statistics_opt/online.php12
10 files changed, 56 insertions, 29 deletions
diff --git a/views/default/notifications/settings/usersettings.php b/views/default/notifications/settings/usersettings.php
index edbaf5584..2792ccd4a 100644
--- a/views/default/notifications/settings/usersettings.php
+++ b/views/default/notifications/settings/usersettings.php
@@ -26,9 +26,17 @@
<tr>
<td><?php echo $k; ?>: </td>
- <td>
- <input type="radio" name="method[<?php echo $k; ?>]" value="yes" <?php if ($notification_settings->$k) echo "checked=\"yes\" "; ?>/><?php echo elgg_echo("option:yes"); ?><br />
- <input type="radio" name="method[<?php echo $k; ?>]" value="no" <?php if (!$notification_settings->$k) echo "checked=\"yes\" "; ?>/><?php echo elgg_echo("option:no"); ?>
+ <td>
+<?php
+
+ if ($notification_settings->k) {
+ $val = "yes";
+ } else {
+ $val = "no";
+ }
+ echo elgg_view('input/radio',array('internalname' => "method[{$k}]", 'options' => array('yes','no'), 'value' => $val));
+
+?>
</td>
</tr>
<?php
diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php
index 7fb88c8ff..d830e7d76 100644
--- a/views/default/page_elements/elgg_topbar.php
+++ b/views/default/page_elements/elgg_topbar.php
@@ -45,7 +45,7 @@
echo elgg_view('elgg_topbar/extend', $vars);
?>
- <a href="<?php echo $vars['url']; ?>settings/" class="usersettings"><?php echo elgg_echo('settings'); ?></a>
+ <a href="<?php echo $vars['url']; ?>pg/settings/" class="usersettings"><?php echo elgg_echo('settings'); ?></a>
<?php
diff --git a/views/default/user/settings/email.php b/views/default/user/settings/email.php
index 24fcc7a0d..6b14504c7 100644
--- a/views/default/user/settings/email.php
+++ b/views/default/user/settings/email.php
@@ -16,7 +16,12 @@
?>
<h2><?php echo elgg_echo('email:settings'); ?></h2>
<p>
- <?php echo elgg_echo('email:address:label'); ?> : <input type="text" name="email" value="<?php echo $user->email; ?>" />
+ <?php echo elgg_echo('email:address:label'); ?>:
+ <?php
+
+ echo elgg_view('input/email',array('internalname' => 'email', 'value' => $user->email));
+
+ ?>
</p>
<?php } ?> \ No newline at end of file
diff --git a/views/default/user/settings/language.php b/views/default/user/settings/language.php
index 0d478ac95..0dbe66b26 100644
--- a/views/default/user/settings/language.php
+++ b/views/default/user/settings/language.php
@@ -18,7 +18,7 @@
<h2><?php echo elgg_echo('user:set:language'); ?></h2>
<p>
- <?php echo elgg_echo('user:language:label'); ?> : <?php
+ <?php echo elgg_echo('user:language:label'); ?>: <?php
$value = $CONFIG->language;
if ($user->language)
diff --git a/views/default/user/settings/name.php b/views/default/user/settings/name.php
index da0ded99a..0faac2428 100644
--- a/views/default/user/settings/name.php
+++ b/views/default/user/settings/name.php
@@ -16,7 +16,12 @@
?>
<h2><?php echo elgg_echo('user:set:name'); ?></h2>
<p>
- <?php echo elgg_echo('user:name:label'); ?> : <input type="text" name="name" value="<?php echo $user->name; ?>" />
+ <?php echo elgg_echo('user:name:label'); ?>:
+ <?php
+
+ echo elgg_view('input/text',array('internalname' => 'name', 'value' => $user->name));
+
+ ?>
</p>
<?php } ?> \ No newline at end of file
diff --git a/views/default/user/settings/password.php b/views/default/user/settings/password.php
index b40a131e6..b180609c6 100644
--- a/views/default/user/settings/password.php
+++ b/views/default/user/settings/password.php
@@ -14,10 +14,15 @@
if ($user) {
?>
- <h2><?php echo elgg_echo('user:set:password'); ?></h2>
+ <h3><?php echo elgg_echo('user:set:password'); ?></h3>
<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="" />
+ <?php echo elgg_echo('user:password:label'); ?>:
+ <?php
+ echo elgg_view('input/password',array('internalname' => 'password'));
+ ?><br />
+ <?php echo elgg_echo('user:password2:label'); ?>: <?php
+ echo elgg_view('input/password',array('internalname' => 'password2'));
+ ?>
</p>
<?php } ?> \ No newline at end of file
diff --git a/views/default/usersettings/form.php b/views/default/usersettings/form.php
index c6f2f4968..e245a0da1 100644
--- a/views/default/usersettings/form.php
+++ b/views/default/usersettings/form.php
@@ -1,9 +1,12 @@
<form action="<?php echo $vars['url']; ?>action/usersettings/save" method="post" >
+
+ <div class="settings_form">
<?php
echo elgg_view("usersettings/user");
?>
+ </div>
<p>
<input type="submit" value="<?php echo elgg_echo('save'); ?>" />
diff --git a/views/default/usersettings/statistics.php b/views/default/usersettings/statistics.php
index 8ab6712c6..a130e730e 100644
--- a/views/default/usersettings/statistics.php
+++ b/views/default/usersettings/statistics.php
@@ -10,7 +10,4 @@
* @link http://elgg.org/
*/
- global $CONFIG;
-
- echo "<p>" . autop(elgg_echo("usersettings:statistics:description")) . "</p>";
?> \ No newline at end of file
diff --git a/views/default/usersettings/statistics_opt/numentities.php b/views/default/usersettings/statistics_opt/numentities.php
index 4fe218048..c6d634f62 100644
--- a/views/default/usersettings/statistics_opt/numentities.php
+++ b/views/default/usersettings/statistics_opt/numentities.php
@@ -17,27 +17,31 @@
if ($entity_stats)
{
?>
-<div>
- <h2><?php echo elgg_echo('usersettings:statistics:label:numentities'); ?></h2>
+<div class="usersettings_statistics">
+ <h3><?php echo elgg_echo('usersettings:statistics:label:numentities'); ?></h3>
<table>
<?php
foreach ($entity_stats as $k => $entry)
{
- echo "<table>";
foreach ($entry as $a => $b)
{
- if ($a == "__base__")
- $a=$k;
- else
- $a = "$k $a";
+ if ($a == "__base__") {
+ $a = elgg_echo("item:{$k}");
+ if (empty($a))
+ $a = $k;
+ } else {
+ $a = elgg_echo("item:{$k}:{$a}");
+ if (empty($a)) {
+ $a = "$k $a";
+ }
+ }
echo <<< END
<tr>
- <td><b>$a :</b></td>
- <td>$b</td>
+ <td style="width: 250px"><b>{$a}:</b></td>
+ <td>{$b}</td>
</tr>
END;
}
- echo "</table>";
}
?>
</table>
diff --git a/views/default/usersettings/statistics_opt/online.php b/views/default/usersettings/statistics_opt/online.php
index 6a4cb9c1b..4f4a07015 100644
--- a/views/default/usersettings/statistics_opt/online.php
+++ b/views/default/usersettings/statistics_opt/online.php
@@ -18,13 +18,13 @@
$logged_in=$log[0]->time_created;
?>
-<div>
- <h2><?php echo elgg_echo('usersettings:statistics:yourdetails'); ?></h2>
+<div class="usersettings_statistics">
+ <h3><?php echo elgg_echo('usersettings:statistics:yourdetails'); ?></h3>
<table>
- <tr><td><?php echo elgg_echo('usersettings:statistics:label:name'); ?></td><td><?php echo $user->name; ?></td></tr>
- <tr><td><?php echo elgg_echo('usersettings:statistics:label:email'); ?></td><td><?php echo $user->email; ?></td></tr>
- <tr><td><?php echo elgg_echo('usersettings:statistics:label:membersince'); ?></td><td><?php echo date("r",$user->time_created); ?></td></tr>
- <tr><td><?php echo elgg_echo('usersettings:statistics:label:lastlogin'); ?></td><td><?php echo date("r",$logged_in); ?></td></tr>
+ <tr><td style="width: 250px"><?php echo elgg_echo('usersettings:statistics:label:name'); ?></td><td><?php echo $user->name; ?></td></tr>
+ <tr><td style="width: 250px"><?php echo elgg_echo('usersettings:statistics:label:email'); ?></td><td><?php echo $user->email; ?></td></tr>
+ <tr><td style="width: 250px"><?php echo elgg_echo('usersettings:statistics:label:membersince'); ?></td><td><?php echo date("r",$user->time_created); ?></td></tr>
+ <tr><td style="width: 250px"><?php echo elgg_echo('usersettings:statistics:label:lastlogin'); ?></td><td><?php echo date("r",$logged_in); ?></td></tr>
</table>
</div> \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-04 06:57:42 +0000