← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~cjwatson/launchpad/new-privacy-policy into lp:launchpad

 

Colin Watson has proposed merging lp:~cjwatson/launchpad/new-privacy-policy into lp:launchpad.

Commit message:
Add a "Data privacy" link to the site footer.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/new-privacy-policy/+merge/346743
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/new-privacy-policy into lp:launchpad.
=== modified file 'lib/lp/app/browser/doc/base-layout.txt'
--- lib/lp/app/browser/doc/base-layout.txt	2018-03-28 19:31:02 +0000
+++ lib/lp/app/browser/doc/base-layout.txt	2018-05-23 14:39:56 +0000
@@ -147,6 +147,7 @@
     Read the guide https://help.launchpad.net/
     Canonical Ltd. http://canonical.com/
     Terms of use http://launchpad.dev/legal
+    Data privacy https://www.ubuntu.com/legal/dataprivacy
     Contact Launchpad Support /feedback
     Blog http://blog.launchpad.net/
     Careers http://www.canonical.com/about-canonical/careers

=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt	2018-01-01 17:40:03 +0000
+++ lib/lp/app/templates/base-layout-macros.pt	2018-05-23 14:39:56 +0000
@@ -298,6 +298,8 @@
        • 
       <a tal:attributes="href string:${rooturl}legal">Terms of use</a>
       &nbsp;&bull;&nbsp;
+      <a href="https://www.ubuntu.com/legal/dataprivacy";>Data privacy</a>
+      &nbsp;&bull;&nbsp;
       <a tal:condition="not: view/user|nothing"
         href="/feedback">Contact Launchpad Support</a>
       <a tal:condition="view/user|nothing"

=== modified file 'lib/lp/services/mailman/monkeypatches/lp-mhonarc-common.mrc'
--- lib/lp/services/mailman/monkeypatches/lp-mhonarc-common.mrc	2018-01-01 17:40:03 +0000
+++ lib/lp/services/mailman/monkeypatches/lp-mhonarc-common.mrc	2018-05-23 14:39:56 +0000
@@ -161,6 +161,8 @@
       &nbsp;&bull;&nbsp;
       <a href="https://launchpad.net/legal";>Terms of use</a>
       &nbsp;&bull;&nbsp;
+      <a href="https://www.ubuntu.com/legal/dataprivacy";>Data privacy</a>
+      &nbsp;&bull;&nbsp;
       <a href="https://launchpad.net/support";>Contact Launchpad Support</a>
       &nbsp;&bull;&nbsp;
       <a href="http://blog.launchpad.net/";>Blog</a>


Follow ups