User settings

git-svn-id: https://code.elgg.org/elgg/trunk@1689 36083f99-b078-4883-b0ff-0f9b5a30f544

4 files changed, 23 insertions, 19 deletions

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