Merge pull request #4338 from kyoshino/bug-1302117-nightly-all-ogp

Fix Bug 1302117 - Improve Open Graph metadata on mozilla.org/firefox/nightly/all

bedrock/firefox/templates/firefox/all.html

@@ -11,14 +11,6 @@
   {%- endif -%}
 {% endblock %}
 
-{% block page_favicon %}
-  {%- if channel == 'nightly' -%}
-    {{ static('img/firefox/favicon-nightly.png') }}
-  {%- else -%}
-    {{ super() }}
-  {%- endif -%}
-{% endblock %}
-
 {% block twitter_id %}
   {%- if channel == 'nightly' -%}
     FirefoxNightly
@@ -27,8 +19,6 @@
   {%- endif -%}
 {% endblock %}
 
-{% block body_id %}firefox-all{% endblock %}
-
 {% block page_desc %}
   {%- if channel == 'beta' -%}
     {{ _('Download Firefox Beta in your language and experience cutting edge features before they make it to final release. Provide feedback to help us refine and polish the next version of Firefox.') }}
@@ -43,14 +33,37 @@
   {%- endif -%}
 {% endblock %}
 
+{% block page_favicon %}
+  {%- if channel == 'alpha' -%}
+    {{ static('img/firefox/developer/favicon.png') }}
+  {%- elif channel == 'nightly' -%}
+    {{ static('img/firefox/nightly/favicon.png') }}
+  {%- else -%}
+    {{ super() }}
+  {%- endif -%}
+{% endblock %}
+
+{% block page_favicon_large %}
+  {%- if channel == 'alpha' -%}
+    {{ static('img/firefox/developer/favicon-196.png') }}
+  {%- elif channel == 'nightly' -%}
+    {{ static('img/firefox/nightly/favicon-196.png') }}
+  {%- else -%}
+    {{ super() }}
+  {%- endif -%}
+{% endblock %}
+
 {% block page_image %}
-  {%- if channel == 'aurora' -%}
+  {%- if channel == 'alpha' -%}
     {{ static('img/firefox/developer/page-image.png') }}
+  {%- elif channel == 'nightly' -%}
+    {{ static('img/firefox/nightly/page-image.png') }}
   {%- else -%}
     {{ static('img/firefox/all/page-image.png') }}
   {%- endif -%}
 {% endblock %}
 
+{% block body_id %}firefox-all{% endblock %}
 {% block body_class -%}
   sky {{ platform }} {{ channel }} {% if channel == 'alpha' %}blueprint{% endif %}
 {% endblock %}

bedrock/firefox/templates/firefox/dev-firstrun.html

@@ -17,6 +17,8 @@
 {% block page_title_prefix %}{% endblock %}
 {% block page_title %}{{_('Welcome to Firefox Developer Edition')}}{% endblock %}
 {% block page_title_suffix %}{% endblock %}
+{% block page_favicon %}{{ static('img/firefox/developer/favicon.png') }}{% endblock %}
+{% block page_favicon_large %}{{ static('img/firefox/developer/favicon-196.png') }}{% endblock %}
 {% block page_image %}{{ static('img/firefox/developer/page-image.png') }}{% endblock %}
 {% block page_og_url %}{{ url('firefox.developer') }}{% endblock %}
 

bedrock/firefox/templates/firefox/dev-whatsnew.html

@@ -17,6 +17,8 @@
 {% block page_title_prefix %}{% endblock %}
 {% block page_title %}{{_('Welcome to Firefox Developer Edition')}}{% endblock %}
 {% block page_title_suffix %}{% endblock %}
+{% block page_favicon %}{{ static('img/firefox/developer/favicon.png') }}{% endblock %}
+{% block page_favicon_large %}{{ static('img/firefox/developer/favicon-196.png') }}{% endblock %}
 {% block page_image %}{{ static('img/firefox/developer/page-image.png') }}{% endblock %}
 {% block page_og_url %}{{ url('firefox.developer') }}{% endblock %}
 

bedrock/firefox/templates/firefox/developer.html

@@ -6,6 +6,8 @@
 
 {% block page_title_prefix %}{% endblock %}
 {% block page_title %}{{_('Firefox Developer Edition')}}{% endblock %}
+{% block page_favicon %}{{ static('img/firefox/developer/favicon.png') }}{% endblock %}
+{% block page_favicon_large %}{{ static('img/firefox/developer/favicon-196.png') }}{% endblock %}
 {% block page_image %}{{ static('img/firefox/developer/page-image.png') }}{% endblock %}
 
 {% block page_desc %}

bedrock/firefox/templates/firefox/nightly_firstrun.html

@@ -15,9 +15,13 @@
 {% add_lang_files "firstrun" "mobile" %}
 
 {% block page_title_prefix %}{% endblock %}
-{% block page_favicon %}{{ static('img/firefox/favicon-nightly.png') }}{% endblock %}
+{% block page_favicon %}{{ static('img/firefox/nightly/favicon.png') }}{% endblock %}
+{% block page_favicon_large %}{{ static('img/firefox/nightly/favicon-196.png') }}{% endblock %}
+{% block page_image %}{{ static('img/firefox/nightly/page-image.png') }}{% endblock %}
 {% block page_title %}{{ _('Firefox Nightly First Run Page') }}{% endblock %}
 {% block page_title_suffix %}{% endblock %}
+{% block page_og_url %}{{ url('firefox.all', channel='nightly') }}{% endblock %}
+
 {% block body_id %}firefox-firstrun{% endblock %}
 
 {% block site_header_nav %}{% endblock %}

bedrock/firefox/templates/firefox/nightly_whatsnew.html

@@ -15,9 +15,12 @@
 {% endblock %}
 
 {% block page_title_prefix %}{% endblock %}
-{% block page_favicon %}{{ static('img/firefox/favicon-nightly.png') }}{% endblock %}
+{% block page_favicon %}{{ static('img/firefox/nightly/favicon.png') }}{% endblock %}
+{% block page_favicon_large %}{{ static('img/firefox/nightly/favicon-196.png') }}{% endblock %}
+{% block page_image %}{{ static('img/firefox/nightly/page-image.png') }}{% endblock %}
 {% block page_title %}{{ _('You’ve just been upgraded to Firefox Nightly %(version)s!')|format(version=num_version) }}{% endblock %}
 {% block page_title_suffix %}{% endblock %}
+{% block page_og_url %}{{ url('firefox.all', channel='nightly') }}{% endblock %}
 
 {% block body_id %}nightly-whatsnew{% endblock %}
 {% block body_class %}{% endblock %}