Added support for lamp.color

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/0.7@2949 b32b6428-25c9-4566-ad07-03861ab6144f

apps/dashboard/xaal/dashboard/templates/grid-labo.mako

@@ -8,7 +8,7 @@
 
   <div class="grid-box">
     <b>Light</b>
-      ${widgets.list_devices(['lamp_entree','lamp_couloir','lamp_salon','lamp_ambiance'])}
+      ${widgets.list_devices(['lamp_entree','lamp_couloir','lamp_salon','lamp_ambiance','aqara_gw'])}
   </div>
 
   <div class="grid-box">
@@ -59,13 +59,13 @@
   
   <div class="grid-box">
     <b>Contact</b>
-    ${widgets.list_devices(['door1','door2','door4','door5','window1','window2'])}
+    ${widgets.list_devices(['door1','door5','window1','window2'])}
   </div>
 
 
 <div class="grid-box">
     <b>Contact</b>
-    ${widgets.list_devices(['drawer1','drawer2','drawer3'])}
+    ${widgets.list_devices(['door2','door4','drawer1','drawer2','drawer3'])}
   </div>
 
 
@@ -174,6 +174,8 @@
 </div> <!-- end of grid -->
 </div><!-- end of grib background -->
 
+
+<script type="riot/tag" src="./static/tags/lamp_color.tag"></script>
 <script type="riot/tag" src="./static/tags/powerrelay.tag"></script>
 <script type="riot/tag" src="./static/tags/hygrometer.tag"></script>
 <script type="riot/tag" src="./static/tags/thermometer.tag"></script>

apps/dashboard/xaal/dashboard/templates/grid.mako

@@ -22,6 +22,7 @@
 <script type="riot/tag" src="./static/tags/thermometer.tag"></script>
 <script type="riot/tag" src="./static/tags/powermeter.tag"></script>
 <script type="riot/tag" src="./static/tags/lamp.tag"></script>
+<script type="riot/tag" src="./static/tags/lamp_color.tag"></script>
 <script type="riot/tag" src="./static/tags/shutter.tag"></script>
 <script type="riot/tag" src="./static/tags/barometer.tag"></script>
 <script type="riot/tag" src="./static/tags/co2meter.tag"></script>

apps/dashboard/xaal/dashboard/templates/widgets.mako

@@ -14,11 +14,16 @@
   <div data-is="powerrelay" xaal_addr=${addr}></div>
 </%def>
 
-<%def name="lamp_(addr)">
+<%def name="lamp(addr)">
   <div data-is="lamp" xaal_addr=${addr}></div>
 </%def>
 
 
+<%def name="lamp_color(addr)">
+  <div data-is="lamp_color" xaal_addr=${addr}></div>
+</%def>
+
+
 <%def name="generic(addr)">
   <div data-is="generic-attrs" xaal_addr=${addr}></div>
 </%def>
@@ -81,7 +86,8 @@
       if type_.startswith('thermometer.')   : return 'thermometer'
       if type_.startswith('hygrometer.')    : return 'hygrometer'
       if type_.startswith('shutter.')       : return 'shutter'
-      if type_.startswith('lamp.')          : return 'lamp_'
+      if type_.startswith('lamp.color')     : return 'lamp_color'
+      if type_.startswith('lamp.')          : return 'lamp'
       if type_.startswith('powerrelay.')    : return 'powerrelay'
       if type_.startswith('powermeter.')    : return 'powermeter'
       if type_.startswith('barometer.')     : return 'barometer'
@@ -132,7 +138,7 @@
 
 
 <%def name="list_all_devices()">
-<table width=98%>
+<table width=98% border=1>
 % for dev in devices:
 % if tag(dev)!= 'generic':
 <tr>