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 %} -

{{ _('Activity Stream') }}

- {{ 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 @@
  • {{ h.nav_link(_('Activity Stream'), controller='user', action='activity', id="") }}
  • {% endblock %} -{% block primary_content %} -
    -
    -

    {{ _('Activity Stream').format(name=c.user_dict.display_name) }}

    -
    - {{ c.user_activity_stream | safe }} -
    -
    -
    +{% block primary_content_inner %} +

    {{ _('Activity Stream') }}

    + {{ c.user_activity_stream | safe }} {% endblock %}