[fix bug 1342235] Redesigned site footer

mozilla · Mar 20, 2017 · c65772b · c65772b
1 parent ffa87a9
commit c65772b
Show file tree

Hide file tree

Showing 73 changed files with 839 additions and 1,094 deletions.
diff --git a/bedrock/base/templates/base-pebbles.html b/bedrock/base/templates/base-pebbles.html
@@ -135,7 +135,11 @@ <h2 class="masthead-logo"><a href="{{ url('mozorg.home') }}">{{ high_res_img('sa
     {% block content %}{% endblock %}
 
     {% block site_footer %}
-      {% include 'includes/site-footer.html' %}
+      {% if LANG.startswith('en-') %}
+        {% include 'includes/site-footer-new.html' %}
+      {% else %}
+        {% include 'includes/site-footer.html' %}
+      {% endif %}
     {% endblock %}
   </div>
 

diff --git a/bedrock/base/templates/base-resp.html b/bedrock/base/templates/base-resp.html
@@ -152,7 +152,11 @@ <h2><a href="{{ url('mozorg.home') }}">{{ high_res_img('sandstone/header-mozilla
       {% block email_form_unwrapped %}{% endblock %}
 
       {% block site_footer %}
-        {% include 'includes/site-footer.html' %}
+        {% if LANG.startswith('en-') %}
+          {% include 'includes/site-footer-new.html' %}
+        {% else %}
+          {% include 'includes/site-footer.html' %}
+        {% endif %}
       {% endblock %}
 
     </div><!-- close #outer-wrapper -->

diff --git a/bedrock/base/templates/base.html b/bedrock/base/templates/base.html
@@ -138,7 +138,11 @@ <h2><a href="{{ url('mozorg.home') }}">{{ high_res_img('sandstone/header-mozilla
     </div><!-- close #wrapper -->
 
     {% block site_footer %}
-      {% include 'includes/site-footer.html' %}
+      {% if LANG.startswith('en-') %}
+        {% include 'includes/site-footer-new.html' %}
+      {% else %}
+        {% include 'includes/site-footer.html' %}
+      {% endif %}
     {% endblock %}
 
     </div><!-- close #outer-wrapper -->

diff --git a/bedrock/base/templates/includes/site-footer-new.html b/bedrock/base/templates/includes/site-footer-new.html
@@ -0,0 +1,65 @@
+<footer id="colophon" class="universal{% if footer_class %} {{ footer_class }}{% endif %}">
+
+  <nav class="row primary">
+    <div class="col col-1">
+      <div class="logo"><a href="{{ url('mozorg.home') }}" data-link-type="footer" data-link-name="Mozilla">{{ _('Mozilla') }}</a></div>
+    </div>
+    <section class="col col-2">
+      <h5>{{ _('Mozilla') }}</h5>
+      <ul class="mozilla-links">
+        <li><a href="{{ url('mozorg.about') }}" data-link-type="footer" data-link-name="About">{{ _('About') }}</a></li>
+        <li><a href="{{ url('mozorg.contact.contact-landing') }}" data-link-type="footer" data-link-name="Contact Us">{{ _('Contact Us') }}</a></li>
+        <li><a href="{{ donate_url('footer') }}" class="donate" data-link-type="footer" data-link-name="Donate">{{ _('Donate') }}</a></li>
+        <li><a href="https://wiki.mozilla.org/Webdev/GetInvolved/mozilla.org" data-link-type="footer" data-link-name="Contribute to this site">{{ _('Contribute to this site') }}</a></li>
+        <li>
+          {{ _('Social:') }}
+          <ul class="social-links">
+            <li><a href="https://twitter.com/mozilla" data-link-type="footer" data-link-name="Twitter (@mozilla)">{{ _('Twitter') }}<span> (@mozilla)</span></a></li>
+            <li><a href="https://www.facebook.com/mozilla" data-link-type="footer" data-link-name="Facebook (Mozilla)">{{ _('Facebook') }}<span> (Mozilla)</span></a></li>
+            <li><a href="https://www.instagram.com/mozillagram/" data-link-type="footer" data-link-name="Instagram (@mozillagram)">{{ _('Instagram') }}<span> (@mozillagram)</span></a></li>
+          </ul>
+        </li>
+      </ul>
+    </section>
+    <section class="col col-3">
+      <h5>{{ _('Firefox') }}</h5>
+      <ul class="firefox-links">
+        <li><a href="{{ url('firefox.new') }}" data-link-type="footer" data-link-name="Download Firefox now">{{ _('Download Firefox Web browser') }}</a></li>
+        <li><a href="{{ url('firefox.desktop.index') }}" data-link-type="footer" data-link-name="Desktop Browser for Mac, Windows, Linux">{{ _('Desktop Browser for Mac, Windows, Linux') }}</a></li>
+        <li><a href="{{ url('firefox.android.index') }}" data-link-type="footer" data-link-name="Mobile Browser for Android">{{ _('Mobile Browser for Android') }}</a></li>
+        <li><a href="{{ url('firefox.ios') }}" data-link-type="footer" data-link-name="Mobile Browser for iOS">{{ _('Mobile Browser for iOS') }}</a></li>
+        <li>
+          {{ _('Social:') }}
+          <ul class="social-links">
+            <li><a href="{{ firefox_twitter_url() }}" data-link-type="footer" data-link-name="Twitter (@firefox)">{{ _('Twitter') }}<span> (@firefox)</span></a></li>
+            <li><a href="https://www.facebook.com/Firefox" data-link-type="footer" data-link-name="Facebook (Firefox)">{{ _('Facebook') }}<span> (Firefox)</span></a></li>
+            <li><a href="https://www.youtube.com/firefoxchannel" data-link-type="footer" data-link-name="YouTube (firefoxchannel)">{{ _('YouTube') }}<span> (firefoxchannel)</span></a></li>
+          </ul>
+        </li>
+      </ul>
+    </section>
+  </nav>
+
+  <nav class="row secondary">
+    <div class="col col-1">
+      <div class="lang-switcher">
+        {% include 'includes/lang_switcher.html' %}
+      </div>
+    </div>
+    <div class="col col-2">
+      <p class="license">
+      {%- trans url=url('foundation.licensing.website-content') -%}
+        Portions of this content are ©1998–{{ current_year }} by individual mozilla.org
+        contributors. Content available under a <a rel="license" href="{{ url }}">Creative Commons license</a>.
+      {%- endtrans -%}
+      </p>
+      <ul class="legal-links">
+        <li><a rel="nofollow" href="{{ url('privacy') }}" data-link-type="footer" data-link-name="Privacy">{{ _('Privacy') }}</a></li>
+        <li><a rel="nofollow" href="{{ url('privacy.notices.websites') }}#cookies" data-link-type="footer" data-link-name="Cookies">{{ _('Cookies') }}</a></li>
+        <li><a rel="nofollow" href="{{ url('legal.index') }}" data-link-type="footer" data-link-name="Legal">{{ _('Legal') }}</a></li>
+        <li><a rel="nofollow" href="{{ url('legal.fraud-report') }}" data-link-type="footer" data-link-name="Report Trademark Abuse">{{ _('Report Trademark Abuse') }}</a></li>
+      </ul>
+    </div>
+  </nav>
+
+</footer>
diff --git a/bedrock/base/templates/includes/site-footer.html b/bedrock/base/templates/includes/site-footer.html
@@ -1,4 +1,4 @@
-      <footer id="colophon" class="{% block footer_class %}{% endblock %}">
+      <footer id="colophon" class="old{% if footer_class %} {{ footer_class }}{% endif %}">
         <nav class="row">
           <div class="col col-1">
             <div class="logo"><a href="{{ url('mozorg.home') }}" data-link-type="footer" data-link-name="Mozilla">Mozilla</a></div>
@@ -18,14 +18,6 @@
               <li class="clear"><a href="https://wiki.mozilla.org/Webdev/GetInvolved/mozilla.org" data-link-type="footer" data-link-name="Contribute to this site">{{ _('Contribute to this site') }}</a></li>
             </ul>
 
-            {% if fx_footer_links %}
-              {% if current_platform %}
-                {{ firefox_footer_links(channel=current_channel, platform=current_platform) }}
-              {% else %}
-                {{ firefox_footer_links(channel=current_channel) }}
-              {% endif %}
-            {% endif %}
-
             <ul class="links-legal">
               <li><a href="{{ url('privacy') }}" data-link-type="footer" data-link-name="Privacy">{{ _('Privacy') }}</a></li>
               <li class="wrap"><a href="{{ url('privacy.notices.websites') }}#cookies" data-link-type="footer" data-link-name="Cookies">{{ _('Cookies') }}</a></li>

diff --git a/bedrock/firefox/templates/firefox/all.html b/bedrock/firefox/templates/firefox/all.html
@@ -173,12 +173,6 @@ <h2>{{ self.page_desc() }}</h2>
   </aside>
 {% endblock %}
 
-{% block site_footer %}
-  {% with fx_footer_links=True, current_platform=platform, current_channel=channel %}
-    {% include 'includes/site-footer.html' %}
-  {% endwith %}
-{% endblock %}
-
 {% block js %}
   {# searching with js only makes sense if we're displaying all #}
   {% if platform == 'desktop' and not query %}

diff --git a/bedrock/firefox/templates/firefox/android/index.html b/bedrock/firefox/templates/firefox/android/index.html
@@ -399,12 +399,6 @@ <h3>{{ _('Choose Firefox') }}</h3>
   </div>
 {% endblock %}
 
-{% block site_footer %}
-  {% with fx_footer_links=True, current_platform='android' %}
-    {% include 'includes/site-footer.html' %}
-  {% endwith %}
-{% endblock %}
-
 {% block js %}
 <!--[if IE 9]>
   {% javascript 'matchmedia_addlistener' %}

diff --git a/bedrock/firefox/templates/firefox/desktop/index.html b/bedrock/firefox/templates/firefox/desktop/index.html
@@ -162,12 +162,6 @@ <h2>{{ _('Faster at what you do most') }}</h2>
 </main>
 {% endblock %}
 
-{% block site_footer %}
-  {% with fx_footer_links=True, current_platform='desktop' %}
-    {% include 'includes/site-footer.html' %}
-  {% endwith %}
-{% endblock %}
-
 {% block js %}
   <!--[if IE 9]>
   {% javascript 'matchmedia_addlistener' %}

diff --git a/bedrock/firefox/templates/firefox/desktop/tips.html b/bedrock/firefox/templates/firefox/desktop/tips.html
@@ -275,7 +275,16 @@ <h3>{{ _('Get Firefox') }}</h3>
 </main>
 {% endblock %}
 
-{% block email_form %}
+{% block email_form %}{% endblock %}
+
+{% block site_footer %}
+  {% with footer_class='dark' %}
+    {% if LANG.startswith('en-') %}
+      {% include 'includes/site-footer-new.html' %}
+    {% else %}
+      {% include 'includes/site-footer.html' %}
+    {% endif %}
+  {% endwith %}
 {% endblock %}
 
 {% block js %}

diff --git a/bedrock/firefox/templates/firefox/developer.html b/bedrock/firefox/templates/firefox/developer.html
@@ -231,10 +231,4 @@ <h3>{{ _('Choose Firefox') }}</h3>
 </section>
 {% endblock %}
 
-{% block site_footer %}
-  {% with fx_footer_links=True, current_channel='alpha', current_platform='desktop' %}
-    {% include 'includes/site-footer.html' %}
-  {% endwith %}
-{% endblock %}
-
 {% block task_completion_survey %}{% endblock %}
diff --git a/bedrock/firefox/templates/firefox/family/index.html b/bedrock/firefox/templates/firefox/family/index.html
@@ -154,10 +154,6 @@ <h2>{{ _('Private Browsing') }}</h2>
   </aside>
 {% endblock %}
 
-{% block site_footer %}
-  {% include 'firefox/includes/simple_footer.html' %}
-{% endblock %}
-
 {% block js %}
   {% javascript 'firefox_family_index' %}
 {% endblock  %}
diff --git a/bedrock/firefox/templates/firefox/includes/simple_footer.html b/bedrock/firefox/templates/firefox/includes/simple_footer.html
diff --git a/bedrock/firefox/templates/firefox/ios.html b/bedrock/firefox/templates/firefox/ios.html
@@ -153,8 +153,12 @@ <h4>{{ _('Get started with Sync') }}</h4>
 {% endblock %}
 
 {% block site_footer %}
-  {% with fx_footer_links=True, current_platform='ios' %}
-    {% include 'includes/site-footer.html' %}
+  {% with footer_class='blue' %}
+    {% if LANG.startswith('en-') %}
+      {% include 'includes/site-footer-new.html' %}
+    {% else %}
+      {% include 'includes/site-footer.html' %}
+    {% endif %}
   {% endwith %}
 {% endblock %}
 

diff --git a/bedrock/firefox/templates/firefox/mobile-download-desktop.html b/bedrock/firefox/templates/firefox/mobile-download-desktop.html
@@ -115,10 +115,6 @@ <h1>
 
 {% block email_form %}{% endblock %}
 
-{% block site_footer %}
-  {% include 'firefox/includes/simple_footer.html' %}
-{% endblock %}
-
 {% block js %}
   {% javascript 'firefox_mobile_download_desktop' %}
 {% endblock %}
diff --git a/bedrock/firefox/templates/firefox/mobile-download.html b/bedrock/firefox/templates/firefox/mobile-download.html
@@ -71,8 +71,4 @@ <h1 class="large" id="main-headline">
 
 {% block email_form %}{% endblock %}
 
-{% block site_footer %}
-  {% include 'firefox/includes/simple_footer.html' %}
-{% endblock %}
-
 {% block js %}{% endblock %}
diff --git a/bedrock/firefox/templates/firefox/new/base.html b/bedrock/firefox/templates/firefox/new/base.html
@@ -51,10 +51,6 @@
 
 {% block email_form %}{% endblock %}
 
-{% block site_footer %}
-  {% include 'firefox/includes/simple_footer.html' %}
-{% endblock %}
-
 {% block js %}{% endblock %}
 
 {% block task_completion_survey %}{% endblock %}
diff --git a/bedrock/firefox/templates/firefox/new/break-free/base.html b/bedrock/firefox/templates/firefox/new/break-free/base.html
@@ -35,12 +35,6 @@ <h1>{{ high_res_img('firefox/new/break-free/heading.png', {'alt': _('Break free
 
 {% block email_form %}{% endblock %}
 
-{% block site_footer %}
-  {% with fx_footer_links=True %}
-    {% include 'firefox/includes/simple_footer.html' %}
-  {% endwith %}
-{% endblock %}
-
 {% block js %}{% endblock %}
 
 {% block task_completion_survey %}{% endblock %}
diff --git a/bedrock/firefox/templates/firefox/new/onboarding/base.html b/bedrock/firefox/templates/firefox/new/onboarding/base.html
@@ -43,10 +43,6 @@
 
 {% block email_form %}{% endblock %}
 
-{% block site_footer %}
-  {% include 'firefox/includes/simple_footer.html' %}
-{% endblock %}
-
 {% block js %}{% endblock %}
 
 {% block task_completion_survey %}{% endblock %}
diff --git a/bedrock/firefox/templates/firefox/new/way-of-the-fox/base.html b/bedrock/firefox/templates/firefox/new/way-of-the-fox/base.html
@@ -36,12 +36,6 @@ <h1>{{ high_res_img('firefox/new/way-of-the-fox/heading.png', {'alt': _('Follow
 
 {% block email_form %}{% endblock %}
 
-{% block site_footer %}
-  {% with fx_footer_links=True %}
-    {% include 'firefox/includes/simple_footer.html' %}
-  {% endwith %}
-{% endblock %}
-
 {% block js %}{% endblock %}
 
 {% block task_completion_survey %}{% endblock %}
diff --git a/bedrock/firefox/templates/firefox/nightly_firstrun.html b/bedrock/firefox/templates/firefox/nightly_firstrun.html
@@ -96,6 +96,16 @@ <h3>Learn more about your local Mozilla community</h3>
 
 {% block email_form %}{% endblock %}
 
+{% block site_footer %}
+  {% with footer_class='dark' %}
+    {% if LANG.startswith('en-') %}
+      {% include 'includes/site-footer-new.html' %}
+    {% else %}
+      {% include 'includes/site-footer.html' %}
+    {% endif %}
+  {% endwith %}
+{% endblock %}
+
 {% block js %}{% endblock %}
 
 {% block task_completion_survey %}{% endblock %}
diff --git a/bedrock/firefox/templates/firefox/nightly_whatsnew.html b/bedrock/firefox/templates/firefox/nightly_whatsnew.html
@@ -99,10 +99,6 @@ <h2>
 
 {% block email_form %}{% endblock %}
 
-{% block site_footer %}
-  {% include 'firefox/includes/simple_footer.html' %}
-{% endblock %}
-
 {% block js %}{% endblock %}
 
 {% block task_completion_survey %}{% endblock %}
diff --git a/bedrock/firefox/templates/firefox/releases/release-notes.html b/bedrock/firefox/templates/firefox/releases/release-notes.html
@@ -317,35 +317,13 @@ <h2>{{ _('Other Resources') }}</h2>
 {% block email_form %}{% endblock %}
 
 {% block site_footer %}
-
-  {# Default to Firefox desktop release channel #}
-  {% set platform = 'desktop' %}
-  {% set channel = 'release' %}
-
-  {% if release.product == 'Firefox' %}
-    {% if release.channel == 'Beta' %}
-      {% set channel = 'beta' %}
-    {# Developer Edition still uses legacy channel names #}
-    {% elif release.channel == 'Aurora' %}
-      {% set channel = 'alpha' %}
-    {% endif %}
-  {% elif release.product == 'Firefox for Android' %}
-    {% set platform = 'android' %}
-    {% if release.channel == 'Beta' %}
-      {% set channel = 'beta' %}
-    {% elif release.channel == 'Aurora' %}
-      {% set channel = 'alpha' %}
+  {% with footer_class='dark' %}
+    {% if LANG.startswith('en-') %}
+      {% include 'includes/site-footer-new.html' %}
+    {% else %}
+      {% include 'includes/site-footer.html' %}
     {% endif %}
-  {% elif release.product == 'Firefox for iOS' %}
-    {% set platform = 'ios' %}
-  {% elif release.product == 'Firefox Extended Support Release' %}
-    {% set channel = 'organizations' %}
-  {% endif %}
-
-  {% with fx_footer_links=True, current_platform=platform, current_channel=channel %}
-    {% include 'includes/site-footer.html' %}
   {% endwith %}
-
 {% endblock %}
 
 {% block js %}

diff --git a/bedrock/firefox/templates/firefox/testflight.html b/bedrock/firefox/templates/firefox/testflight.html
@@ -128,4 +128,14 @@ <h4>{{ _('Terms and Conditions') }}</h4>
 </section>{#-- /#terms-conditions --#}
 {% endblock %}
 
+{% block site_footer %}
+  {% with footer_class='blue' %}
+    {% if LANG.startswith('en-') %}
+      {% include 'includes/site-footer-new.html' %}
+    {% else %}
+      {% include 'includes/site-footer.html' %}
+    {% endif %}
+  {% endwith %}
+{% endblock %}
+
 {% block email_form %}{% endblock %}