Merge branch 'gui/buttons' into develop

This commit is contained in:
DennisSchiefer
2012-03-12 13:26:38 +01:00
9 changed files with 64 additions and 17 deletions
+16 -16
View File
@@ -11,6 +11,10 @@
<meta name="description" content="OSRM Website"/>
<meta name="author" content="Dennis Schieferdecker" />
<!-- stylesheets -->
<link rel="stylesheet" href="leaflet/leaflet.css" />
<link rel="stylesheet" href="main.css" />
<!-- scripts -->
<script src="leaflet/leaflet-src.js"></script>
<!--[if lte IE 8]><link rel="stylesheet" href="leaflet/leaflet.ie.css" /><![endif]-->
@@ -35,10 +39,6 @@
<script src="via.js"></script>
<script src="utils.js"></script>
<!-- stylesheets -->
<link rel="stylesheet" href="leaflet/leaflet.css" />
<link rel="stylesheet" href="main.css" />
</head>
@@ -59,7 +59,7 @@
<div id="main-wrapper" class="gui-wrapper">
<!-- input box -->
<div id="main-input" class="gui-box">
<div class="gui-box not-selectable" id="main-input">
<div id="main-toggle" onclick="OSRM.GUI.toggleMain()"></div>
<img id="osrm-logo" alt="OSRM Logo" src="images/osrm-logo.png" />
@@ -68,15 +68,15 @@
<tr>
<td id="gui-search-source-label">Start:</td>
<td><input id="input-source-name" class="input-box" type="text" value="Karlsruhe" title="Startposition eingeben" onkeypress="if(event.keyCode==13) {callGeocoder(OSRM.SOURCE_MARKER_ID, document.getElementById('input-source-name').value);}" /></td>
<!-- <td class="right"><button id="gui-here-source" onclick="">i</button></td> -->
<td class="right"><button id="gui-search-source" onclick="callGeocoder(OSRM.SOURCE_MARKER_LABEL, document.getElementById('input-source-name').value);">Suchen</button></td>
<!-- <td class="right"><a class="button not-selectable" id="gui-here-target" onclick="">i</a></td> -->
<td class="right"><a class="button not-selectable" id="gui-search-source" onclick="callGeocoder(OSRM.SOURCE_MARKER_LABEL, document.getElementById('input-source-name').value);">Suchen</a></td>
</tr>
<tr>
<td id="gui-search-target-label">Ende:</td>
<td><input id="input-target-name" class="input-box" type="text" value="Aalen" title="Zielposition eingeben" onkeypress="if(event.keyCode==13) {callGeocoder(OSRM.TARGET_MARKER_ID, document.getElementById('input-target-name').value);}" /></td>
<!-- <td class="right"><button id="gui-here-target" onclick="">i</button></td> -->
<td class="right"><button id="gui-search-target" onclick="callGeocoder(OSRM.TARGET_MARKER_LABEL, document.getElementById('input-target-name').value);" >Suchen</button></td>
<!-- <td class="right"><a class="button not-selectable" id="gui-here-target" onclick="">i</a></td> -->
<td class="right"><a class="button not-selectable" id="gui-search-target" onclick="callGeocoder(OSRM.TARGET_MARKER_LABEL, document.getElementById('input-target-name').value);">Suchen</a></td>
</tr>
</table>
@@ -84,22 +84,22 @@
<div class="vquad"></div>
<table style="width:100%">
<tr>
<td><button id="gui-reset" onclick="resetRouting();">Reset</button></td>
<td class="center"><button id="gui-reverse" onclick="reverseRouting();">Reverse</button></td>
<td class="right"><button id="gui-route" onclick="startRouting();">Route</button></td>
<td> <a class="button not-selectable" id="gui-reset" onclick="resetRouting();">Reset</a></td>
<td class="center"> <a class="button not-selectable" id="gui-reverse" onclick="reverseRouting();">Reverse</a></td>
<td class="right"> <a class="button not-selectable" id="gui-route" onclick="startRouting();">Route</a></td>
</tr>
</table>
<!-- options -->
<div class="vquad"></div>
<div id="options-toggle" class="main-options" onclick="OSRM.GUI.toggleOptions()">Options</div>
<div id="options-box" class="main-options">
<div class="main-options not-selectable" id="options-toggle" onclick="OSRM.GUI.toggleOptions()">Options</div>
<div class="main-options not-selectable" id="options-box">
<input type="checkbox" id="option-highlight-nonames" name="main-options" value="highlight-nonames" onclick="getRoute(OSRM.FULL_DESCRIPTION)" /><span id="gui-option-highlight-nonames-label">Unbenannte Straßen hervorheben</span>
</div>
</div>
<!-- output box -->
<div id="main-output" class="gui-box">
<div class="gui-box not-selectable" id="main-output">
<div id="information-box-headline"></div>
<div id="information-box"></div>
<div id="legal-notice">GUI by Dennis Schieferdecker</div>