Diff: net/web-net4-html.c

Revision:

109:3e82f62c7e1f

Parent:

103:91194cc19bbb

--- a/net/web-net4-html.c	Sun Apr 28 09:56:42 2019 +0000
+++ b/net/web-net4-html.c	Mon Apr 29 14:45:30 2019 +0000
@@ -1,35 +1,34 @@
 #include "http.h"
-#include "web-base.h"
-#include "page.h"
-#include "net.h"
+#include "web-add.h"
+#include "web-page-base.h"
 
 void WebNet4Html()
 {
     HttpOk("text/html; charset=UTF-8", "no-cache", NULL, NULL);
-    PageAddHeader(PageSite, "Net IPv4", "settings.css", "net4.js");
-    PageAddNav(NET4_PAGE);
-    PageAddH1(PageSite, "Net IPv4");
+    WebAddHeader("Net IPv4", "settings.css", "net4.js");
+    WebAddNav(NET4_PAGE);
+    WebAddH1("Net IPv4");
     
-    PageAddH2("ARP");
+    WebAddH2("ARP");
     HttpAddText("<code id='ajax-arp'></code>\r\n");
-    PageAddH2("DNS");
+    WebAddH2("DNS");
     HttpAddText("<code id='ajax-dns'></code>\r\n");
     
-    PageAddH2("DHCP");
-    PageAddAjaxLabelled("IP4 address",   "ajax-local-ip"    );
-    PageAddAjaxLabelled("Domain",        "ajax-domain-name" );
-    PageAddAjaxLabelled("Host name",     "ajax-host-name"   );
-    PageAddAjaxLabelled("NTP server",    "ajax-ntp-ip"      );
-    PageAddAjaxLabelled("DNS server",    "ajax-dns-ip"      );
-    PageAddAjaxLabelled("DHCP server",   "ajax-dhcp-ip"     );
-    PageAddAjaxLabelled("Router",        "ajax-router-ip"   );
-    PageAddAjaxLabelled("Subnet mask",   "ajax-subnet-mask" );
-    PageAddAjaxLabelled("Broadcast IP",  "ajax-broadcast-ip");
-    PageAddAjaxLabelled("Lease time IP", "ajax-lease-time"  );
-    PageAddAjaxLabelled("Renewal T1",    "ajax-renewal-t1"  );
-    PageAddAjaxLabelled("Renewal T2",    "ajax-renewal-t2"  );
-    PageAddAjaxLabelled("Elapsed",       "ajax-elapsed"     );
+    WebAddH2("DHCP");
+    WebAddAjaxLabelled("IP4 address",   "ajax-local-ip"    );
+    WebAddAjaxLabelled("Domain",        "ajax-domain-name" );
+    WebAddAjaxLabelled("Host name",     "ajax-host-name"   );
+    WebAddAjaxLabelled("NTP server",    "ajax-ntp-ip"      );
+    WebAddAjaxLabelled("DNS server",    "ajax-dns-ip"      );
+    WebAddAjaxLabelled("DHCP server",   "ajax-dhcp-ip"     );
+    WebAddAjaxLabelled("Router",        "ajax-router-ip"   );
+    WebAddAjaxLabelled("Subnet mask",   "ajax-subnet-mask" );
+    WebAddAjaxLabelled("Broadcast IP",  "ajax-broadcast-ip");
+    WebAddAjaxLabelled("Lease time IP", "ajax-lease-time"  );
+    WebAddAjaxLabelled("Renewal T1",    "ajax-renewal-t1"  );
+    WebAddAjaxLabelled("Renewal T2",    "ajax-renewal-t2"  );
+    WebAddAjaxLabelled("Elapsed",       "ajax-elapsed"     );
     
-    PageAddEnd();
+    WebAddEnd();
                         
 }