X-Git-Url: https://git-public.kairo.at/?p=lantea.git;a=blobdiff_plain;f=index.html;h=c3c491d2528e6b10e3ea8553f3998bf0fcb720c9;hp=53ace7dc36866523373db9f498b9c64a4bc16025;hb=ba819f24b220ff62afb6ecdb5ff7727631c1d1b5;hpb=8f9306c52d312af9e86cdf488bb67e24a2517bfc

diff --git a/index.html b/index.html
index 53ace7d..c3c491d 100644
--- a/index.html
+++ b/index.html
@@ -10,9 +10,9 @@
        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/library.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">
@@ -21,7 +21,7 @@
 <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">
+<div id="trackArea" class="menuDrawer secondaryUI hidden">
 <h2 onclick="toggleTrackArea();">
 <image src="style/track.svg" alt=""> Track
 </h2>
@@ -39,6 +39,44 @@
 <input type="button" id="clearTrackButton" value="Clear"
        onclick="clearTrack();">
 </p>
+<p id="libraryShowLine" class="hidden">
+<input type="button" id="libraryShowButton" value="View uploaded tracks"
+       onclick="showLibrary();">
+</p>
+<div id="trackDialogArea" class="hidden">
+<div id="uploadDialog">
+<p class="subTitle">Upload Track to Lantea Maps Server:</p>
+<label for="uploadPublic">Visibility:</label>
+<select id="uploadPublic">
+<option value="true">Public Domain</option>
+<option value="false">Private</option>
+</select>
+<p class="dialogHelp">Public Domain tracks can be forwarded by the server
+operator to any other services, e.g. OpenStreetMap.</p>
+<p>
+<label for="uploadDesc">Comment:</label>
+<input type="text" id="uploadDesc" maxlength="255" size="25"
+       value="Lantea Maps">
+</p>
+<p>
+<input type="button" id="uploadDialogUploadButton" value="Upload Track"
+       onclick="uploadTrack();">
+<input type="button" id="uploadDialogCancelButton" value="Cancel"
+       onclick="cancelTrackDialog();">
+</p>
+</div>
+<div id="uploadStatus">
+<p class="dialogTitle">Track Upload to Lantea Maps Server</p>
+<p id="uploadInProgress"><img id="actionimg" src="style/loading_action.png">
+  Upload in progress&hellip;</p>
+<p id="uploadSuccess" style="display:none;">Track upload successful!</p>
+<p id="uploadFailed" style="display:none;">Track upload failed.</p>
+<p id="uploadError" style="display:none;">Error:<br>
+  <span id="uploadErrorMsg"></span></p>
+<input type="button" id="uploadStatusCloseButton" value="Close"
+       onclick="cancelTrackDialog();" disabled="true">
+</div>
+</div>
 <p class="loginbox">
 <button type="button" id="loginbtn" class="hidden">Sign in</button>
 <span id="logindesc" class="hidden">to enable uploads</span>
@@ -57,7 +95,7 @@
 </p>
 </div>
 
-<div id="settingsArea" class="menuDrawer hidden">
+<div id="settingsArea" class="menuDrawer secondaryUI hidden">
 <h2 onclick="toggleSettings();">
 <image src="style/settings.svg" alt=""> Settings
 </h2>
@@ -71,25 +109,26 @@
 <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>
-<input type="text" id="uploadUser" maxlength="255"
-       onchange="setUploadField(this);"><br/>
-<label for="uploadPwd">Password:</label>
-<input type="password" id="uploadPwd" maxlength="255"
+<div id="uploadSettingsArea">
+<p class="subTitle">Track Upload:</p>
+<p>
+<label for="uploadDevName">Device name:</label>
+<input type="text" id="uploadDevName" maxlength="255" placeholder="My Device"
        onchange="setUploadField(this);">
+</p>
+<p class="dialogHelp">The device name enables you to tell apart tracks you may
+upload from multiple devices.</p>
 </div>
 </div>
 
-<div id="menuArea" class="overlayArea">
-<image src="style/track.svg" id="trackButton" value="Track"
+<div id="menuArea" class="autoFade overlayArea">
+<image src="style/track.svg" class="controlButton" id="trackButton" value="Track"
        onclick="toggleTrackArea();"><br/>
-<image src="style/settings.svg" id="settingsButton" alt="Settings"
+<image src="style/settings.svg" class="controlButton" id="settingsButton" alt="Settings"
        onclick="toggleSettings();"><br/>
 </div>
 
-<div id="zoomArea" class="overlayArea">
+<div id="zoomArea" class="autoFade overlayArea">
 <input type="button" id="zoomInButton" value="+"
        onclick="zoomIn();">
 <p id="zoomLevel">Z</p>
@@ -97,51 +136,31 @@
        onclick="zoomOut();">
 </div>
 
-<div id="fullscreenArea" class="overlayArea">
+<div id="fullscreenArea" class="autoFade overlayArea">
 <!-- other possible characters: &#x25F0; -->
 <input type="button" id="fullscreenButton" value="&#x25A3;"
        onclick="toggleFullscreen();">
 </div>
 
-<div id="dialogArea" class="hidden">
-<div id="uploadDialog">
-<p class="dialogTitle">Upload Track to OpenStreetMap:</p>
-<label for="uploadVisibility">Visibility:</label>
-<select id="uploadVisibility">
-<option value="identifiable">Identifiable</option>
-<option value="private">Private</option>
-</select><br>
-<label for="uploadDesc">Description:</label>
-<input type="text" id="uploadDesc" maxlength="255" size="25"
-       value="Lantea Maps">
-<p class="dialogHelp">You will be asked for your OSM user name and password
-  when clicking "Upload Track".</p>
-<input type="button" id="uploadDialogUploadButton" value="Upload Track"
-       onclick="uploadTrack();">
-<input type="button" id="uploadDialogCancelButton" value="Cancel"
-       onclick="cancelDialog();">
-</div>
-<div id="uploadStatus">
-<p class="dialogTitle">Track Upload to OpenStreetMap</p>
-<p id="uploadInProgress"><img id="actionimg" src="style/loading_action.png">
-  Upload in progress&hellip;</p>
-<p id="uploadSuccess" style="display:none;">Track upload successful!</p>
-<p id="uploadFailed" style="display:none;">Track upload failed.</p>
-<p id="uploadError" style="display:none;">Error:<br>
-  <span id="uploadErrorMsg"></span></p>
-<input type="button" id="uploadStatusCloseButton" value="Close"
-       onclick="cancelDialog();" disabled="true">
-</div>
+<div id="dialogArea" class="overlayArea hidden">
 <div id="noGLwarning">
   Unable to initialize WebGL. You need a browser that supports it.
 </div>
 </div>
 
+<div id="libraryArea" class="overlayArea fullScreenOverlay secondaryUI hidden">
+<p>The following tracks are saved on the Lantea Maps Server:</p>
+<ul id="libTrackList">
+</ul>
+<p id="libTrackPages" class="hidden"></p>
+<p class="closeButtonContainer"><button id="libCloseButton" class="closeButton">X</button></p>
+</div>
+
 <p id="action">
   <img id="actionimg" src="style/loading_action.png">
   <span id="actionlabel">Loading</span>&hellip;
 </p>
-<p id="copyright" class="overlayArea"></p>
+<p id="copyright" class="autoFade overlayArea"></p>
 
 <canvas id="map" width="500" height="500">
   Please use a browser that supports &lt;canvas&gt; elements.