Merge branch 'master' of linz:/srv/git/lantea

[lantea.git] / index.html
diff --git a/index.html b/index.html

index 45912dbccd28d7fe0e17e3530d1423d20c495873..53ace7dc36866523373db9f498b9c64a4bc16025 100644 (file)
--- a/index.html
+++ b/index.html
@@ -10,19 +10,26 @@
         https://developer.mozilla.org/en/Mobile/Viewport_meta_tag -->
    <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, maximum-scale=1, user-scalable=no">
    <title>Lantea Maps</title>
+  <script src="js/osmauth.js" type="application/javascript;version=1.8"></script>
    <script src="js/map.js" type="application/javascript;version=1.8"></script>
    <script src="js/ui.js" type="application/javascript;version=1.8"></script>
+  <script src="js/piwik.js" async="" defer=""></script>
    <link rel="stylesheet" href="style/lantea.css">
    <link rel="shortcut icon" href="style/lanteaIcon16.png" type="image/png">
  </head>
  <body id="body">
+<noscript><p><img src="https://piwik.kairo.at/piwik.php?idsite=2" style="border:0;" alt="" /></p></noscript>
  <h1>Lantea Map</h1>
  
  <div id="trackArea" class="menuDrawer hidden">
  <h2 onclick="toggleTrackArea();">
-<image src="style/track.svg" alt=""> Track</h2>
-<p id="trackData"><span id="trackLength">0</span> km,
-<span id="trackDuration">0</span> min</p>
+<image src="style/track.svg" alt=""> Track
+</h2>
+<p id="trackData"><span id="trackLength"><span id="trackLengthNum">0</span> km</span>,
+<span id="trackDuration"><span id="trackDurationH"><span id="trackDurationHNum">0</span> h</span>
+<span id="trackDurationM"><span id="trackDurationMNum">0</span> min</span></span>
+</p>
+<p>
  <input type="button" id="saveTrackButton" value="Save"
         onclick="saveTrack();">
  <input type="button" id="dumpTrackButton" value="Dump"
@@ -30,25 +37,40 @@
  <input type="button" id="uploadTrackButton" value="Upload" disabled="true"
         onclick="showUploadDialog();">
  <input type="button" id="clearTrackButton" value="Clear"
-       onclick="clearTrack();"><br/>
+       onclick="clearTrack();">
+</p>
+<p class="loginbox">
+<button type="button" id="loginbtn" class="hidden">Sign in</button>
+<span id="logindesc" class="hidden">to enable uploads</span>
+<span id="username" class="hidden"></span>
+<button type="button" id="logoutbtn" class="hidden">Log out</button>
+</p>
+<p>
  <input type="checkbox" id="trackCheckbox"
         onchange="setTracking(this);">
  <label for="trackCheckbox">Enable tracking</label><br/>
+</p>
+<p>
  <input type="checkbox" id="centerCheckbox"
         onchange="setCentering(this);">
  <label for="centerCheckbox">Center Map</label><br/>
+</p>
  </div>
  
  <div id="settingsArea" class="menuDrawer hidden">
  <h2 onclick="toggleSettings();">
-<image src="style/settings.svg" alt=""> Settings</h2>
+<image src="style/settings.svg" alt=""> Settings
+</h2>
+<p>
  <label for="mapSelector">Map style:</label>
  <select id="mapSelector" onchange="setMapStyle();">
  <!-- option value="osm_mapnik">OpenStreetMap (Mapnik)</option -->
  </select>
-<br/>
+</p>
+<p>
  <input type="button" id="clearCacheButton" value="Clear Cached Maps"
         onclick="gTileService.clearDB();">
+</p>
  <div id="uploadSettingsArea" class="debugHide">
  <p class="settingsSubTitle">OpenStreetMap Track Upload:</p>
  <label for="uploadUser">User name:</label>
@@ -128,4 +150,4 @@
  </canvas>
  
  </body>
-</html>
-\ No newline at end of file
+</html>