From ddd35c8be7f778397525b8a325c2c424a0872c7b Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Tue, 16 Nov 2021 08:07:22 +0100 Subject: [PATCH] Update stylesheet of gpio form for #246 --- data/style.css | 2 +- data/style.css.gz | Bin 1101 -> 1303 bytes src/mqtt/hasp_mqtt_pubsubclient.cpp | 2 +- src/sys/svc/hasp_http.cpp | 60 ++++++++++++++++++---------- src/sys/svc/hasp_http.h | 2 +- 5 files changed, 43 insertions(+), 23 deletions(-) diff --git a/data/style.css b/data/style.css index d679ee4f..5af76902 100644 --- a/data/style.css +++ b/data/style.css @@ -1 +1 @@ -:root{--star:url('data:image/svg+xml,')}a.foot:link,a.foot:visited{color:var(--footfg)}input:not([type=file]){background-color:var(--fldbg);color:var(--fldfg)}input[type=checkbox],input[type=radio]{width:1em}select{background-color:var(--fldbg);color:var(--fldfg)}input:invalid{border:1px solid var(--fldred)}body{font-family:verdana;margin:auto;background:var(--bg);color:var(--txt)}.c,body{text-align:center}.clear{clear:both}.foot{background-color:transparent!important;all:revert;float:right;margin:0;font-size:.6em}.red{background-color:var(--btnred)}.red:focus,.red:hover{background-color:var(--btnredhi)}#doc{text-align:left;margin:0 auto;display:inline-block;color:var(--txt);width:80%;min-width:300px;max-width:600px;display:table}td{font-size:.87rem;padding-bottom:0;padding-top:0}th{padding-top:.5em}*{box-sizing:border-box}a,input,select,textarea{width:100%;padding:12px;border:1px solid #ccc;border-radius:.6rem;resize:vertical}label{padding:12px 18px 12px 0;display:inline-block}.required{background-image:var(--star);background-size:1.5em 1.5em;background-position:right;background-repeat:no-repeat}a,button,input[type=submit]{padding:12px;border:1px solid var(--btnbrd);border-radius:.6rem;background-color:var(--btnbg);color:var(--btnfg);font-size:1rem;width:100%;margin:12px 0;display:flex;align-items:center;justify-content:center;text-align:center;text-decoration:none}a:hover,button:hover,input[type=submit]:hover{background-color:var(--btnbghi)}.container{background-color:var(--grpbg);color:var(--grpfg);border-radius:.6rem;padding:10px;margin:20px 0}.dist{display:flex;justify-content:space-between;width:100%}.dist > a{flex-grow:1;margin:0 6px}.dist>a:first-child{margin-left:0}.dist>a:last-child{margin-right:0}.col-25{float:left;width:25%;text-align:right;margin:0}.col-75{margin:0;float:left;width:75%}.row:after{content:"";display:table;clear:both}.row{font-size:.833rem;margin:5px}.gap,.row:last-of-type{margin:5px 5px 20px}.error,.info,.success,.validation,.warning{border:1px solid;margin:10px auto;padding:15px 10px 15px 50px;background-repeat:no-repeat;background-position:10px center;max-width:500px}.info{color:#00529B;background-color:#BDE5F8}.success{color:#4F8A10;background-color:#DFF2BF}.warning{color:#9F6000;background-color:#FEEFB3}.error{color:#D8000C;background-color:#FFD2D2}@media screen and (max-width:800px){.col-25,.col-75,input[type=submit]{width:100%;margin-top:0}.col-25{text-align:left}label{padding:5px 18px 5px 0}} \ No newline at end of file +:root{--star:url('data:image/svg+xml,');--trash:url('data:image/svg+xml,')}a.foot:link,a.foot:visited{color:var(--footfg)}input:not([type=file]){background-color:var(--fldbg);color:var(--fldfg)}input[type=checkbox],input[type=radio]{width:1em}select{background-color:var(--fldbg);color:var(--fldfg)}input:invalid{border:1px solid var(--fldred)}body{font-family:verdana;margin:auto;background:var(--bg);color:var(--txt)}.c,body{text-align:center}.clear{clear:both}.foot{background-color:transparent!important;all:revert;float:right;margin:0;font-size:.6em}.red{background-color:var(--btnred)}.red:focus,.red:hover{background-color:var(--btnredhi)}#doc{text-align:left;margin:0 auto;display:inline-block;color:var(--txt);width:80%;min-width:300px;max-width:600px;display:table}td{font-size:.87rem;padding-bottom:0;padding-top:0}th{padding-top:.5em}*{box-sizing:border-box}input,select,textarea{width:100%;padding:12px;border:1px solid #ccc;border-radius:.6rem;resize:vertical}label{padding:12px 18px 12px 0;display:inline-block}.required{background-image:var(--star);background-size:1.5em 1.5em;background-position:left;background-repeat:no-repeat}.edit::before{content:"\0000a0"}.edit{background-image:var(--edit);background-size:1.5em 1.5em;background-position:left;background-repeat:no-repeat;width:1.5em;display:inline-block}.trash::before{content:"\0000a0"}.trash{background-image:var(--trash);background-size:1.5em 1.5em;background-position:left;background-repeat:no-repeat;width:1.5em;display:inline-block}.mdi{background-size:1.5em 1.5em;background-position:right;background-repeat:no-repeat;width:1.5em;display:inline-block}#doc>a,button,input[type=submit]{padding:12px;border:1px solid var(--btnbrd);border-radius:.6rem;background-color:var(--btnbg);color:var(--btnfg);font-size:1rem;width:100%;margin:12px 0;display:flex;align-items:center;justify-content:center;text-align:center;text-decoration:none}a.btn:hover,button:hover,input[type=submit]:hover{background-color:var(--btnbghi)}.container{background-color:var(--grpbg);color:var(--grpfg);border-radius:.6rem;padding:10px;margin:20px 0}.dist{display:flex;justify-content:space-between;width:100%}.dist>a{flex-grow:1;margin:0 6px}.dist>a:first-child{margin-left:0}.dist>a:last-child{margin-right:0}.col-25{float:left;width:25%;text-align:right;margin:0}.col-75{margin:0;float:left;width:75%}.row:after{content:"";display:table;clear:both}.row{font-size:.833rem;margin:5px}.gap,.row:last-of-type{margin:5px 5px 20px}.error,.info,.success,.validation,.warning{border:1px solid;margin:10px auto;padding:15px 10px 15px 50px;background-repeat:no-repeat;background-position:10px center;max-width:500px}.info{color:#00529B;background-color:#BDE5F8}.success{color:#4F8A10;background-color:#DFF2BF}.warning{color:#9F6000;background-color:#FEEFB3}.error{color:#D8000C;background-color:#FFD2D2}@media screen and (max-width:800px){.col-25,.col-75,input[type=submit]{width:100%;margin-top:0}.col-25{text-align:left}label{padding:5px 18px 5px 0}} \ No newline at end of file diff --git a/data/style.css.gz b/data/style.css.gz index 9a9fe282e860f6cf7e46be5be68509cf20a359bb..ddad632c3334dfc9c30f1b83bacd6c594832ad02 100644 GIT binary patch literal 1303 zcmV+y1?c)8iwFqlR+C`@0CRMCY-KKEb8`U2R^5}6FcAM&5XbSVzyUq_5v-%9cJ9U3 zKB)H)AkcU~Fr?R3hX377fP(#S#*Z00EloDNo88}jfjDELGR;z8jy62KdLChc5zTNy zuFJ>dsKkwiMDruKGwCpyU^jU6r4Sfh0aN&Yl7pvj2X{h&jc3a%JD`Zcr7LWNPha4^5)G@ zfpqWn^O0|wz*(;U8Ymhq^em!{HZ#Pz$u>e>rE6OniS;>-x@6?+VugC8e1`A0)gcZM!SBbB^4y9LY6X) z9x=Z%O?eO}qnhT$MxdODtIuLzkVQ;WazCm996ltRZSu(cNh*zkWaJ-_4tg3D;hKaG z0o&ah10u%}W%reW5;-KROOldM{NY82=8rg~Q57&A5ssWS;4r#x$tqCB2K_C;m0Y%0&$sQorSiq%rEJ8f~*PPW`Sdu zPzyvZ-Bvs(X5pqZ)N;*0{jY`AbW}f$SUB`AC2?_FSD-A~lM(!cSlensjti!pq}J0g3|p!x(|J=u zM5KwFD1&7PX^7K0#Q{mHp)$>x!9%U=vlz;decRBZ*s4yZfNiG1XppN7NRD(^Q_ta9 z!Jy(PYeG0Y;G`f})_c3EEfP_IP(WhFNfiS6kex{XV#5d9dUJlsCVBSnZEDj;DYyWZ zYSNdjZW%6_tq%W--7sLP-@I0}gTK3174~av1REh(KJ3cnCdjC`uYR5QhdvSTXmqv$ zF1MEBUJ9fbNPU?*QogUjuHPKhN}Q6Nuey>+1U=s+nq1tTn;)o(&^3oOhkr)T=sze*&2^nY|8LgJ%=WLt}R&!=ZqT`&0}U*t$q`gtaQ%%%9!cx5=tCa_OV1Pcomyt-R#l`7Hg?cs264=Y#5{5J4BPpdAhJtc<+alBhNzGpe_Enj~Y_n#Q$ z#5(yPUoEUtaJPV;N=dOJcMD0DpbQ%UYJ%E;5QiE*;a zrKox8{9(n?IA2C*qR~(1BH5B;7mMSQJrhctQt{LrXsWizCq-KkMiTXp2O-M$n9;O} zg-nS=etEPi0Rn5(1<;mlEYeex39g(B7nGgQp2!q)92HpRlp|a#5ltcVC!L?Hj%wMu ziEX?oa#RkSopY2Bu84#;j9}TACyIsIwg&dg)JzFWEWzvrElMF3<|@LBAxR)G6=h6d zg(S_lYKYK_O!yW3MUeX*aC0HCzo8Z@uG2O;C=*Ft*=D&F;Qo1|EnT)RQ<2Q`VLqO-@n)U(VxOGBdtoCS+?sB zk`z&i)0Fbu0brFVkT(jHD3RByZ8I0RAwcw|0rqJpAVnQR9FVlQBc$C?&(@hjG4Mc2 z58~~8AwPiNF39yVNs?abXhPQ&)IY5>EpzY@0a>mvUCSRv)ndkgnDWK=6;2oRhZzL%R)-B(!0G7B0Z27!ht2!>IdTO4> zV4)8$oQ{?56v$tDrB_l)hnwx3Ef5b+GcjFDqx=;}~KimGqQ=to^Cnw{WOu0S$~ zXY8I!Qj!RX4PIPu(&DaVdSLp^B|OhJmPu0gm8*lml>c2dm*t4ZB+BxupiU%(4jNzy zJPk|h0xqhVgL8odOrQifN7R83J_ES3weBt4Xgdf%9FRZt|NHXTsoZ0fQCTS`*;1A^ zor0r>1@cA>hR+o=5se09=>%cZ4Lfbt2N8s?=JlD6!NKf9*o<@W!u~@DIq0BqrU2?8 z-^Jq3DHBbD+Nl3Aa#kwhjpPPDX3$PG*6xkitU_2l*UVQ(fHCjsJ`Lc|(?OeP`+o*6 zJueJCK3q2K%ZJBr;bz?qNe%k%HtR3GcSZkkvk4wH?U-*b{-wyHz|kuA(q>t@Pst+QJ;J=yG@J=aFu#fa%|mfrOILOh%8 T;V{}m(|_%6)k^jFtqK4De6k@V diff --git a/src/mqtt/hasp_mqtt_pubsubclient.cpp b/src/mqtt/hasp_mqtt_pubsubclient.cpp index f3e922fb..647944e7 100644 --- a/src/mqtt/hasp_mqtt_pubsubclient.cpp +++ b/src/mqtt/hasp_mqtt_pubsubclient.cpp @@ -55,7 +55,7 @@ uint32_t mqttReceiveCount; uint32_t mqttFailedCount; char mqttServer[MAX_USERNAME_LENGTH] = MQTT_HOST; -char mqttUsername[MAX_USERNAME_LENGTH] = MQTT_USER; +char mqttUsername[MAX_USERNAME_LENGTH] = MQTT_USER; char mqttPassword[MAX_PASSWORD_LENGTH] = MQTT_PASSW; // char mqttNodeName[16] = MQTT_NODENAME; char mqttGroupName[16] = MQTT_GROUPNAME; diff --git a/src/sys/svc/hasp_http.cpp b/src/sys/svc/hasp_http.cpp index 103057c8..6935f1eb 100644 --- a/src/sys/svc/hasp_http.cpp +++ b/src/sys/svc/hasp_http.cpp @@ -1046,8 +1046,9 @@ static void webHandleMqttConfig() // Broker httpMessage += F("
"); - httpMessage += F("
"); @@ -1060,15 +1061,17 @@ static void webHandleMqttConfig() // Mqtt User httpMessage += F("
"); - httpMessage += F("
"); // Mqtt Password httpMessage += F("
"); - httpMessage += F("
"); @@ -1206,15 +1209,17 @@ static void webHandleWifiConfig() // Wifi SSID httpMessage += F("
"); - httpMessage += F("
"); // Wifi Password httpMessage += F("
"); - httpMessage += F("
"); - httpMessage += F("WiFi SSID (required)
"); + + // Wifi SSID + httpMessage += F("
"); + httpMessage += F("

WiFi Password (required)
"); + + // Wifi Password + httpMessage += F("
"); + httpMessage += F("

"); + httpMessage += F("'>
"); + + // Submit & End Form + httpMessage += F(""); + httpMessage += F("
"); #if HASP_USE_WIFI > 0 && !defined(STM32F4xx) if(WiFi.getMode() == WIFI_STA) { @@ -1487,7 +1506,7 @@ static void webHandleGpioConfig() httpMessage += id; httpMessage += ("&pin="); httpMessage += conf.pin; - httpMessage += ("'>Delete"); + httpMessage += ("' class='trash'>"); configCount++; } } @@ -1730,8 +1749,9 @@ static void webHandleDebugConfig() #if HASP_USE_SYSLOG > 0 // Syslog host httpMessage += F("
"); - httpMessage += F("
"); diff --git a/src/sys/svc/hasp_http.h b/src/sys/svc/hasp_http.h index dc22955c..75e76708 100644 --- a/src/sys/svc/hasp_http.h +++ b/src/sys/svc/hasp_http.h @@ -11,7 +11,7 @@ struct hasp_http_config_t bool enable = true; uint16_t port = 80; - char username[MAX_USERNAME_LENGTH] = ""; + char username[MAX_USERNAME_LENGTH] = ""; char password[MAX_PASSWORD_LENGTH] = ""; };