fixed incorrect urls

master
Ondřej Hruška 8 years ago
parent 30a5479d13
commit f286b4adb6
  1. 2
      esp_meas.pro.user
  2. 2
      html/pages/wifi.tpl
  3. 8
      html/wifi/connecting.html
  4. 2
      html_src/page_wifi.php

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.6.1, 2016-04-01T15:01:35. --> <!-- Written by QtCreator 3.6.1, 2016-04-05T14:38:12. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>

@ -52,7 +52,7 @@
<div class="Modal hidden" id="psk-modal"> <div class="Modal hidden" id="psk-modal">
<div class="Dialog"> <div class="Dialog">
<form action="/wifi/connect.cgi" method="post" id="conn-form"> <form action="/wifi/connect" method="post" id="conn-form">
<input type="hidden" id="conn-essid" name="essid"><!-- <input type="hidden" id="conn-essid" name="essid"><!--
--><label for="psk">Password:</label><!-- --><label for="psk">Password:</label><!--
--><input type="password" id="conn-passwd" name="passwd"><!-- --><input type="password" id="conn-passwd" name="passwd"><!--

@ -1,13 +1,13 @@
<html><head><title>Connecting...</title> <html><head><title>Connecting...</title>
<link rel="stylesheet" type="text/css" href="style.css"> <link rel="stylesheet" type="text/css" href="/wifi/style.css">
<script type="text/javascript" src="140medley.min.js"></script> <script type="text/javascript" src="/wifi/140medley.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var xhr=j(); var xhr=j();
function getStatus() { function getStatus() {
xhr.open("GET", "connstatus.cgi"); xhr.open("GET", "/wifi/connstatus");
xhr.onreadystatechange=function() { xhr.onreadystatechange=function() {
if (xhr.readyState==4 && xhr.status>=200 && xhr.status<300) { if (xhr.readyState==4 && xhr.status>=200 && xhr.status<300) {
var data=JSON.parse(xhr.responseText); var data=JSON.parse(xhr.responseText);
@ -20,7 +20,7 @@ function getStatus() {
$("#status").innerHTML="Trying to connect to selected access point..."; $("#status").innerHTML="Trying to connect to selected access point...";
window.setTimeout(getStatus, 1000); window.setTimeout(getStatus, 1000);
} else if (data.status=="fail") { } else if (data.status=="fail") {
$("#status").innerHTML="Connection failed. Check password and selected AP.<br /><a href=\"wifi.tpl\">Go Back</a>"; $("#status").innerHTML="Connection failed. Check password and selected AP.<br><a href=\"/wifi\">Go Back</a>";
} }
} }
} }

@ -29,7 +29,7 @@
<div class="Modal hidden" id="psk-modal"> <div class="Modal hidden" id="psk-modal">
<div class="Dialog"> <div class="Dialog">
<form action="/wifi/connect.cgi" method="post" id="conn-form"> <form action="/wifi/connect" method="post" id="conn-form">
<input type="hidden" id="conn-essid" name="essid"><!-- <input type="hidden" id="conn-essid" name="essid"><!--
--><label for="psk">Password:</label><!-- --><label for="psk">Password:</label><!--
--><input type="password" id="conn-passwd" name="passwd"><!-- --><input type="password" id="conn-passwd" name="passwd"><!--

Loading…
Cancel
Save