mbirth/pywws-page
Archived
1
0
Fork 0
Code

Add <thead> and <tbody> tags. MDL for 6hrs.txt.

Browse Source
This commit is contained in:
Markus Birth 2016-10-20 17:19:21 +02:00
parent 6fb99a59f3
commit 9f7a813c3b
4 changed files with 138 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_templates/12months.txt
View File

@ -2,6 +2,7 @@
#locale True#
#timezone local#
<table border="1" rules="all">
<thead>
<tr>
<th rowspan="3">Monat</th>
<th colspan="7">Temperatur</th>
@ -22,6 +23,8 @@
<th>durchschn.</th>
<th>tiefste</th>
</tr>
</thead>
<tbody>
#monthly#
#jump -11#
#loop 12#
@ -39,4 +42,5 @@
</tr>
#jump 1#
#endloop#
</tbody>
</table>

39
_templates/6hrs.txt
View File

@ -2,23 +2,28 @@
#locale True#
#timezone local#
#roundtime True#
<table border="1" rules="all">
<table border="1" rules="all" class="mdl-data-table mdl-js-data-table">
<thead>
<tr>
<th colspan="2" rowspan="2">Datum &amp; Zeit</th>
<th rowspan="2">Temp</th>
<th rowspan="2">Gefühlt</th>
<th rowspan="2">Feuchte</th>
<th colspan="3">Wind</th>
<th rowspan="2">Regen</th>
<th rowspan="2">Luftdruck</th>
<th rowspan="2"><a href="https://de.wikipedia.org/wiki/Kondensationsniveau##Konvektionskondensationsniveau" title="Quellwolkenuntergrenze">KKN</a></th>
<th rowspan="2">Vorhersage</th>
<th class="mdl-data-table__cell--non-numeric mdl-data-table__header--sorted-ascending" colspan="2" rowspan="2">Datum &amp; Zeit</th>
<th class="mdl-data-table__cell--non-numeric" rowspan="2">Temp</th>
<th class="mdl-data-table__cell--non-numeric" rowspan="2">Gefühlt</th>
<th class="mdl-data-table__cell--non-numeric" rowspan="2">Feuchte</th>
<th class="mdl-data-table__cell--non-numeric" colspan="3">Wind</th>
<th class="mdl-data-table__cell--non-numeric" rowspan="2">Regen</th>
<th class="mdl-data-table__cell--non-numeric" colspan="2">Luftdruck</th>
<th class="mdl-data-table__cell--non-numeric" rowspan="2"><a href="https://de.wikipedia.org/wiki/Kondensationsniveau##Konvektionskondensationsniveau" title="Quellwolkenuntergrenze">KKN</a></th>
<th class="mdl-data-table__cell--non-numeric" rowspan="2">Vorhersage</th>
</tr>
<tr>
<th>Ri</th>
<th>Ø</th>
<th>Boe</th>
<th class="mdl-data-table__cell--non-numeric">Ri</th>
<th class="mdl-data-table__cell--non-numeric">Ø</th>
<th class="mdl-data-table__cell--non-numeric">Boe</th>
<th class="mdl-data-table__cell--non-numeric">Druck</th>
<th class="mdl-data-table__cell--non-numeric">Tendenz</th>
</tr>
</thead>
<tbody>
#hourly#
#jump -6#
#loop 7#
@ -28,14 +33,16 @@
<td>#temp_out "%.1f ℃"#</td>
<td>#calc "apparent_temp(data['temp_out'], data['hum_out'], data['wind_ave'])" "%.1f ℃"#</td>
<td>#hum_out "%d%%"#</td>
<td>#wind_dir "%s" "-" "winddir_text(x)"#</td>
<td class="mdl-data-table__cell--non-numeric">#wind_dir "%s" "-" "winddir_text(x)"#</td>
<td>#wind_ave "%.0f ㎞/h" "" "wind_kmph(x)"#</td>
<td>#wind_gust "%.0f ㎞/h" "" "wind_kmph(x)"#</td>
<td>#rain "%0.1f ㎜"#</td>
<td>#rel_pressure "%.0f ㍱"#, #pressure_trend "%s" "" "pressure_trend_text(x)"#</td>
<td>#rel_pressure "%.0f ㍱"#</td>
<td class="mdl-data-table__cell--non-numeric">#pressure_trend "%s" "" "pressure_trend_text(x)"#</td>
<td>#calc "cloud_base(data['temp_out'], data['hum_out'])" "%.0f m"#</td>
<td>#calc "Zambretti(params, data)"#</td>
<td class="mdl-data-table__cell--non-numeric">#calc "Zambretti(params, data)"#</td>
</tr>
#jump 1#
#endloop#
</tbody>
</table>

4
_templates/7days.txt
View File

@ -2,6 +2,7 @@
#locale True#
#timezone local#
<table border="1" rules="all">
<thead>
<tr>
<th rowspan="2">letzte 24 Std. bis</th>
<th colspan="3">Temperatur</th>
@ -16,6 +17,8 @@
<th>durchschn.</th>
<th>max. Boe</th>
</tr>
</thead>
<tbody>
#daily#
#jump -7#
#loop 7#
@ -31,4 +34,5 @@
</tr>
#jump 1#
#endloop#
</tbody>
</table>

4
_templates/allmonths.txt
View File

@ -2,6 +2,7 @@
#locale True#
#timezone local#
<table border="1" rules="all">
<thead>
<tr>
<th rowspan="3">Monat</th>
<th colspan="7">Temperatur</th>
@ -22,6 +23,8 @@
<th>durchschn.</th>
<th>tiefstes</th>
</tr>
</thead>
<tbody>
#monthly#
#loop 10000#
<tr>
@ -38,4 +41,5 @@
</tr>
#jump -1#
#endloop#
</tbody>
</table>