Merge pull request #232 from SEL-Columbia/web-app-manifest-merge-2

Web app manifest merge
SEL-Columbia · Jan 13, 2016 · 21d1aa4 · 21d1aa4
2 parents 4026638 + 839cfca
commit 21d1aa4
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 11 deletions.
diff --git a/dokomoforms/static/manifest.json b/dokomoforms/static/manifest.json
@@ -0,0 +1,15 @@
+{
+  "name": "Dokomo Forms",
+  "short_name": "Dokomo Forms",
+  "start_url": "/enumerate/",
+  "scope": "/enumerate/",
+  "display": "standalone",
+  "icons": [
+    {
+      "src": "/static/dist/admin/img/favicon.png",
+      "sizes": "196x196",
+      "type": "image/png"
+    }
+  ],
+  "lang": "en-US"
+}
diff --git a/dokomoforms/static/src/common/js/service-worker.js b/dokomoforms/static/src/common/js/service-worker.js
@@ -0,0 +1 @@
+// Nothing to see here
diff --git a/dokomoforms/templates/base.html b/dokomoforms/templates/base.html
@@ -16,6 +16,7 @@
     <link href="/static/dist/admin/css/admin.css" rel="stylesheet" type="text/css">
 
     <link rel="icon" href="/static/dist/admin/img/favicon.png">
+    <link rel="manifest" href="/static/manifest.json">
 
     <title>{{ options.organization }} Surveys -- Powered by DokomoData</title>
 </head>

diff --git a/dokomoforms/templates/view_enumerate.html b/dokomoforms/templates/view_enumerate.html
@@ -17,6 +17,21 @@
 
         <link href='https://fonts.googleapis.com/css?family=Roboto:400,300,500,700,100' rel='stylesheet' type='text/css'>
         <link rel="icon" href="/static/dist/survey/img/favicon.png">
+	<link rel="manifest" href="/static/manifest.json">
+	<script>
+            // From https://github.com/GoogleChrome/samples/blob/cbc8098c3ebda4dda0ff894673d3847eae31648f/app-install-banner/basic-banner/index.html
+            window.addEventListener('load', function() {
+                if ('serviceWorker' in navigator) {
+                    navigator.serviceWorker.register('/static/src/common/js/service-worker.js', { scope: '/static/src/common/js/' })
+                    .then(function(r) {
+                        console.log('registered service worker');
+                    })
+                    .catch(function(error) {
+                        console.error(error);
+                    });
+                };
+            });
+	</script>
     </head>
 
     <body>

diff --git a/tests/python/test_selenium.py b/tests/python/test_selenium.py
@@ -4082,7 +4082,8 @@ def test_add_new_facility(self):
         self.sleep()
         self.wait_for_element(
             '.btn-add-facility',
-            by=By.CSS_SELECTOR
+            by=By.CSS_SELECTOR,
+            timeout=10,
         )
         # click add button
         self.click(

diff --git a/webapp.py b/webapp.py
@@ -139,6 +139,16 @@ def __init__(self, session=None, options=options):
 
         sur = SurveyResource
 
+        settings = {
+            'template_path': os.path.join(_pwd, 'dokomoforms', 'templates'),
+            'static_path': os.path.join(_pwd, 'dokomoforms', 'static'),
+            'default_handler_class': handlers.NotFound,
+            'xsrf_cookies': True,
+            'cookie_secret': get_cookie_secret(),
+            'login_url': '/',
+            'debug': options.debug,
+        }
+
         urls = [
             # Administrative
             url(r'/', handlers.Index, name='index'),
@@ -252,16 +262,6 @@ def __init__(self, session=None, options=options):
             ),
         ]
 
-        settings = {
-            'template_path': os.path.join(_pwd, 'dokomoforms/templates'),
-            'static_path': os.path.join(_pwd, 'dokomoforms/static'),
-            'default_handler_class': handlers.NotFound,
-            'xsrf_cookies': True,
-            'cookie_secret': get_cookie_secret(),
-            'login_url': '/',
-            'debug': options.debug,
-        }
-
         # HTTPS
         if options.https:
             settings['xsrf_cookie_kwargs'] = {'secure': True}