diff --git a/WebContent/gui/OSRM.MainGUI.js b/WebContent/gui/OSRM.MainGUI.js index ab8f81c13..3022d3049 100644 --- a/WebContent/gui/OSRM.MainGUI.js +++ b/WebContent/gui/OSRM.MainGUI.js @@ -52,7 +52,6 @@ setLabels: function() { document.getElementById("gui-reset").innerHTML = OSRM.loc("GUI_RESET"); document.getElementById("gui-reverse").innerHTML = OSRM.loc("GUI_REVERSE"); document.getElementById("gui-option-highlight-nonames-label").innerHTML = OSRM.loc("GUI_HIGHLIGHT_UNNAMED_ROADS"); - document.getElementById("gui-options-toggle").innerHTML = OSRM.loc("GUI_OPTIONS"); document.getElementById("gui-search-source").innerHTML = OSRM.loc("GUI_SEARCH"); document.getElementById("gui-search-target").innerHTML = OSRM.loc("GUI_SEARCH"); document.getElementById("gui-search-source-label").innerHTML = OSRM.loc("GUI_START")+":"; @@ -68,15 +67,6 @@ clearResults: function() { document.getElementById('information-box-header').innerHTML = ""; }, -// show/hide small options bubble -toggleOptions: function() { - if(document.getElementById('options-box').style.visibility=="visible") { - document.getElementById('options-box').style.visibility="hidden"; - } else { - document.getElementById('options-box').style.visibility="visible"; - } -}, - // reposition and hide zoom controls before main box animation beforeMainTransition: function() { var zoom_controls = OSRM.Browser.getElementsByClassName(document,'leaflet-control-zoom'); diff --git a/WebContent/gui/OSRM.RoutingGUI.js b/WebContent/gui/OSRM.RoutingGUI.js index 5004c6236..6e46510f3 100644 --- a/WebContent/gui/OSRM.RoutingGUI.js +++ b/WebContent/gui/OSRM.RoutingGUI.js @@ -37,7 +37,6 @@ init: function() { document.getElementById("gui-reset").onclick = OSRM.GUI.resetRouting; document.getElementById("gui-reverse").onclick = OSRM.GUI.reverseRouting; - document.getElementById("gui-options-toggle").onclick = OSRM.GUI.toggleOptions; document.getElementById("open-josm").onclick = OSRM.GUI.openJOSM; document.getElementById("open-osmbugs").onclick = OSRM.GUI.openOSMBugs; document.getElementById("option-highlight-nonames").onclick = OSRM.Routing.getZoomRoute; diff --git a/WebContent/images/config.png b/WebContent/images/config.png new file mode 100644 index 000000000..ec3af4035 Binary files /dev/null and b/WebContent/images/config.png differ diff --git a/WebContent/images/config_active.png b/WebContent/images/config_active.png new file mode 100644 index 000000000..ec71c797b Binary files /dev/null and b/WebContent/images/config_active.png differ diff --git a/WebContent/images/config_hover.png b/WebContent/images/config_hover.png new file mode 100644 index 000000000..e90258d46 Binary files /dev/null and b/WebContent/images/config_hover.png differ diff --git a/WebContent/images/mapping.png b/WebContent/images/mapping.png new file mode 100644 index 000000000..50a4b8731 Binary files /dev/null and b/WebContent/images/mapping.png differ diff --git a/WebContent/images/mapping_active.png b/WebContent/images/mapping_active.png new file mode 100644 index 000000000..809a966d5 Binary files /dev/null and b/WebContent/images/mapping_active.png differ diff --git a/WebContent/images/mapping_hover.png b/WebContent/images/mapping_hover.png new file mode 100644 index 000000000..9d3ce0444 Binary files /dev/null and b/WebContent/images/mapping_hover.png differ diff --git a/WebContent/images/raw/gui.pdf b/WebContent/images/raw/gui.pdf index 497b124c5..3b299dd8c 100644 Binary files a/WebContent/images/raw/gui.pdf and b/WebContent/images/raw/gui.pdf differ diff --git a/WebContent/main.css b/WebContent/main.css index 12cc92195..e332f2504 100644 --- a/WebContent/main.css +++ b/WebContent/main.css @@ -117,14 +117,46 @@ html, body { #main-input { width:390px; - height:200px; + height:140px; } #main-output { width:390px; - top:220px; /* main-input.height+2*gui-box.margin+2*gui-box.padding */ + top:160px; /* main-input.height+2*gui-box.margin+2*gui-box.padding */ bottom:0px; } +#mapping-wrapper +{ + width:410px; + height:100px; + bottom:25px; + right:-410px; +} +#mapping-content +{ + width:390px; + height:80px; +} +#config-wrapper +{ + width:410px; + height:100px; + bottom:25px; + right:-410px; +} +#config-content +{ + width:390px; + height:80px; +} + + +/* general styles for gui box content */ +div.label +{ + font-weight:bold; + margin-bottom:10px; +} /* styles for main-input areas */ diff --git a/WebContent/main.html b/WebContent/main.html index 3cb0096a0..c5115d5c5 100644 --- a/WebContent/main.html +++ b/WebContent/main.html @@ -83,21 +83,41 @@ or see http://www.gnu.org/licenses/agpl.txt.
-
-
+ +
+
-Config block + +
Configuraion
+
+
Language:
German
+
Units:
Miles
+
+
-
-
+ +
+
-Mapping block + +
Mapping Tools
+
+
+ +Highlight unnamed streets +
+
+JOSM +OSM Bugs
- +
+
+ +
@@ -134,27 +154,6 @@ Mapping block
Reverse
- -
- - -
- - - Mapping Tools - - -
-
- - Highlight unnamed streets -
-
- JOSM - OSM Bugs -
-
-
diff --git a/WebContent/main.js b/WebContent/main.js index fb633c62a..7cd8c3029 100644 --- a/WebContent/main.js +++ b/WebContent/main.js @@ -59,6 +59,12 @@ OSRM.prefetchImages = function() { {id:'restore', url:'images/restore.png'}, {id:'restore_active', url:'images/restore_active.png'}, {id:'restore_hover', url:'images/restore_hover.png'}, + {id:'config', url:'images/config.png'}, + {id:'config_active', url:'images/config_active.png'}, + {id:'config_hover', url:'images/config_hover.png'}, + {id:'mapping', url:'images/mapping.png'}, + {id:'mapping_active', url:'images/mapping_active.png'}, + {id:'mapping_hover', url:'images/mapping_hover.png'}, {id:'printer', url:'images/printer.png'}, {id:'printer_active', url:'images/printer_active.png'}, {id:'printer_hover', url:'images/printer_hover.png'}, @@ -129,13 +135,13 @@ OSRM.prefetchCSSIcons = function() { { id:'#input-mask-header', image_id:'osrm-logo'}, { id:'.styled-select', image_id:'selector'}, - { id:'#config-handle-icon', image_id:'cancel'}, - { id:'#config-handle-icon:hover', image_id:'cancel_hover'}, - { id:'#config-handle-icon:active', image_id:'cancel_active'}, + { id:'#config-handle-icon', image_id:'config'}, + { id:'#config-handle-icon:hover', image_id:'config_hover'}, + { id:'#config-handle-icon:active', image_id:'config_active'}, - { id:'#mapping-handle-icon', image_id:'cancel'}, - { id:'#mapping-handle-icon:hover', image_id:'cancel_hover'}, - { id:'#mapping-handle-icon:active', image_id:'cancel_active'}, + { id:'#mapping-handle-icon', image_id:'mapping'}, + { id:'#mapping-handle-icon:hover', image_id:'mapping_hover'}, + { id:'#mapping-handle-icon:active', image_id:'mapping_active'}, { id:'#main-handle-icon', image_id:'restore'}, { id:'#main-handle-icon:hover', image_id:'restore_hover'},