Skip to content

Commit

Permalink
Merge pull request #938 from hdoupe/subscribe-page
Browse files Browse the repository at this point in the history
Add subscribed landing page
  • Loading branch information
hdoupe committed Oct 31, 2018
2 parents f7d6261 + 1d022d2 commit 77f8560
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 5 deletions.
13 changes: 13 additions & 0 deletions RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,19 @@ Go
[here](https://github.com/OpenSourcePolicyCenter/PolicyBrain/pulls?q=is%3Apr+is%3Aclosed)
for a complete commit history.

Release 1.7.2 on 2018-10-31
----------------------------
**Major Changes**
- None

**Minor Changes**
- [#931](https://github.com/ospc-org/ospc.org/pull/937) - Use conda 'defaults' channel instead of 'anaconda' - Hank Doupe
- [#938](https://github.com/ospc-org/ospc.org/pull/938) - Add subscribed landing page - Hank Doupe

**Bug Fixes**
- None


Release 1.7.1 on 2018-08-30
----------------------------
**Major Changes**
Expand Down
12 changes: 12 additions & 0 deletions templates/pages/thanks-for-subscribing.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{% extends 'pages/home.html' %}
{% block content %}
<div class="container">
<div class="row">
<div class="columns col-md-12">
<h2>Thank you for joining our mailing list!</h2>
<p>Thank you for signing up for the OSPC newsletter. This is the best way to stay up to date on the latest news from the Open Source Policy Center.</p>
</div>
</div>
</div>
{% endblock %}

Empty file.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from django.test import TestCase


class PagesViewsTestCase(TestCase):
class PageViewsTests(TestCase):
def test_about(self):
resp = self.client.get('/about/')
self.assertEqual(resp.status_code, 200)
Expand All @@ -14,6 +14,6 @@ def test_news(self):
resp = self.client.get('/news/')
self.assertEqual(resp.status_code, 302)

def test_apps(self):
resp = self.client.get('/apps/')
def test_subscribed(self):
resp = self.client.get('/subscribed/')
self.assertEqual(resp.status_code, 200)
4 changes: 3 additions & 1 deletion webapp/apps/pages/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@

from .views import (homepage, aboutpage, newspage, gallerypage, hellopage,
embedpage, widgetpage, newsdetailpage,
apps_landing_page, border_adjustment_plot, docspage, gettingstartedpage)
apps_landing_page, border_adjustment_plot, docspage,
gettingstartedpage, subscribed)

urlpatterns = [
url(r'^$', homepage, name='home'), # url(r'^apps/$', apps_landing_page, name='apps'),
url(r'^about/$', aboutpage, name='about'),
url(r'^getting-started/$', gettingstartedpage, name='gettingstartedpage'),
url(r'^subscribed/$', subscribed, name='subscribed'),
url(r'^hello/$', hellopage, name='hello'),
url(r'^gallery/$', gallerypage, name='gallery'),
url(r'^news/$', newspage, name='news'),
Expand Down
5 changes: 5 additions & 0 deletions webapp/apps/pages/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ def subscribeform(request):
subscribeform = SubscribeForm()
return subscribeform


def subscribed(request):
return render(request, 'pages/thanks-for-subscribing.html')


def check_email(request):
return render(request, 'register/please-check-email.html', {})

Expand Down
2 changes: 1 addition & 1 deletion webapp/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
]


WEBAPP_VERSION = "1.7.0"
WEBAPP_VERSION = "1.7.2"

# Application definition

Expand Down

0 comments on commit 77f8560

Please sign in to comment.