From 4655c8cfdeb75538d910f4ff0c2528fb9683e6f7 Mon Sep 17 00:00:00 2001
From: Tom Keffer <tkeffer>
Date: Mon, 18 Jun 2012 18:11:54 +0000
Subject: [PATCH] Fixed bug in link on smartphone formatted webpage. Retained
 old "mobile formatted" page.

---
 bin/weewx/__init__.py                 |  2 +-
 docs/upgrading.htm                    | 16 +++++++++-------
 skins/Standard/index.html.tmpl        |  3 ++-
 skins/Standard/mobile/index.html.tmpl |  2 +-
 skins/Standard/skin.conf              |  3 +++
 weewx.conf                            |  2 +-
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/bin/weewx/__init__.py b/bin/weewx/__init__.py
index eedd1fef..7ffbcf22 100644
--- a/bin/weewx/__init__.py
+++ b/bin/weewx/__init__.py
@@ -12,7 +12,7 @@
 """
 import time
 
-__version__="1.14.0b1"
+__version__="1.14.0b2"
 
 # Holds the program launch time in unix epoch seconds:
 # Useful for calculating 'uptime.'
diff --git a/docs/upgrading.htm b/docs/upgrading.htm
index 9247d86b..8f66902b 100644
--- a/docs/upgrading.htm
+++ b/docs/upgrading.htm
@@ -23,11 +23,11 @@
 <p>What follows are directions for upgrading from specific versions.</p>
 <h2>V1.13 or earlier</h2>
 <p>Version 1.14 introduces some new webpages that have been expressly formatted for 
-the smartphone, using <a href="http://jquery.com/">jQuery</a>.</p>
+the smartphone by using <a href="http://jquery.com/">jQuery</a>.</p>
 <p>The skins shipped with the distribution take advantage of these features. If 
-you do nothing, your old skins will continue to work, but you will not take 
+you do nothing, your old skins will continue to work, but you will not be taking 
 advantage of these new webpages.</p>
-<p>If you want these new webpages, then you have two choices:</p>
+<p>If you want them, then you have two choices:</p>
 <ol>
 	<li>Rename your old skin directory (call it &quot;<span class="code">skins.old</span>&quot;) 
 	then do the install. This will install the new skin distribution. You can 
@@ -40,11 +40,11 @@ advantage of these new webpages.</p>
 	skins/Standard/mobile</span> from the distribution into your <span class="code">skins/Standard</span> 
 	directory. You will then need to modify your <span class="code">skin.conf</span>.
 </ol>
-<p class="indent">Replace the section that looks like</p>
+<p class="indent">After the section that looks like</p>
 <pre class="style1">       [[[Mobile]]]
             template = mobile.html.tmpl</pre>
-<p class="indent">with a section that looks like</p>
-<pre class="style1">        [[[Mobile]]]
+<p class="indent">add the following directives:</p>
+<pre class="style1">        [[[MobileSmartphone]]]
             template = mobile/index.html.tmpl
             
         [[[MobileTempOutside]]]
@@ -73,7 +73,9 @@ to add the <span class="highlight">highlighted</span> files:</p>
     copy_once = backgrounds/*, weewx.css, mobile.css, favicon.ico, <span class="highlight">mobile/icons/*, mobile/custom.js</span></pre>
 <p>Whichever approach you chose, the generated files will appear in
 <span class="code">public_html/mobile</span>. The start of the document root 
-will be at <span class="code">public_html/mobile/index.html</span>.</p>
+will be at <span class="code">public_html/mobile/index.html</span>. You may want 
+to add a link to this in the template for your main index page
+<span class="code">skins/Standard/index.html.tmpl</span>.</p>
 <h2>V1.12 or earlier</h2>
 <p>Version 1.13 changed the way binding happens to the databases used in reports 
 so that it happens much later. The upshot is that the signature of a few 
diff --git a/skins/Standard/index.html.tmpl b/skins/Standard/index.html.tmpl
index 7b690a20..b89d58c1 100644
--- a/skins/Standard/index.html.tmpl
+++ b/skins/Standard/index.html.tmpl
@@ -309,7 +309,8 @@
             fast, and easy to understand by leveraging modern software concepts.
           </p>
           <p><a href="RSS/weewx_rss.xml">RSS feed</a></p>
-          <p><a href="mobile/index.html">Mobile formatted</a></p>
+          <p><a href="mobile.html">Mobile formatted</a></p>
+          <p><a href="mobile/index.html">Smartphone formatted</a></p>
           <p>Weewx uptime:  $station.uptime<br/>
              Server uptime: $station.os_uptime<br/>
              weewx v$station.version</p>
diff --git a/skins/Standard/mobile/index.html.tmpl b/skins/Standard/mobile/index.html.tmpl
index 21a5b383..8a1bf214 100644
--- a/skins/Standard/mobile/index.html.tmpl
+++ b/skins/Standard/mobile/index.html.tmpl
@@ -29,7 +29,7 @@
 
       <ul data-role="listview" data-inset="true" data-divider-theme="b">
         <li><a href="radar.html">Radar</a></li>
-        <li><a href="../index.html" data-rel="external">Big page</a></li>
+        <li><a href="../index.html" rel="external">Big page</a></li>
       </ul>
 
     </div>
diff --git a/skins/Standard/skin.conf b/skins/Standard/skin.conf
index c663f45d..87a04b99 100644
--- a/skins/Standard/skin.conf
+++ b/skins/Standard/skin.conf
@@ -244,6 +244,9 @@
             template = RSS/weewx_rss.xml.tmpl
                 
         [[[Mobile]]]
+            template = mobile.html.tmpl
+            
+        [[[MobileSmartphone]]]
             template = mobile/index.html.tmpl
             
         [[[MobileTempOutside]]]
diff --git a/weewx.conf b/weewx.conf
index ca180631..6e369fc7 100644
--- a/weewx.conf
+++ b/weewx.conf
@@ -29,7 +29,7 @@ debug = 0
 socket_timeout = 20
 
 # Current version
-version = 1.14.0b1
+version = 1.14.0b2
 
 ############################################################################################