"
"
%s
" // Module name
"
%s
"; // Device name
+#endif // FIRMWARE_MINIMAL
const char HTTP_MENU_HEAD[] PROGMEM =
"
%s
";
@@ -989,13 +987,33 @@ void WSContentSendStyle_P(const char* formatP, ...) {
WSContentSend_P(HTTP_HEAD_LAST_SCRIPT);
#endif
- WSContentSend_P(HTTP_HEAD_STYLE1, WebColor(COL_FORM), WebColor(COL_INPUT), WebColor(COL_INPUT_TEXT), WebColor(COL_INPUT),
- WebColor(COL_INPUT_TEXT), WebColor(COL_CONSOLE), WebColor(COL_CONSOLE_TEXT), WebColor(COL_BACKGROUND));
- WSContentSend_P(HTTP_HEAD_STYLE2, WebColor(COL_BUTTON), WebColor(COL_BUTTON_TEXT), WebColor(COL_BUTTON_HOVER),
- WebColor(COL_BUTTON_RESET), WebColor(COL_BUTTON_RESET_HOVER), WebColor(COL_BUTTON_SAVE), WebColor(COL_BUTTON_SAVE_HOVER),
- WebColor(COL_BUTTON));
+ // Output style root colors by names
+ WSContentSend_P(HTTP_HEAD_STYLE_ROOT_COLOR,
+ WebColor(COL_BACKGROUND), // --c_bg
+ WebColor(COL_FORM), // --c_frm
+ WebColor(COL_TITLE), // --c_ttl
+ WebColor(COL_TEXT), // --c_txt
+ WebColor(COL_TEXT_WARNING), // --c_txtwrn
+ WebColor(COL_TEXT_SUCCESS), // --c_txtscc
+ WebColor(COL_BUTTON), // --c_btn
+ WebColor(COL_BUTTON_OFF), // --c_btnoff
+ WebColor(COL_BUTTON_TEXT), // --c_btntxt
+ WebColor(COL_BUTTON_HOVER), // --c_btnhvr
+ WebColor(COL_BUTTON_RESET), // --c_btnrst
+ WebColor(COL_BUTTON_RESET_HOVER), // --c_btnrsthvr
+ WebColor(COL_BUTTON_SAVE), // --c_btnsv
+ WebColor(COL_BUTTON_SAVE_HOVER), // --c_btnsvhvr
+ WebColor(COL_INPUT), // --c_in
+ WebColor(COL_INPUT_TEXT), // --c_intxt
+ WebColor(COL_CONSOLE), // --c_csl
+ WebColor(COL_CONSOLE_TEXT) // --c_csltxt
+ );
+
+ WSContentSend_P(PSTR("%s"), HTTP_HEAD_STYLE1);
+ WSContentSend_P(PSTR("%s"), HTTP_HEAD_STYLE2);
+
#ifdef USE_WEB_STATUS_LINE_WIFI
- WSContentSend_P(HTTP_HEAD_STYLE_WIFI, WebColor(COL_FORM), WebColor(COL_TITLE));
+ WSContentSend_P(PSTR("%s"), HTTP_HEAD_STYLE_WIFI);
#endif
#if defined(USE_ZIGBEE) || defined(USE_LORAWAN_BRIDGE)
WSContentSend_P(HTTP_HEAD_STYLE_ZIGBEE);
@@ -1011,13 +1029,17 @@ void WSContentSendStyle_P(const char* formatP, ...) {
// WSContentSend_P(PSTR("body{background:%s;background-repeat:no-repeat;background-attachment:fixed;background-size:cover;}"), SettingsText(SET_CANVAS));
WSContentSend_P(PSTR("body{background:%s 0 0 / cover no-repeat fixed;}"), SettingsText(SET_CANVAS));
}
- WSContentSend_P(HTTP_HEAD_STYLE3, WebColor(COL_BACKGROUND), WebColor(COL_TEXT),
#ifdef FIRMWARE_MINIMAL
- WebColor(COL_TEXT_WARNING),
-#endif
- WebColor(COL_TITLE),
- (Web.initial_config) ? "" : (Settings->flag5.gui_module_name) ? "" : ModuleName().c_str(), // SetOption141 - (GUI) Disable display of GUI module name (1)
- (Settings->flag6.gui_device_name) ? "" : SettingsTextEscaped(SET_DEVICENAME).c_str()); // SetOption163 - (GUI) Disable display of GUI device name (1)
+ WSContentSend_P(HTTP_HEAD_STYLE3_MINIMAL,
+ (Web.initial_config) ? "" : (Settings->flag5.gui_module_name) ? "" : ModuleName().c_str(), // SetOption141 - (GUI) Disable display of GUI module name (1)
+ (Settings->flag6.gui_device_name) ? "" : SettingsTextEscaped(SET_DEVICENAME).c_str()); // SetOption163 - (GUI) Disable display of GUI device name (1)
+#else // FIRMWARE_MINIMAL
+ WSContentSend_P(HTTP_HEAD_STYLE3,
+ PSTR(D_NOSCRIPT),
+ (Web.initial_config) ? "" : (Settings->flag5.gui_module_name) ? "" : ModuleName().c_str(), // SetOption141 - (GUI) Disable display of GUI module name (1)
+ (Settings->flag6.gui_device_name) ? "" : SettingsTextEscaped(SET_DEVICENAME).c_str()); // SetOption163 - (GUI) Disable display of GUI device name (1)
+
+#endif // FIRMWARE_MINIMAL
// SetOption53 - Show hostname and IP address in GUI main menu
#if (RESTART_AFTER_INITIAL_WIFI_CONFIG)
@@ -1666,7 +1688,7 @@ void HandleRoot(void) {
#endif // USE_SONOFF_IFAN
if (not_active) {
- WSContentSend_P(PSTR("eb('o%d').style.background='#%06x';"), idx, WebColor(COL_BUTTON_OFF));
+ WSContentSend_P(PSTR("eb('o%d').style.background='var(--c_btnoff)';"), idx);
}
}
WSContentSend_P(PSTR(""));
@@ -1856,8 +1878,8 @@ bool HandleRootStatusRefresh(void) {
}
#endif // USE_SONOFF_IFAN
- WSContentSend_P(PSTR("eb('o%d').style.background='#%06x';"),
- idx, WebColor((active) ? COL_BUTTON : COL_BUTTON_OFF));
+ WSContentSend_P(PSTR("eb('o%d').style.background='var(--c_btn%s)';"),
+ idx, (active) ? PSTR("") : PSTR("off"));
}
}
@@ -2460,7 +2482,7 @@ void HandleWifiConfiguration(void) {
if (WifiIsInManagerMode()) { WSContentSend_P(HTTP_SCRIPT_HIDE); }
if (WIFI_TESTING == Wifi.wifiTest) { WSContentSend_P(HTTP_SCRIPT_RELOAD_TIME, HTTP_RESTART_RECONNECT_TIME); }
#ifdef USE_ENHANCED_GUI_WIFI_SCAN
- WSContentSendStyle_P(HTTP_HEAD_STYLE_SSI, WebColor(COL_TEXT));
+ WSContentSendStyle_P("%s", HTTP_HEAD_STYLE_SSI);
#else
WSContentSendStyle();
#endif // USE_ENHANCED_GUI_WIFI_SCAN