Removed user-context from low-level helper gravatar into the actual t…

…emplates for activity streams

ckan/lib/activity_streams.py

@@ -12,10 +12,14 @@
 # etc.
 
 def get_snippet_actor(activity, detail):
-    return h.linked_user(activity['user_id'], 0, 30)
+    return literal('''<span class="actor" data-module="user-context" data-module-id="%s">%s</span>'''
+        % (activity['user_id'], h.linked_user(activity['user_id'], 0, 30))
+        )
 
 def get_snippet_user(activity, detail):
-    return h.linked_user(activity['data']['user']['name'], 0, 30)
+    return literal('''<span data-module="user-context" data-module-id="%s">%s</span>'''
+        % (activity['user_id'], h.linked_user(activity['user_id'], 0, 20))
+        )
 
 def get_snippet_dataset(activity, detail):
     data = activity['data']

ckan/lib/helpers.py

@@ -608,7 +608,7 @@ def linked_user(user, maxlength=0, avatar=20):
             return user_name
     if user:
         name = user.name if model.User.VALID_NAME.match(user.name) else user.id
-        icon = gravatar(email_hash=user.email_hash, size=avatar, user_id=user.id)
+        icon = gravatar(email_hash=user.email_hash, size=avatar)
         displayname = user.display_name
         if maxlength and len(user.display_name) > maxlength:
             displayname = displayname[:maxlength] + '...'
@@ -679,33 +679,28 @@ def dict_list_reduce(list_, key, unique=True):
     return new_list
 
 
-def linked_gravatar(email_hash, size=100, default=None, user_id=None):
+def linked_gravatar(email_hash, size=100, default=None):
     return literal(
         '<a href="https://gravatar.com/" target="_blank" ' +
         'title="%s">' % _('Update your avatar at gravatar.com') +
-        '%s</a>' % gravatar(email_hash, size, default, user_id)
+        '%s</a>' % gravatar(email_hash, size, default)
         )
 
 _VALID_GRAVATAR_DEFAULTS = ['404', 'mm', 'identicon', 'monsterid',
                             'wavatar', 'retro']
 
 
-def gravatar(email_hash, size=100, default=None, user_id=None):
+def gravatar(email_hash, size=100, default=None):
     if default is None:
         default = config.get('ckan.gravatar_default', 'identicon')
 
     if not default in _VALID_GRAVATAR_DEFAULTS:
         # treat the default as a url
         default = urllib.quote(default, safe='')
 
-    if user_id is None:
-        user_id = ""
-
-    url = url_for(controller='user', action='read', id=user_id)
-
     return literal('''<img src="http://gravatar.com/avatar/%s?s=%d&amp;d=%s"
-        class="gravatar" width="%s" height="%s" data-module="user-context" data-module-id="%s" data-module-url="%s" />'''
-        % (email_hash, size, default, size, size, user_id, url)
+        class="gravatar" width="%s" height="%s" />'''
+        % (email_hash, size, default, size, size)
         )
 
 def pager_url(page, partial=None, **kwargs):

ckan/public/base/javascript/modules/user-context.js

@@ -95,7 +95,6 @@ this.ckan.module('user-context', function($, _) {
 		 * Returns nothing.
 		 */
 		_onHandleUserData: function(json) {
-			console.log(json);
 			this.loading = false;
 			if (json.success) {
 				var id = this.options.id;

ckan/public/base/less/activity.less

@@ -23,10 +23,12 @@
 			.box-shadow(inset 0 1px 2px rgba(0, 0, 0, 0.2));
 		}
 		.gravatar {
+			.border-radius(100px);
+		}
+		.actor .gravatar {
 			float: left;
 			margin-top: -5px;
 			margin-right: 10px;
-			.border-radius(100px);
 		}
 		p {
 			font-size: 14px;