From ae81a7c3687686b00e3c80cbb19a081442f4b4cd Mon Sep 17 00:00:00 2001 From: Alex Buchanan Date: Thu, 15 Jul 2010 10:21:38 -0700 Subject: [PATCH] bug 578087, kill fxcup --- .../templates/addons/collections_teaser.html | 93 +- apps/firefoxcup/__init__.py | 202 --- apps/firefoxcup/cron.py | 25 - apps/firefoxcup/models.py | 15 - .../templates/firefoxcup/index.html | 183 --- apps/firefoxcup/tests.py | 57 - apps/firefoxcup/twitter.py | 79 - apps/firefoxcup/urls.py | 8 - apps/firefoxcup/views.py | 62 - media/css/firefoxcup/firefoxcup.css | 739 --------- media/css/firefoxcup/reset-fonts-grids.css | 7 - media/css/zamboni/zamboni.css | 53 +- media/img/firefoxcup/addons.png | Bin 3094 -> 0 bytes media/img/firefoxcup/arrow.png | Bin 1201 -> 0 bytes media/img/firefoxcup/background-download.png | Bin 19955 -> 0 bytes media/img/firefoxcup/background-repeat.jpg | Bin 6832 -> 0 bytes media/img/firefoxcup/background.jpg | Bin 74646 -> 0 bytes media/img/firefoxcup/email.png | Bin 3295 -> 0 bytes media/img/firefoxcup/facebook.png | Bin 3288 -> 0 bytes media/img/firefoxcup/flags-sprite.png | Bin 102761 -> 0 bytes media/img/firefoxcup/flags/algeria.png | Bin 3127 -> 0 bytes media/img/firefoxcup/flags/argentina.png | Bin 2974 -> 0 bytes media/img/firefoxcup/flags/australia.png | Bin 3320 -> 0 bytes media/img/firefoxcup/flags/brazil.png | Bin 3487 -> 0 bytes media/img/firefoxcup/flags/cameroon.png | Bin 3070 -> 0 bytes media/img/firefoxcup/flags/chile.png | Bin 2873 -> 0 bytes media/img/firefoxcup/flags/cote.png | Bin 2691 -> 0 bytes media/img/firefoxcup/flags/denmark.png | Bin 3013 -> 0 bytes media/img/firefoxcup/flags/england.png | Bin 2634 -> 0 bytes media/img/firefoxcup/flags/france.png | Bin 2714 -> 0 bytes media/img/firefoxcup/flags/germany.png | Bin 2641 -> 0 bytes media/img/firefoxcup/flags/ghana.png | Bin 3039 -> 0 bytes media/img/firefoxcup/flags/greece.png | Bin 3030 -> 0 bytes media/img/firefoxcup/flags/honduras.png | Bin 2911 -> 0 bytes media/img/firefoxcup/flags/italy.png | Bin 2758 -> 0 bytes media/img/firefoxcup/flags/japan.png | Bin 3040 -> 0 bytes media/img/firefoxcup/flags/korea-dpr.png | Bin 3239 -> 0 bytes media/img/firefoxcup/flags/korea-republic.png | Bin 3069 -> 0 bytes media/img/firefoxcup/flags/mexico.png | Bin 2967 -> 0 bytes media/img/firefoxcup/flags/netherlands.png | Bin 2775 -> 0 bytes media/img/firefoxcup/flags/new-zealand.png | Bin 3242 -> 0 bytes media/img/firefoxcup/flags/nigeria.png | Bin 2713 -> 0 bytes media/img/firefoxcup/flags/paraguay.png | Bin 2952 -> 0 bytes media/img/firefoxcup/flags/portugal.png | Bin 3451 -> 0 bytes media/img/firefoxcup/flags/serbia.png | Bin 3365 -> 0 bytes media/img/firefoxcup/flags/slovakia.png | Bin 3247 -> 0 bytes media/img/firefoxcup/flags/slovenia.png | Bin 2898 -> 0 bytes media/img/firefoxcup/flags/south-africa.png | Bin 3260 -> 0 bytes media/img/firefoxcup/flags/spain.png | Bin 3081 -> 0 bytes media/img/firefoxcup/flags/switzerland.png | Bin 2821 -> 0 bytes media/img/firefoxcup/flags/uruguay.png | Bin 3157 -> 0 bytes media/img/firefoxcup/flags/usa.png | Bin 3398 -> 0 bytes media/img/firefoxcup/footiefox.png | Bin 3758 -> 0 bytes media/img/firefoxcup/generic-mac.jpg | Bin 35733 -> 0 bytes media/img/firefoxcup/generic-pc.jpg | Bin 29272 -> 0 bytes media/img/firefoxcup/logo.png | Bin 128284 -> 0 bytes media/img/firefoxcup/preview-uk.jpg | Bin 11660 -> 0 bytes media/img/firefoxcup/rockyourfirefox.png | Bin 8557 -> 0 bytes media/img/firefoxcup/twitter.png | Bin 4243 -> 0 bytes .../promos/FirefoxCup_AddsOn_banner.jpg | Bin 71651 -> 0 bytes media/js/firefoxcup/animation.js | 1380 ----------------- media/js/firefoxcup/browserdetect.js | 119 -- media/js/firefoxcup/firefoxcup.js | 600 ------- media/js/firefoxcup/jquery.form.js | 675 -------- media/js/firefoxcup/newsletter_form.js | 86 - media/js/firefoxcup/yahoo-dom-event.js | 12 - migrations/49-drop-firefoxcup.sql | 1 + requirements/prod.txt | 1 - scripts/crontab/preview | 1 - scripts/crontab/prod | 1 - settings.py | 36 +- 71 files changed, 39 insertions(+), 4396 deletions(-) delete mode 100644 apps/firefoxcup/__init__.py delete mode 100644 apps/firefoxcup/cron.py delete mode 100644 apps/firefoxcup/models.py delete mode 100644 apps/firefoxcup/templates/firefoxcup/index.html delete mode 100644 apps/firefoxcup/tests.py delete mode 100644 apps/firefoxcup/twitter.py delete mode 100644 apps/firefoxcup/urls.py delete mode 100644 apps/firefoxcup/views.py delete mode 100644 media/css/firefoxcup/firefoxcup.css delete mode 100644 media/css/firefoxcup/reset-fonts-grids.css delete mode 100644 media/img/firefoxcup/addons.png delete mode 100644 media/img/firefoxcup/arrow.png delete mode 100644 media/img/firefoxcup/background-download.png delete mode 100644 media/img/firefoxcup/background-repeat.jpg delete mode 100644 media/img/firefoxcup/background.jpg delete mode 100644 media/img/firefoxcup/email.png delete mode 100644 media/img/firefoxcup/facebook.png delete mode 100644 media/img/firefoxcup/flags-sprite.png delete mode 100644 media/img/firefoxcup/flags/algeria.png delete mode 100644 media/img/firefoxcup/flags/argentina.png delete mode 100644 media/img/firefoxcup/flags/australia.png delete mode 100644 media/img/firefoxcup/flags/brazil.png delete mode 100644 media/img/firefoxcup/flags/cameroon.png delete mode 100644 media/img/firefoxcup/flags/chile.png delete mode 100644 media/img/firefoxcup/flags/cote.png delete mode 100644 media/img/firefoxcup/flags/denmark.png delete mode 100644 media/img/firefoxcup/flags/england.png delete mode 100644 media/img/firefoxcup/flags/france.png delete mode 100644 media/img/firefoxcup/flags/germany.png delete mode 100644 media/img/firefoxcup/flags/ghana.png delete mode 100644 media/img/firefoxcup/flags/greece.png delete mode 100644 media/img/firefoxcup/flags/honduras.png delete mode 100644 media/img/firefoxcup/flags/italy.png delete mode 100644 media/img/firefoxcup/flags/japan.png delete mode 100644 media/img/firefoxcup/flags/korea-dpr.png delete mode 100644 media/img/firefoxcup/flags/korea-republic.png delete mode 100644 media/img/firefoxcup/flags/mexico.png delete mode 100644 media/img/firefoxcup/flags/netherlands.png delete mode 100644 media/img/firefoxcup/flags/new-zealand.png delete mode 100644 media/img/firefoxcup/flags/nigeria.png delete mode 100644 media/img/firefoxcup/flags/paraguay.png delete mode 100644 media/img/firefoxcup/flags/portugal.png delete mode 100644 media/img/firefoxcup/flags/serbia.png delete mode 100644 media/img/firefoxcup/flags/slovakia.png delete mode 100644 media/img/firefoxcup/flags/slovenia.png delete mode 100644 media/img/firefoxcup/flags/south-africa.png delete mode 100644 media/img/firefoxcup/flags/spain.png delete mode 100644 media/img/firefoxcup/flags/switzerland.png delete mode 100644 media/img/firefoxcup/flags/uruguay.png delete mode 100644 media/img/firefoxcup/flags/usa.png delete mode 100644 media/img/firefoxcup/footiefox.png delete mode 100644 media/img/firefoxcup/generic-mac.jpg delete mode 100644 media/img/firefoxcup/generic-pc.jpg delete mode 100644 media/img/firefoxcup/logo.png delete mode 100644 media/img/firefoxcup/preview-uk.jpg delete mode 100644 media/img/firefoxcup/rockyourfirefox.png delete mode 100644 media/img/firefoxcup/twitter.png delete mode 100644 media/img/zamboni/promos/FirefoxCup_AddsOn_banner.jpg delete mode 100644 media/js/firefoxcup/animation.js delete mode 100644 media/js/firefoxcup/browserdetect.js delete mode 100644 media/js/firefoxcup/firefoxcup.js delete mode 100644 media/js/firefoxcup/jquery.form.js delete mode 100644 media/js/firefoxcup/newsletter_form.js delete mode 100644 media/js/firefoxcup/yahoo-dom-event.js create mode 100644 migrations/49-drop-firefoxcup.sql diff --git a/apps/addons/templates/addons/collections_teaser.html b/apps/addons/templates/addons/collections_teaser.html index e6c9939f5ce..18cb7ffaec6 100644 --- a/apps/addons/templates/addons/collections_teaser.html +++ b/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() %}