Minor improvements and more help links

Author: femto-code

index.php

@@ -113,7 +113,7 @@
   $permissionerr=false;
   $spannung=substr(exec("vcgencmd measure_volts core"),5);
   if( (strpos($spannung,"failed")!==false) || (strlen($spannung)<2) ){
-    $spannung=$spannung."<div class='alert alert-danger' role='alert'>Reading of core voltage failed. Please run<br><kbd>sudo usermod -aG video www-data</kbd><br>in a terminal to solve this problem.</div>";
+    $spannung=$spannung."<div class='alert alert-danger' role='alert'>Reading of core voltage failed. Please run<br><kbd>sudo usermod -aG video www-data</kbd><br>in a terminal to solve this problem.&nbsp;<a href='https://github.com/femto-code/Raspberry-Pi-Dashboard#core-voltage-or-other-hardware-info-output-is-not-shown-optional' target='blank'><i class='bi bi-question-circle'></i>&nbsp;Help</a></div>";
     $permissionerr=true;
   }
 }
@@ -274,7 +274,7 @@
         <div class="card-header">Model</div>
         <div class="card-body">
           <samp><?php echo exec("cat /sys/firmware/devicetree/base/model");?></samp>
-          <?php $ot=shell_exec("vcgencmd version");if($permissionerr){echo "<div class='alert alert-danger' role='alert'>Execution of system command failed. Please run<br><kbd>sudo usermod -aG video www-data</kbd><br>in a terminal to solve this problem.</div>";}else{echo '<samp>'.$ot.'</samp>';}?>
+          <?php $ot=shell_exec("vcgencmd version");if($permissionerr){echo "<div class='alert alert-danger' role='alert'>Execution of system command failed. Please run<br><kbd>sudo usermod -aG video www-data</kbd><br>in a terminal to solve this problem.&nbsp;<a href='https://github.com/femto-code/Raspberry-Pi-Dashboard#core-voltage-or-other-hardware-info-output-is-not-shown-optional' target='blank'><i class='bi bi-question-circle'></i>&nbsp;Help</a></div>";}else{echo '<samp>'.$ot.'</samp>';}?>
           <p class="card-text"><small class="text-muted">Updated <span><?php echo date("H:i:s");?> (at page load)</span></small></p>
         </div>
       </div>

js/main.js

@@ -598,7 +598,7 @@ document.querySelector('#applyBtn').onclick = function (e) {
       $("#sformFeedback").html('<div class="mt-2 alert alert-info alert-dismissible fade show" role="alert"><i class="bi bi-info-circle"></i>&nbsp;All set! You did not change anything.<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
     }else{
       mdtoast('<i class="bi bi-x-circle"></i>&nbsp;There was an error! ('+data.responseText+')', { type: 'error'});
-      $("#sformFeedback").html('<div class="mt-2 alert alert-danger" role="alert"><i class="bi bi-x-circle"></i>&nbsp;Config file (local.config) exists but could not be modified. Required permissions are not set correctly.<br><a class="alert-link" href="https://github.com/femto-code/Raspberry-Pi-Dashboard#valid-permissions" target="blank"><i class="bi bi-question"></i>&nbsp;Show help</a></div>');
+      $("#sformFeedback").html('<div class="mt-2 alert alert-danger" role="alert"><i class="bi bi-x-circle"></i>&nbsp;Config file (local.config) exists but could not be modified. Required permissions are not set correctly.<br><a class="alert-link" href="https://github.com/femto-code/Raspberry-Pi-Dashboard#valid-permissions" target="blank"><i class="bi bi-question-circle"></i>&nbsp;Show help</a></div>');
     }
   }, null, "POST", false, sFormData);
 };

setup.php

@@ -554,28 +554,14 @@ function completeSetup() {
     return;
   }
   var value=document.getElementById("pwinput1").value;
-  $("#submit").html("Processing...").prop("disabled", true);
-  var vReq = new ntwReq("setup.php", function (data) {
-    console.log(data.responseText);
-    if(data.responseText=="1"){
-      window.setTimeout(function(){
-        $('#submit').html("<i class='bi bi-check-circle'></i>&nbsp;Successful");
-        window.setTimeout(function(){
-          location.replace("index.php");
-        }, 1000);
-      }, 1000);
-    }else{
-      if(data.responseText=="perm_error"){
-        if (confirm(("Config file (local.config) exists but could not be modified. Required permissions are not set correctly.\nShow help?"))){
-          window.open('https://github.com/femto-code/Raspberry-Pi-Dashboard#valid-permissions');
-        }
-      }
-      
-    }
-  }, null, "POST", true, "complete=true&pw="+value);
   <?php
   }else{
   ?>
+  var value="xyz"; // does not matter - server won't accept when setup done before
+  //location.replace("index.php");
+  <?php
+  }
+  ?>
   $("#submit").html("Processing...").prop("disabled", true);
   var vReq = new ntwReq("setup.php", function (data) {
     console.log(data.responseText);
@@ -594,12 +580,7 @@ function completeSetup() {
       }
 
     }
-  }, null, "POST", true, "complete=true&pw=xyz");
-  //location.replace("index.php");
-  <?php
-  }
-  ?>
-
+  }, null, "POST", true, "complete=true&pw="+value);
 
 }