Fix bug 931042: Redirect /collusion/ to /lightbeam/.

Remove collusion related assets.
mozilla · Oct 25, 2013 · 03ce382 · 03ce382
1 parent 32d86a2
commit 03ce382
Show file tree

Hide file tree

Showing 20 changed files with 4 additions and 10,157 deletions.
diff --git a/bedrock/collusion/__init__.py b/bedrock/collusion/__init__.py
diff --git a/bedrock/collusion/models.py b/bedrock/collusion/models.py
diff --git a/bedrock/collusion/templates/collusion/collusion.html b/bedrock/collusion/templates/collusion/collusion.html
diff --git a/bedrock/collusion/templates/collusion/demo.html b/bedrock/collusion/templates/collusion/demo.html
diff --git a/bedrock/collusion/urls.py b/bedrock/collusion/urls.py
diff --git a/bedrock/foundation/templates/foundation/annualreport/2011.html b/bedrock/foundation/templates/foundation/annualreport/2011.html
@@ -532,7 +532,7 @@ <h3>{{ _('Collusion') }}</h3>
           <img src="{{ media('img/foundation/annualreport/2011/act-collusion.jpg') }}" alt="">
           <div class="overlay">
             <p>
-            {% trans collusion_url=url('collusion.collusion') %}
+            {% trans collusion_url=url('lightbeam.lightbeam') %}
               <a href="{{ collusion_url }}" rel="external" hreflang="en-US">Mozilla Collusion</a>
               gives consumers a powerful tool to protect their privacy, arming
               them with transparency, facts and the power to make their own