Merge branch 'master' into social

* master:
  Firefox manifest errors continue.
  Fixing broken Firefox manifest.
  Adding firefox manifest for Mozilla App Marketplace.

apps/static/views.py

@@ -38,3 +38,9 @@ def feedback(request):
 def iphone(request):
     return render_to_response('static/iphone.xhtml', {}, 
                               context_instance=RequestContext(request))
+
+def firefox(request):
+    filename = settings.MEDIA_ROOT + '/extensions/firefox/manifest.json'
+    manifest = open(filename).read()
+    
+    return HttpResponse(manifest, content_type='application/x-web-app-manifest+json')

media/extensions/firefox/manifest.json

@@ -0,0 +1,25 @@
+{
+    "version": "1.0",
+    "name": "NewsBlur",
+    "description": "Visual RSS feed reader with intelligence.",
+    "icons": {
+        "16": "/media/img/favicon.png",
+        "48": "/media/img/logo_128.png",
+        "128": "/media/img/logo_128.png"
+    },
+    "developer": {
+        "name": "Samuel Clay",
+        "url": "http://www.newsblur.com"
+    },
+    "installs_allowed_from": [
+        "https://marketplace.mozilla.org",
+        "http://www.newsblur.com",
+        "http://dev.newsblur.com",
+        "http://newsblur.com",
+        "https://www.newsblur.com",
+        "https://dev.newsblur.com",
+        "https://newsblur.com"
+    ],
+    "locales": {},
+    "default_locale": "en"
+}

urls.py

@@ -30,6 +30,7 @@ urlpatterns = patterns('',
     url(r'^press/?',        static_views.press, name='press'),
     url(r'^feedback/?',     static_views.feedback, name='feedback'),
     url(r'^iphone/?',       static_views.iphone, name='iphone'),
+    url(r'^firefox/?',      static_views.firefox, name='firefox'),
     url(r'zebra/',          include('zebra.urls',  namespace="zebra",  app_name='zebra')),
 )