From 84677ddddf5a9323ca2e18012c65e4a74141e3b1 Mon Sep 17 00:00:00 2001 From: shiin Date: Tue, 8 May 2012 22:37:27 +0200 Subject: [PATCH] moving UI to new boxes --- WebContent/gui/OSRM.MainGUI.js | 10 ----- WebContent/gui/OSRM.RoutingGUI.js | 1 - WebContent/images/config.png | Bin 0 -> 397 bytes WebContent/images/config_active.png | Bin 0 -> 493 bytes WebContent/images/config_hover.png | Bin 0 -> 482 bytes WebContent/images/mapping.png | Bin 0 -> 329 bytes WebContent/images/mapping_active.png | Bin 0 -> 378 bytes WebContent/images/mapping_hover.png | Bin 0 -> 347 bytes WebContent/images/raw/gui.pdf | Bin 3881 -> 5391 bytes WebContent/main.css | 36 +++++++++++++++++- WebContent/main.html | 55 +++++++++++++-------------- WebContent/main.js | 18 ++++++--- 12 files changed, 73 insertions(+), 47 deletions(-) create mode 100644 WebContent/images/config.png create mode 100644 WebContent/images/config_active.png create mode 100644 WebContent/images/config_hover.png create mode 100644 WebContent/images/mapping.png create mode 100644 WebContent/images/mapping_active.png create mode 100644 WebContent/images/mapping_hover.png 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 0000000000000000000000000000000000000000..ec3af403555ca3dbf15b53d60f94bd8e32a260ef GIT binary patch literal 397 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|>?NMQuIzVMIYh)6c3p@I1PXB$ zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvNA9*%6PgshE&{Y4N~N5b`aQO=38J9 z*Ptx%gF*j*VkIMA`(suh|JVnnCdSsof^rQ<1$-_yDuzdSSuKh!OV2BR?q}owVwYcz zL&3Uxk@z!noR%z literal 0 HcmV?d00001 diff --git a/WebContent/images/config_active.png b/WebContent/images/config_active.png new file mode 100644 index 0000000000000000000000000000000000000000..ec71c797b6198f16e9e9475b4acc9d53d9068156 GIT binary patch literal 493 zcmV4tyLW*KAZ#Xx>iIf4D;yoKEm;DT zJ3nn2L=MQfyLmHE1Sktc5Iu}QTOdMzU}m5J7It=^6p&23az#K{8KePXDO`_=udld~ z5gQ-hv*X8au2}=omU{a(P&J4J@ygeiFCiYivS<;q7hjw`3lYD)aU(>8z?WcP>}8mfnc0PVTIb0@?G#!e(@$KGC(!a_7ZJUek>sg)IkEuy8xge>># z(9~hvf-+a)Yn5i z{qFW{sHY+J++4jH5~f#|ECKot=yhHhnUftI-(J6l`sDa=sHcINfQbSa%@7GLQBk-e zNUQ-#h*=T)_siPbL!AV42_zDL?g0ilJnVt-19S|~wX>9!Ax>q0JNM!K{kT#qP!HT= jEO6UF*5LrqL;(f>KuT8;KfqkQ00000NkvXXu0mjfP;9`A literal 0 HcmV?d00001 diff --git a/WebContent/images/config_hover.png b/WebContent/images/config_hover.png new file mode 100644 index 0000000000000000000000000000000000000000..e90258d46646953d55b93bd2d1c7d1d8405280d9 GIT binary patch literal 482 zcmV<80UiE{P)v>VS;9n?WK#Ss()IVFWn|BJ}4ccH>#tK~g|6;R=I*G9%Ov$a++K8N`ej*!dWq z9cQ??2C6OPHc&N4JCqNUhN$*l#Gn}i6*MknFh9?*$QT+DPz^v95L{aVBE=06sv$tk zkU>2JWY2@05Dkp~x{#zDdqJk6f#)X}mRdpCB3eu+az8&Y5CV+_F%J+Y$p}!@-eykRTAfyA2V5h0?9n&`<*U z9_T-<7zSP$hLar(-(JIfavbJqU_1a51u&W+fJ+pi2oh^R05L0kKZC42*weE1AR{4> zkp74va3fSTkOAZZBN(VnP?0?7|R@Nhqr@%jqX-9QEe06hTn7z@I7pgp(%*!2(q Y0ECy#GbiSN;Q#;t07*qoM6N<$g5STjJpcdz literal 0 HcmV?d00001 diff --git a/WebContent/images/mapping.png b/WebContent/images/mapping.png new file mode 100644 index 0000000000000000000000000000000000000000..50a4b8731de9122f4c1a0308d13c5e2e6d4defdd GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|>?NMQuIzVMIYh)28u!)B1PXB$ zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6-xJY5_^DsCnJ`Tky>S+jw2=I38u zUmrW>W@)+e-@kwJ?dy}Sf8=M|SN~s6ON&c9JS>c@>(5~Z4qgY*j5Nlt_xIIG?{53` zt7^@+&6_tL{>mUJZJx)HS@H9eYF$55Z}iS0RTpCq=fp(CiHK z_`v8qS%UZ7yLSsJc2s}YoA~bGQo6yLYi`0J`Koh8$2o&=j~HAmi@l%^)WMojyfe9FIq>>+6NJ zw6?{?0UgN#?NMQuIzVMIYguk;}$5W0fjgV zJR*x37`TN%nDNrxx<5ccmUKs7M+SzC{oH>NS%Lglo-U3d6}OWAe19*`tl7ZX`u(rz z;f-!>GmCiAe@p)RcVtzgU?Ot>YrxCx*8|oqFmgU5%9d7k$4uvf;|jK>@8yoa?C%_1 z$oOK?_ZLM9e;tA!R5kSMo_)}d$*Ojhh28w9tHvD}hB@8LR+Ctd*xz(i$Y}WH+|Xcj z!}Izy0ntSc-VSvPYwIKX-1#{{QNZ;>a)`=>5=aQwB3SR1=_;3E%R z5fQ0~+NE!fGjzRNukTp4@aT(&T3;3jo2PWxo^F_Aa)Du!tsm;DkJt{<})nzmn; o&^w>{U@D`f8^bGex1h=94CVJDoyzQ3L4n5L>FVdQ&MBb@0FPROTmS$7 literal 0 HcmV?d00001 diff --git a/WebContent/images/raw/gui.pdf b/WebContent/images/raw/gui.pdf index 497b124c5c4d01b3c0787abac1dcabc8f28525f6..3b299dd8ce6139889d253bbdf3acf91e009b4f3c 100644 GIT binary patch delta 2960 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
-
-
+ +
+
-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'},