Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #1417

Merged
merged 9 commits into from
Nov 24, 2023
Merged

Release #1417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8f589d2
Update card_vertical_button.yaml
MastrUsr Nov 9, 2023
a063e7b
Update card_welcome_scenes.yaml
basbruss Nov 17, 2023
5b7118c
Merge pull request #1410 from MastrUsr/main
basbruss Nov 17, 2023
6ce09dc
Merge branch 'release' into bug
basbruss Nov 17, 2023
ef1e707
Merge remote-tracking branch 'upstream/main' into release
basbruss Nov 17, 2023
1131002
Merge remote-tracking branch 'upstream/main' into bug
basbruss Nov 17, 2023
297efb0
Merge branch 'release' into bug
basbruss Nov 17, 2023
6b46290
Merge pull request #1415 from basbruss/bug
basbruss Nov 24, 2023
e8c6c3f
Merge branch 'main' into release
basbruss Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_vertical_button.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ card_vertical_button:
return "vacuum.toggle";
if( entity.entity_id.startsWith("script.") )
return "script.toggle";
if( entity.entity_id.startsWith("button.") )
return "button.press";
// If we need to support other entities we can add these options here.
return "";
]]]
Expand Down
61 changes: 27 additions & 34 deletions ..._lovelace_minimalist/lovelace/ulm_templates/card_templates/cards/card_welcome_scenes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,28 +283,24 @@ card_scenes_pill_welcome:
[[[
if(variables?.nav_path){
return "navigate"
} else {
return "call-service"
}
return "call-service"
]]]
service: >
[[[
if(typeof(entity) !== 'undefined' && entity !== undefined){
if(entity.entity_id.startsWith("scene.")){
return "scene.turn_on"
}
if(entity.entity_id.startsWith("media_player.")){
return "media_player.media_play_pause"
}
if(entity.entity_id.startsWith("input_select.")){
return "input_select.select_option"
}
if(entity.entity_id.startsWith("script.")){
return entity.entity_id
}
} else {
return "homeassistant.toggle"
if(entity?.entity_id.startsWith("scene.")){
return "scene.turn_on"
}
if(entity?.entity_id.startsWith("media_player.")){
return "media_player.media_play_pause"
}
if(entity?.entity_id.startsWith("input_select.")){
return "input_select.select_option"
}
if(entity?.entity_id.startsWith("script.")){
return entity.entity_id
}
return "homeassistant.toggle"
]]]
navigation_path: "[[[ return variables?.nav_path; ]]]"
service_data: |
Expand Down Expand Up @@ -374,29 +370,26 @@ card_scenes_pill_welcome:
[[[
if(variables?.nav_path){
return "navigate"
} else {
return "call-service"
}
return "call-service"
]]]
navigation_path: "[[[ return variables?.nav_path; ]]]"
service: >
[[[
if(typeof(entity) !== 'undefined' && entity !== undefined){
if(entity.entity_id.startsWith("scene.")){
return "scene.turn_on"
}
if(entity.entity_id.startsWith("media_player.")){
return "media_player.media_play_pause"
}
if(entity.entity_id.startsWith("input_select.")){
return "input_select.select_option"
}
if(entity.entity_id.startsWith("script.")){
return entity.entity_id
}
} else {
return "homeassistant.toggle"
if(entity?.entity_id.startsWith("scene.")){
return "scene.turn_on"
}
if(entity?.entity_id.startsWith("media_player.")){
return "media_player.media_play_pause"
}
if(entity?.entity_id.startsWith("input_select.")){
return "input_select.select_option"
}
if(entity?.entity_id.startsWith("script.")){
return entity.entity_id
}
return "homeassistant.toggle"
]]]
service_data: |
[[[
if (variables.service_data){
Expand Down
Loading