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

2 files changed, 62 insertions, 0 deletions

diff --git a/mod/cool_theme/pages/groups/info.php b/mod/cool_theme/pages/groups/info.php
new file mode 100644
index 000000000..cdf84d052
--- /dev/null
+++ b/mod/cool_theme/pages/groups/info.php
@@ -0,0 +1,27 @@
+<?php
+// turn this into a core function
+global $autofeed;
+$autofeed = true;
+
+$group = elgg_get_page_owner_entity();
+if (!$group instanceof ElggGroup) {
+	forward('groups/all');
+}
+
+elgg_load_library('elgg:groups');
+groups_register_profile_buttons($group);
+
+$content = elgg_view('groups/profile/layout', array('entity' => $group));
+if (group_gatekeeper(false)) {
+	$sidebar = elgg_view('groups/sidebar/members', array('entity' => $group));
+} else {
+	$sidebar = '';
+}
+
+$body = elgg_view_layout('two_sidebar', array(
+	'content' => $content,
+	'sidebar_alt' => $sidebar,
+	'title' => $group->name,
+));
+
+echo elgg_view_page($group->name, $body);
\ No newline at end of file
diff --git a/mod/cool_theme/pages/groups/wall.php b/mod/cool_theme/pages/groups/wall.php
new file mode 100644
index 000000000..9a273e262
--- /dev/null
+++ b/mod/cool_theme/pages/groups/wall.php
@@ -0,0 +1,35 @@
+<?php
+
+$group = elgg_get_page_owner_entity();
+
+if (!$group || !elgg_instanceof($group, 'group')) {
+	register_error(elgg_echo('groups:notfound'));
+	forward();
+}
+
+elgg_load_library('elgg:groups');
+groups_register_profile_buttons($group);
+
+$title = $group->name;
+
+$composer = '';
+if (elgg_is_logged_in()) {
+	$composer = elgg_view('page/elements/composer', array('entity' => $group));
+}
+
+$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 = $group->guid OR rv.object_guid = $group->guid"),
+));
+
+if (!$activity) {
+	$activity = elgg_view('output/longtext', array('value' => elgg_echo('group:activity:none')));
+}
+
+$body = elgg_view_layout('two_sidebar', array(
+	'title' => $title,
+	'content' => $composer . $activity,
+));
+
+echo elgg_view_page($title, $body);