Permalink
Browse files

Merge remote-tracking branch 'bensternthal/meta-tags'

  • Loading branch information...
2 parents 746295c + 5e9a9dc commit da4c2ac519c4fbd7371e94c18be292e2011dd2b6 @Osmose Osmose committed Mar 13, 2013
@@ -12,19 +12,20 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{ _('Firefox Flicks') }} : {% block page_title %}{% endblock %}</title>
+ {# Meta Description - used for page description and og:description #}
+ {% set meta_description = meta_description or _('Firefox Flicks is a contest that invites Firefox fans and filmmakers
+ from all over the world to create short videos (or &#34;flicks&#34;) to help
+ tell the Firefox story.') %}
+ <meta name="description" content="{{ meta_description }}">
+ <meta name="robots" content="noodp">
+
{# OpenGraph Metadata #}
<meta property="og:title" content="{% block og_title %}{{ _('Firefox Flicks') }}{% endblock %}">
<meta property="og:type" content="{% block og_type %}website{% endblock %}">
<meta property="og:image" content="{% block og_image %}{{ absolutify(static('img/flicks-logo-180.png')) }}{% endblock %}">
<meta property="og:url" content="{% block og_url %}{{ request.build_absolute_uri() }}{% endblock %}">
<meta property="og:site_name" content="{{ _('Firefox Flicks') }}">
- {% block meta_description -%}
- <meta property="og:description" content="{% trans %}
- Firefox Flicks is a contest that invites Firefox fans and filmmakers
- from all over the world to create short videos (or &#34;flicks&#34;) to help
- tell the Firefox story.
- {% endtrans %}">
- {%- endblock %}
+ <meta property="og:description" content="{{ meta_description }}">
<!--[if lt IE 9]>
<script src="{{ static('js/libs/html5.js') }}"></script>
@@ -2,15 +2,8 @@
{% block page_title %}{{ _('FAQ') }}{% endblock %}
-
-{% block meta_description -%}
- <meta property="og:description" content="{% trans %}
-
- Firefox Flicks FAQ &#8212; Your questions answered. Our FAQ covers all the details on
- how to enter the video contest and win prizes.
-
- {% endtrans %}">
-{%- endblock %}
+{% set meta_description = _('Firefox Flicks FAQ &#8212; Your questions answered. Our FAQ covers all the details on
+ how to enter the video contest and win prizes.') %}
{% block content %}
<div class="section">
@@ -4,13 +4,8 @@
{% block page_title %}{{ _('Judges') }}{% endblock %}
-
-{% block meta_description -%}
- <meta property="og:description" content="{% trans %}
- Get to know our illustrious panel of celebrity judges who
- will see your flick and help us choose this year's winner.
- {% endtrans %}">
-{%- endblock %}
+{% set meta_description = _('Get to know our illustrious panel of celebrity judges who
+ will see your flick and help us choose this year\'s winner.') %}
{% block content %}
<div class="section">
@@ -2,10 +2,7 @@
{% block page_title %}Firefox Flicks-Gewinnspiel – Offizielle Regeln{% endblock %}
-
-{% block meta_description -%}
- <meta property="og:description" content="Firefox Flicks-Gewinnspiel – Offizielle Regeln">
-{%- endblock %}
+{% set meta_description = 'Firefox Flicks-Gewinnspiel – Offizielle Regeln' %}
{% block content %}
<div class="section">
@@ -2,14 +2,7 @@
{% block page_title %}Firefox Flicks Contest Official Rules{% endblock %}
-
-{% block meta_description -%}
- <meta property="og:description" content="{% trans %}
-
- Firefox Flicks Contest Official Rules
-
- {% endtrans %}">
-{%- endblock %}
+{% set meta_description = _('Firefox Flicks Contest Official Rules') %}
{% block content %}
<div class="section">
@@ -2,10 +2,7 @@
{% block page_title %}Normas oficiales del concurso de Firefox Flicks{% endblock %}
-
-{% block meta_description -%}
- <meta property="og:description" content="Normas oficiales del concurso de Firefox Flicks">
-{%- endblock %}
+{% set meta_description = 'Normas oficiales del concurso de Firefox Flicks' %}
{% block content %}
<div class="section">
@@ -2,10 +2,7 @@
{% block page_title %}Règlement officiel du concours Firefox Flicks{% endblock %}
-
-{% block meta_description -%}
- <meta property="og:description" content="Règlement officiel du concours Firefox Flicks">
-{%- endblock %}
+{% set meta_description = 'Règlement officiel du concours Firefox Flicks' %}
{% block content %}
<div class="section">
@@ -2,10 +2,7 @@
{% block page_title %}Oficjalny Regulamin konkursu Firefox Flicks{% endblock %}
-
-{% block meta_description -%}
- <meta property="og:description" content="Oficjalny Regulamin konkursu Firefox Flicks">
-{%- endblock %}
+{% set meta_description = 'Oficjalny Regulamin konkursu Firefox Flicks' %}
{% block content %}
<div class="section">
@@ -2,10 +2,7 @@
{% block page_title %}Regras Oficiais do Concurso Firefox Flicks{% endblock %}
-
-{% block meta_description -%}
- <meta property="og:description" content="Regras Oficiais do Concurso Firefox Flicks">
-{%- endblock %}
+{% set meta_description = 'Regras Oficiais do Concurso Firefox Flicks' %}
{% block content %}
<div class="section">
@@ -3,9 +3,8 @@
{% block page_title %}{{ video_title }}{% endblock %}
{% block og_title %}{{ video_title }}{% endblock %}
-{% block meta_description -%}
- <meta property="og:description" content="{{ video_description }}">
-{%- endblock %}
+
+{% set meta_description = video_description %}
{% block video_embed %}
{{ video_embed }}
@@ -6,13 +6,11 @@
{% block og_title %}{{ video.title }}{% endblock %}
{% block og_image %}{{ absolutify(video.thumbnail_url) }}{% endblock %}
-{% block meta_description %}
- {% if video.description %}
- <meta property="og:description" content="{{ video.description }}">
- {% else %}
- <meta property="og:description" content="{{ _('An entry for Firefox Flicks 2013, a global video contest about the power of mobile.') }}">
- {% endif %}
-{% endblock %}>
+{% if video.description %}
+ {% set meta_description = video.description %}
+{% else %}
+ {% set meta_description = _('An entry for Firefox Flicks 2013, a global video contest about the power of mobile.') %}
+{% endif %}
{% block video_embed %}
{{ video.embed_html(width='100%') }}

0 comments on commit da4c2ac

Please sign in to comment.