vmario/doodle3d-connect
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-connect.git synced 2024-12-25 18:13:48 +01:00
Code Issues Releases Wiki Activity

release to connect.doodle3d.com

Browse Source
This commit is contained in:
Rick Companje 2017-07-13 18:52:13 +02:00
parent 3b7abc2977
commit 9803d05b88
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/ControlPage.js
View File

@ -158,6 +158,12 @@
if (state==="connecting") { if (state==="connecting") {
$("#infoConnecting").show(); $("#infoConnecting").show();
$("#infoDisconnected").hide(); $("#infoDisconnected").hide();
//update firmware link
var url = d3d.util.replaceURLParameters("#update",_pageData);
$("#linkConnectingFirmware").attr("href",url);
} else if (state==="disconnected") { } else if (state==="disconnected") {
$("#infoConnecting").hide(); $("#infoConnecting").hide();
$("#infoDisconnected").show(); $("#infoDisconnected").show();
@ -211,12 +217,12 @@
if (state==="ready") { if (state==="ready") {
if (d3d && d3d.pageParams && d3d.pageParams.uuid) { //if (d3d && d3d.pageParams && d3d.pageParams.uuid) {
console.log("show button btnNewPrint"); //console.log("show button btnNewPrint");
var url = d3d.util.replaceURLParameters("#print",_pageData); //var url = d3d.util.replaceURLParameters("#print",_pageData);
// $("#btnNewPrint").attr("href",url); //$("#btnNewPrint").attr("href",url);
// $("#btnNewPrint").show(); //$("#btnNewPrint").show();
} //}
} else { } else {
// $("#grpCustomGCODE").hide(); // $("#grpCustomGCODE").hide();

1
js/PrintPage.js
View File

@ -70,7 +70,6 @@
}, function(failData) { }, function(failData) {
console.log("_connectAPI.list failData",failData); console.log("_connectAPI.list failData",failData);
$("#infoWiFiBox").html("<span class='error'>failed to retrieve list with local WiFi-Box'es</span>"); $("#infoWiFiBox").html("<span class='error'>failed to retrieve list with local WiFi-Box'es</span>");
}); });
$("#lstBoxes").on("change", function(data) { $("#lstBoxes").on("change", function(data) {

2
upload.sh
View File

@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
rsync -av www/ doodle3d.com:/domains/doodle3d.com/connect-dev/ rsync -av www/ doodle3d.com:/domains/doodle3d.com/connect

6
www/index.html
View File

@ -21,8 +21,8 @@
<script src="http://code.jquery.com/jquery-1.10.2.min.js"></script> <script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
<script src="http://code.jquery.com/mobile/1.4.2/jquery.mobile-1.4.2.min.js"></script> <script src="http://code.jquery.com/mobile/1.4.2/jquery.mobile-1.4.2.min.js"></script>
<!-- <script src="js/doodle3d-server.min.js" type="text/javascript"></script> --> <script src="js/doodle3d-server.min.js" type="text/javascript"></script>
<script src="js/doodle3d-server.js" type="text/javascript"></script> <!-- <script src="js/doodle3d-server.js" type="text/javascript"></script> -->
<!-- stylesheets --> <!-- stylesheets -->
<!-- <link href="https://fonts.googleapis.com/css?family=Abel" rel="stylesheet"> --> <!-- <link href="https://fonts.googleapis.com/css?family=Abel" rel="stylesheet"> -->
@ -142,7 +142,7 @@
<div id="infoConnecting"> <div id="infoConnecting">
<p>This can take a while, 20 seconds or so...</p> <p>This can take a while, 20 seconds or so...</p>
<!-- <p>Hmm... this takes longer than usual...</p> --> <!-- <p>Hmm... this takes longer than usual...</p> -->
<p>If it takes too long please try to restart your WiFi-Box. Also make sure the WiFi-Box is running the latest firmware.</p> <p>If it takes too long please try to restart your WiFi-Box. Also make sure the WiFi-Box is running the latest <a id="linkConnectingFirmware" href="#update">firmware</a>.</p>
<p>If you think you're really stuck, please <a href="javascript:talkus('open')">chat</a> with us to see if we can help.</p> <p>If you think you're really stuck, please <a href="javascript:talkus('open')">chat</a> with us to see if we can help.</p>
</div> </div>