Consent page for Shield study 7 - Activity Stream

See tracking bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1301166
2016-11-07 18:28:04 -05:00 · 2016-11-07 18:28:04 -05:00 · a89684358c
--- a/src/olympia/pages/templates/pages/shield_study_7.html
+++ b/src/olympia/pages/templates/pages/shield_study_7.html
@ -0,0 +1,72 @@
 <!DOCTYPE html>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <html lang="en">
  <head>
    <meta charset="utf-8" />
    <title>Activity Stream</title>
    <link rel="stylesheet" href="{{ STATIC_URL }}css/shield_study_7/main.css" type="text/css" />
  </head>
  <body>
      <div class="container">
        <div class="title-container">
          <h1 class="title">Activity Stream</h1>
            <a href="https://addons.mozilla.org/firefox/downloads/latest/activity-stream-shield-study/?src=shield-study-7"><button class="button primary large">Try Activity Stream</button></a>
        </div>
        <div class="content"><p>Mozilla wants to know if the Activity Stream interface for about:newtab on Desktop Firefox has higher user engagement than the existing Tiles about:newtab UI. Participating in this study will help us find out!</p>
 <h2 id="what-will-happen-next">What will happen next</h2>
 <p><strong>If you agree</strong> to participate:</p>
 <ol>
 <li>We will add additional features to Firefox that may provide a new <strong>Activity Stream</strong> experience on the Firefox about:newtab page.</li>
 <li>Continue using Firefox as you normally would. You may notice changes.</li>
 <li>After 14 days, the study will end on its own. Your Firefox will go back to normal.</li>
 <li>We will ask you to fill out a quick <strong>optional survey</strong> to tell us about your experience. The survey should take less than 5 minutes to complete.</li>
 </ol>
 <h2 id="leaving-the-study">Leaving the study</h2>
 <p>The study will expire on its own in 14 days.  You may leave the study early.  To do so, follow these steps:</p>
 <ol>
 <li>Type <code>about:addons</code> into the location bar, and press enter.</li>
 <li>Find <code>Activity Stream Shield Study</code> in the <strong>extensions</strong> list pane.</li>
 <li>Click the <code>remove</code> button.</li>
 <li>If you opt out of the study early we will ask you to fill out a survey. We’re interested in hearing about your experience, even if you didn’t participate in the entire study.</li>
 </ol>
 <p>Opting out of a study does not prevent you from participating in future studies.</p>
 <h2 id="your-privacy">Your privacy</h2>
 <h3 id="all-shield-studies">All Shield Studies</h3>
 <p>Every Shield Study collects data about important study events, such as install, uninstall, daily usage, and end of study. Studies also include an optional survey.</p>
 <p>This data is associated with <a href="https://gecko.readthedocs.io/en/latest/toolkit/components/telemetry/telemetry/index.html">Firefox Telemetry collection</a>.</p>
 <h3 id="this-particular-study">This Particular Study</h3>
 <p>In addition to the data collected by all Shield Studies and your voluntary answers to the followup survey, here are the <strong>key things you should know</strong> about what is happening when you participate in this study:</p>
 <ul>
 <li>A <em>Session</em> ping will be sent to Mozilla servers when you leave the about:newtab.</li>
 <li>An <em>Event</em> ping will be sent to Mozilla servers when you interact with the about:newtab page (Top Sites, Highlights, Search).</li>
 <li>A <em>Performance</em> ping will be sent to Mozilla servers occasionally to help track responsiveness and latency.</li>
 <li>As you would expect, we do not collect any information when you are in private browsing mode.</li>
 </ul>
 <p>You can learn more about the data collection for this study <a href="https://github.com/mozilla/activity-stream/blob/master/data_events.md">here</a></p>
 <h2 id="you-help-make-firefox-better">You help make Firefox better</h2>
 <p>At Mozilla, we pride ourselves on building products for you, the user! That’s why we need your help.  You help us by letting us observe how you use new features and by telling us your opinions about them.</p>
 <p>By participating in this study, you will help us make better decisions on your behalf and directly shape the future of Firefox.</p>
 <h2 id="brought-to-you-by">Brought to you by</h2>
 <p>Firefox Activity Stream Desktop team</p>
 <ul>
 <li>Kate Hudson</li>
 <li>Marina Samuel</li>
 <li>Nan Jiang</li>
 <li>Ursula Sarracini</li>
 <li>Ricky Rosario</li>
 <li>Dan Mosedale</li>
 <li>Ed Lee</li>
 <li>Jared Kerim</li>
 <li>Nick Chapman</li>
 <li>Bryan Bell</li>
 <li>Jenn Chaulk</li>
 <li>Aaron Benson</li>
 <li>Tim Spurway</li>
 </ul>
 </div>
    </div>
  </body>
 </html>
--- a/src/olympia/pages/tests.py
+++ b/src/olympia/pages/tests.py
@ -15,7 +15,7 @@ class TestPages(TestCase):
                 'pages.acr_firstrun', 'pages.dev_faq', 'pages.review_guide',
                 'pages.sunbird', 'pages.shield_study_2',
                 'pages.shield_study_3', 'pages.shield_study_4',
-                 'pages.shield_study_5']
+                 'pages.shield_study_5', 'pages.shield_study_7']
        for page in pages:
            self._check(page, 200)
--- a/src/olympia/pages/urls.py
+++ b/src/olympia/pages/urls.py
@ -43,6 +43,9 @@ urlpatterns = patterns(
    url('^shield_study_5$',
        TemplateView.as_view(template_name='pages/shield_study_5.html'),
        name='pages.shield_study_5'),
    url('^shield_study_7$',
        TemplateView.as_view(template_name='pages/shield_study_7.html'),
        name='pages.shield_study_7'),
    url('^pages/compatibility_firstrun$',
        lambda r: perma_redirect(reverse('pages.acr_firstrun'))),
--- a/static/css/shield_study_7/main.css
+++ b/static/css/shield_study_7/main.css
@ -0,0 +1,63 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@import url("chrome://global/skin/in-content/common.css");
 html {
  height: 100%;
 }
 body {
  align-items: stretch;
  display: flex;
  justify-content: center;
  min-height: 100%;
 }
 .container {
  margin: 10vh 0;
  max-width: 920px;
  padding: 0 10px;
 }
 .title-container {
  align-items: center;
  border-bottom: 1px solid var(--in-content-box-border-color);
  display: flex;
  margin-bottom: .5em;
  padding-bottom: 1em;
  position: relative;
 }
 .title {
  flex: 1;
  margin-bottom: 0;
 }
 .title::before {
  background: url('../../img/shield_study_7/small-firefox-logo@2x.png') no-repeat left center;
  background-size: 57px 59px;
  content: '';
  display: block;
  height: 59px;
  left: -2.3em;
  position: absolute;
  top: 0;
  width: 57px;
 }
 .button {
  height: 40px;
  margin: 0;
  padding: 0 15px;
 }
 /* issues/4 */
 code {
  background-color: rgba(0,0,0,.1);
 }
 pre > code {
  display: block;
 }
--- a/static/img/shield_study_7/small-firefox-logo.png
+++ b/static/img/shield_study_7/small-firefox-logo.png
--- a/static/img/shield_study_7/small-firefox-logo@2x.png
+++ b/static/img/shield_study_7/small-firefox-logo@2x.png