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

diff --git a/index.html b/index.html
index 53ace7d..969178f 100644
--- a/index.html
+++ b/index.html
@@ -39,6 +39,36 @@
 <input type="button" id="clearTrackButton" value="Clear"
        onclick="clearTrack();">
 </p>
+<div id="trackDialogArea" class="hidden">
+<div id="uploadDialog">
+<p class="dialogTitle">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>
+<label for="uploadDesc">Comment:</label>
+<input type="text" id="uploadDesc" maxlength="255" size="25"
+       value="Lantea Maps">
+<input type="button" id="uploadDialogUploadButton" value="Upload Track"
+       onclick="uploadTrack();">
+<input type="button" id="uploadDialogCancelButton" value="Cancel"
+       onclick="cancelTrackDialog();">
+</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>
@@ -71,14 +101,13 @@
 <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="settingsSubTitle">Track Upload:</p>
+<label for="uploadDevName">Device name:</label>
+<input type="text" id="uploadDevName" maxlength="255" placeholder="My Device"
        onchange="setUploadField(this);">
+<p class="dialogHelp">The device name enables you to tell apart tracks you may
+upload from multiple devices.</p>
 </div>
 </div>
 
@@ -104,34 +133,6 @@
 </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="noGLwarning">
   Unable to initialize WebGL. You need a browser that supports it.
 </div>