Merge pull request #839 from UI-Lovelace-Minimalist/release

V1.0.3
UI-Lovelace-Minimalist · Jul 22, 2022 · 7114bb8 · 7114bb8
2 parents 6660e99 + cc760ed
commit 7114bb8
Show file tree

Hide file tree

Showing 26 changed files with 203 additions and 162 deletions.
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/default.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/default.yaml
@@ -43,7 +43,7 @@ ulm_translation_engine:
           }
           var label = hass.resources[lang]["component." + domain + ".state._." + state];
           var translation = label ? label : state;
-          return (entity.attributes.current_temperature ) + '°' + ' • ' + translation + (entity.state !='off' ? ' (' + mode + ')' : '');
+          return (entity.attributes.current_temperature ) + '°' + ' • ' + translation + ((entity.state !='off' && mode !== undefined) ? ' (' + mode + ')' : '');
           }
       ]]]
     ulm_translation_off: "[[[ return hass.resources[hass['language']]['state.default.off']; ]]]"

diff --git a/custom_components/ui_lovelace_minimalist/lovelace/translations/es.yaml b/custom_components/ui_lovelace_minimalist/lovelace/translations/es.yaml
@@ -4,6 +4,9 @@ ulm_language_variables:
     ulm_currency: "€"
     ulm_updates_available: "¡Actualización disponible!"
     ulm_no_updates_available: "No hay actualizaciones"
+    ulm_ophaling: "¡Recogida de basura!"
+    ulm_geen_ophaling: "Sin recogida"
+    ulm_volgende_ophaling: "Próxima recogida"
     ulm_morning: "Buenos días"
     ulm_afternoon: "Buenas tardes"
     ulm_evening: "Buenas noches"

diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/actions/actions_card.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/actions/actions_card.yaml
@@ -30,6 +30,7 @@ ulm_actions_card:
 
         return action
       ]]]
+    navigation_path: "[[[ return variables.ulm_card_tap_action == 'navigate' ? variables.ulm_card_tap_navigate_path : '/0' ]]]"
     service: "input_select.select_option"
     service_data:
       option: "[[[ return variables.ulm_input_select_option ]]]"
@@ -84,6 +85,7 @@ ulm_actions_card:
 
         return action
       ]]]
+    navigation_path: "[[[ return variables.ulm_card_hold_action == 'navigate' ? variables.ulm_card_hold_navigate_path : '/0' ]]]"
     service: "input_select.select_option"
     service_data:
       option: "[[[ return variables.ulm_input_select_option ]]]"
@@ -137,6 +139,7 @@ ulm_actions_card:
 
         return action
       ]]]
+    navigation_path: "[[[ return variables.ulm_card_double_tap_action == 'navigate' ? variables.ulm_card_double_tap_navigate_path : '/0' ]]]"
     service: "input_select.select_option"
     service_data:
       option: "[[[ return variables.ulm_input_select_option ]]]"

diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/actions/actions_icon.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/actions/actions_icon.yaml
@@ -30,6 +30,7 @@ ulm_actions_icon:
 
         return action
       ]]]
+    navigation_path: "[[[ return variables.ulm_icon_tap_action == 'navigate' ? variables.ulm_icon_tap_navigate_path : '/0' ]]]"
     service: "input_select.select_option"
     service_data:
       option: "[[[ return variables.ulm_input_select_option ]]]"
@@ -84,6 +85,7 @@ ulm_actions_icon:
 
         return action
       ]]]
+    navigation_path: "[[[ return variables.ulm_icon_hold_action == 'navigate' ? variables.ulm_icon_hold_navigate_path : '/0' ]]]"
     service: "input_select.select_option"
     service_data:
       option: "[[[ return variables.ulm_input_select_option ]]]"
@@ -137,6 +139,7 @@ ulm_actions_icon:
 
         return action
       ]]]
+    navigation_path: "[[[ return variables.ulm_icon_double_tap_action == 'navigate' ? variables.ulm_icon_double_tap_navigate_path : '/0' ]]]"
     service: "input_select.select_option"
     service_data:
       option: "[[[ return variables.ulm_input_select_option ]]]"

diff --git a/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/actions/actions_name.yaml b/custom_components/ui_lovelace_minimalist/lovelace/ulm_templates/actions/actions_name.yaml
@@ -30,6 +30,7 @@ ulm_actions_name:
 
         return action
       ]]]
+    navigation_path: "[[[ return variables.ulm_name_tap_action == 'navigate' ? variables.ulm_name_tap_navigate_path : '/0' ]]]"
     service: "input_select.select_option"
     service_data:
       option: "[[[ return variables.ulm_input_select_option ]]]"
@@ -84,6 +85,7 @@ ulm_actions_name:
 
         return action
       ]]]
+    navigation_path: "[[[ return variables.ulm_name_hold_action == 'navigate' ? variables.ulm_name_hold_navigate_path : '/0' ]]]"
     service: "input_select.select_option"
     service_data:
       option: "[[[ return variables.ulm_input_select_option ]]]"
@@ -137,6 +139,7 @@ ulm_actions_name:
 
         return action
       ]]]
+    navigation_path: "[[[ return variables.ulm_name_double_tap_action == 'navigate' ? variables.ulm_name_double_tap_navigate_path : '/0' ]]]"
     service: "input_select.select_option"
     service_data:
       option: "[[[ return variables.ulm_input_select_option ]]]"

diff --git a/...ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/2-line_cards/card_graph.yaml b/...ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/2-line_cards/card_graph.yaml
@@ -39,8 +39,6 @@ card_graph:
           item1:
             card:
               type: "custom:button-card"
-              template:
-                - "icon_more_info"
               custom_fields:
                 item1:
                   card:

diff --git a/...ents/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_battery.yaml b/...ents/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_battery.yaml
@@ -20,8 +20,6 @@ card_battery:
     item1:
       card:
         type: "custom:button-card"
-        template:
-          - "icon_more_info"
         custom_fields:
           item1:
             card:

diff --git a/...i_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_binary_sensor.yaml b/...i_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_binary_sensor.yaml
@@ -16,7 +16,6 @@ card_binary_sensor:
       card:
         type: "custom:button-card"
         template:
-          - "icon_more_info"
           - "blue"
         custom_fields:
           item1:

diff --git a/...lace_minimalist/lovelace/ulm_templates/card_templates/cards/card_binary_sensor_alert.yaml b/...lace_minimalist/lovelace/ulm_templates/card_templates/cards/card_binary_sensor_alert.yaml
@@ -16,7 +16,6 @@ card_binary_sensor_alert:
       card:
         type: "custom:button-card"
         template:
-          - "icon_more_info"
           - "blue"
         custom_fields:
           item1:

diff --git a/...onents/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_cover.yaml b/...onents/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_cover.yaml
@@ -85,8 +85,6 @@ card_cover:
     item1:
       card:
         type: "custom:button-card"
-        template:
-          - "icon_more_info"
         custom_fields:
           item1:
             card:

diff --git a/...ents/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_generic.yaml b/...ents/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_generic.yaml
@@ -12,8 +12,6 @@ card_generic:
     item1:
       card:
         type: "custom:button-card"
-        template:
-          - "icon_more_info"
         custom_fields:
           item1:
             card:

diff --git a/...ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_generic_swap.yaml b/...ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_generic_swap.yaml
@@ -12,8 +12,6 @@ card_generic_swap:
     item1:
       card:
         type: "custom:button-card"
-        template:
-          - "icon_more_info"
         custom_fields:
           item1:
             card:

diff --git a/...i_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_input_boolean.yaml b/...i_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_input_boolean.yaml
@@ -14,7 +14,6 @@ card_input_boolean:
       card:
         type: "custom:button-card"
         template:
-          - "icon_more_info"
           - "blue"
         custom_fields:
           item1:

diff --git a/...onents/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_light.yaml b/...onents/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_light.yaml
@@ -98,8 +98,6 @@ card_light:
     item1:
       card:
         type: "custom:button-card"
-        template:
-          - "icon_more_info"
         custom_fields:
           item1:
             card:

diff --git a/...ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_media_player.yaml b/...ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_media_player.yaml
@@ -90,8 +90,6 @@ card_media_player:
     item1:
       card:
         type: "custom:button-card"
-        template:
-          - "icon_more_info"
         custom_fields:
           item1:
             card:

diff --git a/...nents/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_person.yaml b/...nents/ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_person.yaml
@@ -22,7 +22,7 @@ card_person:
       } else {
         let state = states[variables.ulm_card_person_entity].state;
         let option = ["home", "not_home", "unavailable", "unknown"]
-        return (option.includes(state)) ? variables.ulm_translation_state : state
+        return (option.includes(state)) ? variables.ulm_translation_state : (states["zone."+state]?.attributes?.friendly_name || state)
       }
     ]]]
   name: "[[[ return states[variables.ulm_card_person_entity].attributes.friendly_name ]]]"
@@ -61,10 +61,10 @@ card_person:
     notification: >
       [[[
         if (states[variables.ulm_card_person_entity].state !== 'home') {
-          if (states[variables.ulm_card_person_entity].state === states[variables.ulm_card_person_zone1]?.attributes?.friendly_name) {
+          if (states[variables.ulm_card_person_zone1]?.attributes?.persons.includes(variables.ulm_card_person_entity)) {
             var icon = states[variables.ulm_card_person_zone1].attributes.icon !== null ? states[variables.ulm_card_person_zone1].attributes.icon : 'mdi:help-circle'
             return '<ha-icon icon="' + icon + '" style="width: 10px; height: 10px; color: var(--primary-background-color);"></ha-icon>';
-          } else if (states[variables.ulm_card_person_entity].state === states[variables.ulm_card_person_zone2]?.attributes?.friendly_name) {
+          } else if (states[variables.ulm_card_person_zone2]?.attributes?.persons.includes(variables.ulm_card_person_entity)) {
             var icon = states[variables.ulm_card_person_zone2].attributes.icon !== null ? states[variables.ulm_card_person_zone2].attributes.icon : 'mdi:help-circle'
             return '<ha-icon icon="' + icon + '" style="width: 10px; height: 10px; color: var(--primary-background-color);"></ha-icon>';
           } else {

diff --git a/...ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_power_outlet.yaml b/...ui_lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_power_outlet.yaml
@@ -16,7 +16,6 @@ card_power_outlet:
       card:
         type: "custom:button-card"
         template:
-          - "icon_more_info"
           - "yellow"
         custom_fields:
           item1: