From bd8a0bbb38433361af9ff2eb98cb3ddda865a448 Mon Sep 17 00:00:00 2001 From: Matthew Wall Date: Fri, 7 Nov 2014 17:52:13 +0000 Subject: [PATCH] remove some table constraints that caused unexpected behavior and odd resizing. hack to keep toc in same location when horizontal scrolling. limit to h1 and h2 only on upgrading page. make warning and info boxes full width. --- docs/css/weewx_docs.css | 21 +++++---------- docs/customizing.htm | 25 +++++++---------- docs/upgrading.htm | 60 ++++++++++++++++++++++++++++++----------- docs/usersguide.htm | 11 +++++--- 4 files changed, 69 insertions(+), 48 deletions(-) diff --git a/docs/css/weewx_docs.css b/docs/css/weewx_docs.css index 4fbf9e1b..703a8826 100644 --- a/docs/css/weewx_docs.css +++ b/docs/css/weewx_docs.css @@ -47,8 +47,6 @@ h4 { table { border-collapse: collapse; border: 1px solid #cccccc; - width: 80%; - margin: 10px; } tr { vertical-align: top; @@ -74,7 +72,7 @@ caption { } .indent { margin-left: 40px; - margin-right: 80px; + margin-right: 40px; } .station_data { margin-left: 40px; @@ -153,18 +151,14 @@ table .first_row { .note { background-color: #cce0d0; border: 1px solid #aac0b0; - margin: 10px; - margin-left: 30px; - padding: 12px; - width: 80%; + margin: 10px 30px 10px 30px; + padding: 10px; } .warning { background-color: #ffeeee; border: 1px solid #ffdddd; - margin: 10px; - margin-left: 30px; - padding: 12px; - width: 80%; + margin: 10px 30px 10px 30px; + padding: 10px; } .copyright { font-style: italic; @@ -233,7 +227,7 @@ table .first_row { #technical_content{ float:right; - width:80% + width:82% } /* @@ -249,8 +243,7 @@ div .ui-widget-header { */ .tocify { width: 15%; - margin-left: 10px; - margin-top: 10px; + margin-left: 5px; padding-left: 5px; } diff --git a/docs/customizing.htm b/docs/customizing.htm index 66df96fb..c8e0f072 100644 --- a/docs/customizing.htm +++ b/docs/customizing.htm @@ -16,26 +16,20 @@ $(function() { var toc = $("#toc").tocify({ context : "#technical_content", - selectors : "h1, h2", + selectors : "h1, h2, h3", showAndHide : false, theme : "jqueryui", ignoreSelector : ".title", hashGenerator : wee_gen_id }) - }).data("toc-tocify"); - - - @@ -1096,7 +1090,7 @@ or in foobar units: $day.barometer.min.foobar

Tag $trend

The tag $trend is available for time trends, such as barometer trends. Here are some examples:

- +
@@ -1140,7 +1134,7 @@ or in foobar units: $day.barometer.min.foobar

Tag $unit

The unit type, label, and string formats are also available, allowing you to do highly customized labels:

-
Tag
+
@@ -1327,7 +1321,7 @@ Sunrise, sunset: 06:51 19:30 many stars are in the list.

The possible values for the attribute tag are listed in the following table:

-
Tag
+
@@ -2101,7 +2095,7 @@ outTemp = Outside Temperature

This option controls which encoding is to be used for the generated output. The encoding can be specified for individual files. There are 3 possible choices:

-
Attributes that can be used with heavenly bodies
+
@@ -3927,7 +3921,7 @@ Options:

The table below lists all the unit groups, their members, which units are options for the group, and what the defaults are for each standard unit system.

-
Encoding
+
@@ -4566,7 +4560,6 @@ The radiation and UV data are available only with the optional solar radiation sensor.

-

© Copyright Tom Keffer

diff --git a/docs/upgrading.htm b/docs/upgrading.htm index b8cefa97..fcd37457 100644 --- a/docs/upgrading.htm +++ b/docs/upgrading.htm @@ -1,21 +1,51 @@ - - - - - weewx: Upgrade Guide - - + + + + + weewx: Upgrade Guide + + + + + + + + + + + + + +
+
+ +

Upgrading weewx
-Version: 2.7.0 +Version: 3.0.0a1

@@ -29,12 +59,10 @@ Version: 2.7.0

The section Instructions for Specific Versions applies to each installation method.

Warning!
- You must use the same upgrade technique as your initial install!
-
+ You must use the same upgrade technique as your initial install! For example, if you used setup.py to install weewx, you should use - setup.py to upgrade.
-
+ setup.py to upgrade. If you used a DEB or RPM package to install, then you should upgrade using the same package type.

@@ -422,7 +450,7 @@ cooling_base = 65, degree_F

into the new one. You will have to re-edit weewx.conf to put in your customizations.

V1.2.0 or earlier

-

Optional

+

Option clock_check, previously found in the [VantagePro] section, is now found in the [Station] section. The install program will put a default value in the new place, but it will not delete nor move your old value @@ -446,6 +474,8 @@ rm $WEEWX_ROOT/bin/weewx/mainloop.py

© Copyright Tom Keffer

- +
+ + diff --git a/docs/usersguide.htm b/docs/usersguide.htm index 390b5531..a3448b2b 100644 --- a/docs/usersguide.htm +++ b/docs/usersguide.htm @@ -22,7 +22,13 @@ ignoreSelector : ".title", hashGenerator : wee_gen_id }) - }).data("toc-tocify"); + }).data("toc-tocify"); + + $(window).scroll(function(){ + $('#toc').css({ + 'left': 8 - $(this).scrollLeft() + }); + });
Unit groups, members and options