Merge branch '2941-follower-support' of github.com:okfn/ckan into 294…

…1-follower-support
ckan · Oct 5, 2012 · 694e57c · 694e57c
2 parents cee94e1 + 982a0f3
commit 694e57c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/ckan/lib/activity_streams.py b/ckan/lib/activity_streams.py
@@ -150,16 +150,16 @@ def activity_stream_string_new_related_item():
   'changed group': 'users',
   'changed package': 'sitemap',
   'changed package_extra': 'edit',
-  'changed resource': 'bar-chart',
+  'changed resource': 'file',
   'changed user': 'user',
   'deleted group': 'users',
   'deleted package': 'sitemap',
   'deleted package_extra': 'edit',
-  'deleted resource': 'bar-chart',
+  'deleted resource': 'file',
   'new group': 'users',
   'new package': 'sitemap',
   'new package_extra': 'edit',
-  'new resource': 'bar-chart',
+  'new resource': 'file',
   'new user': 'user',
   'removed tag': 'tag',
   'deleted related item': 'picture',

diff --git a/ckan/templates/package/followers.html b/ckan/templates/package/followers.html
@@ -1,4 +1,4 @@
-{% extends "page.html" %}
+{% extends "package/read.html" %}
 
 {% block subtitle %}{{ _('Followers') }} - {{ c.pkg_dict.title or c.pkg_dict.name }}{% endblock %}
 
@@ -7,7 +7,7 @@
     <div class="module-content">
       <h1 class="page-heading">{{ _('Followers') }}</h1>
       {% if c.followers %}
-        <ul class="userlist">
+        <ul class="unstyled userlist">
           {% for follower in c.followers %}
             <li>{{ h.linked_user(follower['name'], maxlength=20) }}</li>
           {% endfor %}

diff --git a/ckan/templates/package/read.html b/ckan/templates/package/read.html
@@ -17,9 +17,7 @@
   {% if h.check_access('package_update', {'id':pkg.id }) %}
     <li>{% link_for _('Edit'), controller='package', action='edit', id=pkg.name, class_='btn', icon='wrench' %}</li>
   {% endif %}
-  {% if h.check_access('package_update', {'id':pkg.id }) %}
-    <li>{% link_for _('Add resource'), controller='package', action='new_resource', id=pkg.name, class_='btn', icon='plus' %}</li>
-  {% endif %}
+  <li>{% link_for _('Followers'), controller='package', action='followers', id=pkg.name, class_='btn', icon='group' %}</li>
   <li>{{ h.follow_button('dataset', pkg.id) }}</li>
 {% endblock %}
 

diff --git a/ckan/templates/user/followers.html b/ckan/templates/user/followers.html
@@ -10,8 +10,6 @@
   <li class="active">{{ h.nav_link(_('Followers'), controller='user', action='followers', id="") }}</li>
 {% endblock %}
 
-
-
 {% block primary_content %}
   <article class="module">
     <div class="module-content">