From 244b8cde159d770b998230c5c9b7073eeeb77194 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 17 Nov 2015 23:04:06 +0100
Subject: [PATCH 1/6] Add binary sensor

---
 src/util/domain-icon.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/util/domain-icon.js b/src/util/domain-icon.js
index bf799e4d45..83f750a382 100644
--- a/src/util/domain-icon.js
+++ b/src/util/domain-icon.js
@@ -5,6 +5,9 @@ export default function domainIcon(domain, state) {
   case 'alarm_control_panel':
     return state && state === 'disarmed' ? 'mdi:lock-open' : 'mdi:lock';
 
+  case 'binary_sensor':
+    return 'mdi:radiobox-marked';
+
   case 'camera':
     return 'mdi:video';
 

From d763c49d232cc9b0d54eb49442af5d89bcaed2f3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 17 Nov 2015 23:04:42 +0100
Subject: [PATCH 2/6] Add binary sensor

---
 src/components/ha-zone-cards.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/ha-zone-cards.js b/src/components/ha-zone-cards.js
index ebe5403801..9f16769768 100644
--- a/src/components/ha-zone-cards.js
+++ b/src/components/ha-zone-cards.js
@@ -16,8 +16,9 @@ const PRIORITY = {
   alarm_control_panel: 3,
   camera: 4,
   sensor: 5,
-  scene: 6,
-  script: 7,
+  binary_sensor: 6,
+  scene: 7,
+  script: 8,
   thermostat: 40,
   media_player: 50,
 };

From 0269527fdbb7cb0c36cdf1c147c59ab571e48fc9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 17 Nov 2015 23:05:09 +0100
Subject: [PATCH 3/6] Add binary sensor

---
 src/components/entity/ha-state-label-badge.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/components/entity/ha-state-label-badge.js b/src/components/entity/ha-state-label-badge.js
index c59ef1e665..d42c90b172 100644
--- a/src/components/entity/ha-state-label-badge.js
+++ b/src/components/entity/ha-state-label-badge.js
@@ -39,6 +39,8 @@ export default new Polymer({
 
   computeClasses(state) {
     switch (state.domain) {
+    case 'binary_sensor':
+      return state.state === 'on' ? 'green' : 'red';
     case 'scene':
       return 'green';
     case 'script':
@@ -52,6 +54,7 @@ export default new Polymer({
 
   computeValue(state) {
     switch (state.domain) {
+    case 'binary_sensor':
     case 'device_tracker':
     case 'updater':
     case 'sun':
@@ -78,6 +81,12 @@ export default new Polymer({
       }
       // state == 'disarmed'
       return 'mdi:lock-open';
+    case 'binary_sensor':
+      if (state.state === 'on') {
+        return 'mdi:radiobox-marked';
+      }
+      // state == 'off'
+      return 'mdi:radiobox-blank';
     case 'device_tracker':
     case 'scene':
     case 'script':

From 5ba4378c25482214b2200342cfc777fc671aac3a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Wed, 18 Nov 2015 22:28:31 +0100
Subject: [PATCH 4/6] Change to work like the alarm control panel

---
 src/util/domain-icon.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/domain-icon.js b/src/util/domain-icon.js
index 83f750a382..260340e556 100644
--- a/src/util/domain-icon.js
+++ b/src/util/domain-icon.js
@@ -6,7 +6,7 @@ export default function domainIcon(domain, state) {
     return state && state === 'disarmed' ? 'mdi:lock-open' : 'mdi:lock';
 
   case 'binary_sensor':
-    return 'mdi:radiobox-marked';
+    return state && state === 'off' ? 'mdi:radiobox-blank' : 'mdi:radiobox-marked';
 
   case 'camera':
     return 'mdi:video';

From c39daa6a592f19fb4a6255fca56419a2299a90b2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Wed, 18 Nov 2015 22:29:35 +0100
Subject: [PATCH 5/6] Update color and computeIcon for binary sensor and
 updater

---
 src/components/entity/ha-state-label-badge.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/components/entity/ha-state-label-badge.js b/src/components/entity/ha-state-label-badge.js
index d42c90b172..748ea53825 100644
--- a/src/components/entity/ha-state-label-badge.js
+++ b/src/components/entity/ha-state-label-badge.js
@@ -40,7 +40,7 @@ export default new Polymer({
   computeClasses(state) {
     switch (state.domain) {
     case 'binary_sensor':
-      return state.state === 'on' ? 'green' : 'red';
+      return state.state === 'on' ? 'blue' : 'grey';
     case 'scene':
       return 'green';
     case 'script':
@@ -82,17 +82,11 @@ export default new Polymer({
       // state == 'disarmed'
       return 'mdi:lock-open';
     case 'binary_sensor':
-      if (state.state === 'on') {
-        return 'mdi:radiobox-marked';
-      }
-      // state == 'off'
-      return 'mdi:radiobox-blank';
     case 'device_tracker':
     case 'scene':
+    case 'updater':
     case 'script':
       return domainIcon(state.domain, state.state);
-    case 'updater':
-      return domainIcon(state.domain);
     case 'sun':
       return state.state === 'above_horizon' ?
         domainIcon(state.domain) : 'mdi:brightness-3';

From 717a3699b288c2ab6a70df32742ab06010c1dedd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 20 Nov 2015 15:23:24 +0100
Subject: [PATCH 6/6] Combined with script

---
 src/components/entity/ha-state-label-badge.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/entity/ha-state-label-badge.js b/src/components/entity/ha-state-label-badge.js
index 748ea53825..c3f7dde5f4 100644
--- a/src/components/entity/ha-state-label-badge.js
+++ b/src/components/entity/ha-state-label-badge.js
@@ -39,10 +39,9 @@ export default new Polymer({
 
   computeClasses(state) {
     switch (state.domain) {
-    case 'binary_sensor':
-      return state.state === 'on' ? 'blue' : 'grey';
     case 'scene':
       return 'green';
+    case 'binary_sensor':
     case 'script':
       return state.state === 'on' ? 'blue' : 'grey';
     case 'updater':