Diff: net/web-net6-html.c

Revision:

109:3e82f62c7e1f

Parent:

103:91194cc19bbb

--- a/net/web-net6-html.c	Sun Apr 28 09:56:42 2019 +0000
+++ b/net/web-net6-html.c	Mon Apr 29 14:45:30 2019 +0000
@@ -1,38 +1,37 @@
-#include  "http.h"
-#include  "web-base.h"
-#include  "page.h"
-#include   "net.h"
+#include "http.h"
+#include "web-page-base.h"
+#include "web-add.h"
 
 void WebNet6Html()
 {
     HttpOk("text/html; charset=UTF-8", "no-cache", NULL, NULL);
-    PageAddHeader(PageSite, "Net IPv6", "settings.css", "net6.js");
-    PageAddNav(NET6_PAGE);
-    PageAddH1(PageSite, "Net IPv6");
+    WebAddHeader("Net IPv6", "settings.css", "net6.js");
+    WebAddNav(NET6_PAGE);
+    WebAddH1("Net IPv6");
 
-    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("NDP");
-    PageAddAjaxLabelled("Hop limit",             "ajax-hop-limit");
-    PageAddAjaxLed     ("Managed address",       "ajax-managed");
-    PageAddAjaxLed     ("Other configuration",   "ajax-other");
-    PageAddAjaxLabelled("Router MAC",            "ajax-router-mac");
-    PageAddAjaxLabelled("Prefix length",         "ajax-prefix-length");
-    PageAddAjaxLed     ("Prefix flag L",         "ajax-prefix-l");
-    PageAddAjaxLed     ("Prefix flag A",         "ajax-prefix-a");
-    PageAddAjaxLabelled("Prefix valid secs",     "ajax-prefix-limit");
-    PageAddAjaxLabelled("Prefix preferred secs", "ajax-prefix-preferred");
-    PageAddAjaxLabelled("Prefix",                "ajax-prefix");
-    PageAddAjaxLabelled("DNS life secs",         "ajax-dns-life");
-    PageAddAjaxLabelled("DNS server",            "ajax-dns-ip");
-    PageAddAjaxLabelled("Lease time",            "ajax-ndp-lease");
-    PageAddAjaxLabelled("Elapsed",               "ajax-ndp-elapsed");
-    PageAddAjaxLabelled("SLAAC",                 "ajax-slaac");
-    PageAddAjaxLabelled("MTU",                   "ajax-mtu");
+    WebAddH2("NDP");
+    WebAddAjaxLabelled("Hop limit",             "ajax-hop-limit");
+    WebAddAjaxLed     ("Managed address",       "ajax-managed");
+    WebAddAjaxLed     ("Other configuration",   "ajax-other");
+    WebAddAjaxLabelled("Router MAC",            "ajax-router-mac");
+    WebAddAjaxLabelled("Prefix length",         "ajax-prefix-length");
+    WebAddAjaxLed     ("Prefix flag L",         "ajax-prefix-l");
+    WebAddAjaxLed     ("Prefix flag A",         "ajax-prefix-a");
+    WebAddAjaxLabelled("Prefix valid secs",     "ajax-prefix-limit");
+    WebAddAjaxLabelled("Prefix preferred secs", "ajax-prefix-preferred");
+    WebAddAjaxLabelled("Prefix",                "ajax-prefix");
+    WebAddAjaxLabelled("DNS life secs",         "ajax-dns-life");
+    WebAddAjaxLabelled("DNS server",            "ajax-dns-ip");
+    WebAddAjaxLabelled("Lease time",            "ajax-ndp-lease");
+    WebAddAjaxLabelled("Elapsed",               "ajax-ndp-elapsed");
+    WebAddAjaxLabelled("SLAAC",                 "ajax-slaac");
+    WebAddAjaxLabelled("MTU",                   "ajax-mtu");
     
-    PageAddEnd();
+    WebAddEnd();
                         
 }