From 1db5f67304b92f9afba4e5e53d1aca40da6dd700 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Sat, 21 Apr 2012 18:31:22 -0700
Subject: [PATCH 1/3] Adding firefox manifest for Mozilla App Marketplace.

---
 apps/static/views.py                   |  6 +++++
 media/extensions/firefox/manifest.json | 32 ++++++++++++++++++++++++++
 urls.py                                |  1 +
 3 files changed, 39 insertions(+)
 create mode 100644 media/extensions/firefox/manifest.json

diff --git a/apps/static/views.py b/apps/static/views.py
index 18ca0a227..848058d3d 100644
--- a/apps/static/views.py
+++ b/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')
\ No newline at end of file
diff --git a/media/extensions/firefox/manifest.json b/media/extensions/firefox/manifest.json
new file mode 100644
index 000000000..498f0fa4a
--- /dev/null
+++ b/media/extensions/firefox/manifest.json
@@ -0,0 +1,32 @@
+{
+    "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": [
+        "http://www.newsblur.com",
+        "http://dev.newsblur.com",
+        "http://newsblur.com"
+        "https://dev.newsblur.com",
+        "https://dev.newsblur.com"
+        "https://newsblur.com"
+    ],
+    "locales": {},
+    "default_locale": "en",
+    "screen_size": {
+        "min_width": "800",
+        "min_height": "800"
+    },
+    "required_features": [
+    ],
+    "orientation": "landscape",
+    "fullscreen": "true"
+}
\ No newline at end of file
diff --git a/urls.py b/urls.py
index d489f1c7d..d29a3c2d6 100644
--- a/urls.py
+++ b/urls.py
@@ -22,6 +22,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')),
 )
 

From 5769efbca8d4737be6e01208a987a63825ce9978 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Sat, 21 Apr 2012 18:33:54 -0700
Subject: [PATCH 2/3] Fixing broken Firefox manifest.

---
 media/extensions/firefox/manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media/extensions/firefox/manifest.json b/media/extensions/firefox/manifest.json
index 498f0fa4a..fb5420322 100644
--- a/media/extensions/firefox/manifest.json
+++ b/media/extensions/firefox/manifest.json
@@ -14,9 +14,9 @@
     "installs_allowed_from": [
         "http://www.newsblur.com",
         "http://dev.newsblur.com",
-        "http://newsblur.com"
+        "http://newsblur.com",
+        "https://www.newsblur.com",
         "https://dev.newsblur.com",
-        "https://dev.newsblur.com"
         "https://newsblur.com"
     ],
     "locales": {},

From 299c416267d69fecdbecb9425189a1e5eea388a8 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Sat, 21 Apr 2012 18:35:22 -0700
Subject: [PATCH 3/3] Firefox manifest errors continue.

---
 media/extensions/firefox/manifest.json | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/media/extensions/firefox/manifest.json b/media/extensions/firefox/manifest.json
index fb5420322..1bf2a5747 100644
--- a/media/extensions/firefox/manifest.json
+++ b/media/extensions/firefox/manifest.json
@@ -12,6 +12,7 @@
         "url": "http://www.newsblur.com"
     },
     "installs_allowed_from": [
+        "https://marketplace.mozilla.org",
         "http://www.newsblur.com",
         "http://dev.newsblur.com",
         "http://newsblur.com",
@@ -20,13 +21,5 @@
         "https://newsblur.com"
     ],
     "locales": {},
-    "default_locale": "en",
-    "screen_size": {
-        "min_width": "800",
-        "min_height": "800"
-    },
-    "required_features": [
-    ],
-    "orientation": "landscape",
-    "fullscreen": "true"
+    "default_locale": "en"
 }
\ No newline at end of file