Diff: page/page.c

Revision:

59:309e78f243dd

Parent:

58:e5ab14ef6ea6

Child:

77:4689596a2f3f

diff -r e5ab14ef6ea6 -r 309e78f243dd page/page.c
--- a/page/page.c	Fri Mar 08 16:07:56 2019 +0000
+++ b/page/page.c	Fri Mar 08 18:42:58 2019 +0000
@@ -88,7 +88,7 @@
     HttpAddText("</ul></nav>\r\n");
 }
 
-void PageAddLabelledValue(char* label, float labelwidth, char* value)
+void PageAddLabelledValue(float labelwidth, char* label, char* value)
 {
     HttpAddF   ("<div style='width:%.1fem;'>", labelwidth);
     HttpAddText(label);
@@ -98,7 +98,7 @@
     HttpAddText("</div>\r\n");
 }
 
-void PageAddLabelledMac(char* label, float labelwidth, char* mac)
+void PageAddLabelledMac(float labelwidth, char* label, char* mac)
 {
     HttpAddF   ("<div style='width:%.1fem;'>", labelwidth);
     HttpAddText(label);
@@ -108,7 +108,7 @@
     HttpAddText("</div>\r\n");
 }
 
-void PageAddLabelledIp4(char* label, float labelwidth, uint32_t ip)
+void PageAddLabelledIp4(float labelwidth, char* label, uint32_t ip)
 {
     HttpAddF   ("<div style='width:%.1fem;'>", labelwidth);
     HttpAddText(label);
@@ -118,7 +118,7 @@
     HttpAddText ("</div>\r\n");
 }
 
-void PageAddLabelledIp6(char* label, float labelwidth, char* ip)
+void PageAddLabelledIp6(float labelwidth, char* label, char* ip)
 {
     HttpAddF   ("<div style='width:%.1fem;'>", labelwidth);
     HttpAddText(label);
@@ -127,16 +127,16 @@
     HttpAddText("</span>");
     HttpAddText ("</div>\r\n");
 }
-void PageAddLabelledOnOff(char* label, float labelwidth, int value)
+void PageAddLabelledOnOff(float labelwidth, char* label, int value)
 {
-    if (value) PageAddLabelledValue(label, labelwidth, "On");
-    else       PageAddLabelledValue(label, labelwidth, "Off");
+    if (value) PageAddLabelledValue(labelwidth, label, "On");
+    else       PageAddLabelledValue(labelwidth, label, "Off");
 }
-void PageAddLabelledInt(char* label, float labelwidth, int value)
+void PageAddLabelledInt(float labelwidth, char* label, int value)
 {
     char text[30];
     snprintf(text, sizeof(text), "%8d", value); //Right align with enough spaces so that the length is always constant. 
-    PageAddLabelledValue(label, labelwidth, text);
+    PageAddLabelledValue(labelwidth, label, text);
 }
 void PageAddInputText(float labelwidth, char* label, float inputwidth, char* value, char* action, char* name)
 {
@@ -162,28 +162,6 @@
     HttpAddF("<input type='submit' value='%s'>\r\n", value);
     HttpAddText("</form>\r\n");
 }
-void PageAddTm(struct tm* ptm)
-{
-    char text[30];
-    snprintf(text, sizeof(text), "%d-%02d-%02d ", ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday);
-    HttpAddText(text);
-    switch(ptm->tm_wday)
-    {
-        case  0: HttpAddText("Sun"); break;
-        case  1: HttpAddText("Mon"); break;
-        case  2: HttpAddText("Tue"); break;
-        case  3: HttpAddText("Wed"); break;
-        case  4: HttpAddText("Thu"); break;
-        case  5: HttpAddText("Fri"); break;
-        case  6: HttpAddText("Sat"); break;
-        default: HttpAddText("???"); break;
-    }
-    snprintf(text, sizeof(text), " %02d:%02d:%02d", ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
-    HttpAddText(text);
-    if      (ptm->tm_isdst  > 0) HttpAddText(" BST");
-    else if (ptm->tm_isdst == 0) HttpAddText(" GMT");
-    else                         HttpAddText(" UTC");
-}
 void PageAddAjaxInputToggle(float labelwidth, char* label, char* id, char* name)
 {
     HttpAddText("<div>\r\n");