From b9ac53ca48b313ebdb0be9f39bcf5796fbfd977b Mon Sep 17 00:00:00 2001
From: Jeff Balogh <me@jeffbalogh.org>
Date: Fri, 26 Feb 2010 17:43:48 -0800
Subject: [PATCH] starting the homepage: global stats

---
 apps/addons/templates/addons/home.html | 20 ++++++++++++++++++++
 apps/addons/urls.py                    |  3 +++
 apps/addons/views.py                   | 13 +++++++++++++
 apps/amo/tests/test_redirects.py       |  2 +-
 apps/amo/tests/test_views.py           | 24 +++++++++++-------------
 apps/cake/tests.py                     |  2 +-
 templates/base.html                    |  2 +-
 urls.py                                |  3 ---
 8 files changed, 50 insertions(+), 19 deletions(-)
 create mode 100644 apps/addons/templates/addons/home.html

diff --git a/apps/addons/templates/addons/home.html b/apps/addons/templates/addons/home.html
new file mode 100644
index 0000000000..3bf69af16b
--- /dev/null
+++ b/apps/addons/templates/addons/home.html
@@ -0,0 +1,20 @@
+{% extends "base_side_categories.html" %}
+
+{% block site_stats %}
+<ul class="stats">
+  {% set dl_text = ngettext('<strong>{0}</strong> <span>add-on downloaded</span>',
+                            '<strong>{0}</strong> <span>add-ons downloaded</span>',
+                            downloads.count) %}
+  {% set ping_text = ngettext('<strong>{0}</strong> <span>add-on in use</span>',
+                              '<strong>{0}</strong> <span>add-ons in use</span>',
+                              pings.count) %}
+  <li>
+    <a href="{{ url('statistics.dashboard') }}">
+      {{ dl_text|f(downloads.count|numberfmt)|safe }}</a>
+  </li>
+  <li>
+    <a href="{{ url('statistics.dashboard') }}">
+      {{ ping_text|f(pings.count|numberfmt)|safe }}</a>
+  </li>
+</ul>
+{% endblock %}
diff --git a/apps/addons/urls.py b/apps/addons/urls.py
index 6b5eec5073..eafd75c199 100644
--- a/apps/addons/urls.py
+++ b/apps/addons/urls.py
@@ -13,6 +13,9 @@ detail_patterns = patterns('',
 
 
 urlpatterns = patterns('',
+    # The homepage.
+    url('^$', views.home, name='home'),
+
     # URLs for a single add-on.
     ('^addon/(?P<addon_id>\d+)/', include(detail_patterns)),
 )
diff --git a/apps/addons/views.py b/apps/addons/views.py
index db1b24116c..da8c01c502 100644
--- a/apps/addons/views.py
+++ b/apps/addons/views.py
@@ -1,6 +1,19 @@
 from django import http
 
+import jingo
+
+from stats.models import GlobalStat
+
 
 # pylint: disable-msg: W0613
 def addon_detail(request, addon_id):
     return http.HttpResponse('this is addon %s' % addon_id)
+
+
+def home(request):
+    gs = GlobalStat.objects
+    downloads = gs.filter(name='addon_total_downloads').latest()
+    pings = gs.filter(name='addon_total_updatepings').latest()
+
+    return jingo.render(request, 'addons/home.html',
+                        {'downloads': downloads, 'pings': pings})
diff --git a/apps/amo/tests/test_redirects.py b/apps/amo/tests/test_redirects.py
index cf4df40492..0d3c96b77e 100644
--- a/apps/amo/tests/test_redirects.py
+++ b/apps/amo/tests/test_redirects.py
@@ -4,7 +4,7 @@ from django import test
 
 class TestRedirects(test.TestCase):
 
-    fixtures = ['amo/test_redirects']
+    fixtures = ['amo/test_redirects', 'base/global-stats']
 
     def test_reviews(self):
         response = self.client.get('/reviews/display/4', follow=True)
diff --git a/apps/amo/tests/test_views.py b/apps/amo/tests/test_views.py
index e81842414e..50e5373bec 100644
--- a/apps/amo/tests/test_views.py
+++ b/apps/amo/tests/test_views.py
@@ -14,20 +14,8 @@ def test_404_no_app():
     eq_(response.status_code, 404)
 
 
-def test_heading():
-    c = test.Client()
-    def title_eq(url, expected):
-        response = c.get(url, follow=True)
-        actual = PyQuery(response.content)('#title').text()
-        eq_(expected, actual)
-
-    title_eq('/firefox', 'Add-ons for Firefox')
-    title_eq('/thunderbird', 'Add-ons for Thunderbird')
-    title_eq('/mobile', 'Mobile Add-ons for Firefox')
-
-
 class TestStuff(test_utils.TestCase):
-    fixtures = ['base/addons']
+    fixtures = ['base/addons', 'base/global-stats']
 
     def test_data_anonymous(self):
         def check(expected):
@@ -50,3 +38,13 @@ class TestStuff(test_utils.TestCase):
         check(0)
         self.client.login(username='admin@mozilla.com', password='password')
         check(1)
+
+    def test_heading(self):
+        def title_eq(url, expected):
+            response = self.client.get(url, follow=True)
+            actual = PyQuery(response.content)('#title').text()
+            eq_(expected, actual)
+
+        title_eq('/firefox', 'Add-ons for Firefox')
+        title_eq('/thunderbird', 'Add-ons for Thunderbird')
+        title_eq('/mobile', 'Mobile Add-ons for Firefox')
diff --git a/apps/cake/tests.py b/apps/cake/tests.py
index e7f48adab7..b315a43df1 100644
--- a/apps/cake/tests.py
+++ b/apps/cake/tests.py
@@ -9,7 +9,7 @@ from cake.backends import SessionBackend
 
 class CakeTestCase(TestCase):
 
-    fixtures = ['cake/sessions.json']
+    fixtures = ['cake/sessions.json', 'base/global-stats']
 
     def test_login(self):
         """
diff --git a/templates/base.html b/templates/base.html
index b3ecfe8493..6ed6b93603 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -34,7 +34,7 @@
             <a href="http://www.mozilla.com/" title="{{ _('Mozilla') }}"
                accesskey="1">{{ _('Mozilla') }}</a>
           </p>
-
+          {% block site_stats %}{% endblock %}
           <div id="aux-nav" role="navigation">
             <ul id="other-apps" class="change"
                 title="{{ _('Find add-ons for other applications') }}">
diff --git a/urls.py b/urls.py
index cf233d3cd1..fc20c1c176 100644
--- a/urls.py
+++ b/urls.py
@@ -9,9 +9,6 @@ handler404 = 'amo.views.handler404'
 handler500 = 'amo.views.handler500'
 
 urlpatterns = patterns('',
-    url('^$', 'jingo.views.direct_to_template',
-        {'template': 'base.html'}, name='home'),
-
     # Add-ons.
     ('', include('addons.urls')),