diff --git a/install.py b/install.py index e665ba9f..4b616129 100644 --- a/install.py +++ b/install.py @@ -53,6 +53,7 @@ def __init__(self): 'skins/weewx-wdc/includes/diagram-tile.inc', 'skins/weewx-wdc/includes/stat-tile.inc', 'skins/weewx-wdc/includes/ui-shell.inc', + 'skins/weewx-wdc/includes/footer.inc', 'skins/weewx-wdc/includes/icons/barometer.svg', 'skins/weewx-wdc/includes/pictograms/sun.svg', 'skins/weewx-wdc/includes/pictograms/moon.svg', diff --git a/readme.md b/readme.md index d45bc388..5d599ab7 100644 --- a/readme.md +++ b/readme.md @@ -4,7 +4,7 @@ Inspired by and build with the [Carbon Design System](https://carbondesignsystem ## Key Features -- Clear and beatiful UI thanks to [IBM Carbon](https://carbondesignsystem.com/) and [nivo](https://nivo.rocks/) +- Clear and beautiful UI thanks to [IBM Carbon](https://carbondesignsystem.com/) and [nivo](https://nivo.rocks/) - Configurable Statistic Tiles and Diagram tiles - Combinable diagrams via skin.conf - Responsive @@ -47,12 +47,11 @@ Starts a nginx docker container to serve the generated files. `docker run -it --rm -d -p 8080:80 --name web -v /var/www/html/weewx:/usr/share/nginx/html nginx` -## Credits - ### Todo -- Footer - Add yearly archive accessible via Sidebar - Add NOAA reports accessible via Sidebar - Responsive - Add Carbon Data Tables + +## Credits diff --git a/skins/weewx-wdc/includes/almanac-moon-detail-tile.inc b/skins/weewx-wdc/includes/almanac-moon-detail-tile.inc index 696bde3f..d25fcfce 100644 --- a/skins/weewx-wdc/includes/almanac-moon-detail-tile.inc +++ b/skins/weewx-wdc/includes/almanac-moon-detail-tile.inc @@ -12,7 +12,7 @@

$("%.1f°" % $almanac.moon.az)s

-

$gettext("Altitude")

+

$pgettext("Astronomical", "Altitude")

$("%.1f°" % $almanac.moon.alt)

diff --git a/skins/weewx-wdc/includes/almanac-sun-detail-tile.inc b/skins/weewx-wdc/includes/almanac-sun-detail-tile.inc index a44f82ce..43157249 100644 --- a/skins/weewx-wdc/includes/almanac-sun-detail-tile.inc +++ b/skins/weewx-wdc/includes/almanac-sun-detail-tile.inc @@ -42,7 +42,7 @@

$("%.1f°" % $almanac.sun.az)s

-

$gettext("Altitude")

+

$pgettext("Astronomical", "Altitude")

$("%.1f°" % $almanac.sun.alt)

diff --git a/skins/weewx-wdc/includes/footer.inc b/skins/weewx-wdc/includes/footer.inc new file mode 100644 index 00000000..966b82b1 --- /dev/null +++ b/skins/weewx-wdc/includes/footer.inc @@ -0,0 +1,34 @@ + +#encoding UTF-8 + + diff --git a/skins/weewx-wdc/index.html.tmpl b/skins/weewx-wdc/index.html.tmpl index e227f46e..526332f5 100644 --- a/skins/weewx-wdc/index.html.tmpl +++ b/skins/weewx-wdc/index.html.tmpl @@ -78,19 +78,7 @@ - + #include "includes/footer.inc" diff --git a/skins/weewx-wdc/lang/de.conf b/skins/weewx-wdc/lang/de.conf index 156f13a2..74d453e0 100644 --- a/skins/weewx-wdc/lang/de.conf +++ b/skins/weewx-wdc/lang/de.conf @@ -149,7 +149,6 @@ "Declination" = "Deklination" "Equinox" = "Tagundnachtgleiche" "Azimuth" = "Azimut" - "Altitude" = "Höhe" "Right ascension" = "Right ascension" "Total daylight" = "Total daylight" "Start civil twilight" = "Dämmerungsbeginn (bürgerlich)" @@ -162,4 +161,15 @@ "more than yesterday" = "mehr als gestern" "New moon" = "Neumond" "Full moon" = "Vollmond" - "full" = "sichtbar" \ No newline at end of file + "full" = "sichtbar" + "Skin" = "Skin" + "Server uptime" = "Server-Laufzeit" + "WeeWX uptime" = "WeeWX-Laufzeit" + "WeeWX version" = "WeeWX-Version" + "This station is controlled by WeeWX, an experimental weather software system written in Python." = "Diese Station wird von WeeWX gesteuert, einer experimentellen Wetter-Software, geschrieben in Python." + + [[Geographical]] + "Altitude" = "Höhe ü. NN" # As in height above sea level + + [[Astronomical]] + "Altitude" = "Höhe" # As in angle above the horizon \ No newline at end of file diff --git a/skins/weewx-wdc/lang/en.conf b/skins/weewx-wdc/lang/en.conf index 4fd8df93..7c32bdf3 100644 --- a/skins/weewx-wdc/lang/en.conf +++ b/skins/weewx-wdc/lang/en.conf @@ -149,7 +149,6 @@ "Declination" = "Declination" "Equinox" = "Equinox" "Azimuth" = "Azimuth" - "Altitude" = "Altitude" "Right ascension" = "Right ascension" "Total daylight" = "Total daylight" "Start civil twilight" = "Start civil twilight" @@ -162,4 +161,15 @@ "more than yesterday" = "more than yesterday" "New moon" = "New moon" "Full moon" = "Full moon" - "full" = "full" \ No newline at end of file + "full" = "full" + "Skin" = "Skin" + "Server uptime" = "Server uptime" + "WeeWX uptime" = "WeeWX uptime" + "WeeWX version" = "WeeWX version" + "This station is controlled by WeeWX, an experimental weather software system written in Python." = "This station is controlled by WeeWX, an experimental weather software system written in Python." + + [[Geographical]] + "Altitude" = "Altitude" # As in height above sea level + + [[Astronomical]] + "Altitude" = "Altitude" # As in angle above the horizon \ No newline at end of file diff --git a/skins/weewx-wdc/month.html.tmpl b/skins/weewx-wdc/month.html.tmpl index 7ff3fd62..a05f129b 100644 --- a/skins/weewx-wdc/month.html.tmpl +++ b/skins/weewx-wdc/month.html.tmpl @@ -81,19 +81,7 @@ - + #include "includes/footer.inc" diff --git a/skins/weewx-wdc/skin.conf b/skins/weewx-wdc/skin.conf index fe18f3ad..d1582cc1 100644 --- a/skins/weewx-wdc/skin.conf +++ b/skins/weewx-wdc/skin.conf @@ -1,4 +1,6 @@ # configuration file for the weewx-wdc skin +SKIN_NAME = Weather Data Center +SKIN_VERSION = 1.0.0-alpha2 [Extras] diff --git a/skins/weewx-wdc/src/scss/index.scss b/skins/weewx-wdc/src/scss/index.scss index 03eb338b..dc16a864 100644 --- a/skins/weewx-wdc/src/scss/index.scss +++ b/skins/weewx-wdc/src/scss/index.scss @@ -187,4 +187,12 @@ header.section-header { #footer { padding: 2rem; margin-top: $spacing-09; + background-color: $background-inverse; + color: $text-inverse; + a { + color: $link-inverse; + } + .footnote { + margin-top: $spacing-06; + } } diff --git a/skins/weewx-wdc/statistics.html.tmpl b/skins/weewx-wdc/statistics.html.tmpl index 2382f21c..e4c3604b 100644 --- a/skins/weewx-wdc/statistics.html.tmpl +++ b/skins/weewx-wdc/statistics.html.tmpl @@ -81,19 +81,7 @@ - + #include "includes/footer.inc" diff --git a/skins/weewx-wdc/week.html.tmpl b/skins/weewx-wdc/week.html.tmpl index b7d46cb0..e34c901c 100644 --- a/skins/weewx-wdc/week.html.tmpl +++ b/skins/weewx-wdc/week.html.tmpl @@ -80,19 +80,7 @@ - + #include "includes/footer.inc" diff --git a/skins/weewx-wdc/year.html.tmpl b/skins/weewx-wdc/year.html.tmpl index 6092c801..31f96356 100644 --- a/skins/weewx-wdc/year.html.tmpl +++ b/skins/weewx-wdc/year.html.tmpl @@ -80,19 +80,7 @@ - + #include "includes/footer.inc"