vmario/doodle3d-client
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-11-22 01:07:56 +01:00
Code Issues Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
peteruithoven 2014-05-28 17:49:35 +02:00
commit 6202f9febd
5 changed files with 58 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/settings/NetworkPanel.js
View File

@ -145,6 +145,9 @@ function NetworkPanel() {
this.retrieveNetworkStatus = function(connecting) { this.retrieveNetworkStatus = function(connecting) {
//console.log("NetworkPanel:retrieveNetworkStatus"); //console.log("NetworkPanel:retrieveNetworkStatus");
_api.status(function(data) { _api.status(function(data) {
if(data.status === "") {
data.status = NetworkAPI.STATUS.CREATED.toString();
}
if(typeof data.status === 'string') { if(typeof data.status === 'string') {
data.status = parseInt(data.status); data.status = parseInt(data.status);
} }

7
less/404.less
View File

@ -6,9 +6,12 @@
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
height: 250px; height: 200px;
width: 500px; width: 500px;
margin: -125px 0 0 -250px; margin: -85px 0px 0px -250px;
background-color: #FCFCFC;
padding: 0px 1em;
} }
} }

8
less/base.less
View File

@ -47,18 +47,20 @@ body {
left: 0px; left: 0px;
//z-index: -5; //z-index: -5;
} }
#bgTop { #bgTop {
top: 0px; top: 0px;
} }
#bgMiddle { #bgMiddle {
top: 30%; top: 30%;
} }
#bgBottom { #bgBottom {
bottom: 0px; bottom: 0px;
} }
@media only screen and (max-height: 700px) {
#bgMiddle {
display: none;
}
}
@import "base_centerpanel.less"; @import "base_centerpanel.less";
@import "base_leftpanel.less"; @import "base_leftpanel.less";

30
www/404.html Normal file
View File

@ -0,0 +1,30 @@
<div id="landscape" class="clearfix">
<!-- background images -->
<div class="bgContainer">
<img id="bgTop" src="img/bg_top.png" />
<img id="bgMiddle" src="img/bg_middle.png" />
<img id="bgBottom" src="img/bg_bottom.png" />
</div>
<!-- center panel -->
<div id="centerpanel">
<div id="logopanel" class="btn">
<img id="pencil" src="img/logo/pencil.png"/>
<img id="logo" src="img/logo/doodle3d.png"/>
</div>
</div>
<div id="message404">
<p>
You're probably trying to go to a website on the internet, but you're currently only connected to the Doodle3D WiFi box, which means you're not connected to the internet.<br/>
You could:
<ul>
<li>Reconnect to the WiFi you normally use.</li>
<li>Configure the WiFi box to connect to that WiFi in client mode. You can do this trough the settings screen.</li>
</ul>
</p>
</div>
</div>
<div id="portrait">
<img id="vertImage" src="img/bg_vertical.png"/>
</div>

50
www/redirect.html
View File

@ -1,50 +1,30 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Doodle3D 404</title> <title>Success</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" /> <meta name="apple-mobile-web-app-status-bar-style" content="black" />
<link rel="icon" type="image/ico" href="favicon_alt.ico"/> <meta name="mobile-web-app-capable" content="yes" />
<link href="./img/webpage_icons/apple-touch-icon-144x144-precomposed.png" rel="apple-touch-icon-precomposed" sizes="144x144" /> <meta id="Viewport" name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no,minimal-ui">
<meta id="Viewport" name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no">
<link rel="icon" type="image/ico" href="./favicon_alt.ico"/>
<link rel="apple-touch-icon-precomposed" href="./img/webpage_icons/apple-touch-icon-144x144-precomposed.png"/>
<link rel="apple-touch-icon-precomposed" href="./img/webpage_icons/apple-touch-icon-144x144-precomposed.png" sizes="144x144" />
<link href="css/styles.min.css" rel="stylesheet" media="screen"> <link href="css/styles.min.css" rel="stylesheet" media="screen">
<link href="css/debug.min.css" rel="stylesheet" media="screen"> <link href="css/debug.min.css" rel="stylesheet" media="screen">
<script src="js/libs/jquery-1-9-1.min.js"></script>
</head> </head>
<body id="page404"> <body id="page404">
Success
<div id="landscape" class="clearfix"> <script>
$(document.body).load("404.html");
<!-- background images --> document.title = "Doodle3D 404"
<div class="bgContainer"> </script>
<img class="bgTop" src="img/bg_top.png" />
<img class="bgMiddle" src="img/bg_middle.png" />
<img class="bgBottom" src="img/bg_bottom.png" />
</div>
<!-- center panel -->
<div class="centerpanel">
<div class="logopanel">
<div class="d3dlogo" onclick="location.reload()"></div>
</div>
</div>
<div id="message404">
<p>
You're probably trying to go to a website on the internet, but you're currently only connected to the Doodle3D WiFi box, which means you're not connected to the internet.<br/>
You could:
<ul>
<li>Reconnect to the WiFi you normally use.</li>
<li>Configure the WiFi box to connect to that WiFi in client mode. You can do this trough the settings screen.</li>
</ul>
</p>
</div>
</div>
<div id="portrait">
<img class="vertImage" src="img/bg_vertical.png"/>
</div>
</body> </body>
</html> </html>