Permalink
Browse files

Fixing issue on ev machines not being backed by s3. Also removing unu…

…sed faq and about js.
  • Loading branch information...
1 parent ce52a32 commit 56162dc8710007b03d996328d0444ecf894d8017 @samuelclay committed Sep 22, 2012
View
@@ -565,7 +565,10 @@ def load_feed_page(request, feed_id):
feed = Feed.get_by_id(feed_id)
- if feed.has_page and not feed.has_page_exception and feed.s3_page:
+ if (feed.has_page and
+ not feed.has_page_exception and
+ settings.BACKED_BY_AWS['icons_on_s3'] and
+ feed.s3_page):
if settings.PROXY_S3_PAGES:
key = settings.S3_PAGES_BUCKET.get_key(feed.s3_pages_key)
compressed_data = key.get_contents_as_string()
View
@@ -89,13 +89,13 @@ def title(self):
@property
def favicon_url(self):
- if self.s3_icon:
+ if settings.BACKED_BY_AWS['icons_on_s3'] and self.s3_icon:
return "http://%s/%s.png" % (settings.S3_ICONS_BUCKET_NAME, self.pk)
return reverse('feed-favicon', kwargs={'feed_id': self.pk})
@property
def favicon_url_fqdn(self):
- if self.s3_icon:
+ if settings.BACKED_BY_AWS['icons_on_s3'] and self.s3_icon:
return self.favicon_url
return "http://%s%s" % (
Site.objects.get_current().domain,
View
@@ -65,7 +65,6 @@ javascripts:
- media/js/newsblur/reader/reader_utils.js
- media/js/newsblur/reader/reader.js
- media/js/newsblur/reader/*.js
- - media/js/newsblur/static/*.js
- media/js/newsblur/welcome/*.js
mobile:
- media/js/vendor/jquery-1.7.2.js
@@ -3060,7 +3060,6 @@
this.flags['feed_list_showing_manage_menu'] = false;
$(document).unbind('click.menu');
$(document).unbind('mouseup.menu');
- $manage_menu_container.uncorner();
if (this.model.preference('show_tooltips')) {
$('.NB-task-manage').tipsy('enable');
}
@@ -1,197 +0,0 @@
-NEWSBLUR.About = function(options) {
- var defaults = {};
-
- this.options = $.extend({}, defaults, options);
- this.runner();
-};
-
-NEWSBLUR.About.prototype = {
-
- runner: function() {
- this.make_modal();
- this.open_modal();
-
- this.$modal.bind('click', $.rescope(this.handle_click, this));
- },
-
- make_modal: function() {
- var self = this;
-
- this.$modal = $.make('div', { className: 'NB-modal-about NB-modal-exception NB-modal' }, [
- $.make('a', { href: '#faq', className: 'NB-link-about-faq' }, 'FAQ'),
- $.make('h2', { className: 'NB-modal-title' }, 'About NewsBlur'),
- $.make('div', { className: 'NB-fieldset NB-modal-submit' }, [
- $.make('h5', [
- $.make('div', { className: 'NB-exception-option-meta' }),
- $.make('span', { className: 'NB-exception-option-option' }, 'What:'),
- 'A Feed Reader with Intelligence'
- ]),
- $.make('div', { className: 'NB-fieldset-fields' }, [
- $.make('ul', { className: 'NB-about-what' }, [
- $.make('li', 'Read the original site or the RSS feed.'),
- $.make('li', 'Automatically highlight stories you want to read.'),
- $.make('li', { className: 'last' }, 'Filter out stories you don\'t want to read.')
- ])
- ])
- ]),
- $.make('div', { className: 'NB-fieldset NB-modal-submit' }, [
- $.make('h5', [
- $.make('div', { className: 'NB-exception-option-meta' }),
- $.make('span', { className: 'NB-exception-option-option' }, 'Who:'),
- 'A Labor of Love'
- ]),
- $.make('div', { className: 'NB-fieldset-fields' }, [
- $.make('ul', { className: 'NB-about-who' }, [
- $.make('li', [
- 'Hand-crafted by: ',
- $.make('a', { href: 'http://www.samuelclay.com' }, 'Samuel Clay')
- ]),
- $.make('li', [
- 'Find him on Twitter: ',
- $.make('a', { href: 'http://twitter.com/samuelclay' }, '@samuelclay')
- ]),
- $.make('li', [
- 'E-mail: ',
- $.make('a', { href: 'mailto:samuel@newsblur.com' }, 'samuel@newsblur.com')
- ]),
- $.make('li', { className: 'last' }, [
- 'Made in: ',
- $.make('a', { href: 'http://www.newyorkfieldguide.com' }, 'New York City')
- ])
- ])
- ])
- ]),
- $.make('div', { className: 'NB-fieldset NB-modal-submit' }, [
- $.make('h5', [
- $.make('div', { className: 'NB-exception-option-meta' }),
- $.make('span', { className: 'NB-exception-option-option' }, 'How:'),
- 'Server-side technologies'
- ]),
- $.make('div', { className: 'NB-fieldset-fields' }, [
- $.make('ul', { className: 'NB-about-server' }, [
- $.make('li', [
- $.make('a', { href: 'http://www.djangoproject.com' }, 'Django'),
- ': Web framework written in Python, used to serve all pages.'
- ]),
- $.make('li', [
- $.make('a', { href: 'http://ask.github.com/celery' }, 'Celery'),
- ' & ',
- $.make('a', { href: 'http://www.rabbitmq.com' }, 'RabbitMQ'),
- ': Asynchronous queueing server, used to fetch and parse RSS feeds.'
- ]),
- $.make('li', [
- $.make('a', { href: 'http://www.mongodb.com' }, 'MongoDB'),
- ', ',
- $.make('a', { href: 'http://www.mongodb.com/pymongo' }, 'Pymongo'),
- ', & ',
- $.make('a', { href: 'http://www.github.com/hmarr/mongoengine' }, 'Mongoengine'),
- ': Non-relational database, used to store stories, read stories, feed/page fetch histories, and proxied sites.'
- ]),
- $.make('li', { className: 'last' }, [
- $.make('a', { href: 'http://www.postgresql.com' }, 'PostgreSQL'),
- ': Relational database, used to store feeds, subscriptions, and user accounts.'
- ])
- ])
- ])
- ]),
- $.make('div', { className: 'NB-fieldset NB-modal-submit' }, [
- $.make('h5', [
- $.make('div', { className: 'NB-exception-option-meta' }),
- $.make('span', { className: 'NB-exception-option-option' }, 'How:'),
- 'Client-side and design'
- ]),
- $.make('div', { className: 'NB-fieldset-fields' }, [
- $.make('ul', { className: 'NB-about-client' }, [
- $.make('li', [
- $.make('a', { href: 'http://www.jquery.com' }, 'jQuery'),
- ': Cross-browser compliant JavaScript code. IE works without effort.'
- ]),
- $.make('li', [
- $.make('a', { href: 'http://documentcloud.github.com/underscore/' }, 'Underscore.js'),
- ': Functional programming for JavaScript. Indispensible.'
- ]),
- $.make('li', [
- $.make('b', 'Miscellaneous jQuery Plugins:'),
- ' Everything from resizable layouts, to progress bars, sortables, date handling, colors, corners, JSON, animations. See the complete list on ',
- $.make('a', { href: 'http://github.com/samuelclay/NewsBlur/' }, 'NewsBlur\'s GitHub repository')
- ])
- ])
- ])
- ]),
- $.make('div', { className: 'NB-fieldset NB-modal-submit' }, [
- $.make('h5', [
- $.make('div', { className: 'NB-exception-option-meta' }),
- $.make('span', { className: 'NB-exception-option-option' }, 'Why:'),
- 'What\'s the point of another RSS feed reader?'
- ]),
- $.make('div', { className: 'NB-fieldset-fields' }, [
- $.make('ul', { className: 'NB-about-why' }, [
- $.make('li', [
- 'To learn how to build and scale the entire web stack: front-end JavaScript, HTML5 layout, back-end view processing, large dataset schema migrations, relational and non-relational database clusters across multiple servers, and getting multiple machines to talk to each other.'
- ]),
- $.make('li', [
- 'All of this just to prove that I could do it.'
- ]),
- $.make('li', [
- 'But most importantly, to meet future co-founders.'
- ])
- ])
- ])
- ])
- ]);
- },
-
- open_modal: function() {
- var self = this;
-
- this.$modal.modal({
- 'minWidth': 600,
- 'maxWidth': 600,
- 'overlayClose': true,
- 'onOpen': function (dialog) {
- dialog.overlay.fadeIn(200, function () {
- dialog.container.fadeIn(200);
- dialog.data.fadeIn(200);
- });
- },
- 'onShow': function(dialog) {
- $('#simplemodal-container').corner('6px');
- },
- 'onClose': function(dialog, callback) {
- dialog.data.hide().empty().remove();
- dialog.container.hide().empty().remove();
- dialog.overlay.fadeOut(200, function() {
- dialog.overlay.empty().remove();
- $.modal.close(callback);
- });
- $('.NB-modal-holder').empty().remove();
- }
- });
- },
-
- handle_cancel: function() {
- var $cancel = $('.NB-modal-cancel', this.$modal);
-
- $cancel.click(function(e) {
- e.preventDefault();
- $.modal.close();
- });
- },
-
- // ===========
- // = Actions =
- // ===========
-
- handle_click: function(elem, e) {
- var self = this;
-
- $.targetIs(e, { tagSelector: '.NB-link-about-faq' }, function($t, $p) {
- e.preventDefault();
-
- $.modal.close(function() {
- NEWSBLUR.faq = new NEWSBLUR.Faq();
- });
- });
- }
-
-};
Oops, something went wrong.

0 comments on commit 56162dc

Please sign in to comment.