From: Robert Kaiser <kairo@kairo.at>
Date: Mon, 10 Dec 2012 03:37:51 +0000 (+0100)
Subject: Merge branch 'master' of linz:/srv/git/tricorder
X-Git-Tag: production~28
X-Git-Url: https://git-public.kairo.at//?a=commitdiff_plain;h=f5b9d67ff7148a1c3eed923f18000781b97f51e9;hp=-c;p=tricorder.git

Merge branch 'master' of linz:/srv/git/tricorder
---

f5b9d67ff7148a1c3eed923f18000781b97f51e9
diff --combined index.html
index 4a30d0e,ba3b821..8a6580d
--- a/index.html
+++ b/index.html
@@@ -8,7 -8,7 +8,7 @@@
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    <!-- try to counts default scaling on mobile, see 
         https://developer.mozilla.org/en/Mobile/Viewport_meta_tag -->
 -  <meta name="viewport" content="width=device-width, height=device-height, initial-scale=.6667, maximum-scale=.6667">
 +  <meta name="viewport" content="width=device-width, height=device-height">
    <title>Tricorder</title>
    <script src="js/tricorder.js"></script>
    <link rel="stylesheet" href="style/tricorder.css">
@@@ -34,7 -34,7 +34,7 @@@
  <ul id="navlist">
  <li id="navPos" onclick="switchModule('Pos');">Position</li>
  <li id="navGrav" onclick="switchModule('Grav');">Gravity</li>
- <li id="navAcou" onclick="switchModule('Acou');">Acoustics</li>
+ <li id="navOther" onclick="switchModule('Other');">Other</li>
  </ul>
  </div>
  
@@@ -64,15 -64,18 +64,18 @@@ a better device
  </p>
  <div id="posavail" style="display:none">
  <table>
- <tr><td>Latitude:</td><td id="posLat">...</td></tr>
- <tr><td>Longitude:</td><td id="posLong">...</td></tr>
- <tr><td>Accuracy:</td><td id="posAcc">...</td></tr>
- <tr><td>Altitude:</td><td id="posAlt">...</td></tr>
- <tr><td>Alt. Accuracy:</td><td id="posAltAcc">...</td></tr>
- <tr><td>Heading:</td><td id="posHead">...</td></tr>
- <tr><td>Speed:</td><td id="posSpd">...</td></tr>
- <tr><td>Timestamp:</td><td id="posTime">...</td></tr>
+ <tr><td>Latitude:</td><td id="posLat" class="posVal">...</td></tr>
+ <tr><td>Longitude:</td><td id="posLong" class="posVal">...</td></tr>
+ <tr><td>Accuracy:</td><td id="posAcc" class="posVal">...</td></tr>
+ <tr><td>Altitude:</td><td id="posAlt" class="posVal">...</td></tr>
+ <tr><td>Alt. Accuracy:</td><td id="posAltAcc" class="posVal">...</td></tr>
+ <tr><td>Heading:</td><td id="posHead" class="posVal">...</td></tr>
+ <tr><td>Speed:</td><td id="posSpd" class="posVal">...</td></tr>
+ <tr><td>Timestamp:</td><td id="posTime" class="posVal">...</td></tr>
  </table>
+ <p class="note">
+ All coordinates use the WGS84 coordinate system.
+ </p>
  </div>
  </section>
  
@@@ -84,6 -87,7 +87,7 @@@ a better device
  </p>
  <div id="gravavail" style="display:none">
  <table>
+ <tr><td>Total:</td><td id="gravTotal" class="gravVal">...</td></tr>
  <tr><td>X:</td><td id="gravX" class="gravVal">...</td></tr>
  <tr><td>Y:</td><td id="gravY" class="gravVal">...</td></tr>
  <tr><td>Z:</td><td id="gravZ" class="gravVal">...</td></tr>
@@@ -94,10 -98,10 +98,10 @@@
  </div>
  </section>
  
- <section id="sectAcou">
- <p>This tricorder model doesn't have an acoustics sensors yet, please contact
- the Starfleet science department if you want to help developing this for future
- models.</p>
+ <section id="sectOther">
+ <p>This tricorder model doesn't have other sensors yet, please contact
+ the <a href="http://www.kairo.at/apps">Starfleet science department</a>
+ if you want to help developing this for future models.</p>
  </section>
  </div>