bug 578087, kill fxcup

apps/addons/templates/addons/collections_teaser.html

@@ -1,78 +1,53 @@
-{# TODO set fxcup to true on June 10th #}
-{% set fxcup = true %}
-
 {% if promobox %}
 {% cache promobox.features() %}
 <div class="section-teaser featured">
   <div class="featured-inner">
     <div class="teaser-header">
       <ol>
-        {# TODO remove if blocks after the Firefox Cup promo ends #}
-        {% if fxcup %}
-          <li><a href="#t-firefox-cup">{{ _('Firefox Cup') }}</a></li>
-        {% else %}
-          <li><a href="#t-introduction">{{ _('Introduction') }}</a></li>
-        {% endif %}
+        <li><a href="#t-introduction">{{ _('Introduction') }}</a></li>
         {% for feature in promobox.features() %}
             <li><a href="#t-{{ feature.title|slugify }}">{{ feature.title }}</a></li>
         {% endfor %}
       </ol>
     </div> {# teaser-header #}
     <ol class="teaser-items">
-      {# TODO remove if blocks after the Firefox Cup promo ends #}
-      {% if fxcup %}
-        <li id="t-firefox-cup">
-          <div class="cta">
-            <h2>{{ _('Support your team in the Firefox Cup') }}</h2>
+      <li id="t-introduction">
+        <h2>{{ _('What are Add-ons?') }}</h2>
+        <div class="column-wrapper">
+          <div class="first column">
+            <h3><img src="{{ MEDIA_URL }}img/amo2009/illustrations/extras.gif"
+                     alt="{{ _('Extras') }}">
+            </h3>
             <p>
-              {% trans url=url('firefoxcup.index') %}
-                Dress up your Firefox in a Persona that shows off team spirit
-                and keep up with game scores using the FootieFox Add-on. See
-                it all on <a href="{{ url }}">Firefox Cup</a>.
-              {% endtrans %}
+            {% trans %}
+              <strong>Over 5000 free extras</strong> that let you customize and
+              extend Firefox to meet your needs.
+            {% endtrans %}
             </p>
           </div>
-          <a class="cover" href="{{ url('firefoxcup.index') }}">&nbsp;</a>
-        </li>
-      {% else %}
-        <li id="t-introduction">
-          <h2>{{ _('What are Add-ons?') }}</h2>
-          <div class="column-wrapper">
-            <div class="first column">
-              <h3><img src="{{ MEDIA_URL }}img/amo2009/illustrations/extras.gif"
-                       alt="{{ _('Extras') }}">
-              </h3>
-              <p>
-              {% trans %}
-                <strong>Over 5000 free extras</strong> that let you customize and
-                extend Firefox to meet your needs.
-              {% endtrans %}
-              </p>
-            </div>
-            <div class="column">
-              <h3><img src="{{ MEDIA_URL }}img/amo2009/illustrations/themes.gif"
-                       alt="{{ _('Themes') }}">
-              </h3>
-              <p>
-              {% trans %}
-                Toolbars, themes and search providers that
-                <strong>help you perform common tasks.</strong>
-              {% endtrans %}
-              </p>
-            </div>
-            <div class="column">
-              <h3><img src="{{ MEDIA_URL }}img/amo2009/illustrations/install.gif"
-                       alt="{{ _('Install') }}">
-              </h3>
-              <p>
-              {% trans %}
-                <strong>Easy to install</strong> and keep up-to-date.
-              {% endtrans %}
-              </p>
-            </div>
+          <div class="column">
+            <h3><img src="{{ MEDIA_URL }}img/amo2009/illustrations/themes.gif"
+                     alt="{{ _('Themes') }}">
+            </h3>
+            <p>
+            {% trans %}
+              Toolbars, themes and search providers that
+              <strong>help you perform common tasks.</strong>
+            {% endtrans %}
+            </p>
           </div>
-        </li>
-      {% endif %}
+          <div class="column">
+            <h3><img src="{{ MEDIA_URL }}img/amo2009/illustrations/install.gif"
+                     alt="{{ _('Install') }}">
+            </h3>
+            <p>
+            {% trans %}
+              <strong>Easy to install</strong> and keep up-to-date.
+            {% endtrans %}
+            </p>
+          </div>
+        </div>
+      </li>
       {% set collections = promobox.collections() %}
       {% for feature in promobox.features() %}
         <li id="t-{{ feature.title|slugify }}" class="addon-view">