Inicio Explorar Axuda
Iniciar sesión
SoftwareDesign
/
csu3_am335x
8
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

2020-12-16 / ct_chen

Actions:
1. Webservice optimize UI of scan wifi ssid

Files:
1. as list
ct_chen %!s(int64=4) %!d(string=hai) anos
pai
a92e213045
achega
ba1e0fbd25
Modificáronse 4 ficheiros con 30 adicións e 8 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 1 0
      EVSE/rootfs/var/www/foot.php
  2. 1 0
      EVSE/rootfs/var/www/head.php
  3. 18 5
      EVSE/rootfs/var/www/scan_wifi.php
  4. 10 3
      EVSE/rootfs/var/www/set_network.php

+ 1 - 0
EVSE/rootfs/var/www/foot.php
Ver ficheiro 

@@ -77,6 +77,7 @@
 
     <script src="js/jquery.rivathemes.js"></script>
 
     <script src="js/jquery.rivathemes.js"></script>
 
 	<script src="js/bootstrap.min.js"></script>
 
 	<script src="js/bootstrap.min.js"></script>
 
 	<script src="js/bootstrap-datetimepicker.js"></script>
 
 	<script src="js/bootstrap-datetimepicker.js"></script>
 
+	<script src="js/jquery.fancybox.min.js"></script>
 
     <script type="text/javascript">
 
     <script type="text/javascript">
 
       $('document').ready(function() {
 
       $('document').ready(function() {
 
           /*
 
           /*

+ 1 - 0
EVSE/rootfs/var/www/head.php
Ver ficheiro 

@@ -156,6 +156,7 @@
 
     <link href="css/responsive.css" rel="stylesheet" type="text/css">
 
     <link href="css/responsive.css" rel="stylesheet" type="text/css">
 
     <link href="css/color1.css" rel="stylesheet" type="text/css" id="envor-site-color">
 
     <link href="css/color1.css" rel="stylesheet" type="text/css" id="envor-site-color">
 
     <link href="css/rivathemes.css" rel="stylesheet" type="text/css">
 
     <link href="css/rivathemes.css" rel="stylesheet" type="text/css">
 
+    <link href="css/jquery.fancybox.min.css" rel="stylesheet" type="text/css">
 
 
 
     <!-- LayerSlider styles -->
 
     <!-- LayerSlider styles -->
 
     <link rel="stylesheet" href="css/layerslider/css/layerslider.css" type="text/css">
 
     <link rel="stylesheet" href="css/layerslider/css/layerslider.css" type="text/css">

+ 18 - 5
EVSE/rootfs/var/www/scan_wifi.php
Ver ficheiro 

@@ -1,3 +1,8 @@
 
+<html>
 
+<head>
 
+<script src="js/vendor/jquery-1.11.0.min.js"></script>
 
+<script src="js/jquery.fancybox.min.js"></script>
 
+</head>
 
 <?php
 
 <?php
 
         echo '<h1>Scan Wifi SSID...</h1><br>';
 
         echo '<h1>Scan Wifi SSID...</h1><br>';
 
 
 
@@ -12,23 +17,31 @@
 
                 	echo '<option value="'.$ssid.'">'.$ssid.'</option>';
 
                 	echo '<option value="'.$ssid.'">'.$ssid.'</option>';
 
         }
 
         }
 
         echo '</select></pre>';
 
         echo '</select></pre>';
 
-        echo '<input type="button" value="Select" OnClick="sendValue()">'
 
+        echo '<input type="button" id="close-button" value="Select" OnClick="sendValue()">'
 
 ?>
 
 ?>
 
-
 
+<script>
 
+	$(document).ready(function(){
 
+		$(function() {
 
+			$('#close-button').click(function(){
 
+				parent.$.fancybox.close();
 
+			});
 
+		});
 
+	});
 
+</script>
 
 <script language="javascript">
 
 <script language="javascript">
 
 var ssid_selected;
 
 var ssid_selected;
 
-
 
 function sendValue()
 
 function sendValue()
 
 {
 
 {
 
   getComboA(document.getElementById("ssids"));
 
   getComboA(document.getElementById("ssids"));
 
-  window.opener.document.getElementById('WifiSsid').value=ssid_selected;
 
-  window.close();
 
+  parent.document.getElementById('WifiSsid').value=ssid_selected;
 
 }
 
 }
 
 
 
 function getComboA(sel)
 
 function getComboA(sel)
 
 {
 
 {
 
     ssid_selected = sel.value;
 
     ssid_selected = sel.value;
 
+	console.log(sel.value);
 
 }
 
 }
 
 
 
 </script>
 
 </script>
 
 
 
+</html>

+ 10 - 3
EVSE/rootfs/var/www/set_network.php
Ver ficheiro 

@@ -194,7 +194,7 @@ img {
 
 										<div class="form-group" id="WifiSsidDiv">
 
 										<div class="form-group" id="WifiSsidDiv">
 
 											<label>SSID</label>
 
 											<label>SSID</label>
 
 											<input type="text" name="WifiSsid" id="WifiSsid" class="form-control" value="<?php echo $obj->{'WifiSsid'};?>">
 
 											<input type="text" name="WifiSsid" id="WifiSsid" class="form-control" value="<?php echo $obj->{'WifiSsid'};?>">
 
-											<input type="button" value="Scan" class="form-control" onClick="scan_wifi()">
 
+											<a id="scan" href="scan_wifi.php"><input type="button" value="Scan" class="form-control"></a>
 
 										</div>
 
 										</div>
 
 										<div class="form-group" id="WifiPasswordDiv">
 
 										<div class="form-group" id="WifiPasswordDiv">
 
 											<label>Password</label>
 
 											<label>Password</label>
 
@@ -567,8 +567,15 @@ img {
 
         {
 
         {
 
           window.open("scan_wifi.php","_blank","height=200,width=400, status=yes,toolbar=no,menubar=no,location=no");
 
           window.open("scan_wifi.php","_blank","height=200,width=400, status=yes,toolbar=no,menubar=no,location=no");
 
         }
 
         }
 
-
 
+	$("#scan").fancybox({
 
+		'type'				: 'iframe',
 
+		'iframe' : {
 
+			'css' : {
 
+				'width' : '600px',
 
+				'height': '200px'
 
+			}
 
+		}
 
+	});
 
 </script>
 
 </script>
 
 
 
-
 
 </html>
 
 </html>