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

Adding follow/unfollow buttons. Preparing to modelize with Backbone.

Browse source
This commit is contained in:
Samuel Clay 2012-01-03 09:29:21 -08:00
parent 3e7d6a42ee
commit 7601bb7b3d
5 changed files with 1192 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
media/css/reader.css
View file

@ -6659,11 +6659,11 @@ background: transparent;
padding-left: 12px; padding-left: 12px;
} }
.NB-modal-friends .NB-profile-badge .NB-profile-badge-bio { .NB-modal-friends .NB-profile-badge .NB-profile-badge-bio {
clear: both; clear: left;
} }
.NB-modal-friends .NB-profile-badge .NB-profile-badge-stats { .NB-modal-friends .NB-profile-badge .NB-profile-badge-stats {
clear: both; clear: left;
color: #5A6C8A; color: #AE5D15;
font-size: 11px; font-size: 11px;
text-transform: uppercase; text-transform: uppercase;
} }
@ -6671,3 +6671,11 @@ background: transparent;
padding-right: 3px; padding-right: 3px;
font-weight: bold; font-weight: bold;
} }
.NB-modal-friends .NB-profile-badge-actions {
float: right;
margin-top: 10px;
}
.NB-modal-friends .NB-profile-badge-actions .NB-modal-submit-button {
width: 80px;
text-align: center;
}

1158
media/js/backbone-0.5.3.js Normal file
View file

File diff suppressed because it is too large Load diff

8
media/js/newsblur/assetmodel.js
View file

@ -31,6 +31,8 @@ NEWSBLUR.AssetModel.Reader = function() {
this.story_keys = {}; this.story_keys = {};
this.queued_read_stories = {}; this.queued_read_stories = {};
this.classifiers = {}; this.classifiers = {};
this.friends = {};
this.profile = {};
this.starred_stories = []; this.starred_stories = [];
this.starred_count = 0; this.starred_count = 0;
this.read_stories_river_count = 0; this.read_stories_river_count = 0;
@ -916,7 +918,11 @@ NEWSBLUR.AssetModel.Reader.prototype = {
}, },
fetch_friends: function(callback) { fetch_friends: function(callback) {
this.make_request('/social/friends', null, callback); var pre_callback = _.bind(function(data) {
// this.profile =
callback(data);
}, this);
this.make_request('/social/friends', null, pre_callback);
}, },
disconnect_social_service: function(service, callback) { disconnect_social_service: function(service, callback) {

15
media/js/newsblur/reader_friends.js
View file

@ -92,6 +92,7 @@ _.extend(NEWSBLUR.ReaderFriends.prototype, {
make_find_friends_and_services: function(data) { make_find_friends_and_services: function(data) {
console.log(["data", data]); console.log(["data", data]);
this.profile = data.social_profile;
$('.NB-modal-loading', this.$modal).removeClass('NB-active'); $('.NB-modal-loading', this.$modal).removeClass('NB-active');
var $services = $('.NB-friends-services', this.$modal).empty(); var $services = $('.NB-friends-services', this.$modal).empty();
@ -226,6 +227,7 @@ _.extend(NEWSBLUR.ReaderFriends.prototype, {
make_profile_badge: function(profile) { make_profile_badge: function(profile) {
var $badge = $.make('div', { className: "NB-profile-badge" }, [ var $badge = $.make('div', { className: "NB-profile-badge" }, [
$.make('div', { className: 'NB-profile-badge-actions' }),
$.make('div', { className: 'NB-profile-badge-photo' }, [ $.make('div', { className: 'NB-profile-badge-photo' }, [
$.make('img', { src: profile.photo_url }) $.make('img', { src: profile.photo_url })
]), ]),
@ -243,6 +245,19 @@ _.extend(NEWSBLUR.ReaderFriends.prototype, {
'followers' 'followers'
]) ])
]); ]);
var $actions;
if (_.contains(this.profile.following_user_ids, profile.user_id)) {
$actions = $.make('div', {
className: 'NB-profile-badge-action-unfollow NB-modal-submit-button NB-modal-submit-close'
}, 'Following');
} else {
$actions = $.make('div', {
className: 'NB-profile-badge-action-unfollow NB-modal-submit-button NB-modal-submit-green'
}, 'Follow');
}
$('.NB-profile-badge-actions', $badge).append($actions);
return $badge; return $badge;
}, },

1
settings.py
View file

@ -187,6 +187,7 @@ COMPRESS_JS = {
# 'js/socket.io-client.0.8.7.js', # 'js/socket.io-client.0.8.7.js',
'js/underscore.js', 'js/underscore.js',
'js/underscore.string.js', 'js/underscore.string.js',
'js/backbone-0.5.3.js',
'js/newsblur/reader_utils.js', 'js/newsblur/reader_utils.js',
'js/newsblur/assetmodel.js', 'js/newsblur/assetmodel.js',
'js/newsblur/reader.js', 'js/newsblur/reader.js',