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

Replacing tutorial_finished boolean bakc in db so I can run development and production against the same db.

Browse source
This commit is contained in:
Samuel Clay 2012-03-20 11:15:40 -07:00
parent 5b71327531
commit 637f4201b8
5 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/profile/migrations/0017_gettingstarted.py
View file

@ -8,9 +8,6 @@ class Migration(SchemaMigration):
def forwards(self, orm):
# Deleting field 'Profile.tutorial_finished'
db.delete_column('profile_profile', 'tutorial_finished')
# Adding field 'Profile.hide_getting_started'
db.add_column('profile_profile', 'hide_getting_started', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
@ -26,9 +23,6 @@ class Migration(SchemaMigration):
def backwards(self, orm):
# Adding field 'Profile.tutorial_finished'
db.add_column('profile_profile', 'tutorial_finished', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
# Deleting field 'Profile.hide_getting_started'
db.delete_column('profile_profile', 'hide_getting_started')
@ -98,6 +92,7 @@ class Migration(SchemaMigration):
'stripe_4_digits': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}),
'stripe_id': ('django.db.models.fields.CharField', [], {'max_length': '24', 'null': 'True', 'blank': 'True'}),
'timezone': ('vendor.timezones.fields.TimeZoneField', [], {'default': "'America/New_York'", 'max_length': '100'}),
'tutorial_finished': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.User']"}),
'view_settings': ('django.db.models.fields.TextField', [], {'default': "'{}'"})
}

1
apps/profile/models.py
View file

@ -28,6 +28,7 @@ class Profile(models.Model):
view_settings = models.TextField(default="{}")
collapsed_folders = models.TextField(default="[]")
feed_pane_size = models.IntegerField(default=240)
tutorial_finished = models.BooleanField(default=False)
hide_getting_started = models.BooleanField(default=False)
has_setup_feeds = models.BooleanField(default=False)
has_found_friends = models.BooleanField(default=False)

14
media/css/reader.css
View file

@ -5554,8 +5554,8 @@ background: transparent;
.NB-modal-intro .NB-intro-services .NB-note {
display: block;
clear: both;
margin: 6px 24px 12px;
color: #606060;
margin: 12px 24px 12px;
color: #505050;
font-size: 11px;
text-align: center;
}
@ -5646,16 +5646,14 @@ background: transparent;
height: 10px;
float: right;
margin-top: 22px;
}
.NB-modal-intro .NB-intro-uptodate-follow.NB-intro-uptodate-twitter-active .NB-intro-uptodate-newwindow {
display: none;
}
.NB-modal-intro .NB-intro-uptodate-follow input {
display: none;
}
.NB-modal-intro .NB-intro-uptodate-follow.NB-intro-uptodate-twitter-active input {
.NB-modal-intro .NB-intro-uptodate-follow-twitter.NB-intro-uptodate-twitter-inactive .NB-intro-uptodate-newwindow {
display: block;
}
.NB-modal-intro .NB-intro-uptodate-follow-twitter.NB-intro-uptodate-twitter-inactive input {
display: none;
}
/* ============ */
/* = Carousel = */

5
media/js/newsblur/common/assetmodel.js
View file

@ -307,7 +307,10 @@ NEWSBLUR.AssetModel.Reader.prototype = {
data['include_favicons'] = true;
}
this.make_request('/reader/feeds', data, pre_callback, error_callback, {request_type: 'GET'});
this.make_request('/reader/feeds', data, pre_callback, error_callback, {
ajax_group: 'feed',
request_type: 'GET'
});
},
detect_any_inactive_feeds: function() {

8
media/js/newsblur/reader/reader_intro.js
View file

@ -96,7 +96,7 @@ _.extend(NEWSBLUR.ReaderIntro.prototype, {
$.make('div', { className: 'NB-page NB-page-4' }, [
$.make('h4', { className: 'NB-page-4-started' }, "Keep up-to-date with NewsBlur"),
$.make('div', { className: 'NB-intro-section' }, [
$.make('div', { className: 'NB-intro-uptodate-follow NB-right' }, [
$.make('div', { className: 'NB-intro-uptodate-follow NB-intro-uptodate-follow-twitter NB-right' }, [
$.make('input', { type: 'checkbox', id: 'NB-intro-uptodate-follow-newsblur' }),
$.make('label', { 'for': 'NB-intro-uptodate-follow-newsblur' }, [
$.make('img', { src: NEWSBLUR.Globals.MEDIA_URL + 'img/reader/new-window-icon.png', className: 'NB-intro-uptodate-newwindow' }),
@ -109,7 +109,7 @@ _.extend(NEWSBLUR.ReaderIntro.prototype, {
])
])
]),
$.make('div', { className: 'NB-intro-uptodate-follow' }, [
$.make('div', { className: 'NB-intro-uptodate-follow NB-intro-uptodate-follow-twitter' }, [
$.make('input', { type: 'checkbox', id: 'NB-intro-uptodate-follow-samuelclay' }),
$.make('label', { 'for': 'NB-intro-uptodate-follow-samuelclay' }, [
$.make('img', { src: NEWSBLUR.Globals.MEDIA_URL + 'img/reader/new-window-icon.png', className: 'NB-intro-uptodate-newwindow' }),
@ -213,7 +213,7 @@ _.extend(NEWSBLUR.ReaderIntro.prototype, {
var $note = $.make('div', { className: 'NB-note'}, [
'Feel comfortable connecting to these services.',
$.make('br'),
'NewsBlur will not spam, email, bother, or do anything without your permission.'
'Nothing happens without your permission.'
]);
$services.append($note);
}
@ -481,7 +481,7 @@ _.extend(NEWSBLUR.ReaderIntro.prototype, {
// ===================
show_twitter_follow_buttons: function() {
$('.NB-intro-uptodate-follow', this.$modal).toggleClass('NB-intro-uptodate-twitter-active', !!this.services.twitter.twitter_uid);
$('.NB-intro-uptodate-follow', this.$modal).toggleClass('NB-intro-uptodate-twitter-inactive', !this.services.twitter.twitter_uid);
},
follow_twitter_account: function(username) {