diff --git a/media/css/reader.css b/media/css/reader.css index a099de30e..b6e351534 100644 --- a/media/css/reader.css +++ b/media/css/reader.css @@ -4714,6 +4714,9 @@ background: transparent; .NB-menu-manage .NB-menu-manage-mark-read .NB-menu-manage-image { background: transparent url('/media/embed/icons/silk/cut.png') no-repeat 0 2px; } +.NB-menu-manage .NB-menu-manage-social-profile .NB-menu-manage-image { + background: transparent url('/media/embed/icons/silk/user_orange.png') no-repeat 0 1px; +} .NB-menu-manage .NB-menu-manage-keyboard .NB-menu-manage-image { background: transparent url('/media/embed/icons/silk/keyboard.png') no-repeat 0 1px; } diff --git a/media/js/newsblur/reader/reader.js b/media/js/newsblur/reader/reader.js index 746b433e6..03eb51bb1 100644 --- a/media/js/newsblur/reader/reader.js +++ b/media/js/newsblur/reader/reader.js @@ -4901,6 +4901,9 @@ }, open_social_profile_modal: function(user_id) { + if (_.string.contains(user_id, 'social:')) { + user_id = parseInt(user_id.replace('social:', ''), 10); + } NEWSBLUR.social_profile = new NEWSBLUR.ReaderSocialProfile(user_id); }, @@ -5079,6 +5082,11 @@ $.make('div', { className: 'NB-menu-manage-title' }, 'Fix this misbehaving site') ])), (feed.has_exception && $.make('li', { className: 'NB-menu-separator-inverse' })), + $.make('li', { className: 'NB-menu-manage-feed NB-menu-manage-social-profile' }, [ + $.make('div', { className: 'NB-menu-manage-image' }), + $.make('div', { className: 'NB-menu-manage-title' }, 'View profile') + ]), + $.make('li', { className: 'NB-menu-separator' }), (feed.exception_type != 'feed' && $.make('li', { className: 'NB-menu-manage-feed NB-menu-manage-mark-read NB-menu-manage-feed-mark-read' }, [ $.make('div', { className: 'NB-menu-manage-image' }), $.make('div', { className: 'NB-menu-manage-title' }, 'Mark as read') @@ -7422,6 +7430,11 @@ self.open_mark_read_modal(); } }); + $.targetIs(e, { tagSelector: '.NB-menu-manage-social-profile' }, function($t, $p){ + e.preventDefault(); + var feed_id = $t.parents('.NB-menu-manage').data('feed_id'); + self.open_social_profile_modal(feed_id); + }); $.targetIs(e, { tagSelector: '.NB-menu-manage-keyboard' }, function($t, $p){ e.preventDefault(); if (!$t.hasClass('NB-disabled')) { diff --git a/media/js/newsblur/reader/reader_social_profile.js b/media/js/newsblur/reader/reader_social_profile.js index 60a145216..8e43b1ee5 100644 --- a/media/js/newsblur/reader/reader_social_profile.js +++ b/media/js/newsblur/reader/reader_social_profile.js @@ -16,6 +16,9 @@ NEWSBLUR.ReaderSocialProfile.prototype = new NEWSBLUR.Modal; _.extend(NEWSBLUR.ReaderSocialProfile.prototype, { runner: function(user_id) { + if (!this.model.user_profiles.find(user_id)) { + this.model.add_user_profiles([{user_id: user_id}]); + } this.profile = this.model.user_profiles.find(user_id).clone(); this.make_modal(); this.open_modal();