diff --git a/apps/feed_import/views.py b/apps/feed_import/views.py index eb2bbd4ce..56bcff29f 100644 --- a/apps/feed_import/views.py +++ b/apps/feed_import/views.py @@ -173,7 +173,7 @@ def reader_callback(request): if request.user.is_authenticated(): return render_to_response('social/social_connect.xhtml', {}, context_instance=RequestContext(request)) - + return HttpResponseRedirect(reverse('import-signup')) @json.json_view @@ -221,7 +221,10 @@ def import_signup(request): user_token.user = new_user user_token.save() login_user(request, new_user) - return HttpResponseRedirect(reverse('index')) + url = "https://%s%s" % (Site.objects.get_current().domain, + reverse('stripe-form')) + return HttpResponseRedirect(url) + # return HttpResponseRedirect(reverse('index')) else: logging.user(request, "~BR~FW ***> Can't find user token during import/signup. Re-authenticating...") return HttpResponseRedirect(reverse('google-reader-authorize')) diff --git a/apps/reader/views.py b/apps/reader/views.py index c3b53bcd2..de5f39f75 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -159,7 +159,9 @@ def signup(request): new_user = form.save() login_user(request, new_user) logging.user(new_user, "~FG~SB~BBNEW SIGNUP~FW") - return HttpResponseRedirect(reverse('index')) + url = "https://%s%s" % (Site.objects.get_current().domain, + reverse('stripe-form')) + return HttpResponseRedirect(url) return index(request) diff --git a/media/css/reader.css b/media/css/reader.css index abb9e0df3..720a8b137 100644 --- a/media/css/reader.css +++ b/media/css/reader.css @@ -9097,4 +9097,15 @@ form.opml_import_form input { } .NB-static-form .NB-errors { margin-left: 200px; +} + +.NB-static-alert { + margin: 24px 0 0 0; + text-align: center; + font-size: 16px; + line-height: 24px; + color: #294A28; +} +.NB-static-feedchooser .NB-feedchooser-premium-bullets li { + background-color: rgba(255, 255, 255, .4); } \ No newline at end of file diff --git a/templates/profile/stripe_form.xhtml b/templates/profile/stripe_form.xhtml index 339f14c80..f7052a09c 100644 --- a/templates/profile/stripe_form.xhtml +++ b/templates/profile/stripe_form.xhtml @@ -15,7 +15,49 @@ {% block content %} -
+
+ Due to overwhelming demand, free accounts are temporarily suspended. +
+ By going premium you get full access to NewsBlur. +
+ +
+
+
+
+ Super-Mega Premium Account +
+
+
    +
  • +
    Enable every site by going premium +
  • +
  • +
    Sites updated up to 10x more often +
  • +
  • +
    River of News (reading by folder) +
  • +
  • +
    Privacy options for your blurblog +
  • +
  • +
    Text view conveniently extracts the story +
  • +
  • +
    You feed my poor, hungry dog for 12 days +
  • +
  • +
    Choose how much you would like to pay +
    + The only difference is happiness +
    +
  • +
+
+
{{ user.username }}