Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui

This commit is contained in:
Johannes Braun
2022-12-30 14:00:14 +01:00
4 changed files with 2163 additions and 319 deletions

View File

@@ -238,7 +238,6 @@ class LuiPagesGen(object):
if entityType == "navigate":
page_search_res = self._config.searchCard(entityId)
if page_search_res is not None:
icon_res = get_icon_ha(entityId, overwrite=icon)
name = name if name is not None else page_search_res.title
text = get_translation(self._locale, "frontend.ui.card.button.press")
if status_entity:
@@ -251,6 +250,7 @@ class LuiPagesGen(object):
else:
#icon_color = rgb_dec565(colorOverride) if colorOverride is not None and type(colorOverride) is list else 17299
icon_color = self.get_entity_color(entityId, overwrite=colorOverride)
icon_res = get_icon_ha(entityId, overwrite=icon)
return f"~button~{entityId}~{icon_res}~{icon_color}~{name}~{text}"
else:
return f"~text~{entityId}~{get_icon_id('alert-circle-outline')}~17299~page not found~"
@@ -647,32 +647,33 @@ class LuiPagesGen(object):
def render_card(self, card, send_page_type=True):
l = self.generate_entities_item(Entity(
{
'entity': f'navigate.{card.uuid_prev}',
'icon': 'mdi:arrow-left-bold',
'color': [255, 255, 255],
}
))[1:]
r = self.generate_entities_item(Entity(
{
'entity': f'navigate.{card.uuid_next}',
'icon': 'mdi:arrow-right-bold',
'color': [255, 255, 255],
}
))[1:]
leftBtn = "delete~~~~~"
if card.uuid_prev is not None:
leftBtn = self.generate_entities_item(Entity(
{
'entity': f'navigate.{card.uuid_prev}',
'icon': 'mdi:arrow-left-bold',
'color': [255, 255, 255],
}
))[1:]
if len(self._config._config_cards) == 1:
l = "delete~~~~~"
r = "delete~~~~~"
rightBtn = "delete~~~~~"
if card.uuid_prev is not None:
rightBtn = self.generate_entities_item(Entity(
{
'entity': f'navigate.{card.uuid_next}',
'icon': 'mdi:arrow-right-bold',
'color': [255, 255, 255],
}
))[1:]
if card.hidden:
l = f"x~navUp~{get_icon_id('mdi:arrow-up-bold')}~65535~~"
r = "delete~~~~~"
leftBtn = f"x~navUp~{get_icon_id('mdi:arrow-up-bold')}~65535~~"
rightBtn = "delete~~~~~"
# r = 0
# if self._config.get("homeButton"):
# r = 2
navigation = f"{l}~{r}"
navigation = f"{leftBtn}~{rightBtn}"
# Switch to page
if send_page_type: