{"action":"created","comment":{"url":"https://api.github.com/repos/mozilla/bedrock/pulls/comments/23448491","id":23448491,"diff_hunk":"@@ -1,142 +1,310 @@\n {# This Source Code Form is subject to the terms of the Mozilla Public\n  # License, v. 2.0. If a copy of the MPL was not distributed with this\n- # file, You can obtain one at http://mozilla.org/MPL/2.0/. -#}\n+ # file, You can obtain one at http://mozilla.org/MPL/2.0/. #}\n \n {% extends \"base-resp.html\" %}\n \n-{% block body_id %}privacy-day{% endblock %}\n+{% from \"macros.html\" import share_cta with context %}\n+\n+{% block page_title_prefix %}{% endblock %}\n+{% block page_title %}{{ _('Get smart on privacy') }}{% endblock %}\n \n-{% block page_title %}{{ _('We put your privacy first') }}{% endblock %}\n+{% block page_image %}{{ media('img/privacy/you/sharing-tile.png') }}{% endblock %}\n+\n+{% block page_desc %}\n+  {{ _('Feel like you’ve lost control of how your information is used online?') }}\n+  {{ _('Here are 4 easy steps to raising your privacy IQ & protecting yourself online.') }}\n+{% endblock %}\n \n-{% block extrahead %}\n+{% block body_id %}privacy-day{% endblock %}\n+\n+{% block site_css %}\n   {{ css('privacy-day') }}\n {% endblock %}\n \n-{% block body_class %}privacy-day{% endblock %}\n+{%\n+set share_urls = {\n+    'twitter': 'http://mzl.la/1E63Mxm',\n+    'googleplus': 'https://www.mozilla.org/' + LANG + '/privacy/tips/?utm_source=Google&utm_medium=MozLandingPage&utm_campaign=privacy2015&utm_content=WebsiteShare',\n+    'facebook': 'https://www.mozilla.org/' + LANG + '/privacy/tips/?utm_source=Facebook&utm_medium=MozLandingPage&utm_campaign=privacy2015&utm_content=WebsiteShare#play'\n+}\n+%}\n \n {% block site_header %}\n   <header id=\"masthead\">\n     <div class=\"container\">\n       <a href=\"{{ url('mozorg.home') }}\" id=\"tabzilla\" data-infobar=\"{{ settings.TABZILLA_INFOBAR_OPTIONS }}\">Mozilla</a>\n-    {% block site_header_logo %}\n-      <h2><a href=\"{{ url('mozorg.home') }}\">{{ high_res_img('img/sandstone/mozilla-wordmark-white.png', {'alt': 'Mozilla', 'width': '170', 'height': '46'}) }}</a></h2>\n-    {% endblock %}\n+      {% block site_header_nav %}{% endblock %}\n     </div>\n   </header>\n {% endblock %}\n \n {% block content %}\n+<main role=\"main\" id=\"main-content\">\n+  <div id=\"page-header\">\n+    <div class=\"container\">\n+      <h1>{{ _('Get smart on privacy') }}</h1>\n+      <h2>{{ _('In four easy steps') }}</h2>\n+    </div>\n+  </div>\n \n-<main role=\"main\">\n-  <article id=\"main-content\">\n-    <header>\n-      <div class=\"container\">\n-        <h1>{{ _('We put your privacy first') }}</h1>\n-        <div id=\"download\">\n-          {{ download_firefox(small=True) }}\n-        </div>\n-        <p id=\"principles\"><a href=\"{{ url('privacy.principles') }}\">{{ _('Explore our privacy principles') }}</a></p>\n-      </div>\n-    </header>\n+  <div class=\"pager pager-auto-init pager-with-tabs\">\n \n+  <div id=\"button-nav-wrapper\" class=\"button-wrapper\">\n     <div class=\"container\">\n-      <div class=\"intro\">\n-        <p>\n-        {% trans manifesto=url('mozorg.about.manifesto') %}\n-          At Mozilla, we have a long history of taking privacy seriously. It’s front and center\n-          in every piece of software we make. It's in our <a href=\"{{ manifesto }}\">Manifesto</a>.\n-        {% endtrans %}\n-        {% trans %}\n-          It’s part of our DNA. The Web is an amazing thing and it's at its best when it’s open,\n-          transparent and safe for everyone. Here are some of the ways we work to give you a better\n-          understanding — and more control — of your privacy online.\n-        {% endtrans %}\n-        </p>\n+      <div class=\"share-widget\">\n+        {{ share_cta(_('Share'), share_urls, _('I’m taking control of my online privacy. Here’s how you can, too: #SmartOnPrivacy')) }}\n       </div>\n+      <nav id=\"tips-nav-direct\">\n+        <ol role=\"tablist\" class=\"pager-tabs\">\n+          <li role=\"presentation\">\n+            <a role=\"tab\" aria-controls=\"ask\" aria-selected=\"true\" href=\"#ask\" id=\"tab-ask\"><span>{{ _('1') }}</span> {{ _('ASK') }}</a>\n+          </li>\n+          <li role=\"presentation\">\n+            <a role=\"tab\" aria-controls=\"learn\" aria-selected=\"false\" href=\"#learn\" id=\"tab-learn\"><span>{{ _('2') }}</span> {{ _('LEARN') }}</a>\n+          </li>\n+          <li role=\"presentation\">\n+            <a role=\"tab\" aria-controls=\"act\" aria-selected=\"false\" href=\"#act\" id=\"tab-act\"><span>{{ _('3') }}</span> {{ _('ACT') }}</a>\n+          </li>\n+          <li role=\"presentation\">\n+            <a role=\"tab\" aria-controls=\"discuss\" aria-selected=\"false\" href=\"#discuss\" id=\"tab-discuss\"><span>{{ _('4') }}</span> {{ _('DISCUSS') }}</a>\n+          </li>\n+        </ol>\n+      </nav>\n+    </div>{# /#share-nav-wrapper #}\n+  </div>{# /.container #}\n \n-      <div class=\"main\">\n-\n-          <div class=\"block\">\n-            <h2>{{ _('Privacy Principles') }}</h2>\n-            <p>\n-            {% trans %}\n-              We have a set of privacy principles that stem from the Mozilla Manifesto and\n-              inform how we develop our websites, products and services.\n-            {% endtrans %}\n-            </p>\n-            <p class=\"go\"><a href=\"{{ url('privacy.principles') }}\">{{ _('Learn about our privacy principles') }}</a></p>\n-          </div>\n-\n-          <div class=\"block\">\n-            <h2>{{ _('Do Not Track') }}</h2>\n-            <p>\n-            {% trans %}\n-              Do Not Track is a feature in Firefox that helps put you in control of the way your\n-              information is collected and used online.\n-            {% endtrans %}\n-            {% trans %}\n-              When enabled, Do Not Track will tell advertising networks and websites that you want\n-              to opt-out of tracking for purposes like behavioral advertising.\n-            {% endtrans %}\n-            </p>\n-            <p class=\"go\"><a href=\"https://support.mozilla.org/kb/how-do-i-turn-do-not-track-feature\">{{ _('Enable Do Not Track in your Firefox today') }}</a></p>\n-          </div>\n \n-          <div class=\"block\">\n-            <h2>Lightbeam</h2>\n-            <p>\n-            {% trans %}\n-              A Firefox add-on, Lightbeam allows you to see the first and hidden third party sites\n-              you interact with on the Web. Using interactive visualizations, it’s an innovative way\n-              to see who’s tracking you online.\n-            {% endtrans %}\n-            </p>\n-            <p class=\"go\"><a href=\"{{ url('lightbeam.lightbeam') }}\">{{ _('Download Lightbeam and shine a light on who’s watching you') }}</a></p>\n+  <div id=\"page-content\">\n+    <div class=\"container\">\n+      <div id=\"tips-wrapper\" class=\"pager-content\">\n+        <div class=\"tip pager-page default-page\" id=\"ask\" role=\"tabpanel\" aria-labelledby=\"tab-ask\">","path":"bedrock/privacy/templates/privacy/privacy-day.html","position":149,"original_position":149,"commit_id":"f08da966518289c27ac0b07449dd15591b96428a","original_commit_id":"923faf8e15feae8542b8bc208c3c3f05e716fc7f","user":{"login":"alexgibson","id":400117,"avatar_url":"https://avatars.githubusercontent.com/u/400117?v=3","gravatar_id":"","url":"https://api.github.com/users/alexgibson","html_url":"https://github.com/alexgibson","followers_url":"https://api.github.com/users/alexgibson/followers","following_url":"https://api.github.com/users/alexgibson/following{/other_user}","gists_url":"https://api.github.com/users/alexgibson/gists{/gist_id}","starred_url":"https://api.github.com/users/alexgibson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/alexgibson/subscriptions","organizations_url":"https://api.github.com/users/alexgibson/orgs","repos_url":"https://api.github.com/users/alexgibson/repos","events_url":"https://api.github.com/users/alexgibson/events{/privacy}","received_events_url":"https://api.github.com/users/alexgibson/received_events","type":"User","site_admin":false},"body":"Likewise, I think things like `role=\"tabpanel\" aria-labelledby=\"tab-ask\"` are also generated by the plugin?","created_at":"2015-01-23T13:15:19Z","updated_at":"2015-01-23T13:15:19Z","html_url":"https://github.com/mozilla/bedrock/pull/2660#discussion_r23448491","pull_request_url":"https://api.github.com/repos/mozilla/bedrock/pulls/2660","_links":{"self":{"href":"https://api.github.com/repos/mozilla/bedrock/pulls/comments/23448491"},"html":{"href":"https://github.com/mozilla/bedrock/pull/2660#discussion_r23448491"},"pull_request":{"href":"https://api.github.com/repos/mozilla/bedrock/pulls/2660"}}},"pull_request":{"url":"https://api.github.com/repos/mozilla/bedrock/pulls/2660","id":27379996,"html_url":"https://github.com/mozilla/bedrock/pull/2660","diff_url":"https://github.com/mozilla/bedrock/pull/2660.diff","patch_url":"https://github.com/mozilla/bedrock/pull/2660.patch","issue_url":"https://api.github.com/repos/mozilla/bedrock/issues/2660","number":2660,"state":"open","locked":false,"title":"Bug 1109318 Privacy Day landing page for 2015","user":{"login":"sgarrity","id":58062,"avatar_url":"https://avatars.githubusercontent.com/u/58062?v=3","gravatar_id":"","url":"https://api.github.com/users/sgarrity","html_url":"https://github.com/sgarrity","followers_url":"https://api.github.com/users/sgarrity/followers","following_url":"https://api.github.com/users/sgarrity/following{/other_user}","gists_url":"https://api.github.com/users/sgarrity/gists{/gist_id}","starred_url":"https://api.github.com/users/sgarrity/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sgarrity/subscriptions","organizations_url":"https://api.github.com/users/sgarrity/orgs","repos_url":"https://api.github.com/users/sgarrity/repos","events_url":"https://api.github.com/users/sgarrity/events{/privacy}","received_events_url":"https://api.github.com/users/sgarrity/received_events","type":"User","site_admin":false},"body":"","created_at":"2015-01-14T20:20:09Z","updated_at":"2015-01-23T13:15:19Z","closed_at":null,"merged_at":null,"merge_commit_sha":"626d4a8bb79bc5fd2f08a320d602707e98d26bf6","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/mozilla/bedrock/pulls/2660/commits","review_comments_url":"https://api.github.com/repos/mozilla/bedrock/pulls/2660/comments","review_comment_url":"https://api.github.com/repos/mozilla/bedrock/pulls/comments/{number}","comments_url":"https://api.github.com/repos/mozilla/bedrock/issues/2660/comments","statuses_url":"https://api.github.com/repos/mozilla/bedrock/statuses/f08da966518289c27ac0b07449dd15591b96428a","head":{"label":"mozilla:bug-1109318-privacy-day","ref":"bug-1109318-privacy-day","sha":"f08da966518289c27ac0b07449dd15591b96428a","user":{"login":"mozilla","id":131524,"avatar_url":"https://avatars.githubusercontent.com/u/131524?v=3","gravatar_id":"","url":"https://api.github.com/users/mozilla","html_url":"https://github.com/mozilla","followers_url":"https://api.github.com/users/mozilla/followers","following_url":"https://api.github.com/users/mozilla/following{/other_user}","gists_url":"https://api.github.com/users/mozilla/gists{/gist_id}","starred_url":"https://api.github.com/users/mozilla/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mozilla/subscriptions","organizations_url":"https://api.github.com/users/mozilla/orgs","repos_url":"https://api.github.com/users/mozilla/repos","events_url":"https://api.github.com/users/mozilla/events{/privacy}","received_events_url":"https://api.github.com/users/mozilla/received_events","type":"Organization","site_admin":false},"repo":{"id":1616665,"name":"bedrock","full_name":"mozilla/bedrock","owner":{"login":"mozilla","id":131524,"avatar_url":"https://avatars.githubusercontent.com/u/131524?v=3","gravatar_id":"","url":"https://api.github.com/users/mozilla","html_url":"https://github.com/mozilla","followers_url":"https://api.github.com/users/mozilla/followers","following_url":"https://api.github.com/users/mozilla/following{/other_user}","gists_url":"https://api.github.com/users/mozilla/gists{/gist_id}","starred_url":"https://api.github.com/users/mozilla/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mozilla/subscriptions","organizations_url":"https://api.github.com/users/mozilla/orgs","repos_url":"https://api.github.com/users/mozilla/repos","events_url":"https://api.github.com/users/mozilla/events{/privacy}","received_events_url":"https://api.github.com/users/mozilla/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/mozilla/bedrock","description":"Making mozilla.org awesome, one pebble at a time","fork":false,"url":"https://api.github.com/repos/mozilla/bedrock","forks_url":"https://api.github.com/repos/mozilla/bedrock/forks","keys_url":"https://api.github.com/repos/mozilla/bedrock/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mozilla/bedrock/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mozilla/bedrock/teams","hooks_url":"https://api.github.com/repos/mozilla/bedrock/hooks","issue_events_url":"https://api.github.com/repos/mozilla/bedrock/issues/events{/number}","events_url":"https://api.github.com/repos/mozilla/bedrock/events","assignees_url":"https://api.github.com/repos/mozilla/bedrock/assignees{/user}","branches_url":"https://api.github.com/repos/mozilla/bedrock/branches{/branch}","tags_url":"https://api.github.com/repos/mozilla/bedrock/tags","blobs_url":"https://api.github.com/repos/mozilla/bedrock/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mozilla/bedrock/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mozilla/bedrock/git/refs{/sha}","trees_url":"https://api.github.com/repos/mozilla/bedrock/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mozilla/bedrock/statuses/{sha}","languages_url":"https://api.github.com/repos/mozilla/bedrock/languages","stargazers_url":"https://api.github.com/repos/mozilla/bedrock/stargazers","contributors_url":"https://api.github.com/repos/mozilla/bedrock/contributors","subscribers_url":"https://api.github.com/repos/mozilla/bedrock/subscribers","subscription_url":"https://api.github.com/repos/mozilla/bedrock/subscription","commits_url":"https://api.github.com/repos/mozilla/bedrock/commits{/sha}","git_commits_url":"https://api.github.com/repos/mozilla/bedrock/git/commits{/sha}","comments_url":"https://api.github.com/repos/mozilla/bedrock/comments{/number}","issue_comment_url":"https://api.github.com/repos/mozilla/bedrock/issues/comments/{number}","contents_url":"https://api.github.com/repos/mozilla/bedrock/contents/{+path}","compare_url":"https://api.github.com/repos/mozilla/bedrock/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mozilla/bedrock/merges","archive_url":"https://api.github.com/repos/mozilla/bedrock/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mozilla/bedrock/downloads","issues_url":"https://api.github.com/repos/mozilla/bedrock/issues{/number}","pulls_url":"https://api.github.com/repos/mozilla/bedrock/pulls{/number}","milestones_url":"https://api.github.com/repos/mozilla/bedrock/milestones{/number}","notifications_url":"https://api.github.com/repos/mozilla/bedrock/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mozilla/bedrock/labels{/name}","releases_url":"https://api.github.com/repos/mozilla/bedrock/releases{/id}","created_at":"2011-04-14T22:57:57Z","updated_at":"2015-01-23T12:55:57Z","pushed_at":"2015-01-23T13:14:41Z","git_url":"git://github.com/mozilla/bedrock.git","ssh_url":"git@github.com:mozilla/bedrock.git","clone_url":"https://github.com/mozilla/bedrock.git","svn_url":"https://github.com/mozilla/bedrock","homepage":"http://mozilla.org","size":325313,"stargazers_count":203,"watchers_count":203,"language":"Python","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":290,"mirror_url":null,"open_issues_count":15,"forks":290,"open_issues":15,"watchers":203,"default_branch":"master"}},"base":{"label":"mozilla:master","ref":"master","sha":"ff8782a0da008646db377129f43a060ac2c4a877","user":{"login":"mozilla","id":131524,"avatar_url":"https://avatars.githubusercontent.com/u/131524?v=3","gravatar_id":"","url":"https://api.github.com/users/mozilla","html_url":"https://github.com/mozilla","followers_url":"https://api.github.com/users/mozilla/followers","following_url":"https://api.github.com/users/mozilla/following{/other_user}","gists_url":"https://api.github.com/users/mozilla/gists{/gist_id}","starred_url":"https://api.github.com/users/mozilla/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mozilla/subscriptions","organizations_url":"https://api.github.com/users/mozilla/orgs","repos_url":"https://api.github.com/users/mozilla/repos","events_url":"https://api.github.com/users/mozilla/events{/privacy}","received_events_url":"https://api.github.com/users/mozilla/received_events","type":"Organization","site_admin":false},"repo":{"id":1616665,"name":"bedrock","full_name":"mozilla/bedrock","owner":{"login":"mozilla","id":131524,"avatar_url":"https://avatars.githubusercontent.com/u/131524?v=3","gravatar_id":"","url":"https://api.github.com/users/mozilla","html_url":"https://github.com/mozilla","followers_url":"https://api.github.com/users/mozilla/followers","following_url":"https://api.github.com/users/mozilla/following{/other_user}","gists_url":"https://api.github.com/users/mozilla/gists{/gist_id}","starred_url":"https://api.github.com/users/mozilla/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mozilla/subscriptions","organizations_url":"https://api.github.com/users/mozilla/orgs","repos_url":"https://api.github.com/users/mozilla/repos","events_url":"https://api.github.com/users/mozilla/events{/privacy}","received_events_url":"https://api.github.com/users/mozilla/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/mozilla/bedrock","description":"Making mozilla.org awesome, one pebble at a time","fork":false,"url":"https://api.github.com/repos/mozilla/bedrock","forks_url":"https://api.github.com/repos/mozilla/bedrock/forks","keys_url":"https://api.github.com/repos/mozilla/bedrock/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mozilla/bedrock/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mozilla/bedrock/teams","hooks_url":"https://api.github.com/repos/mozilla/bedrock/hooks","issue_events_url":"https://api.github.com/repos/mozilla/bedrock/issues/events{/number}","events_url":"https://api.github.com/repos/mozilla/bedrock/events","assignees_url":"https://api.github.com/repos/mozilla/bedrock/assignees{/user}","branches_url":"https://api.github.com/repos/mozilla/bedrock/branches{/branch}","tags_url":"https://api.github.com/repos/mozilla/bedrock/tags","blobs_url":"https://api.github.com/repos/mozilla/bedrock/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mozilla/bedrock/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mozilla/bedrock/git/refs{/sha}","trees_url":"https://api.github.com/repos/mozilla/bedrock/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mozilla/bedrock/statuses/{sha}","languages_url":"https://api.github.com/repos/mozilla/bedrock/languages","stargazers_url":"https://api.github.com/repos/mozilla/bedrock/stargazers","contributors_url":"https://api.github.com/repos/mozilla/bedrock/contributors","subscribers_url":"https://api.github.com/repos/mozilla/bedrock/subscribers","subscription_url":"https://api.github.com/repos/mozilla/bedrock/subscription","commits_url":"https://api.github.com/repos/mozilla/bedrock/commits{/sha}","git_commits_url":"https://api.github.com/repos/mozilla/bedrock/git/commits{/sha}","comments_url":"https://api.github.com/repos/mozilla/bedrock/comments{/number}","issue_comment_url":"https://api.github.com/repos/mozilla/bedrock/issues/comments/{number}","contents_url":"https://api.github.com/repos/mozilla/bedrock/contents/{+path}","compare_url":"https://api.github.com/repos/mozilla/bedrock/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mozilla/bedrock/merges","archive_url":"https://api.github.com/repos/mozilla/bedrock/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mozilla/bedrock/downloads","issues_url":"https://api.github.com/repos/mozilla/bedrock/issues{/number}","pulls_url":"https://api.github.com/repos/mozilla/bedrock/pulls{/number}","milestones_url":"https://api.github.com/repos/mozilla/bedrock/milestones{/number}","notifications_url":"https://api.github.com/repos/mozilla/bedrock/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mozilla/bedrock/labels{/name}","releases_url":"https://api.github.com/repos/mozilla/bedrock/releases{/id}","created_at":"2011-04-14T22:57:57Z","updated_at":"2015-01-23T12:55:57Z","pushed_at":"2015-01-23T13:14:41Z","git_url":"git://github.com/mozilla/bedrock.git","ssh_url":"git@github.com:mozilla/bedrock.git","clone_url":"https://github.com/mozilla/bedrock.git","svn_url":"https://github.com/mozilla/bedrock","homepage":"http://mozilla.org","size":325313,"stargazers_count":203,"watchers_count":203,"language":"Python","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":290,"mirror_url":null,"open_issues_count":15,"forks":290,"open_issues":15,"watchers":203,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/mozilla/bedrock/pulls/2660"},"html":{"href":"https://github.com/mozilla/bedrock/pull/2660"},"issue":{"href":"https://api.github.com/repos/mozilla/bedrock/issues/2660"},"comments":{"href":"https://api.github.com/repos/mozilla/bedrock/issues/2660/comments"},"review_comments":{"href":"https://api.github.com/repos/mozilla/bedrock/pulls/2660/comments"},"review_comment":{"href":"https://api.github.com/repos/mozilla/bedrock/pulls/comments/{number}"},"commits":{"href":"https://api.github.com/repos/mozilla/bedrock/pulls/2660/commits"},"statuses":{"href":"https://api.github.com/repos/mozilla/bedrock/statuses/f08da966518289c27ac0b07449dd15591b96428a"}}}}