[fix bug 1102404 1102414] Implement firstrun and whatsnew search/Yaho…

…o changes

bedrock/firefox/templates/firefox/australis/firstrun-34-tour.html

@@ -0,0 +1,94 @@
+{# 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/. #}
+
+{% extends "firefox/australis/firstrun-tour.html" %}
+
+{% set_lang_files "firefox/australis/firefox_tour" %}
+
+{% block telemetry_id %}australis-tour-firstrun-34-release{% endblock %}
+
+{% block tour_content %}
+  <div id="ui-tour" tabindex="-1" aria-expanded="false">
+    <div class="cta">
+      <button type="button" aria-controls="ui-tour">{{ _('Start browsing') }}</button>
+    </div>
+    <div class="tour-tip"></div>
+    <div class="ui-tour-controls">
+      <button class="step prev" aria-controls="tour-steps tour-progress">{{ _('Previous') }}</button>
+      <button class="step next" aria-controls="tour-steps tour-progress">{{ _('Next') }}</button>
+      <button class="close" aria-controls="tour-steps tour-progress">{{ _('Close') }}</button>
+    </div>
+    <div class="tour-background">
+      <div class="tour-inner">
+        <div id="tour-progress" class="progress-step">
+          <div class="logo"></div>
+          <span class="step"></span>
+          <div class="progress" role="progressbar" aria-valuenow="1" aria-valuemin="1" aria-valuemax="4">
+            <span class="indicator"></span>
+          </div>
+        </div>
+        <ul id="tour-steps" class="ui-tour-list">
+          <li class="tour-step current app-menu visible" data-step="1" data-tip-next="{{ _('<span>Next:</span> Customize') }}">
+            <div class="tour-item">
+              {# L10n: <br> tag below used for formatting only. #}
+              <h2 class="tour-highlight step-target" data-target="appMenu" data-effect="wobble">
+                {{ _('It starts with the new,<br> intuitive menu') }}
+              </h2>
+              <ul class="tour-highlight step-target" data-target="appMenu" data-effect="wobble">
+                <li>{{ _('The features you use most, all in one place') }}</li>
+                <li>{{ _('Grouped together for quick, easy access') }}</li>
+                <li><a href="#" role="button" class="more">{{ _('Learn how to customize your Firefox') }}</a></li>
+              </ul>
+            </div>
+            {{ high_res_img('img/firefox/australis/diag-menu-bar.jpg?03-2014', {'alt': _('The features you use most, all in one place'), 'width': '300', 'height': '188'}) }}
+          </li>
+          <li class="tour-step app-menu" data-step="2" data-tip-prev="{{ _('<span>Previous:</span> Menu') }}" data-tip-next="{{ _('<span>Next:</span> Search') }}">
+            <div class="tour-item">
+              {# L10n: <br> tag below used for formatting only. #}
+              <h2 class="tour-highlight step-target" data-target="customize" data-effect="wobble">
+                {{ _('Designed so you can<br> make it your own') }}
+              </h2>
+              <ul>
+                <li>{{ _('How you use the Web is unique') }}</li>
+                <li>{{ _('Move or remove any button to match') }}</li>
+                <li><a href="#" role="button" class="more">{{ _('Choose how you want to search') }}</a></li>
+              </ul>
+            </div>
+            {{ high_res_img('img/firefox/australis/diag-customize.jpg?03-2014', {'alt': _('Learn how to customize your Firefox'), 'width': '300', 'height': '188'}) }}
+          </li>
+          <li class="tour-step" data-step="3" data-tip-prev="{{ _('<span>Previous:</span> Customize') }}" data-tip-next="{{ _('<span>Next:</span> Bookmarks') }}">
+            <div class="tour-item">
+              {# L10n: <br> tag below used for formatting only. #}
+              <h2 class="tour-highlight step-target" data-target="searchIcon" data-effect="wobble">
+                {{ _('Introducing a smarter <br>way to search') }}
+              </h2>
+              <ul>
+                <li>{{ _('Search suggestions appear as you type') }}</li>
+                <li>{{ _('Choose the right site for every search') }}</li>
+                <li><a href="#" role="button" class="more">{{ _('Use the star to create bookmarks') }}</a></li>
+              </ul>
+            </div>
+            {{ high_res_img('img/firefox/australis/diag-search.jpg?25-11-04', {'alt': _('Add features and styles with add-ons'), 'width': '300', 'height': '188'}) }}
+          </li>
+          <li class="tour-step" data-step="4" data-tip-prev="{{ _('<span>Previous:</span> Search') }}">
+            <div class="tour-item">
+              {# L10n: <br> tag below used for formatting only. #}
+              <h2 class="tour-highlight step-target" data-target="bookmarks" data-effect="wobble">
+                {{ _('Your favorite sites<br> are closer than ever') }}
+              </h2>
+              <ul>
+                <li>{{ _('Add and view bookmarks from the same spot') }}</li>
+                <li>{{ _('Save sites with a single click') }}</li>
+                <li id="sync-link"><a href="#" role="button" class="more">{{ _('Enjoy seamless browsing between devices with Sync') }}</a></li>
+              </ul>
+            </div>
+            {{ high_res_img('img/firefox/australis/diag-bookmarks.jpg?03-2014', {'alt': _('Use the star to create bookmarks'), 'width': '300', 'height': '188'}) }}
+          </li>
+        </ul>
+        <div class="compact-title"></div>
+        <div class="tour-init" data-target="appMenu" data-icon="{{ MEDIA_URL }}img/firefox/australis/logo.png?2014-03" data-icon-high-res="{{ MEDIA_URL }}img/firefox/australis/logo-high-res.png?2014-03"></div>
+      </div>
+    </div>
+  </div>
+{% endblock %}

bedrock/firefox/templates/firefox/australis/help-menu-34-tour.html

@@ -0,0 +1,9 @@
+{# 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/. #}
+
+{% extends "firefox/australis/firstrun-34-tour.html" %}
+
+{% set_lang_files "firefox/australis/firefox_tour" %}
+
+{% block telemetry_id %}australis-tour-firstrun-34-release-nav{% endblock %}

bedrock/firefox/templates/firefox/search_tour/index.html

@@ -0,0 +1,125 @@
+{# 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/. #}
+
+{% extends "firefox/base.html" %}
+
+{% block extra_meta %}<meta name="robots" content="noindex">{% endblock %}
+
+{% block body_class %}sky{% endblock %}
+
+{% block site_css %}{% endblock %}
+{% block js %}{% endblock %}
+
+{% block string_data %}{% endblock %}
+
+{% block page_title %}{{ _('Get the best of the Web') }}{% endblock %}
+
+{% block site_header %}
+  <header id="masthead">
+    <a href="{{ url('mozorg.home') }}" id="tabzilla">Mozilla</a>
+    {% block site_header_nav %}{% endblock %}
+    {% block site_header_logo %}{% endblock %}
+    {% block breadcrumbs %}{% endblock %}
+  </header>
+{% endblock %}
+
+{% block content %}
+  <main role="main">
+    <header role="banner">
+      <div class="default">
+        <h1 class="large">{{ _('Committed to you, your privacy <br>and an open Web') }}</h1>
+      </div>
+      <div class="ravioli">
+        <h1 class="large">{{ _('New: A Smarter Way to Search') }}</h1>
+        <p>{{ _('We’ve partnered with Yahoo to bring you better search results.') }}</p>
+      </div>
+      <div class="flare">
+        <h1 class="large">{{ _('Search On Your Terms') }}</h1>
+        <p>{{ _('Introducing our smartest way to search ever.') }}</p>
+      </div>
+      <div class="independence">
+        <h1 class="large">{{ _('Search. Freely.') }}</h1>
+        <p>{{ _('A smarter new way to search from the only independent browser on the Web.') }}</p>
+      </div>
+    </header>
+    {% block noscript %}{% endblock %}
+    <article class="features default">
+      <div class="inner-container">
+        <div class="sync-content">
+          <header>
+            <h2>{{ _('Keep your Firefox in Sync') }}</h2>
+            <p>{{ _('Access your bookmarks, passwords and more from any device.')}}</p>
+          </header>
+          <div class="sync-cta">
+            <a href="{{ url('firefox.sync') }}" class="button">{{ _('Get started with Sync') }}</a>
+          </div>
+        </div>
+        <div class="sync-anim-wrapper">
+          {% include 'firefox/includes/sync-animation.html' %}
+        </div>
+      </div>
+    </article>
+    <article class="features ravioli">
+      <section>
+        <div class="feature great-results">
+          <h2>{{ _('Better results from Yahoo') }}</h2>
+          <p>{{ _('Get them in a new, exclusive look showcasing the best from around the Web.') }}</p>
+        </div>
+      </section>
+      <section>
+        <div class="feature search-choice">
+          <h2>{{ _('More choices from Firefox') }}</h2>
+          <p>{{ _('Choose the site you want to search every time and see suggestions appear as you type.') }}</p>
+        </div>
+      </section>
+    </article>
+    <article class="features flare">
+      <section>
+        <div class="feature search-choice">
+          <h2>{{ _('More choices from Firefox') }}</h2>
+          <p>{{ _('Choose the site you want to search every time and see suggestions appear as you type.') }}</p>
+        </div>
+      </section>
+      <section>
+        <div class="feature great-results">
+          <h2>{{ _('Better results from Yahoo') }}</h2>
+          <p>{{ _('Get them in a new, exclusive look showcasing the best from around the Web.') }}</p>
+        </div>
+      </section>
+    </article>
+    <article class="features independence">
+      <section>
+        <div class="feature great-results">
+          <h2>{{ _('Better results from Yahoo') }}</h2>
+          <p>{{ _('Get them in a new, exclusive look showcasing the best from around the Web.') }}</p>
+        </div>
+      </section>
+      <section>
+        <div class="feature search-choice">
+          <h2>{{ _('More choices from Firefox') }}</h2>
+          <p>{{ _('Choose the site you want to search every time and see suggestions appear as you type.') }}</p>
+        </div>
+      </section>
+    </article>
+    <aside>
+      <h3>{{ _('Celebrate 10 years of Firefox!') }}</h3>
+      <a href="{{ url('firefox.independent') }}" class="button more">{{ _('Declare Your Independence') }}</a>
+    </aside>
+  </main>
+{% endblock %}
+
+{% block site_footer %}
+  <footer role="contentinfo">
+    <ul>
+      <li><a href="{{ url('firefox.desktop.index') }}" class="more">{{ _('Firefox Features') }}</a></li>
+      <li><a href="https://support.mozilla.org/products/firefox" class="more">{{ _('Firefox Help') }}</a></li>
+    </ul>
+    <ul>
+      <li><a href="{{ url('legal.index') }}">{{ _('Legal') }}</a></li>
+      <li><a href="{{ url('privacy') }}">{{ _('Privacy') }}</a></li>
+    </ul>
+  </footer>
+{% endblock %}
+
+{% block email_form %}{% endblock %}

bedrock/firefox/templates/firefox/search_tour/no-tour.html

@@ -0,0 +1,15 @@
+{# 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/. #}
+
+{% extends "firefox/search_tour/index.html" %}
+
+{% block site_css %}
+  {{ css('firefox_search_no_tour') }}
+{% endblock %}
+
+{% block string_data %}{% endblock %}
+
+{% block js %}
+  {{ js('firefox_search_no_tour') }}
+{% endblock %}

bedrock/firefox/templates/firefox/search_tour/tour.html

@@ -0,0 +1,32 @@
+{# 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/. #}
+
+{% extends "firefox/search_tour/index.html" %}
+
+{% block site_css %}
+  {{ css('firefox_search_tour') }}
+{% endblock %}
+
+{% block string_data %}
+data-forced-title="{{ _('Searching just got better') }}"
+data-forced-text="{{ _('A new default. A new look. A brand new way to search.') }}"
+data-forced-cta="{{ _('Try it now') }}"
+data-opt-in-title="{{ _('Choose Yahoo for searches') }}"
+data-opt-in-text="{{ _('Make it your default and be one of the first to experience a brand new way to search.') }}"
+data-opt-in-cta="{{ _('Switch to Yahoo') }}"
+data-later="{{ _('Later') }}"
+data-icon="{{ MEDIA_URL }}img/firefox/search_tour/search-icon.png"
+data-icon-high-res="{{ MEDIA_URL }}img/firefox/search_tour/search-icon-high-res.png"
+data-has-tour="True"
+{% endblock %}
+
+{% block js %}
+  {{ js('firefox_search_tour') }}
+{% endblock %}
+
+{% block noscript %}
+  <noscript>
+    <p>{{ _('Please turn on JavaScript to display this page correctly.') }}</p>
+  </noscript>
+{% endblock %}