From eaef0364f32f18413dafe6a5d2a55338c06e0262 Mon Sep 17 00:00:00 2001
From: John Martin <me@johnmart.in>
Date: Mon, 5 Nov 2012 11:59:04 +0000
Subject: [PATCH] Added activity stream to group front end

---
 ckan/templates/group/activity_stream.html | 10 ++++++----
 ckan/templates/group/read.html            |  3 +++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ckan/templates/group/activity_stream.html b/ckan/templates/group/activity_stream.html
index 8543d0d8a3a..fd106697cea 100644
--- a/ckan/templates/group/activity_stream.html
+++ b/ckan/templates/group/activity_stream.html
@@ -1,6 +1,8 @@
-{% extends "page.html" %}
+{% extends "group/read.html" %}
 
-{% block primary_content %}
-  <h2 class="hide-heading">{{ _('Activity Stream') }}</h2>
-  {{ c.group_activity_stream | safe }}
+{% block primary_content_inner %}
+<section class="module-content">
+	<h2 class="hide-heading">{{ _('Activity Stream') }}</h2>
+	{{ c.group_activity_stream | safe }}
+</section>
 {% endblock %}
diff --git a/ckan/templates/group/read.html b/ckan/templates/group/read.html
index 0405b3c67f5..edc5625a442 100644
--- a/ckan/templates/group/read.html
+++ b/ckan/templates/group/read.html
@@ -23,6 +23,9 @@
           <li{% if c.action == 'read' %} class="active"{% endif %}>
             {% link_for _('Datasets'), controller='group', action='read', id=c.group_dict.name, icon='sitemap' %}
           </li>
+          <li{% if c.action == 'activity' %} class="active"{% endif %}>
+            {% link_for _('Activity Stream'), controller='group', action='activity', id=c.group_dict.name, icon='time' %}
+          </li>
           <li{% if c.action == 'followers' %} class="active"{% endif %}>
             {% link_for _('Followers'), controller='group', action='followers', id=c.group_dict.name, icon='group' %}
           </li>