mirror/weewx
1
0
Fork 0
mirror of https://github.com/weewx/weewx.git synced 2026-04-24 19:47:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

eliminate vestigial styles. make tables consistent across blocks.

Browse Source
This commit is contained in:
Matthew Wall
2017-01-28 23:47:41 -05:00
parent d676da4221
commit 12c2ac12b2
8 changed files with 52 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
skins/Standard/celestial.inc
View File

@@ -41,7 +41,7 @@
#if $almanac.hasExtras
<div class="celestial_body">
<table class="celestial">
<tr><th>Sun</th><th></th></tr>
<tr><th>Sun</th></tr>
<tr>
<td class="label">Rise</td>
<td class="data">$almanac.sun.rise.string($sun_None)</td>
@@ -58,7 +58,7 @@
</div>
<div class="celestial_body">
<table class="celestial">
<tr><th>Moon</th><th></th></tr>
<tr><th>Moon</th></tr>
<tr>
<td class="label">Rise</td>
<td class="data">$almanac.moon.rise</td>
@@ -97,7 +97,7 @@
<div id="celestial_details" style="display:none">
<div class="celestial_body">
<table class="celestial">
<tr><th>Sun</th><th></th></tr>
<tr><th>Sun</th></tr>
<tr>
<td class="label">Start civil twilight</td>
<td class="data">$almanac(horizon=-6).sun(use_center=1).rise</td>
@@ -163,7 +163,7 @@
</div>
<div class="celestial_body">
<table class="celestial">
<tr><th>Moon</th><th></th></tr>
<tr><th>Moon</th></tr>
<tr><td class="label">&nbsp;</td><td class="data">&nbsp;</td></tr>
<tr>
<td class="label">Rise</td>

4
skins/Standard/current.inc
View File

@@ -4,13 +4,13 @@
<div id='current_widget' class="widget">
<div class="widget_title">
Current
Current Conditions
<a class="widget_control"
onclick="toggle_widget('current')">&diams;</a>
</div>
<div class="widget_contents">
<table class="stats">
<table>
<tbody>
<tr>
<td class="label">$obs.label.outTemp</td>

2
skins/Standard/hilo.inc
View File

@@ -12,7 +12,7 @@
</div>
<div class="widget_contents">
<table class="stats">
<table>
<tbody>
<tr>
<th></th>

6
skins/Standard/sensors.inc
View File

@@ -51,7 +51,7 @@ LOW
<table>
#if $have_conn
<tr><td class="rowhead">Connectivity</td><td></td></tr>
<tr><th>Connectivity</th></tr>
#if $day.rxCheckPercent.has_data
<tr>
<td class="label">$obs.label.rxCheckPercent</td>
@@ -61,7 +61,7 @@ LOW
#end if
#if $have_battery_status
<tr><td class="rowhead">Battery Status</td><td></td></tr>
<tr><th>Battery Status</th></tr>
#if $day.txBatteryStatus.has_data
<tr>
<td class="label">$obs.label.txBatteryStatus</td>
@@ -95,7 +95,7 @@ LOW
#end if
#if $have_voltage
<tr><td class="rowhead">Voltage</td><td></td></tr>
<tr><th>Voltage</th></tr>
#if $day.consBatteryVoltage.has_data
<tr>
<td class="label">$obs.label.consBatteryVoltage</td>

20
skins/Standard/skin.conf
View File

@@ -443,9 +443,11 @@
[[[dayradiation]]]
[[[[radiation]]]]
[[[[radiation_max]]]]
label = Maximum
data_type = radiation
aggregate_type = max
aggregate_interval = 3600
line_gap_fraction = 0.1
[[[dayuv]]]
yscale = 0, 16, 1
@@ -455,7 +457,8 @@
data_type = UV
aggregate_type = max
aggregate_interval = 3600
line_gap_fraction = 0.1
[[[dayrx]]]
[[[[rxCheckPercent]]]]
@@ -511,8 +514,10 @@
[[[weekradiation]]]
[[[[radiation]]]]
[[[[radiation_max]]]]
label = Maximum
data_type = radiation
aggregate_type = max
line_gap_fraction = 0.1
[[[weekuv]]]
yscale = 0, 16, 1
@@ -521,7 +526,8 @@
label = Maximum
data_type = UV
aggregate_type = max
line_gap_fraction = 0.1
[[[weekrx]]]
[[[[rxCheckPercent]]]]
@@ -578,8 +584,10 @@
[[[monthradiation]]]
[[[[radiation]]]]
[[[[radiation_max]]]]
label = Maximum
data_type = radiation
aggregate_type = max
line_gap_fraction = 0.1
[[[monthuv]]]
yscale = 0, 16, 1
@@ -588,7 +596,8 @@
label = Maximum
data_type = UV
aggregate_type = max
line_gap_fraction = 0.1
[[[monthrx]]]
[[[[rxCheckPercent]]]]
@@ -646,8 +655,10 @@
[[[yearradiation]]]
[[[[radiation]]]]
[[[[radiation_max]]]]
label = Maximum
data_type = radiation
aggregate_type = max
line_gap_fraction = 0.1
[[[yearuv]]]
yscale = 0, 16, 1
@@ -656,7 +667,8 @@
label = Maximum
data_type = UV
aggregate_type = max
line_gap_fraction = 0.1
[[[yearrx]]]
[[[[rxCheckPercent]]]]

49
skins/Standard/standard.css
View File

@@ -128,21 +128,6 @@ a:hover {
*/
}
.stats {
}
table.stats th {
font-weight: normal;
font-size: 80%;
text-align: left;
}
.rowhead {
text-align: right;
padding-top: 10px;
border-bottom: 1px solid #dddddd;
}
.label {
font-size: 80%;
vertical-align: top;
@@ -169,6 +154,14 @@ table.stats th {
font-weight: normal;
}
.hival {
color: #aa4444;
}
.loval {
color: #4444aa;
}
.button {
cursor: pointer;
padding-left: 10px;
@@ -219,15 +212,20 @@ table.stats th {
border-top: 1px solid #dddddd;
}
table.celestial th {
text-align: left;
}
.celestial_body {
margin-bottom: 30px;
float: left;
}
#hilo_widget table.stats th {
#celestial_widget table th {
font-weight: normal;
text-align: right;
border-bottom: 1px solid #dddddd;
}
#hilo_widget table th {
font-weight: normal;
font-size: 80%;
text-align: right;
}
@@ -238,12 +236,11 @@ table.celestial th {
padding-left: 10px;
}
.hival {
color: #aa4444;
}
.loval {
color: #4444aa;
#sensors_widget table th {
font-weight: normal;
text-align: right;
padding-top: 10px;
border-bottom: 1px solid #dddddd;
}
#history_widget img {

8
skins/Standard/statistics.html.tmpl
View File

@@ -12,15 +12,11 @@
<script type="text/javascript" src="standard.js"></script>
<style>
#statistics_widget th {
font-weight: normal;
text-align: right;
}
#statistics_widget .stats {
float: left;
margin-bottom: 30px;
margin-right: 30px;
}
#statistics_widget .widget_title {
margin-bottom: 40px;
margin-bottom: 25px;
}
.label {
font-size: 100%;

2
skins/Standard/statistics.inc
View File

@@ -10,7 +10,7 @@
</div>
<div class="widget_contents">
<table class="stats">
<table>
<tbody>
<tr>
<th></th>