Merge branch 'master' of ssh://localhost:10022/hmetzner/do_fhem

fhem/core/www/tablet_dev/main1280x800.html

@@ -155,10 +155,31 @@
         </div>
       </div>
     </li>
-<!--Geburtstage-->
-    <li data-col="5" data-row="7"  data-sizex="5" data-sizey="6">
-      <header>Geburtstage</header>
-      <!-- place your widget here -->
+    <li data-col="5" data-row="7"  data-sizex="5" data-sizey="6" class="fulltransparent">
+      <header class="fulltransparent">Geburtstage</header>
+      <div data-type="calview"
+           data-device="BirthdayView"
+           data-get="today"
+           data-color="red"
+           data-detail='["bdate","summary","age"]'
+           data-detailwidth='["10","50","10"]'>
+      </div>
+      <div data-type="calview"
+           data-device="BirthdayView"
+           data-get="tomorrow"
+           data-color="yellow"
+           data-detail='["bdate","summary","age"]'
+           data-detailwidth='["10","50","10"]'>
+      </div>
+      <div class="left-align">demnächst</div>
+      <div data-type="calview"
+           data-device="BirthdayView"
+           data-get="all"
+           data-start="notomorrow"
+           data-dateformat="short"
+           data-detail='["bdate","summary","age"]'
+           data-detailwidth='["10","50","10"]'>
+      </div>
     </li>
     <li data-col="10" data-row="7" data-sizex="3" data-sizey="3">
       <header>Küchenorchester</header>

fhem/core/www/tablet_dev/templates/template_fahrzeit.html

@@ -10,14 +10,24 @@
      data-get="distance">
 </div>
 <!--Aktuelle Dauer-->
-<div class="top-narrow-2x cell-30 left-align left-space large"
-     data-type="label"
-     data-device="paraDev"
-     data-get="duration_in_traffic">
+<div class="top-narrow-2x cell-30 left-align left-space large">
+  <div data-type="label"
+       data-device="paraDev"
+       data-get="duration_in_traffic">
+  </div>
+  <div data-type="label"
+       data-device="paraDev"
+       data-get="return_duration_in_traffic">
+  </div>
 </div>
 <!--Verzögerung-->
-<div class="top-narrow-2x cell-20 right-align right-space large"
-     data-type="label"
-     data-device="paraDev"
-     data-get="delay">
+<div class="top-narrow-2x cell-20 right-align right-space large">
+  <div data-type="label"
+       data-device="paraDev"
+       data-get="delay">
+  </div>
+  <div data-type="label"
+       data-device="paraDev"
+       data-get="return_delay">
+  </div>
 </div>