Diff: web-derived/system/web-system-html.c

Revision:

51:c7c6ce0d57ad

Parent:

49:9491c966dc60

Child:

52:76254a967391

diff -r df2cf771798d -r c7c6ce0d57ad web-derived/system/web-system-html.c
--- a/web-derived/system/web-system-html.c	Mon Apr 29 06:35:27 2019 +0000
+++ b/web-derived/system/web-system-html.c	Mon Apr 29 14:46:58 2019 +0000
@@ -2,30 +2,30 @@
 
 #include "http.h"
 #include "web-base.h"
-#include "page.h"
-#include "page-derived.h"
+#include "web-page-derived.h"
+#include "web-add.h"
 
 void WebSystemHtml()
 {
     HttpOk("text/html; charset=UTF-8", "no-cache", NULL, NULL);
-    PageAddHeader(PageSite, "System", "settings.css", "system.js");
-    PageAddNav(SYSTEM_PAGE);
-    PageAddH1(PageSite, "System");
+    WebAddHeader("System", "settings.css", "system.js");
+    WebAddNav(SYSTEM_PAGE);
+    WebAddH1("System");
 
-    PageAddH2("TFTP");
-    PageAddAjaxInput   ("Server url",                      5, "ajax-server-name",   "tftpserver"   );
-    PageAddAjaxInput   ("File (strftime)",                11, "ajax-file-name",     "tftpfilename" );
-    PageAddAjaxInput   ("Interval (secs) 0=no",            5, "ajax-read-interval", "tftpreadint"  );
-    PageAddAjaxInput   ("Records per backup 0=no",         5, "ajax-write-size",    "tftpwriteint" );
-    PageAddAjaxLabelled("Count",                              "ajax-count"                         );
-    PageAddAjaxLabelled("Started",                            "ajax-start-time"                    );
+    WebAddH2("TFTP");
+    WebAddAjaxInput   ("Server url",                      5, "ajax-server-name",   "tftpserver"   );
+    WebAddAjaxInput   ("File (strftime)",                11, "ajax-file-name",     "tftpfilename" );
+    WebAddAjaxInput   ("Interval (secs) 0=no",            5, "ajax-read-interval", "tftpreadint"  );
+    WebAddAjaxInput   ("Records per backup 0=no",         5, "ajax-write-size",    "tftpwriteint" );
+    WebAddAjaxLabelled("Count",                              "ajax-count"                         );
+    WebAddAjaxLabelled("Started",                            "ajax-start-time"                    );
 
-    PageAddH2("FRAM");
-    PageAddAjaxLabelled("Used",                               "ajax-fram-used"                     );
+    WebAddH2("FRAM");
+    WebAddAjaxLabelled("Used",                               "ajax-fram-used"                     );
     
-    PageAddH2("Compiler");
-    PageAddLabelledInt("Version Vvvbbbb", __ARMCC_VERSION);
+    WebAddH2("Compiler");
+    WebAddLabelledInt("Version Vvvbbbb", __ARMCC_VERSION);
     
-    PageAddEnd();
+    WebAddEnd();
 
 }