Merge branch 'joBr99:main' into screensavericoncolors

This commit is contained in:
bembelstemmer
2023-03-05 22:02:54 +01:00
committed by GitHub
2 changed files with 9 additions and 5 deletions

View File

@@ -38,8 +38,12 @@ class Card(object):
self.cardType = card_input_config.get("type", "unknown")
self.title = card_input_config.get("title", "unknown")
self.key = card_input_config.get("key", "unknown")
self.nav1Override = card_input_config.get("navItem1")
self.nav2Override = card_input_config.get("navItem2")
self.nav1Override = None
if card_input_config.get("navItem1"):
self.nav1Override = Entity(card_input_config.get("navItem1"))
self.nav2Override = None
if card_input_config.get("navItem2"):
self.nav2Override = Entity(card_input_config.get("navItem2"))
self.sleepTimeout = card_input_config.get("sleepTimeout")
self.last_update = 0
self.cooldown = card_input_config.get("cooldown", 0)

View File

@@ -492,7 +492,7 @@ class LuiPagesGen(object):
state_translation = get_translation(self._locale, "frontend.ui.panel.config.devices.entities.state")
action_translation = get_translation(self._locale, "frontend.ui.card.climate.operation").replace(' ','\r\n')
detailPage = ""
detailPage = "1"
if any(x in ["preset_modes", "swing_modes", "fan_modes"] for x in entity.attributes):
detailPage = "0"
@@ -695,10 +695,10 @@ class LuiPagesGen(object):
rightBtn = "delete~~~~~"
if card.nav1Override is not None:
leftBtn = self.generate_entities_item(Entity(card.nav1Override))[1:]
leftBtn = self.generate_entities_item(card.nav1Override)[1:]
if card.nav2Override is not None:
rightBtn = self.generate_entities_item(Entity(card.nav2Override))[1:]
rightBtn = self.generate_entities_item(card.nav2Override)[1:]
navigation = f"{leftBtn}~{rightBtn}"