big changes

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

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

@@ -7,26 +7,21 @@
 <div class="grid">
 
   <div class="grid-box">
-    <div style="text-align:center;">
-      ${widgets.lamp('lamp_entree')}
-      ${widgets.lamp('lamp_couloir')}       
-    </div>
+    <b>Eclairage</b>
+      ${widgets.list_devices(['lamp_entree','lamp_couloir','lamp_salon'])}
   </div>
 
   <div class="grid-box">
-    <div style="text-align:center;">
-      ${widgets.lamp('lamp_salon')}
-      ${widgets.lamp('lamp_salle')}       
-    </div>
+    <b>Eclairage</b>
+      ${widgets.list_devices(['lamp_salle','lamp_cuisine','lamp_sdb','relay_spot'])}      
   </div>
 
   <div class="grid-box">
-    <div style="text-align:center;">
-      ${widgets.lamp('lamp_cuisine')}
-      ${widgets.lamp('lamp_sdb')}       
-    </div>
+    <b>Relais</b>
+      ${widgets.list_devices(['relay_pepper','relay_bouilloire'])}
   </div>
 
+
   <div class="grid-box">
     <div style="text-align:center;">
      ${widgets.shutter('shutter_sdb')}
@@ -40,12 +35,6 @@
   </div>
 
   
-  <div class="grid-box">
-    <div style="text-align:center;">
-      ${widgets.lamp('lamp_test')}
-    </div>
-  </div>
-
   <div class="grid-box">
     <b>Température</b>
     ${widgets.list_devices(['temp_netatmo','temp_owm','temp_bureau',])}
@@ -57,34 +46,36 @@
   </div>
 
 
-
   <div class="grid-box">
-    <b>Plugs</b>
-    ${widgets.list_devices(['meter_lampe_télé'])}
+    <b>Aquara</b>
+    ${widgets.list_devices(['temp_aqara1','rh_aqara1','press_aqara1'])}
+    ${widgets.list_devices(['temp_aqara2','rh_aqara2','press_aqara2'])}    
   </div>
 
   
-  
-  <div class="grid-box two">
-    ${widgets.device_addr("dd1e9aee-38f5-11e8-9099-e0db55fb413a")}
-    ${widgets.device('rh_owm')}
+  <div class="grid-box">
+    <b>Ouverture</b>
+    ${widgets.list_devices(['door1','door2','door3','door4'])}
   </div>
 
- <div class="grid-box">
-  <div style="text-align:center;">
-    <b>Wall Plug</b>
-    ${widgets.device('relay_lampe_télé')}
-    <br/>
-    ${widgets.device_addr("6265eb30-8c59-11e9-98b1-b827ebe99202")}
+
+
+  
+  <div class="grid-box">
+    <b>Consommations</b>
+    ${widgets.list_devices(['pmeter_spot','pmeter_robot','pmeter_bouilloire'])}
   </div>
- </div>
 
- <div class="grid-box">
-  <div style="text-align:center;">
-    <b>Lamp RGB Bureau</b>
-    ${widgets.device_addr("232e8554-02e7-11e9-8931-00fec8f7138c")}
+  <div class="grid-box">
+    <b>Mouvement</b>
+    ${widgets.list_devices(['motion1','motion2','motion3','motion4','motion5'])}
   </div>
- </div>
+  
+  <div class="grid-box">
+    <b>CO2</b>
+    ${widgets.list_devices(['co2_1','co2_2','co2_3','co2_4'])}
+  </div>
+
 
 
 <!-- 
@@ -118,6 +109,11 @@
 <script type="riot/tag" src="/dash/static/tags/powermeter.tag"></script>
 <script type="riot/tag" src="/dash/static/tags/lamp.tag"></script>
 <script type="riot/tag" src="/dash/static/tags/shutter.tag"></script>
+<script type="riot/tag" src="/dash/static/tags/barometer.tag"></script>
+<script type="riot/tag" src="/dash/static/tags/co2meter.tag"></script>
+<script type="riot/tag" src="/dash/static/tags/motion.tag"></script>
+<script type="riot/tag" src="/dash/static/tags/door.tag"></script>
+
 
 
 <script type="riot/tag" src="/dash/static/tags/generic_attrs.tag"></script>