diff --git a/apps/social/models.py b/apps/social/models.py index b7b4e5880..1c408cf1b 100644 --- a/apps/social/models.py +++ b/apps/social/models.py @@ -244,7 +244,8 @@ class MSocialProfile(mongo.Document): follower_key = "F:%s:f" % (user_id) r.sadd(follower_key, self.user_id) - MInteraction.new_follow(follower_user_id=self.user_id, followee_user_id=user_id) + if self.user_id != user_id: + MInteraction.new_follow(follower_user_id=self.user_id, followee_user_id=user_id) MSocialSubscription.objects.get_or_create(user_id=self.user_id, subscription_user_id=user_id) def is_following_user(self, user_id): diff --git a/media/css/reader.css b/media/css/reader.css index 24405746c..09fb510b1 100644 --- a/media/css/reader.css +++ b/media/css/reader.css @@ -4099,7 +4099,7 @@ background: transparent; margin-top: 0; overflow: hidden; } -.NB-module .NB-module-activities .NB-module-content-header { +.NB-module.NB-module-features .NB-module-content-header { margin-left: 12px; padding-right: 12px; } diff --git a/templates/reader/activities_module.xhtml b/templates/reader/activities_module.xhtml index 32241fa90..197a43940 100644 --- a/templates/reader/activities_module.xhtml +++ b/templates/reader/activities_module.xhtml @@ -2,8 +2,8 @@ {% if activities %} -
-

+
+
@@ -11,7 +11,7 @@
Your Activity -
+

- {% render_activities_module %} - @@ -408,6 +409,10 @@ {% endif %} + {% if user.is_authenticated and user_profile.hide_getting_started %} + {% render_features_module %} + {% endif %} + {% if not user.is_authenticated or user_profile.hide_getting_started %} {% render_statistics_graphs statistics %} {% endif %}