diff --git a/FILE_MANIFEST.sha256 b/FILE_MANIFEST.sha256 index 253d3bf..fa5127d 100644 --- a/FILE_MANIFEST.sha256 +++ b/FILE_MANIFEST.sha256 @@ -26,8 +26,8 @@ cca65482e36d48035aca178121a378fe7d578d600acff267ae81a6399c0da653 ./home-assista 13f30e2dcdcedbd1b6c3f99c2335e0487108fd72c8e86922368b84f2fa2038ae ./home-assistant/custom_components/gree_controller/translations/pl.json 4513070521d3dda0efb0d974a86ba674494cfb2b66fe9e5cac5b1b0430dede97 ./home-assistant/generated/gree_controller_entities.example.json 253a0bc912786e67ea7fc92a64e4a510ad973bec343a88ccfb1f28fca3e8cf01 ./lang/README.md -8c92d35110a2610a9693c45063b2996370ad9cd63db2c667f027fcfff23dcd5e ./lang/en.json -b4e288e03408570f51a5bda2e9f5eaa3f64be3c134f805fc0b965a1eeda08f68 ./lang/pl.json +981cbf3b3c24a32480a2ceb611985d62bdd9eecc6db68f105447d68a02c3492c ./lang/en.json +9e0088d79f5863239591d902a874ae81f1735721ef9f861d9ee26a6414beea47 ./lang/pl.json d8459024f04ca514bd8e9d6bd3af872fb942fd85a7cdd5583f4a9d28aab6faba ./make_zip.py b14233a8987e53bbbdd6770386ba10fa166ec25c1e098275c173c544b37846fc ./presets/bedroom_window_night.json 1960841119c0b673fb2f03621b32237552fd828045304cd221401214b997c910 ./presets/device_resilience.json @@ -177,7 +177,7 @@ d6df434f3fbd33ba38dd244830c980e54433c6dff94dd39c716b377255bd2ebf ./web/index.ht 72fa280996ba331a05bdb29a1f49b4e61bdd8964953c8ce1db952156620f08fe ./web/js/charts.js f07600277c60c771c04b1d43c5ed08de6bf518a72660011767b71cde8ec5bde8 ./web/js/core.js dfc123885a9b6b5c1d07c12d2d2625ff15aa0844e5cd3736092ccd0a360da39c ./web/js/dashboard.js -2887856e35e086bb575e9fc0d8b0ed1160b6912297a2957535d5416bda68b4b7 ./web/js/entities.js +f53e2da5c48b55cf0191ffeb970a2c053c66e62d29099e3c5b5fccc8d89440cc ./web/js/entities.js 9a0e87911f78cd8a969f4c57ce74774f5fa829fdecd79494d9a7f9d5804f9792 ./web/js/events.js 133165112ee1a37264be87d251a6eae07db6af4e14d7ac6115f4e3589940f0e3 ./web/js/flows.js f06557c6d338259059b990f8f79c91d68ac8ec1f245c302468f08929b5506901 ./web/js/forms.js @@ -189,6 +189,6 @@ c8c82e88c3715b1bfabf155e36266a4c94f5e2fc03eb39dcdd9d08a1985a997c ./web/js/route 34513d9ec2e45c60443dffe028eea74f415b8a29016df6af3377a80a4ac0df5b ./web/js/settings-ui.js aa6a2ba22648de44547efd09f41c4335ebe38ed564f4684e942d7827df40f1a2 ./web/js/settings.js 6b653e4fe2d4db4ffae6ff8f39b8ce57a10a990dc0000ee4aae51d949afadd52 ./web/manifest.webmanifest -cabd79ded6d8386c6b715751058139edc1b3d1031f5bb1b7872323f340dff4f0 ./web/styles.css +a0f7cfe940ba27e549a9aafd42e9fd726aa0767312c4914f389291ba39ecdf47 ./web/styles.css ae1b03f30b494f474a781a5d32072f1e73eba2b7c768109fc1cc8028cb6662a4 ./web/sw.js d505d793ce7cc9485b45b78bba1c0d51887adc7451ab59a42702946e5b991382 ./web/theme-init.js diff --git a/lang/en.json b/lang/en.json index a4a34b9..d11947b 100644 --- a/lang/en.json +++ b/lang/en.json @@ -780,6 +780,7 @@ "zones.waitingDeviceDisabled": "Waiting — device is technically disabled", "zones.waitingMode": "Waiting for the unit mode to change", "groups.gateOff": "Group off", + "groups.gateOn": "Group on", "zones.disabledByGroup": "Disabled by group: {groups}", "groups.controlToggle": "Group power", "groups.enableControlFirst": "Turn the group on first.", diff --git a/lang/pl.json b/lang/pl.json index b03a326..f440ba9 100644 --- a/lang/pl.json +++ b/lang/pl.json @@ -780,6 +780,7 @@ "zones.waitingDeviceDisabled": "Oczekuje — urządzenie jest wyłączone technicznie", "zones.waitingMode": "Oczekuje na zmianę trybu jednostki", "groups.gateOff": "Grupa wyłączona", + "groups.gateOn": "Grupa włączona", "zones.disabledByGroup": "Wyłączona przez grupę: {groups}", "groups.controlToggle": "Zasilanie grupy", "groups.enableControlFirst": "Najpierw włącz grupę.", diff --git a/web/js/entities.js b/web/js/entities.js index ff1c56a..7f6c7ee 100644 --- a/web/js/entities.js +++ b/web/js/entities.js @@ -381,7 +381,7 @@ function groupCard(group, detailed = false) { const climateControlsDisabled = powerEnabled ? '' : ` disabled aria-disabled="true" title="${esc(tr('groups.enableControlFirst'))}"`; const groupStatusBadge = groupIsControlSource ? `${esc(tr('groups.activeControl'))}` - : (!powerEnabled ? `${esc(tr('groups.gateOff'))}` : ''); + : `${esc(tr(powerEnabled ? 'groups.gateOn' : 'groups.gateOff'))}`; return `
${esc(tr('groups.group'))}

${esc(group.name)}

${esc(memberText)}

${groupStatusBadge}
${detailed ? `
${esc(tr('groups.mode'))}${esc(modeLabelForGroup(state.mode))}
${esc(tr('groups.profile'))}${esc(presetLabelForGroup(state.preset))}
${esc(tr('groups.members'))}${state.zones.length}
` : ''} diff --git a/web/styles.css b/web/styles.css index d49d09f..a41c9ff 100644 --- a/web/styles.css +++ b/web/styles.css @@ -5923,22 +5923,26 @@ textarea[aria-invalid="true"] { } } -/* Group OFF powers members down but releases group ownership; OFF groups do not membership-block thermostats. */ -.list-card.group-card.group-linked { - border-color: color-mix(in srgb, var(--group-control-color) 42%, var(--line)); -} - +/* Idle groups keep the card neutral; only the state badge carries the group color. */ +.list-card.group-card.group-linked, .list-card.group-card.group-off { - border-style: dashed; - border-color: color-mix(in srgb, var(--group-control-color) 62%, var(--line)); + border-style: solid; + border-color: var(--line); + box-shadow: none; } +.group-on-badge, .group-off-badge { color: var(--group-control-color); - border: 1px dashed color-mix(in srgb, var(--group-control-color) 55%, var(--line)); + border: 1px solid color-mix(in srgb, var(--group-control-color) 58%, var(--line)); background: color-mix(in srgb, var(--group-control-color) 7%, var(--surface)); } +.group-off-badge { + border-style: dashed; +} + +/* Color the whole group card only while the group is the active control source. */ .list-card.group-card.group-linked.group-controlled { border-style: solid; border-color: var(--group-control-color);