Merging..

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

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

 <%inherit file="base.mako"/>
 <%namespace name="widgets" file="widgets.mako" />
 
+<link href="/dash/static/css/btns.css" rel="stylesheet">
+
 <div class="grid-background">
 <div class="grid">
 
@@ -27,20 +29,16 @@
 
   <div class="grid-box">
     <div style="text-align:center;">
-      <b>Volet cuisine</b>
-     <span data-is="shutter" xaal_addr="2fe70f46-3ece-44d1-af34-2d82e10fb854"></span>
+     ${widgets.shutter('shutter_sdb')}
     </div>
   </div>
 
   <div class="grid-box">   
     <div style="text-align:center;">
-      <b>Volet SDB</b>
-     <span data-is="shutter" xaal_addr="e4b05165-be5d-46d5-acd0-4da7be1158ed"></span>
+     ${widgets.shutter('shutter_cuisine')}
     </div>
   </div>
 
-
-  
   
   <div class="grid-box">
     <div style="text-align:center;">
@@ -50,36 +48,46 @@
 
   <div class="grid-box">
     <b>Température</b>
-    ${widgets.list_thermometer(['temp_netatmo','temp_owm','temp_bureau',])}
+    ${widgets.list_devices(['temp_netatmo','temp_owm','temp_bureau',])}
   </div>
 
   <div class="grid-box">
     <b>Humidité</b>
-    ${widgets.list_hygrometer(['rh_netatmo','rh_owm','rh_bureau'])}
+    ${widgets.list_devices(['rh_netatmo','rh_owm','rh_bureau'])}
+  </div>
+
+
+
+  <div class="grid-box">
+    <b>Plugs</b>
+    ${widgets.list_devices(['meter_lampe_télé'])}
   </div>
 
+  
+  
   <div class="grid-box two">
-    <div data-is="generic-attrs" xaal_addr="dd1e9aee-38f5-11e8-9099-e0db55fb413a"></div>
+    ${widgets.device_addr("dd1e9aee-38f5-11e8-9099-e0db55fb413a")}
+    ${widgets.device('rh_owm')}
   </div>
 
  <div class="grid-box">
   <div style="text-align:center;">
     <b>Wall Plug</b>
-    <span data-is="powerrelay" xaal_addr="95762dde-68d1-11e8-8ac2-b827ebc3cb01"></span>
+    ${widgets.device('relay_lampe_télé')}
     <br/>
-    <span data-is="powermeter" xaal_addr="95762dde-68d1-11e8-8ac2-b827ebc3cb02"></span>
+    ${widgets.device_addr("6265eb30-8c59-11e9-98b1-b827ebe99202")}
   </div>
  </div>
 
  <div class="grid-box">
   <div style="text-align:center;">
     <b>Lamp RGB Bureau</b>
-    <span data-is="lamp" xaal_addr="232e8554-02e7-11e9-8931-00fec8f7138c"></span>
+    ${widgets.device_addr("232e8554-02e7-11e9-8931-00fec8f7138c")}
   </div>
  </div>
 
 
- 
+<!-- 
 <div class="grid-box two">
   <div style="text-align:center;">
     <iframe src="https://aal.enstb.org/grafana/d-solo/mNvuqkJmz/xaal-lab?refresh=5s&panelId=24&orgId=1" width="310" height="100" frameborder="0"></iframe>
@@ -87,7 +95,7 @@
   </div>
  </div>
  
-
+-->
 
   <!--
   <div class="grid-box two" style="align:center;">
@@ -104,13 +112,13 @@
 </div> <!-- end of grid -->
 </div><!-- end of grib background -->
 
-<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>
-<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/shutter.tag"></script>
+<script type="riot/tag" src="/dash/static/tags/powerrelay.tag"></script>
+<script type="riot/tag" src="/dash/static/tags/hygrometer.tag"></script>
+<script type="riot/tag" src="/dash/static/tags/thermometer.tag"></script>
+<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="/static/tags/generic_attrs.tag"></script>
-<script type="riot/tag" src="/static/tags/clock.tag"></script>
+<script type="riot/tag" src="/dash/static/tags/generic_attrs.tag"></script>
+<script type="riot/tag" src="/dash/static/tags/clock.tag"></script>