public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moving activities and features module. Fixing bug around interactions when following self.

Browse source
This commit is contained in:
Samuel Clay 2012-04-12 11:43:36 -07:00
parent 4612bedb49
commit 38b64999be
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/social/models.py
View file

@ -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):

2
media/css/reader.css
View file

@ -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;
}

6
templates/reader/activities_module.xhtml
View file

@ -2,8 +2,8 @@
{% if activities %}
<div class="NB-module-item NB-module-activities NB-page-{{ page }}">
<h3 class="NB-module-content-header">
<div class="NB-module NB-module-activities NB-page-{{ page }}">
<h5 class="NB-module-header">
<div class="NB-module-header-right">
<div class="NB-spinner NB-left"></div>
<a href="#" class="NB-module-direction NB-module-next-page NB-javascript {% if activities|length <= 5 %}NB-disabled{% endif %}"></a>
@ -11,7 +11,7 @@
</div>
Your Activity
</h3>
</h5>
<ul class="NB-interactions">
{% for activity in activities|slice:":5" %}

11
templates/reader/feeds.xhtml
View file

@ -35,9 +35,12 @@
{% if user.is_authenticated %}
{% render_interactions_module %}
{% render_activities_module %}
{% endif %}
{% render_features_module %}
{% if not user.is_authenticated %}
{% render_features_module %}
{% endif %}
{% if recommended_feeds %}
{% render_recommended_feed recommended_feeds %}
@ -272,8 +275,6 @@
</div>
</div>
{% render_activities_module %}
</div>
</div>
@ -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 %}