From e659b0fe8348e364d7018dc7e66f42fce9a90936 Mon Sep 17 00:00:00 2001
From: Skylar Ittner <admin@netsyms.com>
Date: Sat, 27 Aug 2016 15:00:11 -0600
Subject: [PATCH] Finish Munzee integration

---
 www/screens/munzeelink.html | 21 ++++++----
 www/screens/settings.html   | 78 ++++++++++++++++++-------------------
 2 files changed, 52 insertions(+), 47 deletions(-)

diff --git a/www/screens/munzeelink.html b/www/screens/munzeelink.html
index 46d4a41..8470dc3 100644
--- a/www/screens/munzeelink.html
+++ b/www/screens/munzeelink.html
@@ -15,14 +15,19 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<iframe id="munzeeoauth" src="about:blank"></iframe>
+<iframe id="munzeeoauth" src="about:blank" style="background-color: white;"></iframe>
 
 <script>
-    setTimeout(function () {
-        $('#munzeeoauth').attr('src', 'https://api.munzee.com/oauth?response_type=code&client_id='
-                + MUNZEE_CLIENT_ID
-                + '&redirect_uri='
-                + MUNZEE_REDIRECT
-                + '&scope=read');// capture_light');
-    }, 1000);
+    $('#munzeeoauth').attr('src', 'https://api.munzee.com/oauth?response_type=code&client_id='
+            + MUNZEE_CLIENT_ID
+            + '&redirect_uri='
+            + MUNZEE_REDIRECT
+            + '&scope=read capture_light');
+
+    $("#munzeeoauth").load(function () {
+        alert(this.contentWindow.location);
+        if (this.contentWindow.location == "about:closeme") {
+            openscreen("home");
+        }
+    });
 </script>
diff --git a/www/screens/settings.html b/www/screens/settings.html
index df1678e..1c9fb74 100644
--- a/www/screens/settings.html
+++ b/www/screens/settings.html
@@ -15,43 +15,43 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<div class="scrollable-box">
-    <div class='list-group'>
-        <div class='list-group-item' onclick='openIntro()'>
-            Show Introduction
-        </div>
-        <div class='list-group-item' onclick='openRules()'>
-            Show Rules
-        </div>
-        <!--<div class='list-group-item' onclick='openscreen("munzeelink")'>
-            Link with Munzee account
-            <br />
-            <span class="small">When you link a Munzee account, any Munzee QR codes you scan will be automatically captured in Munzee as well.</span>
-        </div>-->
-        <div class='list-group-item' onclick='askLogout()'>
-            Logout from app
-        </div>
-        <div class='list-group-item'>
-            <p>
-                <span style='font-weight: bold;'>Data and Libraries Used</span>
-                <br />
-                Map tiles by Stamen Design (stamen.com), under CC BY 3.0 (creativecommons.org/licenses/by/3.0).
-                <br />
-                Map tile data by OpenStreetMap (openstreetmap.org), under CC BY-SA (creativecommons.org/licenses/by-sa/3.0).
-                <br />
-                Places from OpenStreetMap and contributers, licensed under the ODbL (opendatacommons.org/licenses/odbl).
-                <br />
-                Map display is powered by Leaflet (leafletjs.com), copyright (c) 2010-2016, Vladimir Agafonkin and copyright (c) 2010-2011, CloudMade.  BSD 2-clause license.
-                <br />
-                Weather data Powered by Forecast (forecast.io).
-                <br />
-                Application developed using Apache Cordova (Apache License 2.0).
-                <br />
-                Barcode scanner code copyright (c) 2010 Matt Kane (MIT License).
-            </p>
-        </div>
-        <div class='list-group-item' onclick="openmodal('licenses', '#license-modal');">
-            Open Source Licenses
-        </div>
-    </div>
+<div class="scrollable-box">
+    <div class='list-group'>
+        <div class='list-group-item' onclick='openIntro()'>
+            Show Introduction
+        </div>
+        <div class='list-group-item' onclick='openRules()'>
+            Show Rules
+        </div>
+        <div class='list-group-item' onclick='openscreen("munzeelink")'>
+            Link with Munzee account
+            <br />
+            <span class="small">When you link a Munzee account, any Munzee QR codes you scan will be automatically captured in Munzee as well.</span>
+        </div>
+        <div class='list-group-item' onclick='askLogout()'>
+            Logout from app
+        </div>
+        <div class='list-group-item'>
+            <p>
+                <span style='font-weight: bold;'>Data and Libraries Used</span>
+                <br />
+                Map tiles by Stamen Design (stamen.com), under CC BY 3.0 (creativecommons.org/licenses/by/3.0).
+                <br />
+                Map tile data by OpenStreetMap (openstreetmap.org), under CC BY-SA (creativecommons.org/licenses/by-sa/3.0).
+                <br />
+                Places from OpenStreetMap and contributers, licensed under the ODbL (opendatacommons.org/licenses/odbl).
+                <br />
+                Map display is powered by Leaflet (leafletjs.com), copyright (c) 2010-2016, Vladimir Agafonkin and copyright (c) 2010-2011, CloudMade.  BSD 2-clause license.
+                <br />
+                Weather data Powered by Forecast (forecast.io).
+                <br />
+                Application developed using Apache Cordova (Apache License 2.0).
+                <br />
+                Barcode scanner code copyright (c) 2010 Matt Kane (MIT License).
+            </p>
+        </div>
+        <div class='list-group-item' onclick="openmodal('licenses', '#license-modal');">
+            Open Source Licenses
+        </div>
+    </div>
 </div>
\ No newline at end of file