Added Activity stream back in

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

5 files changed, 192 insertions, 0 deletions

diff --git a/mod/activity/views/default/activity/css.php b/mod/activity/views/default/activity/css.php
new file mode 100644
index 000000000..bce6fe0d2
--- /dev/null
+++ b/mod/activity/views/default/activity/css.php
@@ -0,0 +1,103 @@
+<?php
+
+	/**
+	 * Elgg Activity CSS
+	 * 
+	 * @package ElggBookmarks
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+?>
+
+
+/* ***************************************
+	ACTIVITY
+*************************************** */
+.activity_item p {
+	margin:0;
+	padding:2px 0 0 0;
+	line-height:1.1em;
+	min-height:17px;	
+}
+.activity_item .activity_item_time {
+	font-size:90%;
+	color:#666666;
+}
+#activity {
+	border-top:1px solid #dddddd;
+}
+#activity .activity_item p {
+	margin:0;
+	padding:2px 0 0 20px;
+	line-height:1.1em;
+	min-height:17px;
+}
+#activity .activity_item {
+	border-bottom:1px solid #dddddd;
+	padding:2px 0 2px 0;
+}
+#activity .river_item_time {
+	font-size:90%;
+	color:#666666;
+}
+/* IE6 fix */
+* html #activity .river_item p { 
+	padding:3px 0 3px 20px;
+}
+/* IE7 */
+*:first-child+html #activity .river_item p {
+	min-height:17px;
+}
+
+#activity .activity_file_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_files.gif) no-repeat left -1px;
+}
+#activity .activity_file_annotate {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+}
+#activity .activity_status_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px;
+}
+#activity .activity_user_profileupdate {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px;
+}
+#activity .activity_user_profileiconupdate {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px;
+}
+#activity .activity_relationship_friend_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_friends.gif) no-repeat left -1px;
+}
+#activity .activity_bookmarks_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_bookmarks.gif) no-repeat left -1px;
+}
+#activity .activity_blog_annotate {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+}
+#activity .activity_widget_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_plugin.gif) no-repeat left -1px;
+}
+#activity .activity_blog_update {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px;
+}
+#activity .activity_blog_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px;
+}
+#activity .activity_status_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_status.gif) no-repeat left -1px;
+}
+#activity .activity_forums_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
+}
+#activity .activity_forums_update {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
+}
+#activity .activity_forumtopic_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
+}
+#activity .activity_relationship_member_create {
+	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
+}
+
diff --git a/mod/activity/views/default/activity/dashboard.php b/mod/activity/views/default/activity/dashboard.php
new file mode 100644
index 000000000..3e626b49f
--- /dev/null
+++ b/mod/activity/views/default/activity/dashboard.php
@@ -0,0 +1,14 @@
+<?php
+	/// Extract the activity
+	$activity = $vars['activity'];
+?>
+<div id="activity">
+	<?php
+	if (($activity) && (count($activity)))
+	{
+		foreach ($activity as $a) echo $a;
+	}
+	else
+		echo elgg_echo('activity:noactivity');
+	?>
+</div>
\ No newline at end of file
diff --git a/mod/activity/views/default/activity/wrapper.php b/mod/activity/views/default/activity/wrapper.php
new file mode 100644
index 000000000..88ba6ef57
--- /dev/null
+++ b/mod/activity/views/default/activity/wrapper.php
@@ -0,0 +1,51 @@
+<?php
+
+	/**
+	 * Elgg activity item wrapper.
+	 * Wraps all river items.
+	 * 
+	 * @package Elgg
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.com/
+	 */
+
+	$statement = $vars['statement'];
+	$time = $vars['time'];
+	$event = $vars['event'];
+	$entry = $vars['entry'];
+	
+	if ($statement->getObject() instanceof ElggEntity) {
+		
+		$obj = $statement->getObject();
+		$subtype = $obj->getSubtype();
+		if (empty($subtype)) $subtype = $obj->type;
+		if (empty($subtype)) $subtype = "general";
+	} else if (is_array($statement->getObject())) {
+		$obj = $statement->getObject();
+		$subtype = "relationship_" . $obj['relationship'];
+	}
+?>
+<div class="activity_item">
+
+	<div class="activity_<?php echo $subtype; ?>">
+		<div class="activity_<?php echo $event; ?>">
+			<p class="activity_<?php echo $subtype; ?>_<?php echo $event; ?>">
+				<?php
+		
+					echo $vars['entry'];
+				
+				?>
+				<span class="activity_item_time">
+					(<?php
+		
+						echo friendly_time($time);
+					
+					?>)
+				</span>
+			</p>
+		</div>
+	</div>
+
+</div>
diff --git a/mod/activity/views/default/settings/activity/edit.php b/mod/activity/views/default/settings/activity/edit.php
new file mode 100644
index 000000000..bfb1a9dbe
--- /dev/null
+++ b/mod/activity/views/default/settings/activity/edit.php
@@ -0,0 +1,11 @@
+<?php
+?>
+<p>
+	<?php echo elgg_echo('activity:useasdashboard'); ?>
+	
+	<select name="params[useasdashboard]">
+		<option value="yes" <?php if ($vars['entity']->useasdashboard == 'yes') echo " selected=\"yes\" "; ?>><?php echo elgg_echo('option:yes'); ?></option>
+		<option value="no" <?php if ($vars['entity']->useasdashboard != 'yes') echo " selected=\"yes\" "; ?>><?php echo elgg_echo('option:no'); ?></option>
+	</select>
+	
+</p>
diff --git a/mod/activity/views/opendd/activity/dashboard.php b/mod/activity/views/opendd/activity/dashboard.php
new file mode 100644
index 000000000..2fdd7bbf2
--- /dev/null
+++ b/mod/activity/views/opendd/activity/dashboard.php
@@ -0,0 +1,13 @@
+<?php
+	/// Extract the activity
+	$activity = $vars['activity'];
+
+	if (($activity) && (count($activity)))
+	{
+		foreach ($activity as $a) 
+		{
+			foreach ($a as $odd)
+				echo $odd;
+		}
+	}
+?>
\ No newline at end of file