Bug 565785, Firefox Cup promo box

apps/addons/templates/addons/collections_teaser.html

@@ -6,7 +6,12 @@
       <ol>
         <li><a href="#t-introduction">{{ _('Introduction') }}</a></li>
         {% for feature in promobox.features() %}
-          <li><a href="#t-{{ feature.title|slugify }}">{{ feature.title }}</a></li>
+					{# TODO remove if blocks after the Firefox Cup promo ends #}
+					{% if (feature.title|slugify) in ['sports', 'rock-your-firefox'] %}
+						<li><a href="#t-firefox-cup">{{ _('Firefox Cup') }}</a></li>
+					{% else %}
+	          <li><a href="#t-{{ feature.title|slugify }}">{{ feature.title }}</a></li>
+					{% endif %}
         {% endfor %}
       </ol>
     </div> {# teaser-header #}
@@ -50,29 +55,45 @@
       </li>
       {% set collections = promobox.collections() %}
       {% for feature in promobox.features() %}
-        <li id="t-{{ feature.title|slugify }}" class="addon-view">
-          {% set collection = collections[feature] %}
-          <h2>{{ feature.tagline }}</h2>
-          {% for addon in collection.public_addons.order_by('?')[:3] %}
-            <div class="column {% if loop.first %}first{% endif %}">
-              <div class="column-inner item">
-                <a title="{{ addon.name }}" href="{{ addon.get_url_path() }}">
-                  <img width="32" height="32" class="icon"
-                       src="{{ addon.icon_url }}"></a>
-                <h3>
-                  <a title="{{ _('Learn more about this add-on') }}"
-                    href="{{ addon.get_url_path() }}">{{ addon.name }}</a>
-                </h3>
-                <p>{{ addon.summary|truncate(80) }}</p>
-                {{ install_button(addon, src='homepagepromo') }}
-              </div>
-            </div>
-          {% endfor %}
-          <p class="lead">
-            {% set link = '<a href="{0}">{1}</a>'|f(collection.get_url_path(), collection.name) %}
-            {{ _('Like these? Find more add-ons in the {0} collection.')|f(link)|safe }}
-          </p>
-        </li>
+				{# TODO remove if blocks after the Firefox Cup promo ends #}
+				{% if (feature.title|slugify) in ['sports', 'rock-your-firefox'] %}
+					<li id="t-firefox-cup">
+						<div class="cta">
+							<h2>{{ _('Support your team in the Firefox Cup') }}</h2>
+							<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 %}
+							</p>
+						</div>
+					</li>
+				{% else %}
+	        <li id="t-{{ feature.title|slugify }}" class="addon-view">
+	          {% set collection = collections[feature] %}
+	          <h2>{{ feature.tagline }}</h2>
+	          {% for addon in collection.public_addons.order_by('?')[:3] %}
+	            <div class="column {% if loop.first %}first{% endif %}">
+	              <div class="column-inner item">
+	                <a title="{{ addon.name }}" href="{{ addon.get_url_path() }}">
+	                  <img width="32" height="32" class="icon"
+	                       src="{{ addon.icon_url }}"></a>
+	                <h3>
+	                  <a title="{{ _('Learn more about this add-on') }}"
+	                    href="{{ addon.get_url_path() }}">{{ addon.name }}</a>
+	                </h3>
+	                <p>{{ addon.summary|truncate(80) }}</p>
+	                {{ install_button(addon, src='homepagepromo') }}
+	              </div>
+	            </div>
+	          {% endfor %}
+	          <p class="lead">
+	            {% set link = '<a href="{0}">{1}</a>'|f(collection.get_url_path(), collection.name) %}
+	            {{ _('Like these? Find more add-ons in the {0} collection.')|f(link)|safe }}
+	          </p>
+	        </li>
+				{% endif %}
       {% endfor %}
     </ol> {# teaser-items #}
   </div>

media/css/main.css

@@ -2380,8 +2380,8 @@ form.favorite {
 .section-teaser .window ol.teaser-items {
     margin: 0;
     padding: 0;
-    height: 240px;
-    max-height: 240px;
+    height: 250px;
+    max-height: 250px;
     position: relative;
     left: 0;
     direction: ltr;
@@ -2389,7 +2389,7 @@ form.favorite {
 
 .section-teaser .window ol.teaser-items li {
     margin: 0;
-    padding: 0;
+    padding: 1px 0 0 0;
 }
 
 .section-teaser .window .more-info {
@@ -2413,6 +2413,7 @@ form.favorite {
     margin-right: 0.619em;
     font-size: 1.615em;
     line-height: 0.952em;
+	padding-top:1px;
 }
 
 .section-teaser .column {

media/css/zamboni/zamboni.css

@@ -1984,3 +1984,44 @@ form .error .note.error {
 #discovery-modules .locales input {
     width: 20em;
 }
+
+/**
+ *	Firefox Cup promo styles
+ *	TODO remove these when promo is pulled
+**/
+
+#t-firefox-cup,
+#t-firefox-cup div.cta p,
+#t-firefox-cup div.cta h2 {
+	font-family: "Geneva", "Lucida Sans Unicode", "Lucida Sans", "Trebuchet", sans-serif;
+}
+#t-firefox-cup {
+	padding-top:10px;
+	background-image: url("../../img/zamboni/promos/FirefoxCup_AddsOn_banner.jpg");
+	background-position: top center;
+	height: 260px;
+}
+#t-firefox-cup div.cta {
+	margin-left: 280px;
+}
+#t-firefox-cup div.cta h2 {
+	color:#bcffbb;
+	font-size:200%;
+	margin:1.3em 50px 1em 0;
+	word-spacing:-.1em;
+}
+#t-firefox-cup div.cta p {
+	color:#FFFFFD;
+	font-size:120%;
+	margin-right:50px;
+	margin-left:0;
+}
+#t-firefox-cup div.cta a {
+	color: #FFFFFD;
+	text-decoration: underline;
+}
+
+/**
+ *	End Firefox Cup promo styles
+ *	TODO remove these when promo is pulled
+**/

media/js/amo2009/global.js

@@ -73,6 +73,7 @@
 	Slideshow.prototype.autoRotate = function() {
 	    if(this.scroll) {
 	        var that = this; //closure due to setInterval's 'this' refers to window, not the current 'this'
+			clearInterval(this.interval);
     	    this.interval = setInterval(function() {
     	        if(that.currentItem != that.itemTotal) {
                     that.moveToItem(that.currentItem+1);