Browse Source
			
			
			Merge pull request #253 from Grufbert/url-path-relative
			
				Use relative url path on setup page
			
			
				pull/283/head
			
			
		 
		
			
				
					
						 Andreas Schiffler
					
					3 years ago
						Andreas Schiffler
					
					3 years ago
					
						
							committed by
							
								 GitHub
								GitHub
							
						 
					
				 
				
			 
		 
		
			
				
					
					No known key found for this signature in database
					
						
							GPG Key ID: 4AEE18F83AFDEB23
						
					
				
			
		
		
		
	
		
			
				 2 changed files with 
5 additions and 
9 deletions
			 
			
		 
		
			
				- 
					
					
					 
					tools/esp8266/html/setup.html
				
- 
					
					
					 
					tools/esp8266/web.cpp
				
				
				
					
						
							
								
									
	
		
		
			
				
					|  | @ -54,7 +54,7 @@ | 
			
		
	
		
		
			
				
					|  |  |             <div id="content"> |  |  |             <div id="content"> | 
			
		
	
		
		
			
				
					|  |  |                 <a class="erase" href="/erase">ERASE SETTINGS (not WiFi)</a> |  |  |                 <a class="erase" href="/erase">ERASE SETTINGS (not WiFi)</a> | 
			
		
	
		
		
			
				
					|  |  | 
 |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |                 <form method="post" action="{IP}/save"> |  |  |                 <form method="post" action="/save"> | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					|  |  |                     <fieldset> |  |  |                     <fieldset> | 
			
		
	
		
		
			
				
					|  |  |                         <legend class="des">Device Host Name</legend> |  |  |                         <legend class="des">Device Host Name</legend> | 
			
		
	
		
		
			
				
					|  |  |                         <label for="device">Device Name</label> |  |  |                         <label for="device">Device Name</label> | 
			
		
	
	
		
		
			
				
					|  | @ -143,11 +143,11 @@ | 
			
		
	
		
		
			
				
					|  |  |         </div> |  |  |         </div> | 
			
		
	
		
		
			
				
					|  |  | 
 |  |  | 
 | 
			
		
	
		
		
			
				
					|  |  |         <div id="footer"> |  |  |         <div id="footer"> | 
			
		
	
		
		
			
				
					
					|  |  |             <p class="left"><a href="{IP}/">Home</a></p> |  |  |             <p class="left"><a href="/">Home</a></p> | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |             <p class="left"><a href="{IP}/update">Update Firmware</a></p> |  |  |             <p class="left"><a href="/update">Update Firmware</a></p> | 
			
				
				
			
		
	
		
		
	
		
		
	
		
		
			
				
					|  |  |             <p class="right">AHOY - {VERSION}</p> |  |  |             <p class="right">AHOY - {VERSION}</p> | 
			
		
	
		
		
			
				
					
					|  |  |             <p class="right"><a href="{IP}/factory">Factory Reset</a></p> |  |  |             <p class="right"><a href="/factory">Factory Reset</a></p> | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |             <p class="right"><a href="{IP}/reboot">Reboot</a></p> |  |  |             <p class="right"><a href="/reboot">Reboot</a></p> | 
			
				
				
			
		
	
		
		
	
		
		
	
		
		
			
				
					|  |  |         </div> |  |  |         </div> | 
			
		
	
		
		
			
				
					|  |  | 
 |  |  | 
 | 
			
		
	
		
		
			
				
					|  |  |         <script type="text/javascript"> |  |  |         <script type="text/javascript"> | 
			
		
	
	
		
		
			
				
					|  | 
 | 
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
		
			
				
					|  | @ -187,10 +187,6 @@ void web::showSetup(void) { | 
			
		
	
		
		
			
				
					|  |  |     // -> the PWD will only be changed if it does not match the default "{PWD}"
 |  |  |     // -> the PWD will only be changed if it does not match the default "{PWD}"
 | 
			
		
	
		
		
			
				
					|  |  |     html.replace(F("{DEVICE}"), String(mSysCfg->deviceName)); |  |  |     html.replace(F("{DEVICE}"), String(mSysCfg->deviceName)); | 
			
		
	
		
		
			
				
					|  |  |     html.replace(F("{VERSION}"), String(mVersion)); |  |  |     html.replace(F("{VERSION}"), String(mVersion)); | 
			
		
	
		
		
			
				
					|  |  |     if(mMain->getWifiApActive()) |  |  |  | 
			
		
	
		
		
			
				
					|  |  |         html.replace("{IP}", String(F("http://192.168.1.1"))); |  |  |  | 
			
		
	
		
		
			
				
					|  |  |     else |  |  |  | 
			
		
	
		
		
			
				
					|  |  |         html.replace("{IP}", (F("http://") + String(WiFi.localIP().toString()))); |  |  |  | 
			
		
	
		
		
			
				
					|  |  | 
 |  |  | 
 | 
			
		
	
		
		
			
				
					|  |  |     String inv = ""; |  |  |     String inv = ""; | 
			
		
	
		
		
			
				
					|  |  |     Inverter<> *iv; |  |  |     Inverter<> *iv; | 
			
		
	
	
		
		
			
				
					|  | 
 |