Merge pull request #1364 from kyoshino/bug-930152-page-title-prefix

Bug 930152 - Remove "Mozilla" prefix from Bedrock base template
mozilla · Nov 5, 2013 · 1e20912 · 1e20912
2 parents 6723a13 + 4ca24e1
commit 1e20912
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 12 deletions.
diff --git a/bedrock/base/templates/404.html b/bedrock/base/templates/404.html
@@ -4,7 +4,6 @@
 
 {% extends "base-resp.html" %}
 
-{% block page_title_prefix %}{% endblock %}
 {% block page_title %}404: Page Not Found{% endblock %}
 
 {% block extrahead %}

diff --git a/bedrock/base/templates/base-resp.html b/bedrock/base/templates/base-resp.html
@@ -14,7 +14,7 @@
     {% block shared_meta %}
     {#- Please sync this block with the base.html template.
         Because of blocks, we cannot use an include here. -#}
-    <title>{% block page_title_full %}{% block page_title_prefix %}Mozilla — {% endblock %}{% block page_title %}{% endblock %}{% endblock page_title_full %}{% block page_title_suffix %} — Mozilla{% endblock %}</title>
+    <title>{% block page_title_full %}{% block page_title_prefix %}{% endblock %}{% block page_title %}{% endblock %}{% endblock page_title_full %}{% block page_title_suffix %} — Mozilla{% endblock %}</title>
     <meta name="description" content="{% block page_desc %}{% endblock %}">
     <meta property="og:type" content="website">
     <meta property="og:site_name" content="{{ _('Mozilla') }}">

diff --git a/bedrock/base/templates/base.html b/bedrock/base/templates/base.html
@@ -13,7 +13,7 @@
     {% block shared_meta %}
     {#- Please sync this block with the base-resp.html template.
         Because of blocks, we cannot use an include here. -#}
-    <title>{% block page_title_full %}{% block page_title_prefix %}Mozilla — {% endblock %}{% block page_title %}{% endblock %}{% endblock page_title_full %}{% block page_title_suffix %} — Mozilla{% endblock %}</title>
+    <title>{% block page_title_full %}{% block page_title_prefix %}{% endblock %}{% block page_title %}{% endblock %}{% endblock page_title_full %}{% block page_title_suffix %} — Mozilla{% endblock %}</title>
     <meta name="description" content="{% block page_desc %}{% endblock %}">
     <meta property="og:type" content="website">
     <meta property="og:site_name" content="{{ _('Mozilla') }}">

diff --git a/bedrock/firefox/templates/firefox/partners/index.html b/bedrock/firefox/templates/firefox/partners/index.html
@@ -4,7 +4,6 @@
 
 {% extends "base-resp.html" %}
 
-{% block page_title_prefix %}{% endblock %}
 {% block page_title %}{{ _('Firefox OS, Marketplace, Android — Partners') }}{% endblock %}
 {% block page_desc %}{{ _('We’re enabling operators, phone manufacturers and developers to manage, customize and improve relationships with their customers directly through our mobile products: Firefox OS, Firefox Marketplace and Firefox for Android.') }}{% endblock %}
 {% block page_image %}{{ media('img/firefox/firefox-256.jpg') }}{% endblock %}

diff --git a/bedrock/foundation/templates/foundation/base-resp.html b/bedrock/foundation/templates/foundation/base-resp.html
@@ -4,7 +4,6 @@
 
 {% extends "base-resp.html" %}
 
-{% block page_title_prefix %}{% endblock %}
 {% block page_title_suffix %}{% endblock %}
 
 {% block extrahead %}

diff --git a/bedrock/marketplace/templates/marketplace/marketplace.html b/bedrock/marketplace/templates/marketplace/marketplace.html
@@ -5,7 +5,6 @@
 {% extends "base-resp.html" %}
 {% from "macros.html" import email_newsletter_form with context %}
 
-{% block page_title_prefix %}{% endblock %}
 {% block page_title %}{{_('Firefox Marketplace')}}{% endblock %}
 {% block page_image %}{{ media('img/mozorg/partnerships/icon-marketplace.png') }}{% endblock %}
 

diff --git a/bedrock/mozorg/templates/mozorg/products.html b/bedrock/mozorg/templates/mozorg/products.html
@@ -4,7 +4,6 @@
 
 {% extends "mozorg/base-resp.html" %}
 
-{% block page_title_prefix %}{% endblock %}
 {% block page_title %}{{ _('Mozilla Products — Built by us, for the Web') }}{% endblock %}
 {% block body_id %}products-page{% endblock %}
 

diff --git a/bedrock/mozorg/templates/mozorg/projects/mozilla-based.html b/bedrock/mozorg/templates/mozorg/projects/mozilla-based.html
@@ -1,6 +1,5 @@
 {% extends "mozorg/base-resp.html" %}
 
-{% block page_title_prefix %}{% endblock %}
 {% block page_title %}{{ _('Featured Mozilla-Based Applications') }}{% endblock %}
 {% block body_id %}projects{% endblock %}
 

diff --git a/bedrock/persona/templates/persona/about.html b/bedrock/persona/templates/persona/about.html
@@ -4,7 +4,6 @@
 
 {% extends "base-resp.html" %}
 
-{% block page_title_prefix %}{% endblock %}
 {% block page_title %}{{ _('About Mozilla Persona') }}{% endblock %}
 {% block page_image %}{{ media('img/mozorg/partnerships/icon-persona.png') }}{% endblock %}
 

diff --git a/bedrock/persona/templates/persona/persona.html b/bedrock/persona/templates/persona/persona.html
@@ -4,7 +4,6 @@
 
 {% extends "base-resp.html" %}
 
-{% block page_title_prefix %}{% endblock %}
 {% block page_title %}{{ _('Mozilla Persona — simple sign-in with email') }}{% endblock %}
 {% block page_image %}{{ media('img/mozorg/partnerships/icon-persona.png') }}{% endblock %}
 

diff --git a/bedrock/persona/templates/persona/privacy-policy.html b/bedrock/persona/templates/persona/privacy-policy.html
@@ -4,7 +4,6 @@
 
 {% extends "base-resp.html" %}
 
-{% block page_title_prefix %}{% endblock %}
 {% block page_title %}{{ _('Mozilla Persona Terms of Service') }}{% endblock %}
 {% block page_image %}{{ media('img/mozorg/partnerships/icon-persona.png') }}{% endblock %}
 

diff --git a/bedrock/persona/templates/persona/terms-of-service.html b/bedrock/persona/templates/persona/terms-of-service.html
@@ -4,7 +4,6 @@
 
 {% extends "base-resp.html" %}
 
-{% block page_title_prefix %}{% endblock %}
 {% block page_title %}{{ _('Mozilla Persona Terms of Service') }}{% endblock %}
 {% block page_image %}{{ media('img/mozorg/partnerships/icon-persona.png') }}{% endblock %}