jan
/
ancient-weatherstation
mirror of https://github.com/agdsn/ancient-weatherstation.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webstuff/frontend/content/modules/mod_auss2Small.html
View File

@ -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>

8
webstuff/frontend/content/modules/mod_hum.html
View File

@ -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>

8
webstuff/frontend/content/modules/mod_innenSmall.html
View File

@ -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>

8
webstuff/frontend/content/modules/mod_press.html
View File

@ -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>

8
webstuff/frontend/content/modules/mod_rain.html
View File

@ -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>

4
webstuff/frontend/content/modules/mod_regenSmall.html
View File

@ -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>

8
webstuff/frontend/content/modules/mod_temp.html
View File

@ -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>

8
webstuff/frontend/content/modules/mod_wind.html
View File

@ -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>

4
webstuff/frontend/content/modules/mod_windsSmall.html
View File

@ -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>

22
webstuff/frontend/css/example.css
View File

@ -54,33 +54,37 @@ div.module table tr td.mod_line_val {
color: #776666;
}
div.module h3.mod_headline, div.report h3.report_head, div.chart h3.chart_headline {
div.module span.mod_headline, div.report span.report_head, div.chart span.chart_headline {
margin-top:2px;
margin-left:2px;
margin-bottom: 5px;
font-weight: 600;
font-size: 14pt;
color: #222222;
display:block;
}
div.report h3.report_head {
div.report span.report_head {
width:100%;
text-align:left;
display:block;
}
div.chart h3.chart_headline {
div.chart span.chart_headline {
width:100%;
text-align:left;
display:block;
}
div.module h4.mod_subhead {
div.module span.mod_subhead {
margin-top:2px;
margin-left:2px;
margin-bottom: 4px;
font-weight: 600;
font-size: 12pt;
color: #444444;
display:block;
}
div.module div.mod_subsec, div.report div.rpt_subsec {
@ -122,13 +126,13 @@ div.module div.mod_subsec div.chart_link_div a.chart_link, div.module div.mod_su
display: inline;
}
div.module div.mod_subsec div.chart_link_div a.chart_link p.chart_link_desc, div.module div.mod_subsec div.report_link_div a.report_link p.report_link_desc {
div.module div.mod_subsec div.chart_link_div a.chart_link span.chart_link_desc, div.module div.mod_subsec div.report_link_div a.report_link span.report_link_desc {
visibility: hidden;
position: absolute;
top: -100px;
}
div.module div.mod_subsec div.chart_link_div a.chart_link:hover p.chart_link_desc, div.module div.mod_subsec div.report_link_div a.report_link:hover p.report_link_desc {
div.module div.mod_subsec div.chart_link_div a.chart_link:hover span.chart_link_desc, div.module div.mod_subsec div.report_link_div a.report_link:hover span.report_link_desc {
top: 5px;
left: 5px;
visibility: visible;
@ -144,6 +148,7 @@ div.module div.mod_subsec div.chart_link_div a.chart_link:hover p.chart_link_des
font-style: normal;
text-decoration: none;
z-index: 300;
display:block;
}
div.module div.mod_subsec div.chart_link_div a.chart_link img.chart_link_prev {
@ -249,7 +254,7 @@ div.small_set div.module {
height:155px;
}
div.small_set div.module h3.mod_headline{
div.small_set div.module span.mod_headline{
font-size: 11pt;
}
@ -291,13 +296,14 @@ div.small_set div.module a.mod_small_link:hover {
background: #FFeebb;
}
div.small_set div.module a.mod_small_link H4.mod_subheadline{
div.small_set div.module a.mod_small_link span.mod_subheadline{
background: #F0D0AF;
margin:0px;
padding:2px;
font-size:12px;
font-weight:900;
color: #222255;
display:block;
}
div.small_set div.module a.mod_small_link span.mod_body {

2
webstuff/frontend/frontend.conf
View File

@ -4,7 +4,7 @@
$allTitle = "Meine Wetterstation";
/* Datenbankverbindung */
$pg_host = "localhost";
$pg_host = "141.30.228.39";
$pg_database = "wetter";
$pg_user = "weatherstation";
$pg_pass = "";

10
webstuff/frontend/php_inc/chart.inc.php
View File

@ -32,19 +32,19 @@ class Chart{
$buff .= '" class="chart_link">';
$buff .= $chartArray[1];
$buff .= '<p class="chart_link_desc">';
$buff .= '<span class="chart_link_desc">';
$buff .= $chartArray[2];
if ($chartArray[3] == null){
$buff .= '<img class="chart_link_prev" width="250" height="100" src="';
$buff .= Chart::_getChartImgLink($chartArray[0]);
$buff .= '">';
$buff .= '" alt="&nbsp;">';
} else {
$buff .= '<img class="chart_link_prev" width="250" height="100" src="';
$buff .= Chart::_getChartImgLink($chartArray[3]);
$buff .= '">';
$buff .= '" alt="&nbsp;">';
}
$buff .= '</p>';
$buff .= '</span>';
$buff .= '</a>';
$buff .= '</div>';
@ -60,7 +60,7 @@ class Chart{
$buff = '<img class="chart_img" src="';
$buff .= Chart::_getChartImgLink($chartArray[0]);
$buff .= '">';
$buff .= '" alt="&nbsp;">';
return $buff;
}

2
webstuff/frontend/php_inc/module_set.inc.php
View File

@ -103,7 +103,7 @@ class ModuleSet{
$i--;
$buff .= '?'.$key.'='.$value;
} else {
$buff .= '&'.$key.'='.$value;
$buff .= '&amp;'.$key.'='.$value;
}
}

4
webstuff/frontend/php_inc/report.inc.php
View File

@ -133,9 +133,9 @@ class Report{
$buff .= '" class="report_link">';
$buff .= $rptArray[0];
$buff .= '<p class="report_link_desc">';
$buff .= '<span class="report_link_desc">';
$buff .= $rptArray[1];
$buff .= '</p>';
$buff .= '</span>';
$buff .= '</a>';
$buff .= '</div>';