From d243678f94c3b6d31f234802fd24f21257c2f486 Mon Sep 17 00:00:00 2001
From: John Martin <me@johnmart.in>
Date: Wed, 10 Oct 2012 16:10:46 +0100
Subject: [PATCH] Activity stream tabs now work on user profile pages

---
 ckan/templates/user/activity.html        |  8 --------
 ckan/templates/user/activity_stream.html | 12 +++---------
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 ckan/templates/user/activity.html

diff --git a/ckan/templates/user/activity.html b/ckan/templates/user/activity.html
deleted file mode 100644
index 7fdffc925b3..00000000000
--- a/ckan/templates/user/activity.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends "user/page.html" %}
-
-{% block subtitle %}{{ _('Activity Stream') }}{% endblock %}
-
-{% block primary_content_inner %}
-	<h2 class="tab-heading">{{ _('Activity Stream') }}</h2>
-	{{ c.user_activity_stream | safe }}
-{% endblock %}
diff --git a/ckan/templates/user/activity_stream.html b/ckan/templates/user/activity_stream.html
index e08631d64c6..ffcdd1da0cd 100644
--- a/ckan/templates/user/activity_stream.html
+++ b/ckan/templates/user/activity_stream.html
@@ -10,13 +10,7 @@
   <li class="active">{{ h.nav_link(_('Activity Stream'), controller='user', action='activity', id="") }}</li>
 {% endblock %}
 
-{% block primary_content %}
-  <article class="module">
-    <div class="module-content">
-      <h1 class="page-heading">{{ _('Activity Stream').format(name=c.user_dict.display_name) }}</h1>
-      <section>
-        {{ c.user_activity_stream | safe }}
-      </section>
-    </div>
-  </article>
+{% block primary_content_inner %}
+  <h2 class="tab-heading">{{ _('Activity Stream') }}</h2>
+  {{ c.user_activity_stream | safe }}
 {% endblock %}