CSS Again & Again

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

apps/dashboard/xaal/dashboard/static/tags/hygrometer.tag

@@ -23,7 +23,7 @@
 }
  
 .addr {
-    font-size:80%;
+    font-size:70%;
     color : #8e8e8e;
  }
 

apps/dashboard/xaal/dashboard/static/tags/powerrelay.tag

 <powerrelay>
 
 <div class="powerrelay">
-<span class="{stateClass}">state : { power } </span><br/>
+<div class="{stateClass}">{ power }</div>
 <input type="button" class="button" value="ON"  name="btn_on" onclick={ btn } />
 <input type="button" class="button" value="OFF" name="btn_off" onclick={ btn } /><br/>
 <span class="addr">addr : { addr }</span><br/>
@@ -33,23 +33,22 @@ btn(e) {
 
 <style>
  .powerrelay {
-    padding: 8px 0px;
  }
 
  .state-on {
-    font-size: 100%;
-    color:  red;
+     color:  #ff005f;
      font-weight: bold;
+     padding: 8px;
  }
 
  .state-off {
-    font-size: 100%;
      color:  #00bbd7;
      font-weight: bold;
+     padding: 8px;
  }
 
  .addr {
-    font-size:80%;
+     font-size:70%;
      color : #8e8e8e;
  }
 

apps/dashboard/xaal/dashboard/templates/base.mako

@@ -25,6 +25,8 @@
     <li><a href="#" onclick="openNav()">&#9776;</a></li>     
     <li class="active"><a href="/test0">Sensors</a></li>
     <li><a href="/http_info">HTTPD</a></li>
+    <li><a href="/test_grid">Grid</a></li>
+    <li><a href="/links">Links</a></li>        
   </ul>
   </div>
   

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

@@ -2,30 +2,40 @@
 
 <div class="grid">
   <div class="grid-box">
-    <div data-is="powerrelay" xaal_addr="092725ef-ca87-45d5-a619-9d7680046c93"></div>
+    <div data-is="powerrelay" xaal_addr="ccc44227-d4fc-46eb-8578-159e2c47da04"></div>
   </div>
   <div class="grid-box">
+    <div>
       <div data-is="hygrometer" xaal_addr="b4cec9fa-7513-4d87-bfc1-ee1107176cf1"></div>
+      <br/>
+      Bureau
+    </div>
   </div>
 
   <div class="grid-box">
     <div>
-      <a href="/generic/2f31c921-01b2-4097-bfae-5753dde2cd42">
-        <div data-is="thermometer" xaal_addr="2f31c921-01b2-4097-bfae-5753dde2cd42"></div>
-        <br/><br/>
+      <a href="/generic/b4cec9fa-7513-4d87-bfc1-ee1107176cf0">
+        <div data-is="thermometer" xaal_addr="b4cec9fa-7513-4d87-bfc1-ee1107176cf0"></div>
+        <br/>
         Bureau
       </a>
     </div>
   </div>
 
+  <div class="grid-box two">
+    <div data-is="generic-attrs" xaal_addr="ccc44227-d4fc-46eb-8578-159e2c47da04"></div>
+  </div>
+
   <div class="grid-box">
       <span data-is="clock"/>
   </div>
   <div class="grid-box">
-    <div data-is="generic-attrs" xaal_addr="5fcc6ad1-804d-49cb-b66c-e877f2374905"></div>
+    <div>
+      <progress class="avancement" value="10" max="100"></progress>
+    </div>
   </div>
 <div class="grid-box">Foo</div>
-<div class="grid-box">Foo</div>
+
 
 
 <script type="riot/tag" src="/static/tags/powerrelay.tag"></script>