Improvements to initial setup page/process

Author: darylc

www/index.php

@@ -196,6 +196,7 @@ function PageSetup() {
                 RemoteVolumeControlChange(this.value);
             });
 
+            SetupHostnameBanner();
             SetupBanner();
         };
 
@@ -222,6 +223,34 @@ function SetupBanner() {
             }
         }
 
+        function HostnameConfirmed() {
+            SetSetting("hostnameConfirmed", "True", 2);
+            $("#bannerHostnameRow").hide();
+        }
+
+        function SetupHostnameBanner() {
+            let showHostnameBanner = false;
+            console.log(settings.hasOwnProperty('hostnameConfirmed'));
+            if (!(settings.hasOwnProperty('hostnameConfirmed') && $settings["HostName"] == "FPP")) {
+                showHostnameBanner = true;
+            }
+
+            if (showHostnameBanner) {
+                $("#bannerHostnameRow").html(
+                    "Your hostname is set to FPP, if you have multiple FPP devices " +
+                    "each one should have a different hostname. " +
+                    "Please visit the " +
+                    "<a href=\"networkconfig.php#tab-host-dns\">Host Settings Page</a> " +
+                    " to change your hostname." +
+                    "<div style='margin-top:1em'><button class='buttons wideButton " +
+                    "btn-outline-light' onClick='HostnameConfirmed();'>Dismiss Warning</button></div>"
+                ).show();
+            } else {
+                $("#bannerHostnameRow").hide();
+            }
+
+        }
+
         function SetSpeakerIndicator(value) {
             var speaker = $('#speaker');
             var speaker_d_flex = $('#speaker_d_flex');
@@ -380,6 +409,7 @@ function NextPlaylistEntry() {
                     <div id="warningsDiv"></div>
                 </div>
             </div>
+            <div id="bannerHostnameRow" class="alert alert-info"></div>
             <div id="bannerRow" class="alert alert-info">Banner Messages go here.</div>
             <div id="programControl" class="settings">
 
@@ -712,4 +742,4 @@ class="col-4 d-flex flex-grow-1 align-items-center">
     </div>
 </body>
 
-</html>
+</html>

www/initialSetup.php

@@ -141,17 +141,24 @@ function UpdateChildSettingsVisibility() {
                         ?>
                         <b>System Settings</b><br>
                         <?
-
+                        PrintSettingGroup('initialSetup', '', '', 1, '', '', false);
+                        ?>
+                        <b>Privacy Settings</b><br>
+                        <?
                         $extraData = "<div class='form-actions'>" .
-                            "<input type='button' class='buttons' value='Preview Statistics' onClick='PreviewStatistics();'> ";
+                            "<input type='button' class='buttons' value='Preview Statistics' onClick='PreviewStatistics();'> </div>";
+                        PrintSettingGroup('initialSetup-privacy', $extraData, '', '', '', '', false);
+                        ?>
+                        <b>Location Settings</b><br>
+                        <?
+                        $extraData = "<div class='form-actions'>";
                         if ($settings["Platform"] != "MacOS") {
                             $extraData .= "<input type='button' class='buttons' value='Lookup Time Zone' onClick='GetTimeZone();'> ";
                         }
                         $extraData .= "<input type='button' class='buttons' value='Lookup Location' onClick='GetGeoLocation();'> " .
                             "<input type='button' class='buttons' value='Show On Map' onClick='ViewLatLon();'> " .
                             "</div>";
-
-                        PrintSettingGroup('initialSetup', $extraData, '', 1, '', '', false);
+                        PrintSettingGroup('initialSetup-location', '', $extraData, '', '', '', false);
                         ?>
 
                     </div>
@@ -161,4 +168,4 @@ function UpdateChildSettingsVisibility() {
         </div>
 </body>
 
-</html>
+</html>

www/networkconfig.php

@@ -938,9 +938,12 @@ function dhcpServerEnabledCallback() {
                     </div>
                     <div class="tab-pane fade" id="tab-host-dns" role="tabpanel" aria-labelledby="tab-host-dns-tab">
 
-
+                        <h2>Host Settings</h2>
+                        <b>Changing the hostname from FPP will cause http://fpp.local/ to change and you will need to use the new hostname eg http://&lthostname&gt.local/</b>
+                        <br>
+                        <br>
                         <?
-                        PrintSettingGroup('host');
+                        PrintSettingGroup('host','','','','','',false);
                         ?>
 
 
@@ -1007,4 +1010,4 @@ class="newInterfaceName" value="">
     </div>
 </body>
 
-</html>
+</html>

www/settings.json

@@ -100,14 +100,22 @@
 			"description": "Initial Setup",
 			"settings": [
 				"fppMode",
-				"HostName",
-				"HostDescription",
-				"emailAddress",
-				"statsPublish",
+				"InstalledCape"
+			]
+		},
+		"initialSetup-privacy": {
+			"description": "Privacy Setup",
+			"settings": [
 				"ShareCrashData",
+				"emailAddress",
 				"FetchVendorLogos",
 				"SendVendorSerial",
-				"InstalledCape",
+				"statsPublish"
+			]
+		},
+		"initialSetup-location": {
+			"description": "Location Setup",
+			"settings": [
 				"Locale",
 				"TimeZone",
 				"Latitude",
@@ -1927,13 +1935,13 @@
 		},
 		"osPasswordEnable": {
 			"name": "osPasswordEnable",
-			"description": "Set OS password",
+			"description": "OS password",
 			"tip": "Changing the OS password is not normally needed unless your FPP instance is connected to a public network.  The default password is 'falcon', but you may select 'Custom' to allow choosing a custom password.  The OS password can always be changed via the FPP UI even if you do not remember the OS password.",
 			"gatherStats": true,
 			"type": "select",
 			"options": {
-				"Default (falcon)": "0",
-				"Custom": "1"
+				"falcon (Default)": "0",
+				"Enter a Password": "1"
 			},
 			"onChange": "ConfirmOSPasswordEnable",
 			"children": {
@@ -1977,13 +1985,13 @@
 		},
 		"passwordEnable": {
 			"name": "passwordEnable",
-			"description": "Enable UI password",
+			"description": "UI password",
 			"tip": "Enabling UI Password is not normally needed unless you are connected to a public network. If you set a UI password, you will need to make sure that you remember this password so you and other applications, like xLights, will be able to access the UI when needed. Select 'Disabled' to disable password protection. Select 'Enabled' to allow choosing a UI password",
 			"gatherStats": true,
 			"type": "select",
 			"options": {
-				"Disabled": "0",
-				"Enabled": "1"
+				"No Password (Default)": "0",
+				"Enter a Password": "1"
 			},
 			"onChange": "ConfirmPasswordEnable",
 			"children": {
@@ -2498,4 +2506,4 @@
 			]
 		}
 	}
-}
+}