Fixes #4422 pulling in Ismayil's changes so that we use the module view for settings

2 files changed, 61 insertions, 50 deletions

diff --git a/views/default/core/settings/statistics/numentities.php b/views/default/core/settings/statistics/numentities.php
index 245fd67be..ce1705a2e 100644
--- a/views/default/core/settings/statistics/numentities.php
+++ b/views/default/core/settings/statistics/numentities.php
@@ -10,42 +10,35 @@
 $entity_stats = get_entity_statistics(elgg_get_logged_in_user_guid());
 
 if ($entity_stats) {
-?>
-<div class="elgg-module elgg-module-info">
-	<div class="elgg-head">
-		<h3><?php echo elgg_echo('usersettings:statistics:label:numentities'); ?></h3>
-	</div>
-	<div class="elgg-body">
-		<table class="elgg-table-alt">
-		<?php
-			foreach ($entity_stats as $k => $entry) {
-				foreach ($entry as $a => $b) {
+	$rows = '';
+	foreach ($entity_stats as $k => $entry) {
+		foreach ($entry as $a => $b) {
 
-					//This function controls the alternating class
-					$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
+			// This function controls the alternating class
+			$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
 
-					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 class="{$even_odd}">
-							<td class="column-one"><b>{$a}:</b></td>
-							<td>{$b}</td>
-						</tr>
-END;
+			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";
 				}
 			}
-		?>
-		</table>
-	</div>
-</div>
-<?php
-}
\ No newline at end of file
+			$rows .= <<< END
+				<tr class="{$even_odd}">
+					<td class="column-one"><b>{$a}:</b></td>
+					<td>{$b}</td>
+				</tr>
+END;
+		}
+	}
+
+	$title = elgg_echo('usersettings:statistics:label:numentities');
+	$content = "<table class=\"elgg-table-alt\">$rows</table>";
+
+	echo elgg_view_module('info', $title, $content);
+}
diff --git a/views/default/core/settings/statistics/online.php b/views/default/core/settings/statistics/online.php
index 65db42cb1..ce7ff35fb 100644
--- a/views/default/core/settings/statistics/online.php
+++ b/views/default/core/settings/statistics/online.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Elgg statistics screen showing online users.
+ * Statistics about this user.
  *
  * @package Elgg
  * @subpackage Core
@@ -15,17 +15,35 @@ if ($log) {
 	$logged_in = $log[0]->time_created;
 }
 
-?>
-<div class="elgg-module elgg-module-info">
-	<div class="elgg-head">
-		<h3><?php echo elgg_echo('usersettings:statistics:yourdetails'); ?></h3>
-	</div>
-	<div class="elgg-body">
-		<table class="elgg-table-alt">
-			<tr class="odd"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:name'); ?></td><td><?php echo $user->name; ?></td></tr>
-			<tr class="even"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:email'); ?></td><td><?php echo $user->email; ?></td></tr>
-			<tr class="odd"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:membersince'); ?></td><td><?php echo date("r",$user->time_created); ?></td></tr>
-			<tr class="even"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:lastlogin'); ?></td><td><?php echo date("r",$logged_in); ?></td></tr>
-		</table>
-	</div>
-</div>
\ No newline at end of file
+$label_name = elgg_echo('usersettings:statistics:label:name');
+$label_email = elgg_echo('usersettings:statistics:label:email');
+$label_member_since = elgg_echo('usersettings:statistics:label:membersince');
+$label_last_login = elgg_echo('usersettings:statistics:label:lastlogin');
+
+$time_created = date("r", $user->time_created);
+$last_login = date("r", $logged_in);
+
+$title = elgg_echo('usersettings:statistics:yourdetails');
+
+$content = <<<__HTML
+<table class="elgg-table-alt">
+	<tr class="odd">
+		<td class="column-one">$label_name</td>
+		<td>$user->name</td>
+	</tr>
+	<tr class="even">
+		<td class="column-one">$label_email</td>
+		<td>$user->email</td>
+	</tr>
+	<tr class="odd">
+		<td class="column-one">$label_member_since</td>
+		<td>$time_created</td>
+	</tr>
+	<tr class="even">
+		<td class="column-one">$label_last_login</td>
+		<td>$last_login</td>
+	</tr>
+</table>
+__HTML;
+
+echo elgg_view_module('info', $title, $content);