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

Merge branch 'social' into redis

Browse source 
* social:
  Fixing tall floats pulling comments and shares into the story.
  Ignore requests errors and just try urllib fallback.
  Fixing bug where custom css would disappear.
  Don't delete old stories, screws up blurblogs.

Conflicts:
	apps/reader/models.py
This commit is contained in:
Samuel Clay 2012-07-19 23:31:46 -07:00
commit 19734cdc5e
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/rss_feeds/page_importer.py
View file

@ -94,7 +94,7 @@ class PageImporter(object):
except (requests.exceptions.RequestException,
requests.packages.urllib3.exceptions.HTTPError), e:
logging.debug(' ***> [%-30s] Page fetch failed using requests: %s' % (self.feed, e))
mail_feed_error_to_admin(self.feed, e, local_vars=locals())
# mail_feed_error_to_admin(self.feed, e, local_vars=locals())
return self.fetch_page(urllib_fallback=True, requests_exception=e)
except Exception, e:
logging.debug('[%d] ! -------------------------' % (self.feed.id,))

1
media/css/reader.css
View file

@ -2054,6 +2054,7 @@ background: transparent;
max-width: 700px;
border-top: 2px solid #353535;
border-bottom: 1px solid #353535;
clear: both;
}
#story_pane .NB-story-comment {
border-top: 1px solid #A6A6A6;

7
media/js/newsblur/reader/reader_profile_editor.js
View file

@ -85,7 +85,7 @@ _.extend(NEWSBLUR.ReaderProfileEditor.prototype, {
$.make('fieldset', [
$.make('legend', 'Custom CSS for your Blurblog'),
$.make('div', { className: 'NB-modal-section NB-profile-editor-blurblog-custom-css'}, [
$.make('textarea', { 'className': 'NB-profile-blurblog-css', name: 'css' })
$.make('textarea', { 'className': 'NB-profile-blurblog-css', name: 'css' }, this.profile.get('custom_css'))
])
]),
$.make('div', { className: 'NB-modal-submit-grey NB-blurblog-save-button NB-modal-submit-button' }, 'Change your blurblog settings above')
@ -144,6 +144,10 @@ _.extend(NEWSBLUR.ReaderProfileEditor.prototype, {
});
},
populate_data: function() {
$('textarea[name=css]', this.$modal).val(this.profile.get('custom_css'));
},
make_profile_section: function() {
var $badge = $('.NB-friends-findfriends-profile', this.$modal).empty();
var $profile_badge;
@ -199,6 +203,7 @@ _.extend(NEWSBLUR.ReaderProfileEditor.prototype, {
this.make_profile_section();
this.make_profile_photo_chooser();
this.choose_color();
this.populate_data();
callback && callback();
}, this));
},