2020-01-10 / ct_chen

Actions:
1. 網頁設定時可能因寫入flash過久, 增加loading圖示以減少使用者誤操作

Files:
1. EVSE/rootfs/var/www/*

EVSE/rootfs/var/www/foot.php

@@ -53,7 +53,7 @@
  <script src="js/jquery.mCustomScrollbar.min.js"></script>
    <script src="js/jquery.mousewheel.min.js"></script>
     <script src="js/jquery.colorbox-min.js"></script>
-    <script src="js/preloadCssImages.jQuery_v5.js"></script>
+<?php /*    <script src="js/preloadCssImages.jQuery_v5.js"></script>*/?>
     <script src="js/jquery.stellar.min.js"></script>
     <!--
     * jQuery with jQuery Easing, and jQuery Transit JS
@@ -158,7 +158,7 @@
 
           Preload Images
 
-          */
+          
           var imgs = new Array(), $imgs = $('img');
           for (var i = 0; i < $imgs.length; i++) {
             imgs[i] = new Image();
@@ -172,7 +172,7 @@
                   $.preloadCssImages();
             })
           })
-                  $('#envor-preload').hide();
+                  $('#envor-preload').hide();*/
       });
       /*
 

EVSE/rootfs/var/www/head.php

@@ -127,7 +127,7 @@
     <link href="css/animate.css" rel="stylesheet" type="text/css">
     <link href="css/jquery.mCustomScrollbar.css" rel="stylesheet" type="text/css">
     <link href="css/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
-    <link rel="stylesheet" href="css/colorbox-skins/4/colorbox.css" type="text/css">
+    <link rel="stylesheet" href="css/colorbox-skins/1/colorbox.css" type="text/css">
         <link href="css/main.css" rel="stylesheet" type="text/css">
     
 
@@ -154,7 +154,7 @@
 	<link rel="stylesheet" href="css/font-awesome.min.css">
 	<link href="css/prettify-1.0.css" rel="stylesheet">
 	<link rel="stylesheet" type="text/css" href="css/bootstrap-datetimepicker.css" />
-<!--	<script src="js/jquery-1.8.3.min.js"></script>
+	<!--	<script src="js/jquery-1.8.3.min.js"></script>
 	<script src="js/moment.js"></script>
 	<script src="js/bootstrap.min.js"></script>
 	<script src="js/bootstrap-datetimepicker.min.js"></script>

EVSE/rootfs/var/www/set_backend.php

@@ -14,6 +14,13 @@
 	}
 ?>
 
+<style>
+img {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+</style>
 	<div class="envor-content">
 		<!--
 		Page Title start
@@ -33,12 +40,13 @@
 		<!--
 		Main Content start
 		//-->
+		<div id="loading" style="display:none;"><img src="img/giphy.gif"/></div>
 		<section class="envor-section">
 			<div class="container">
 				<div class="row">
-					<div class="col-lg-12">         
+					<div class="col-lg-12">
 						<div class="envor-sorting" id="faq-sorting">
-							<div class="envor-toggle">                
+							<div class="envor-toggle">
 								<!--Common Information-->
 								<article class="envor-sorting-item css">
 									<header><?php echo $lang->showWord("common_information"); ?><i class="fa fa-plus"></i></header>
@@ -108,6 +116,7 @@
 	document.getElementById("save").onclick = function() {
 		if(formCheck())
 		{
+			document.getElementById("loading").style.display="block";
 			// 發送 Ajax 查詢請求並處理
 			var request = new XMLHttpRequest();
 			request.open("POST", "set_backend_action.php");
@@ -128,6 +137,7 @@
 			request.onreadystatechange = function() {
 				// 伺服器請求完成
 				if (request.readyState == 4) {
+					 document.getElementById("loading").style.display="none";
 					// 伺服器回應成功
 					if (request.status == 200 && JSON.parse(request.responseText).result=="Success") {
 						alert("<?php echo $lang->showWord("done")?>");

EVSE/rootfs/var/www/set_backend_action.php

@@ -25,7 +25,7 @@
 //		$json = json_decode(file_get_contents("charging.txt"), true);
 //		$json = string[];
 		$json['BackendConnTimeout']			= (int)$_POST['BackendConnTimeout'];
-		$json['OfflinePolicy']				= $_POST['OfflinePolicy'];
+		$json['OfflinePolicy']				= (int)$_POST['OfflinePolicy'];
 		$json['OfflineMaxChargeEnergy']		= (int)$_POST['OfflineMaxChargeEnergy'];
 		$json['OfflineMaxChargeDuration']	= (int)$_POST['OfflineMaxChargeDuration'];
 //		$json['OcppConnStatus']				= $_POST['OcppConnStatus'];

EVSE/rootfs/var/www/set_charging.php

@@ -90,6 +90,13 @@
 		}
 	}
 ?>
+<style>
+img {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+</style>
 	<div class="envor-content">
 		<!--
 		Page Title start
@@ -109,6 +116,7 @@
 		<!--
 		Main Content start
 		//-->
+		<div id="loading" style="display:none;"><img src="img/giphy.gif"/></div>
 		<section class="envor-section">
 			<div class="container">
 				<div class="row">
@@ -482,6 +490,7 @@
 	document.getElementById("save").onclick = function() {
 		if(formCheck())
 		{
+			document.getElementById("loading").style.display="block";
 			// 發送 Ajax 查詢請求並處理
 			var request = new XMLHttpRequest();
 			request.open("POST", "set_charging_action.php");
@@ -512,6 +521,7 @@
 			request.onreadystatechange = function() {
 				// 伺服器請求完成
 				if (request.readyState == 4) {
+					 document.getElementById("loading").style.display="none";
 					// 伺服器回應成功
 					if (request.status == 200 && JSON.parse(request.responseText).result=="Success") {
 						alert("<?php echo $lang->showWord("done")?>");

EVSE/rootfs/var/www/set_network.php

@@ -67,6 +67,13 @@
 			break;
 	}
 ?>
+<style>
+img {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+</style>
 	<div class="envor-content">
 		<!--
 		Page Title start
@@ -86,6 +93,7 @@
 		<!--
 		Main Content start
 		//-->
+		<div id="loading" style="display:none;"><img src="img/giphy.gif"/></div>
 		<section class="envor-section">
 			<div class="container">
 				<div class="row">
@@ -334,6 +342,7 @@
 	document.getElementById("save").onclick = function() {
 		if(formCheck())
 		{
+			document.getElementById("loading").style.display="block";
 			// 發送 Ajax 查詢請求並處理
 			var request = new XMLHttpRequest();
 			request.open("POST", "set_network_action.php");
@@ -368,6 +377,7 @@
 			request.onreadystatechange = function() {
 				// 伺服器請求完成
 				if (request.readyState == 4) {
+					 document.getElementById("loading").style.display="none";
 					// 伺服器回應成功
 					if (request.status == 200 && JSON.parse(request.responseText).result=="Success") {
 						alert("<?php echo $lang->showWord("done")?>");

EVSE/rootfs/var/www/set_system.php

@@ -31,6 +31,13 @@
 			break;
 	}
 ?>
+<style>
+img {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+</style>
 	<div class="envor-content">
 		<!--
 		Page Title start
@@ -50,6 +57,7 @@
 		<!--
 		Main Content start
 		//-->
+		<div id="loading" style="display:none;"><img src="img/giphy.gif"/></div>
 		<section class="envor-section">
 			<div class="container">
 				<div class="row">
@@ -373,6 +381,7 @@
 	document.getElementById("save").onclick = function() {
 		if(formCheck())
 		{
+			document.getElementById("loading").style.display="block";
 			// 發送 Ajax 查詢請求並處理
 			var request = new XMLHttpRequest();
 			request.open("POST", "set_system_action.php");
@@ -394,6 +403,7 @@
 			request.onreadystatechange = function() {
 				// 伺服器請求完成
 				if (request.readyState == 4) {
+					 document.getElementById("loading").style.display="none";
 					// 伺服器回應成功
 					if (request.status == 200 && JSON.parse(request.responseText).result=="Success") {
 						alert("<?php echo $lang->showWord("done")?>");