Revision 57:8fa31ff4e773, committed 2019-03-07

Comitter:

andrewboyson

Date:

Thu Mar 07 13:40:12 2019 +0000

Parent:

56:f6e814fe0159

Child:

58:e5ab14ef6ea6

Commit message:

Tidied page module ajax routine

Changed in this revision

--- a/page/page.c	Wed Mar 06 11:43:29 2019 +0000
+++ b/page/page.c	Thu Mar 07 13:40:12 2019 +0000
@@ -127,19 +127,6 @@
     HttpAddText("</span>");
     HttpAddText ("</div>\r\n");
 }
-void PageAddLabelledName(char* label, float labelwidth, char* name, char* suffix)
-{
-    char text[100];
-    HttpAddText("<div>");
-    snprintf(text, sizeof(text), "<div style='width:%.1fem; display:inline-block;'>", labelwidth);
-    HttpAddText(text);
-    HttpAddText(label);
-    HttpAddText("</div><span id='");
-    HttpAddText(name);
-    HttpAddText("'></span>");
-    HttpAddText(suffix);
-    HttpAddText("</div>\r\n");
-}
 void PageAddLabelledOnOff(char* label, float labelwidth, int value)
 {
     if (value) PageAddLabelledValue(label, labelwidth, "On");
@@ -257,5 +244,13 @@
     
     HttpAddText("</div>\r\n");
 }
+void PageAddAjaxLabelled(float labelwidth, char* label, char* id, char* suffix)
+{
+    HttpAddText("<div>");
+        HttpAddF   ("<div style='width:%.1fem; display:inline-block;'>%s</div>", labelwidth, label);
+        HttpAddText("<span id='"); HttpAddText(id); HttpAddText("'></span>");
+        HttpAddText(suffix);
+    HttpAddText("</div>\r\n");
+}
 
 

--- a/page/page.h	Wed Mar 06 11:43:29 2019 +0000
+++ b/page/page.h	Thu Mar 07 13:40:12 2019 +0000
@@ -21,7 +21,6 @@
 extern void PageAddLabelledMac  (char* label, float labelwidth, char* mac);
 extern void PageAddLabelledIp4  (char* label, float labelwidth, uint32_t ip);
 extern void PageAddLabelledIp6  (char* label, float labelwidth, char* ip);
-extern void PageAddLabelledName (char* label, float labelwidth, char* name, char* suffix);
 extern void PageAddLabelledOnOff(char* label, float labelwidth, int value);
 extern void PageAddLabelledInt  (char* label, float labelwidth, int value);
 extern void PageAddTm           (struct tm* ptm);
@@ -33,3 +32,4 @@
 
 extern void PageAddAjaxToggle   (float labelwidth, char* label,                   char* id, char* request);
 extern void PageAddAjaxInput    (float labelwidth, char* label, float inputwidth, char* id, char* request);
+extern void PageAddAjaxLabelled (float labelwidth, char* label,                   char* id, char* suffix);
\ No newline at end of file