Merge commit '5041c6c48153453ed597206d08eeff37cf20e676' as 'mod/cool_theme'

2 files changed, 41 insertions, 0 deletions

diff --git a/mod/cool_theme/pages/profile/info.php b/mod/cool_theme/pages/profile/info.php
new file mode 100644
index 000000000..9dc40c4c7
--- /dev/null
+++ b/mod/cool_theme/pages/profile/info.php
@@ -0,0 +1,9 @@
+<?php
+$user = elgg_get_page_owner_entity();
+
+$body = elgg_view_layout('two_sidebar', array(
+	'title' => $user->name,
+	'content' => elgg_view('profile/details'),
+));
+
+echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/mod/cool_theme/pages/profile/wall.php b/mod/cool_theme/pages/profile/wall.php
new file mode 100644
index 000000000..48d3b8646
--- /dev/null
+++ b/mod/cool_theme/pages/profile/wall.php
@@ -0,0 +1,32 @@
+<?php
+
+$user = elgg_get_page_owner_entity();
+
+if (!$user || !elgg_instanceof($user, 'user')) {
+	register_error(elgg_echo('profile:notfound'));
+	forward();
+}
+
+$title = $user->name;
+
+$composer = '';
+if (elgg_is_logged_in()) {
+	$composer = elgg_view('page/elements/composer', array('entity' => $user));
+}
+
+$db_prefix = elgg_get_config('dbprefix');
+$activity = elgg_list_river(array(
+	'joins' => array("JOIN {$db_prefix}entities e ON e.guid = rv.object_guid"),
+	'wheres' => array("e.container_guid = $user->guid OR rv.object_guid = $user->guid")
+));
+
+if (!$activity) {
+	$activity = elgg_view('output/longtext', array('value' => elgg_echo('profile:activity:none')));
+}
+
+$body = elgg_view_layout('two_sidebar', array(
+	'content' => $composer . $activity,
+	'title' => $title,
+));
+
+echo elgg_view_page($title, $body);