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.

2026-06-10 01:55:07 -04:00 · 2014-11-07 17:52:13 +00:00
parent 1eb15c637f
commit bd8a0bbb38
4 changed files with 69 additions and 48 deletions
--- 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;
 }

--- 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");
-  </script>
-  <script>
+    }).data("toc-tocify");
+
    $(window).scroll(function(){
      $('#toc').css({
-        'left': - $(this).scrollLeft()
+        'left': 8 - $(this).scrollLeft()
      });
    });
  </script>
-  <style>
-    .tocify {
-      margin: 0;
-    }
-  </style>
 </head>
 <body>

@@ -1096,7 +1090,7 @@ or in foobar units: $day.barometer.min.foobar
      <h3>Tag <span class="code">$trend</span></h3>
      <p>The tag <span class="code">$trend</span> is available for time trends,
        such as barometer trends. Here are some examples:</p>
-      <table class="indent" style="width: 40%" summary="Examples of using unit formats">
+      <table class="indent" style="width: 50%" summary="Examples of using unit formats">
        <tbody>
          <tr class="first_row">
            <td>Tag</td>
@@ -1140,7 +1134,7 @@ or in foobar units: $day.barometer.min.foobar
    <h3>Tag <span class="code">$unit</span></h3>
      <p>The unit type, label, and string formats are also available, allowing
        you to do highly customized labels: </p>
-      <table class="indent" style="width: 40%" summary="Examples of using unit formats">
+      <table class="indent" style="width: 50%" summary="Examples of using unit formats">
        <tbody>
          <tr class="first_row">
            <td>Tag</td>
@@ -1327,7 +1321,7 @@ Sunrise, sunset: 06:51 19:30</pre>
        many stars are in the list.</p>
      <p>The possible values for the <span class="code">attribute</span> tag
        are listed in the following table:</p>
-      <table class="indent" style="width: 60%">
+      <table class="indent" style="width: 80%">
        <caption>Attributes that can be used with heavenly bodies</caption>
        <tbody class="code">
          <tr>
@@ -2101,7 +2095,7 @@ outTemp = Outside Temperature</pre>
      <p>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: </p>
-      <table class="indent" style="width:80%">
+      <table class="indent">
        <tbody>
          <tr class="first_row">
            <td>Encoding</td>
@@ -3927,7 +3921,7 @@ Options:
    <p>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. </p>
-      <table class="indent" style="width: 80%">
+      <table class="indent">
        <caption>Unit groups, members and options</caption>
        <tbody class="code">
          <tr class="first_row">
@@ -4566,7 +4560,6 @@ The <span class='code'>radiation</span> and <span class='code'>UV</span>
 data are available only with the optional solar radiation sensor.
 </p>

-  <hr/>
  <p class="copyright"> &copy; <a href="copyright.htm">Copyright</a> Tom Keffer </p>
  </div> <!-- #technical_content -->

--- a/docs/upgrading.htm
+++ b/docs/upgrading.htm
@@ -1,21 +1,51 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <!-- $Id$ -->
-  <head>
-    <meta http-equiv="Content-Language" content="en-us" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>weewx: Upgrade Guide</title>
-    <link href="css/weewx_docs.css" rel="stylesheet" />
-  </head>
+<!-- $Id$ -->
+<head>
+  <meta http-equiv="Content-Language" content="en-us" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>weewx: Upgrade Guide</title>
+  <link href="css/weewx_docs.css" rel="stylesheet" />
+  <link href="css/ui-lightness/jquery-ui-1.10.4.custom.min.css" rel="stylesheet" />
+  <link href="css/jquery.tocify.css" rel="stylesheet" />
+  <link href="css/weewx_docs.css" rel="stylesheet" />
+  <script src="js/jquery-1.10.2.min.js" type="text/javascript"></script>
+  <script src="js/jquery-ui-1.10.4.custom.min.js"></script>
+  <script src="js/jquery.tocify-1.9.0.js"></script>
+  <script src="js/weewx.js"></script>
+  <script>
+$(function() {
+  var toc = $("#toc").tocify({
+    context : "#technical_content",
+    selectors : "h1, h2",
+    showAndHide : false,
+    theme : "jqueryui",
+    ignoreSelector : ".title",
+    hashGenerator : wee_gen_id
+  })
+}).data("toc-tocify");

-  <body>
+$(window).scroll(function(){
+  $('#toc').css({
+    'left': 8 - $(this).scrollLeft()
+  });
+});
+  </script>
+</head>
+
+<body>
+
+  <div id="toc">
+  </div>
+
+  <div id="technical_content">

    <a href='http://weewx.com'>
      <img src='logo-weewx.png' class='logo' align='right' />
    </a>
    <h1 class="title">Upgrading <span class="code">weewx</span><br/>
      <span class='version'>
-Version: 2.7.0
+Version: 3.0.0a1
      </span>
    </h1>

@@ -29,12 +59,10 @@ Version: 2.7.0
    <p>The section <em><a href="#Instructions_for_specific_versions">Instructions for Specific Versions</a></em> applies to each installation method.</p>

    <p class="warning"><strong>Warning!</strong><br/>
-      You must use the same upgrade technique as your initial install!<br/>
-      <br/>
+      You must use the same upgrade technique as your initial install!
      For example, if you used <span class="code">setup.py</span> to install
      <span class='code'>weewx</span>, you should use
-      <span class="code">setup.py</span> to upgrade.<br/>
-      <br/>
+      <span class="code">setup.py</span> to upgrade.
      If you used a DEB or RPM package to install, then you should upgrade
      using the same package type.
    </p>
@@ -422,7 +450,7 @@ cooling_base = 65, degree_F</p>
      into the new one. You will have to re-edit <span class="code">weewx.conf</span> 
      to put in your customizations.</p>
    <h2>V1.2.0 or earlier</h2>
-    <h3>Optional</h3>
+
    <p>Option <span class="code">clock_check</span>, previously found in the <span class="code">[VantagePro]</span> section, is now found in the
      <span class="code">[Station]</span> 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 <span class='symcode'>$WEEWX_ROOT</span>/bin/weewx/mainloop.py</p>
      &copy; <a href='copyright.htm'>Copyright</a> Tom Keffer
    </p>

-  </body>
+  </div> <!-- #technical_content -->
+
+</body>

 </html>
--- 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()
+      });
+    });
  </script>
  <script>
 function showtab(tab,id) {
@@ -1092,7 +1098,7 @@ longitude = -77.0366</pre>
    <p>Set to the type of hardware you are using.</p>
    <pre class="tty">station_type = Simulator</pre>
    <p>Valid options include:</p>
-    <table class="indent" style="width: 50%">
+    <table class="indent">
      <tr class="first_row">
        <td>Option</td>
        <td>Description</td>
@@ -4024,7 +4030,6 @@ next_dt = time_dt + delta
 next_ts = int(time.mktime(next_dt.timetuple()))</pre>
    <p>Other time conversion problems are handled in a similar manner. </p>

-  <hr/>
  <p class="copyright"> &copy; <a href="copyright.htm">Copyright</a> Tom Keffer </p>
  </div> <!-- #technical_content -->