1
0
mirror of https://github.com/agdsn/ancient-weatherstation.git synced 2026-06-19 23:07:59 +00:00

merging Christian Jakobs branch back to trunk

fixes #5


git-svn-id: file:///home/jan/tmp/wetterstation/trunk@256 dd492736-c11a-0410-ad51-8c26713eaf7f
This commit is contained in:
jan
2008-04-09 16:31:20 +00:00
parent 69454ce9b1
commit 1430e01afc
14 changed files with 54 additions and 48 deletions
@@ -1,8 +1,8 @@
<h3 class="mod_headline">Sensor {content:fill:sens_id} - {content:fill:sens_location}</h3>
<span class="mod_headline">Sensor {content:fill:sens_id} - {content:fill:sens_location}</span>
<ul class="val_list">
<li class="val_elm">
<a href="{content:addSetLink:full}#temp_{content:fill:sens_id}" class="mod_small_link">
<h4 class="mod_subheadline">Temperatur</h4>
<span class="mod_subheadline">Temperatur</span>
<span class="mod_body">
<span class="mod_now">{content:fill:temp_now_val}&deg;C</span>
<span class="mod_av">(&Oslash; {content:fill:temp_av_value}&deg;C)</span>
@@ -14,7 +14,7 @@
</li>
<li class="val_elm">
<a href="{content:addSetLink:full}#hum_{content:fill:sens_id}" class="mod_small_link">
<h4 class="mod_subheadline">Luftfeuchte</h4>
<span class="mod_subheadline">Luftfeuchte</span>
<span class="mod_body">
<span class="mod_now">{content:fill:hum_now_val}%</span>
<span class="mod_av">(&Oslash; {content:fill:hum_av_value}%)</span>
@@ -1,9 +1,9 @@
<a name="hum_{content:fill:sens_id}">
<h3 class="mod_headline">Luftfeuchtigkeit - {content:fill:sens_location}</h3>
<span class="mod_headline">Luftfeuchtigkeit - {content:fill:sens_location}</span>
</a>
<p class="mod_description">{content:fill:sens_description}</p>
<div class="mod_subsec">
<h4 class="mod_subhead">Momentane Werte</h4>
<span class="mod_subhead">Momentane Werte</span>
<table class="mod_hum_now_data">
<tr class="mod_hum_current_row">
<td class="mod_line_desc">Momentan:</td><td class="mod_line_val">{content:fill:hum_now_val}%</td><td class="mod_line_date">{content:fill:hum_now_date}</td>
@@ -17,7 +17,7 @@
</table>
</div>
<div class="mod_subsec">
<h4 class="mod_subhead">Extrema</h4>
<span class="mod_subhead">Extrema</span>
<table>
<tr class="mod_hum_max_row">
<td class="mod_line_desc">Max:</td><td class="mod_line_val">{content:fill:hum_max_val}%</td><td class="mod_line_date">{content:fill:hum_max_date}</td>
@@ -29,7 +29,7 @@
</div>
<div class="mod_subsec">
<h4 class="mod_subhead">Statistik</h4>
<span class="mod_subhead">Statistik</span>
<table>
<tr class="mod_temp_stat_row">
<td class="mod_line_desc">10 Tage</td><td class="mod_line_stat">{content:addChartLink:hum_10}</td><td class="mod_line_chart">{content:addReportLink:hum_10}</td>
@@ -1,8 +1,8 @@
<h3 class="mod_headline">Sensor {content:fill:sens_id} - {content:fill:sens_location}</h3>
<span class="mod_headline">Sensor {content:fill:sens_id} - {content:fill:sens_location}</span>
<ul class="val_list">
<li class="val_elm">
<a href="{content:addSetLink:full}#temp_{content:fill:sens_id}" class="mod_small_link">
<h4 class="mod_subheadline">Temperatur</h4>
<span class="mod_subheadline">Temperatur</span>
<span class="mod_body">
<span class="mod_now">{content:fill:temp_now_val}&deg;C</span>
<span class="mod_av">(&Oslash; {content:fill:temp_av_value}&deg;C)</span>
@@ -14,7 +14,7 @@
</li>
<li class="val_elm">
<a href="{content:addSetLink:full}#hum_{content:fill:sens_id}" class="mod_small_link">
<h4 class="mod_subheadline">Luftfeuchte</h4>
<span class="mod_subheadline">Luftfeuchte</span>
<span class="mod_body">
<span class="mod_now">{content:fill:hum_now_val}%</span>
<span class="mod_av">(&Oslash; {content:fill:hum_av_value}%)</span>
@@ -26,7 +26,7 @@
</li>
<li class="val_elm">
<a href="{content:addSetLink:full}#press_{content:fill:sens_id}" class="mod_small_link">
<h4 class="mod_subheadline">Luftdruck</h4>
<span class="mod_subheadline">Luftdruck</span>
<span class="mod_body">
<span class="mod_now">{content:fill:press_now_val}hPa</span>
<span class="mod_av">(&Oslash; {content:fill:press_av_value}hPa)</span>
@@ -1,9 +1,9 @@
<a name="press_{content:fill:sens_id}">
<h3 class="mod_headline">Luftdruck - {content:fill:sens_location}</h3>
<span class="mod_headline">Luftdruck - {content:fill:sens_location}</span>
</a>
<p class="mod_description">{content:fill:sens_description}</p>
<div class="mod_subsec">
<h4 class="mod_subhead">Momentane Werte</h4>
<span class="mod_subhead">Momentane Werte</span>
<table class="mod_press_now_data">
<tr class="mod_press_current_row">
<td class="mod_line_desc">Momentan:</td><td class="mod_line_val">{content:fill:press_now_val} hPa</td><td class="mod_line_date">{content:fill:press_now_date}</td>
@@ -17,7 +17,7 @@
</table>
</div>
<div class="mod_subsec">
<h4 class="mod_subhead">Extrema</h4>
<span class="mod_subhead">Extrema</span>
<table>
<tr class="mod_press_max_row">
<td class="mod_line_desc">Max:</td><td class="mod_line_val">{content:fill:press_max_val} hPa</td><td class="mod_line_date">{content:fill:press_max_date}</td>
@@ -29,7 +29,7 @@
</div>
<div class="mod_subsec">
<h4 class="mod_subhead">Statistik</h4>
<span class="mod_subhead">Statistik</span>
<table>
<tr class="mod_temp_stat_row">
<td class="mod_line_desc">10 Tage</td><td class="mod_line_stat">{content:addChartLink:press_10}</td><td class="mod_line_chart">{content:addReportLink:press_10}</td>
@@ -1,9 +1,9 @@
<a name="rain_{content:fill:sens_id}">
<h3 class="mod_headline">Regen - {content:fill:sens_location}</h3>
<span class="mod_headline">Regen - {content:fill:sens_location}</span>
</a>
<p class="mod_description">{content:fill:sens_description}</p>
<div class="mod_subsec">
<h4 class="mod_subhead">Aktuelle Werte</h4>
<span class="mod_subhead">Aktuelle Werte</span>
<table class="mod_rain_now_data">
<tr class="mod_rain_hour_row">
<td class="mod_line_desc">Letze Stunde:</td><td class="mod_line_val">{content:fill:rain_now_hour} <sup>l</sup>/<sub>m<sup>2</sup></sub></td>
@@ -23,7 +23,7 @@
</table>
</div>
<div class="mod_subsec">
<h4 class="mod_subhead">Extrema</h4>
<span class="mod_subhead">Extrema</span>
<table>
<tr class="mod_rain_max_hour_row">
<td class="mod_line_desc">Regenreichste Stunde:</td><td class="mod_line_val">{content:fill:rain_max_hour_val} <sup>l</sup>/<sub>m<sup>2</sup></sub></td><td class="mod_line_date">{content:fill:rain_max_hour_date}</td>
@@ -41,7 +41,7 @@
</div>
<div class="mod_subsec">
<h4 class="mod_subhead">Statistik</h4>
<span class="mod_subhead">Statistik</span>
<table>
<tr class="mod_temp_stat_row">
<td class="mod_line_desc">10 Tage</td><td class="mod_line_stat">{content:addChartLink:rain_10}</td><td class="mod_line_chart">{content:addReportLink:rain_10}</td>
@@ -1,8 +1,8 @@
<h3 class="mod_headline">Sensor {content:fill:sens_id} - {content:fill:sens_location}</h3>
<span class="mod_headline">Sensor {content:fill:sens_id} - {content:fill:sens_location}</span>
<ul class="val_list">
<li class="val_elm">
<a href="{content:addSetLink:full}#rain_{content:fill:sens_id}" class="mod_small_link">
<h4 class="mod_subheadline">Regen</h4>
<span class="mod_subheadline">Regen</span>
<span class="mod_body">
<span class="mod_now">Stunde: {content:fill:rain_now_hour} <sup>l</sup>/<sub>m<sup>2</sup></sub></span>
<span class="mod_av">(Tag: {content:fill:rain_now_day} <sup>l</sup>/<sub>m<sup>2</sup></sub>)</span>
@@ -1,9 +1,9 @@
<a name="temp_{content:fill:sens_id}">
<h3 class="mod_headline">Temperatur - {content:fill:sens_location}</h3>
<span class="mod_headline">Temperatur - {content:fill:sens_location}</span>
</a>
<p class="mod_description">{content:fill:sens_description}</p>
<div class="mod_subsec">
<h4 class="mod_subhead">Momentane Werte</h4>
<span class="mod_subhead">Momentane Werte</span>
<table class="mod_temp_now_data">
<tr class="mod_temp_current_row">
<td class="mod_line_desc">Momentan:</td><td class="mod_line_val">{content:fill:temp_now_val}&deg;C</td><td class="mod_line_date">{content:fill:temp_now_date}</td>
@@ -17,7 +17,7 @@
</table>
</div>
<div class="mod_subsec">
<h4 class="mod_subhead">Extrema</h4>
<span class="mod_subhead">Extrema</span>
<table>
<tr class="mod_temp_max_row">
<td class="mod_line_desc">Max:</td><td class="mod_line_val">{content:fill:temp_max_val}&deg;C</td><td class="mod_line_date">{content:fill:temp_max_date}</td>
@@ -29,7 +29,7 @@
</div>
<div class="mod_subsec">
<h4 class="mod_subhead">Statistik</h4>
<span class="mod_subhead">Statistik</span>
<table>
<tr class="mod_temp_stat_row">
<td class="mod_line_desc">10 Tage</td><td class="mod_line_chart">{content:addChartLink:temp_10}</td><td class="mod_line_chart">{content:addReportLink:temp_10}</td>
@@ -1,9 +1,9 @@
<a name="wind_{content:fill:sens_id}">
<h3 class="mod_headline">Wind - {content:fill:sens_location}</h3>
<span class="mod_headline">Wind - {content:fill:sens_location}</span>
</a>
<p class="mod_description">{content:fill:sens_description}</p>
<div class="mod_subsec">
<h4 class="mod_subhead">Momentane Werte</h4>
<span class="mod_subhead">Momentane Werte</span>
<table class="mod_wind_now_data">
<tr class="mod_wind_current_row">
<td class="mod_line_desc">Momentan:</td><td class="mod_line_val">{content:fill:wind_now_val} <sup>km</sup>/<sub>h</sub></td><td class="mod_line_dir">Aus: {content:fill:wind_now_dir_full}</td><td class="mod_line_date">{content:fill:wind_now_date}</td>
@@ -17,7 +17,7 @@
</table>
</div>
<div class="mod_subsec">
<h4 class="mod_subhead">Extrema</h4>
<span class="mod_subhead">Extrema</span>
<table>
<tr class="mod_wind_max_row">
<td class="mod_line_desc">Max:</td><td class="mod_line_val">{content:fill:wind_max_val} <sup>km</sup>/<sub>h</sub></td><td class="mod_line_dir">Aus: {content:fill:wind_max_dir_full}</td><td class="mod_line_date">{content:fill:wind_max_date}</td>
@@ -26,7 +26,7 @@
</div>
<div class="mod_subsec">
<h4 class="mod_subhead">Statistik</h4>
<span class="mod_subhead">Statistik</span>
<table>
<tr class="mod_temp_stat_row">
<td class="mod_line_desc">10 Tage</td><td class="mod_line_stat">{content:addChartLink:wind_10}</td><td class="mod_line_chart">{content:addReportLink:wind_10}</td>
@@ -1,8 +1,8 @@
<h3 class="mod_headline">Sensor {content:fill:sens_id} - {content:fill:sens_location}</h3>
<span class="mod_headline">Sensor {content:fill:sens_id} - {content:fill:sens_location}</span>
<ul class="val_list">
<li class="val_elm">
<a href="{content:addSetLink:full}#wind_{content:fill:sens_id}" class="mod_small_link">
<h4 class="mod_subheadline">Wind</h4>
<span class="mod_subheadline">Wind</span>
<span class="mod_body">
<span class="mod_now">{content:fill:wind_now_val} <sup>km</sup>/<sub>h</sub></span>
<span class="mod_now_extra"> Aus: {content:fill:wind_now_dir_full}</span>