diff --git a/apps/opml_import/views.py b/apps/opml_import/views.py index 143a9e252..f2ffcb5d2 100644 --- a/apps/opml_import/views.py +++ b/apps/opml_import/views.py @@ -63,6 +63,10 @@ class OPMLImporter: folders.append({folder.text: self.process_outline(folder)}) elif hasattr(item, 'xmlUrl'): feed = item + if not hasattr(feed, 'htmlUrl'): + setattr(feed, 'htmlUrl', None) + if not hasattr(feed, 'title'): + setattr(feed, 'title', feed.htmlUrl) print '\t%s - %s - %s' % (feed.title, feed.htmlUrl, feed.xmlUrl,) feed_data = dict(feed_address=feed.xmlUrl, feed_link=feed.htmlUrl, feed_title=feed.title) # feeds.append(feed_data) diff --git a/apps/reader/models.py b/apps/reader/models.py index 7b1e6b52c..1fba71237 100644 --- a/apps/reader/models.py +++ b/apps/reader/models.py @@ -25,9 +25,9 @@ class UserSubscription(models.Model): def __unicode__(self): return '[' + self.feed.feed_title + '] ' - def save(self, force_insert=False, force_update=False): + def save(self, force_insert=False, force_update=False, *args, **kwargs): self.unread_count_updated = datetime.datetime.now() - super(UserSubscription, self).save(force_insert, force_update) + super(UserSubscription, self).save(force_insert, force_update, *args, **kwargs) def get_user_feeds(self): return Feed.objects.get(user=self.user, feed=feeds) diff --git a/media/css/reader.css b/media/css/reader.css index 4694705f5..135d29de3 100644 --- a/media/css/reader.css +++ b/media/css/reader.css @@ -1074,7 +1074,6 @@ form.opml_import_form input { .NB-classifier .NB-publisher .NB-classifier-authors .NB-classifier-author { float: left; margin: 4px 16px 0 0; - font-weight: bold; } .NB-classifier .NB-publisher .NB-classifier-authors input { @@ -1295,10 +1294,12 @@ background: transparent; margin: 2px 6px 6px 0; cursor: pointer; padding: 2px 9px 2px 4px; + font-size: 12px; + text-transform: uppercase; } .NB-classifiers .NB-classifier input[type=checkbox] { - margin: 0px 4px 0px; + margin: 0 6px 0 4px; float: none; cursor: pointer; } @@ -1306,24 +1307,41 @@ background: transparent; .NB-classifiers .NB-classifier label { cursor: pointer; color: black; - text-shadow: 1px 1px 0 #ccc; +} + +.NB-classifiers .NB-classifier label b { + color: #303030; + text-shadow: none; + font-weight: normal; } .NB-classifiers .NB-classifier.NB-classifier-tag { background-color: #FFA200; } +.NB-classifiers .NB-classifier.NB-classifier-tag label { + text-shadow: 1px 1px 0 #cF7200; +} .NB-classifiers .NB-classifier.NB-classifier-title { background-color: #FF7940; } +.NB-classifiers .NB-classifier.NB-classifier-title label { + text-shadow: 1px 1px 0 #cF4910; +} .NB-classifiers .NB-classifier.NB-classifier-author { background-color: #60D6A7; } +.NB-classifiers .NB-classifier.NB-classifier-author label { + text-shadow: 1px 1px 0 #30a677; +} .NB-classifiers .NB-classifier.NB-classifier-publisher { background-color: #6a93d4; } +.NB-classifiers .NB-classifier.NB-classifier-publisher label { + text-shadow: 1px 1px 0 #3A63A4; +} .NB-classifiers .NB-classifier.NB-classifier-facet-disabled { background-color: white; diff --git a/media/js/newsblur/reader_classifier.js b/media/js/newsblur/reader_classifier.js index c7df4ba5d..5491a4186 100644 --- a/media/js/newsblur/reader_classifier.js +++ b/media/js/newsblur/reader_classifier.js @@ -80,7 +80,7 @@ var classifier = { $.make('span', { className: 'NB-classifier-tag NB-classifier' }, [ $.make('input', { type: 'checkbox', name: 'tag', value: tag[0], id: 'classifier_tag_'+t, checked: checked }), $.make('label', { 'for': 'classifier_tag_'+t }, [ - $.make('b', tag[0]) + tag[0] ]) ]), $.make('span', { className: 'NB-classifier-tag-count' }, [ @@ -158,7 +158,7 @@ var classifier = { var $tag = $.make('span', { className: 'NB-classifier-tag-container NB-classifier NB-classifier-tag' }, [ $.make('input', input_attrs), $.make('label', { 'for': 'classifier_tag_'+t }, [ - $.make('b', tag) + tag ]) ]); $story_tags.push($tag); @@ -195,7 +195,7 @@ var classifier = { $.make('div', { className: 'NB-classifier NB-classifier-author' }, [ $story_author, $.make('label', { 'for': 'classifier_author' }, [ - $.make('b', story.story_authors) + story.story_authors ]) ]) ]) diff --git a/settings.py b/settings.py index ace440b7b..333b9fed6 100644 --- a/settings.py +++ b/settings.py @@ -79,7 +79,7 @@ elif STAGING: 'ENGINE': 'django.db.backends.mysql', 'USER': 'newsblur', 'PASSWORD': '', - 'HOST': 'localhost', + 'HOST': '127.0.0.1' } } DATABASE_HOST = 'localhost' @@ -101,7 +101,7 @@ elif DEV_SERVER1: 'ENGINE': 'django.db.backends.mysql', 'USER': 'newsblur', 'PASSWORD': '', - 'HOST': 'localhost' + 'HOST': '127.0.0.1', } } DATABASE_HOST = 'localhost' @@ -125,7 +125,7 @@ elif DEV_SERVER2: 'ENGINE': 'django.db.backends.mysql', 'USER': 'newsblur', 'PASSWORD': '', - 'HOST': 'localhost' + 'HOST': '127.0.0.1', } } DATABASE_HOST = 'localhost' diff --git a/utils/compressed_textfield.py b/utils/compressed_textfield.py index f8ed5f4db..2b26c3c3c 100644 --- a/utils/compressed_textfield.py +++ b/utils/compressed_textfield.py @@ -31,14 +31,12 @@ class StoryField(models.TextField): except: return value - def get_db_prep_save(self, value): + def get_prep_save(self, value): - if not value: - return None - - # print "Pre To DB: %s %s" % (len(value), value[:25]) - value = value.encode('zlib').encode('base64') - # print "Post To DB: %s %s" % (len(value), value[:25]) + if value: + # print "Pre To DB: %s %s" % (len(value), value[:25]) + value = value.encode('zlib').encode('base64') + # print "Post To DB: %s %s" % (len(value), value[:25]) - return super(StoryField, self).get_db_prep_save(value) + return super(StoryField, self).get_prep_save(value) \ No newline at end of file