From 0c3694382eb9800193894b1f742125bb04291870 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Wed, 23 May 2018 14:33:29 +0100 Subject: [PATCH 1/8] Excluding the privacy page from the navigation stuff --- app/navigation.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/navigation.py b/app/navigation.py index 8d15a63da..d724d2bfa 100644 --- a/app/navigation.py +++ b/app/navigation.py @@ -170,6 +170,7 @@ class HeaderNavigation(Navigation): 'old_using_notify', 'organisation_dashboard', 'organisation_settings', + 'privacy', 'public_agreement', 'public_download_agreement', 'received_text_messages_callback', @@ -418,6 +419,7 @@ class MainNavigation(Navigation): 'organisations', 'platform_admin', 'pricing', + 'privacy', 'public_agreement', 'public_download_agreement', 'redact_template', @@ -585,6 +587,7 @@ class OrgNavigation(Navigation): 'organisations', 'platform_admin', 'pricing', + 'privacy', 'public_agreement', 'public_download_agreement', 'received_text_messages_callback', From 53a1b05aaf76c9a225c76d468af40f3078fc55fb Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Wed, 23 May 2018 14:35:26 +0100 Subject: [PATCH 2/8] Adding the privacy page to the routes --- app/main/views/index.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/main/views/index.py b/app/main/views/index.py index 6e7bc1c6f..77ba91b94 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -37,6 +37,11 @@ def cookies(): return render_template('views/cookies.html') +@main.route('/privacy') +def privacy(): + return render_template('views/privacy.html') + + @main.route('/trial-mode') def trial_mode(): return redirect(url_for('.using_notify') + '#trial-mode', 301) From aa8992c7b90387923ef0b2d899ffff874feaa97b Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Wed, 23 May 2018 14:36:36 +0100 Subject: [PATCH 3/8] Testing that the privacy page exists --- tests/app/main/views/test_index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py index be6348ac3..17f5ad7c7 100644 --- a/tests/app/main/views/test_index.py +++ b/tests/app/main/views/test_index.py @@ -41,7 +41,7 @@ def test_logged_in_user_redirects_to_choose_account( @pytest.mark.parametrize('view', [ - 'cookies', 'using_notify', 'pricing', 'terms', 'integration_testing', 'roadmap', + 'cookies', 'privacy', 'using_notify', 'pricing', 'terms', 'integration_testing', 'roadmap', 'features', 'callbacks', 'documentation', 'security' ]) def test_static_pages( From a32399369079d0b41709591eaf07209eac8fd2b6 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Wed, 23 May 2018 14:41:19 +0100 Subject: [PATCH 4/8] Adding link to the privacy page in the footer --- app/templates/admin_template.html | 1 + 1 file changed, 1 insertion(+) diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index d8c1c8ca7..ae715f45f 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -109,6 +109,7 @@ {% block footer_support_links %}