From 248de728c667d56a088d1ca80e993fb43da9d102 Mon Sep 17 00:00:00 2001 From: peteruithoven Date: Wed, 14 May 2014 17:28:09 +0200 Subject: [PATCH 1/4] iOS Captive portal fix --- www/{redirect.html => 404.html} | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) rename www/{redirect.html => 404.html} (55%) diff --git a/www/redirect.html b/www/404.html similarity index 55% rename from www/redirect.html rename to www/404.html index 9cff7c7..f7931ca 100644 --- a/www/redirect.html +++ b/www/404.html @@ -1,21 +1,3 @@ - - - - Doodle3D 404 - - - - - - - - - - - - - -
@@ -44,7 +26,4 @@
-
- - - \ No newline at end of file + \ No newline at end of file From 72d2e859f765ad25a0c9e7b64854259aea35a570 Mon Sep 17 00:00:00 2001 From: peteruithoven Date: Wed, 14 May 2014 17:28:51 +0200 Subject: [PATCH 2/4] iOS Captive portal fix 2 --- www/redirect.html | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 www/redirect.html diff --git a/www/redirect.html b/www/redirect.html new file mode 100644 index 0000000..85187ce --- /dev/null +++ b/www/redirect.html @@ -0,0 +1,30 @@ + + + + Success + + + + + + + + + + + + + + + + + + + +Success + + + \ No newline at end of file From 953d50e5fca866ed80d85ce330d189e39fc5bffd Mon Sep 17 00:00:00 2001 From: peteruithoven Date: Wed, 14 May 2014 17:49:05 +0200 Subject: [PATCH 3/4] 404 style fixes --- less/404.less | 7 +++++-- less/base.less | 8 +++++--- www/404.html | 15 ++++++++------- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/less/404.less b/less/404.less index d2defa4..9105c50 100644 --- a/less/404.less +++ b/less/404.less @@ -6,9 +6,12 @@ position: absolute; top: 50%; left: 50%; - height: 250px; + height: 200px; width: 500px; - margin: -125px 0 0 -250px; + margin: -85px 0px 0px -250px; + + background-color: #FCFCFC; + padding: 0px 1em; } } diff --git a/less/base.less b/less/base.less index 560dfa7..a837a7b 100644 --- a/less/base.less +++ b/less/base.less @@ -47,18 +47,20 @@ body { left: 0px; //z-index: -5; } - #bgTop { top: 0px; } - #bgMiddle { top: 30%; } - #bgBottom { bottom: 0px; } +@media only screen and (max-height: 700px) { + #bgMiddle { + display: none; + } +} @import "base_centerpanel.less"; @import "base_leftpanel.less"; diff --git a/www/404.html b/www/404.html index f7931ca..26a57e7 100644 --- a/www/404.html +++ b/www/404.html @@ -2,15 +2,16 @@
- - - + + +
-
-
- +
+
+ +
@@ -25,5 +26,5 @@
- +
\ No newline at end of file From 53843f499cb018d783ad8962371851e6e9503728 Mon Sep 17 00:00:00 2001 From: peteruithoven Date: Thu, 22 May 2014 13:58:24 +0200 Subject: [PATCH 4/4] Fix #246. Assume ap created when empty network status --- js/settings/NetworkPanel.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/settings/NetworkPanel.js b/js/settings/NetworkPanel.js index 63f2e2c..9745d20 100644 --- a/js/settings/NetworkPanel.js +++ b/js/settings/NetworkPanel.js @@ -145,6 +145,9 @@ function NetworkPanel() { this.retrieveNetworkStatus = function(connecting) { //console.log("NetworkPanel:retrieveNetworkStatus"); _api.status(function(data) { + if(data.status === "") { + data.status = NetworkAPI.STATUS.CREATED.toString(); + } if(typeof data.status === 'string') { data.status = parseInt(data.status); }