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

Resolving conflicts.

Browse source
This commit is contained in:
Samuel Clay 2010-04-03 20:07:10 +00:00
commit da725418e0
6 changed files with 39 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/opml_import/views.py
View file

@ -63,6 +63,10 @@ class OPMLImporter:
folders.append({folder.text: self.process_outline(folder)}) folders.append({folder.text: self.process_outline(folder)})
elif hasattr(item, 'xmlUrl'): elif hasattr(item, 'xmlUrl'):
feed = item 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,) 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) feed_data = dict(feed_address=feed.xmlUrl, feed_link=feed.htmlUrl, feed_title=feed.title)
# feeds.append(feed_data) # feeds.append(feed_data)

4
apps/reader/models.py
View file

@ -25,9 +25,9 @@ class UserSubscription(models.Model):
def __unicode__(self): def __unicode__(self):
return '[' + self.feed.feed_title + '] ' 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() 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): def get_user_feeds(self):
return Feed.objects.get(user=self.user, feed=feeds) return Feed.objects.get(user=self.user, feed=feeds)

24
media/css/reader.css
View file

@ -1074,7 +1074,6 @@ form.opml_import_form input {
.NB-classifier .NB-publisher .NB-classifier-authors .NB-classifier-author { .NB-classifier .NB-publisher .NB-classifier-authors .NB-classifier-author {
float: left; float: left;
margin: 4px 16px 0 0; margin: 4px 16px 0 0;
font-weight: bold;
} }
.NB-classifier .NB-publisher .NB-classifier-authors input { .NB-classifier .NB-publisher .NB-classifier-authors input {
@ -1295,10 +1294,12 @@ background: transparent;
margin: 2px 6px 6px 0; margin: 2px 6px 6px 0;
cursor: pointer; cursor: pointer;
padding: 2px 9px 2px 4px; padding: 2px 9px 2px 4px;
font-size: 12px;
text-transform: uppercase;
} }
.NB-classifiers .NB-classifier input[type=checkbox] { .NB-classifiers .NB-classifier input[type=checkbox] {
margin: 0px 4px 0px; margin: 0 6px 0 4px;
float: none; float: none;
cursor: pointer; cursor: pointer;
} }
@ -1306,24 +1307,41 @@ background: transparent;
.NB-classifiers .NB-classifier label { .NB-classifiers .NB-classifier label {
cursor: pointer; cursor: pointer;
color: black; 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 { .NB-classifiers .NB-classifier.NB-classifier-tag {
background-color: #FFA200; background-color: #FFA200;
} }
.NB-classifiers .NB-classifier.NB-classifier-tag label {
text-shadow: 1px 1px 0 #cF7200;
}
.NB-classifiers .NB-classifier.NB-classifier-title { .NB-classifiers .NB-classifier.NB-classifier-title {
background-color: #FF7940; background-color: #FF7940;
} }
.NB-classifiers .NB-classifier.NB-classifier-title label {
text-shadow: 1px 1px 0 #cF4910;
}
.NB-classifiers .NB-classifier.NB-classifier-author { .NB-classifiers .NB-classifier.NB-classifier-author {
background-color: #60D6A7; background-color: #60D6A7;
} }
.NB-classifiers .NB-classifier.NB-classifier-author label {
text-shadow: 1px 1px 0 #30a677;
}
.NB-classifiers .NB-classifier.NB-classifier-publisher { .NB-classifiers .NB-classifier.NB-classifier-publisher {
background-color: #6a93d4; 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 { .NB-classifiers .NB-classifier.NB-classifier-facet-disabled {
background-color: white; background-color: white;

6
media/js/newsblur/reader_classifier.js
View file

@ -80,7 +80,7 @@ var classifier = {
$.make('span', { className: 'NB-classifier-tag NB-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('input', { type: 'checkbox', name: 'tag', value: tag[0], id: 'classifier_tag_'+t, checked: checked }),
$.make('label', { 'for': 'classifier_tag_'+t }, [ $.make('label', { 'for': 'classifier_tag_'+t }, [
$.make('b', tag[0]) tag[0]
]) ])
]), ]),
$.make('span', { className: 'NB-classifier-tag-count' }, [ $.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' }, [ var $tag = $.make('span', { className: 'NB-classifier-tag-container NB-classifier NB-classifier-tag' }, [
$.make('input', input_attrs), $.make('input', input_attrs),
$.make('label', { 'for': 'classifier_tag_'+t }, [ $.make('label', { 'for': 'classifier_tag_'+t }, [
$.make('b', tag) tag
]) ])
]); ]);
$story_tags.push($tag); $story_tags.push($tag);
@ -195,7 +195,7 @@ var classifier = {
$.make('div', { className: 'NB-classifier NB-classifier-author' }, [ $.make('div', { className: 'NB-classifier NB-classifier-author' }, [
$story_author, $story_author,
$.make('label', { 'for': 'classifier_author' }, [ $.make('label', { 'for': 'classifier_author' }, [
$.make('b', story.story_authors) story.story_authors
]) ])
]) ])
]) ])

6
settings.py
View file

@ -79,7 +79,7 @@ elif STAGING:
'ENGINE': 'django.db.backends.mysql', 'ENGINE': 'django.db.backends.mysql',
'USER': 'newsblur', 'USER': 'newsblur',
'PASSWORD': '', 'PASSWORD': '',
'HOST': 'localhost', 'HOST': '127.0.0.1'
} }
} }
DATABASE_HOST = 'localhost' DATABASE_HOST = 'localhost'
@ -101,7 +101,7 @@ elif DEV_SERVER1:
'ENGINE': 'django.db.backends.mysql', 'ENGINE': 'django.db.backends.mysql',
'USER': 'newsblur', 'USER': 'newsblur',
'PASSWORD': '', 'PASSWORD': '',
'HOST': 'localhost' 'HOST': '127.0.0.1',
} }
} }
DATABASE_HOST = 'localhost' DATABASE_HOST = 'localhost'
@ -125,7 +125,7 @@ elif DEV_SERVER2:
'ENGINE': 'django.db.backends.mysql', 'ENGINE': 'django.db.backends.mysql',
'USER': 'newsblur', 'USER': 'newsblur',
'PASSWORD': '', 'PASSWORD': '',
'HOST': 'localhost' 'HOST': '127.0.0.1',
} }
} }
DATABASE_HOST = 'localhost' DATABASE_HOST = 'localhost'

14
utils/compressed_textfield.py
View file

@ -31,14 +31,12 @@ class StoryField(models.TextField):
except: except:
return value return value
def get_db_prep_save(self, value): def get_prep_save(self, value):
if not value: if 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])
# print "Pre To DB: %s %s" % (len(value), value[:25]) return super(StoryField, self).get_prep_save(value)
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)