Added Footer. Updated readme.

Daveiano · May 11, 2022 · 7d7fe5a · 7d7fe5a
1 parent d8b702a
commit 7d7fe5a
Show file tree

Hide file tree

Showing 14 changed files with 79 additions and 75 deletions.
diff --git 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
@@ -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
@@ -12,7 +12,7 @@
             <p class="value">$("%.1f&deg;" % $almanac.moon.az)s</p>
           </div>
           <div class="bx--col">
-            <p class="label small">$gettext("Altitude")</p>
+            <p class="label small">$pgettext("Astronomical", "Altitude")</p>
             <p class="value">$("%.1f&deg;" % $almanac.moon.alt)</p>
           </div>
         </div>

diff --git a/skins/weewx-wdc/includes/almanac-sun-detail-tile.inc b/skins/weewx-wdc/includes/almanac-sun-detail-tile.inc
@@ -42,7 +42,7 @@
             <p class="value">$("%.1f&deg;" % $almanac.sun.az)s</p>
           </div>
           <div class="bx--col">
-            <p class="label small">$gettext("Altitude")</p>
+            <p class="label small">$pgettext("Astronomical", "Altitude")</p>
             <p class="value">$("%.1f&deg;" % $almanac.sun.alt)</p>
           </div>
         </div>

diff --git a/skins/weewx-wdc/includes/footer.inc b/skins/weewx-wdc/includes/footer.inc
@@ -0,0 +1,34 @@
+<!--prettier-ignore-->
+#encoding UTF-8
+
+<div id="footer">
+  <div class="bx--grid bx--grid--full-width">
+    <div class="bx--row">
+      <div class="bx--col">
+        <p>
+          $gettext("Weewx uptime"): $station.uptime<br />
+          $gettext("Server uptime"): $station.os_uptime<br />
+          weewx $station.version with $station.hardware<br />
+          $gettext("Skin"): $SKIN_NAME $SKIN_VERSION
+        </p>
+      </div>
+      <div class="bx--col">
+        <p>
+          $pgettext("Geographical", "Altitude"): $station.altitude<br />
+          $gettext("Latitude"): $station.latitude[0]&deg; $station.latitude[1]'
+          $station.latitude[2]<br />
+          $gettext("Longitude"): $station.longitude[0]&deg;
+          $station.longitude[1]' $station.longitude[2]
+        </p>
+      </div>
+    </div>
+    <div class="bx--row">
+      <div class="bx--col">
+        <!--prettier-ignore-->
+        <p class="footnote">
+          $gettext("This station is controlled by <a target='_blank' href='https://weewx.com'>WeeWX</a>, an experimental weather software system written in Python.")
+        </p>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/skins/weewx-wdc/index.html.tmpl b/skins/weewx-wdc/index.html.tmpl
@@ -78,19 +78,7 @@
       </section>
     </main>
 
-    <div id="footer">
-      <div class="bx--grid bx--grid--full-width">
-        <div class="bx--row">
-          <div class="bx--col">
-            <p>
-              weewx: $station.uptime<br />
-              server: $station.os_uptime<br />
-              weewx $station.version with $station.hardware<br />
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
+    #include "includes/footer.inc"
 
     <script src="dist/js/index.js"></script>
   </body>

diff --git 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"
+    "full" = "sichtbar"
+    "Skin" = "Skin"
+    "Server uptime" = "Server-Laufzeit"
+    "WeeWX uptime" = "WeeWX-Laufzeit"
+    "WeeWX version" = "WeeWX-Version"
+    "This station is controlled by <a href='https://weewx.com'>WeeWX</a>, an experimental weather software system written in Python." = "Diese Station wird von <a href='https://weewx.com'>WeeWX</a> 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
diff --git 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"
+    "full" = "full"
+    "Skin" = "Skin"
+    "Server uptime" = "Server uptime"
+    "WeeWX uptime" = "WeeWX uptime"
+    "WeeWX version" = "WeeWX version"
+    "This station is controlled by <a href='https://weewx.com'>WeeWX</a>, an experimental weather software system written in Python." = "This station is controlled by <a href='https://weewx.com'>WeeWX</a>, 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
diff --git a/skins/weewx-wdc/month.html.tmpl b/skins/weewx-wdc/month.html.tmpl
@@ -81,19 +81,7 @@
       </section>
     </main>
 
-    <div id="footer">
-      <div class="bx--grid bx--grid--full-width">
-        <div class="bx--row">
-          <div class="bx--col">
-            <p>
-              weewx: $station.uptime<br />
-              server: $station.os_uptime<br />
-              weewx $station.version with $station.hardware<br />
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
+    #include "includes/footer.inc"
 
     <script src="dist/js/index.js"></script>
   </body>

diff --git 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
@@ -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
@@ -81,19 +81,7 @@
       </section>
     </main>
 
-    <div id="footer">
-      <div class="bx--grid bx--grid--full-width">
-        <div class="bx--row">
-          <div class="bx--col">
-            <p>
-              weewx: $station.uptime<br />
-              server: $station.os_uptime<br />
-              weewx $station.version with $station.hardware<br />
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
+    #include "includes/footer.inc"
 
     <script src="dist/js/index.js"></script>
   </body>

diff --git a/skins/weewx-wdc/week.html.tmpl b/skins/weewx-wdc/week.html.tmpl
@@ -80,19 +80,7 @@
       </section>
     </main>
 
-    <div id="footer">
-      <div class="bx--grid bx--grid--full-width">
-        <div class="bx--row">
-          <div class="bx--col">
-            <p>
-              weewx: $station.uptime<br />
-              server: $station.os_uptime<br />
-              weewx $station.version with $station.hardware<br />
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
+    #include "includes/footer.inc"
 
     <script src="dist/js/index.js"></script>
   </body>

diff --git a/skins/weewx-wdc/year.html.tmpl b/skins/weewx-wdc/year.html.tmpl
@@ -80,19 +80,7 @@
       </section>
     </main>
 
-    <div id="footer">
-      <div class="bx--grid bx--grid--full-width">
-        <div class="bx--row">
-          <div class="bx--col">
-            <p>
-              weewx: $station.uptime<br />
-              server: $station.os_uptime<br />
-              weewx $station.version with $station.hardware<br />
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
+    #include "includes/footer.inc"
 
     <script src="dist/js/index.js"></script>
   </body>