From 12da36e25bc1bab6b3235117399f265b7514c4f1 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 26 Jan 2011 12:30:18 +0000
Subject: adding activity module to groups

git-svn-id: http://code.elgg.org/elgg/trunk@7941 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/groups/views/default/groups/css.php            |  2 +-
 .../default/groups/profile/activity_module.php     | 74 ++++++++++++++++++++++
 .../default/groups/profile/activity_widget.php     | 35 ----------
 .../views/default/groups/profile/widgets.php       |  5 --
 4 files changed, 75 insertions(+), 41 deletions(-)
 create mode 100644 mod/groups/views/default/groups/profile/activity_module.php
 delete mode 100644 mod/groups/views/default/groups/profile/activity_widget.php

(limited to 'mod/groups/views/default')

diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
index 5a7366fe3..5be21e981 100644
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -17,7 +17,7 @@
 	margin-right: 30px;
 }
 
-#group_tools_latest > .elgg-module .elgg-head {
+#group_tools_latest > .elgg-module > .elgg-inner > .elgg-head {
 	padding: 5px 5px 3px;
 	background-color: #e4e4e4;
 	border-bottom: 1px solid #cccccc;
diff --git a/mod/groups/views/default/groups/profile/activity_module.php b/mod/groups/views/default/groups/profile/activity_module.php
new file mode 100644
index 000000000..8a2d587c9
--- /dev/null
+++ b/mod/groups/views/default/groups/profile/activity_module.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Groups latest activity
+ *
+ * @package Groups
+ */
+
+global $CONFIG;
+
+if ($vars['entity']->activity_enable == 'no') {
+	return true;
+}
+
+$group = $vars['entity'];
+
+
+$all_link = elgg_view('output/url', array(
+	'href' => "pg/groups/activity/$group->guid",
+	'text' => elgg_echo('link:view:all'),
+));
+
+$header = "<span class=\"group-widget-viewall\">$all_link</span>";
+$header .= '<h3>' . elgg_echo('groups:activity') . '</h3>';
+
+
+elgg_push_context('widgets');
+$content = elgg_list_river(array(
+	'limit' => 4,
+	'pagination' => false,
+	'joins' => array("join {$CONFIG->dbprefix}entities e1 on e1.guid = rv.object_guid"),
+	'wheres' => array("(e1.container_guid = $group->guid)"),
+));
+elgg_pop_context();
+
+if (!$content) {
+	$content = '<p>' . elgg_echo('groups:activity:none') . '</p>';
+}
+
+$params = array(
+	'header' => $header,
+	'body' => $content,
+);
+echo elgg_view('layout/objects/module', $params);
+
+return true;
+?>
+<span class="group_widget_link"><a href="<?php echo elgg_get_site_url() . "pg/groups/activity/" . elgg_get_page_owner_guid(); ?>"><?php echo elgg_echo('link:view:all')?></a></span>
+<h3><?php echo elgg_echo("activity"); ?></h3>
+<?php
+	$owner = elgg_get_page_owner_entity();
+	$group_guid = $owner->guid;
+	$limit = 5;
+
+	$offset = (int) get_input('offset', 0);
+
+	// Sanitise variables -- future proof in case they get sourced elsewhere
+	$limit = (int) $limit;
+	$offset = (int) $offset;
+	$group_guid = (int) $group_guid;
+
+	$sql = "SELECT {$CONFIG->dbprefix}river.id, {$CONFIG->dbprefix}river.type, {$CONFIG->dbprefix}river.subtype, {$CONFIG->dbprefix}river.action_type, {$CONFIG->dbprefix}river.access_id, {$CONFIG->dbprefix}river.view, {$CONFIG->dbprefix}river.subject_guid, {$CONFIG->dbprefix}river.object_guid, {$CONFIG->dbprefix}river.posted FROM {$CONFIG->dbprefix}river INNER JOIN {$CONFIG->dbprefix}entities AS entities1 ON {$CONFIG->dbprefix}river.object_guid = entities1.guid INNER JOIN {$CONFIG->dbprefix}entities AS entities2 ON entities1.container_guid = entities2.guid WHERE entities2.guid = $group_guid OR {$CONFIG->dbprefix}river.object_guid = $group_guid ORDER BY posted DESC limit {$offset},{$limit}";
+
+	$items = get_data($sql);
+
+    if (count($items) > 0) {
+		$river_items = elgg_view('river/item/list',array(
+								'limit' => $limit,
+								'offset' => $offset,
+								'items' => $items
+								));
+	}
+	echo $river_items;
+
+?>
diff --git a/mod/groups/views/default/groups/profile/activity_widget.php b/mod/groups/views/default/groups/profile/activity_widget.php
deleted file mode 100644
index 3ac385553..000000000
--- a/mod/groups/views/default/groups/profile/activity_widget.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Groups latest activity
- *
- * @package Groups
- */
-?>
-<span class="group_widget_link"><a href="<?php echo elgg_get_site_url() . "pg/groups/activity/" . elgg_get_page_owner_guid(); ?>"><?php echo elgg_echo('link:view:all')?></a></span>
-<h3><?php echo elgg_echo("activity"); ?></h3>
-<?php
-	$owner = elgg_get_page_owner();
-	$group_guid = $owner->guid;
-	$limit = 5;
-
-	$offset = (int) get_input('offset', 0);
-
-	// Sanitise variables -- future proof in case they get sourced elsewhere
-	$limit = (int) $limit;
-	$offset = (int) $offset;
-	$group_guid = (int) $group_guid;
-
-	$sql = "SELECT {$CONFIG->dbprefix}river.id, {$CONFIG->dbprefix}river.type, {$CONFIG->dbprefix}river.subtype, {$CONFIG->dbprefix}river.action_type, {$CONFIG->dbprefix}river.access_id, {$CONFIG->dbprefix}river.view, {$CONFIG->dbprefix}river.subject_guid, {$CONFIG->dbprefix}river.object_guid, {$CONFIG->dbprefix}river.posted FROM {$CONFIG->dbprefix}river INNER JOIN {$CONFIG->dbprefix}entities AS entities1 ON {$CONFIG->dbprefix}river.object_guid = entities1.guid INNER JOIN {$CONFIG->dbprefix}entities AS entities2 ON entities1.container_guid = entities2.guid WHERE entities2.guid = $group_guid OR {$CONFIG->dbprefix}river.object_guid = $group_guid ORDER BY posted DESC limit {$offset},{$limit}";
-
-	$items = get_data($sql);
-
-    if (count($items) > 0) {
-		$river_items = elgg_view('river/item/list',array(
-								'limit' => $limit,
-								'offset' => $offset,
-								'items' => $items
-								));
-	}
-	echo $river_items;
-
-?>
diff --git a/mod/groups/views/default/groups/profile/widgets.php b/mod/groups/views/default/groups/profile/widgets.php
index 3e28c0091..b72932ab3 100644
--- a/mod/groups/views/default/groups/profile/widgets.php
+++ b/mod/groups/views/default/groups/profile/widgets.php
@@ -7,11 +7,6 @@
 	 
 // tools widget area
 echo "<div id='group_tools_latest' class='clearfix'>";
-
-	// activity latest 
-	echo "<div class='group_tool_widget activity clearfix'>";
-	echo elgg_view("groups/profile/activity_widget", array('entity' => $vars['entity']));
-	echo "</div>";
 	
 	// enable tools to extend this area
 	echo elgg_view("groups/tool_latest", array('entity' => $vars['entity']));
-- 
cgit v1.2.3