From 3f1c3e0923546393ab978266dca7572fb878bf15 Mon Sep 17 00:00:00 2001 From: DennisSchiefer Date: Wed, 22 Aug 2012 15:47:09 +0100 Subject: [PATCH] moved gui version/timestamp to configuration box --- WebContent/gui/OSRM.MainGUI.js | 7 +++++-- WebContent/localization/OSRM.Locale.cs.js | 5 +---- WebContent/localization/OSRM.Locale.de.js | 5 +---- WebContent/localization/OSRM.Locale.dk.js | 5 +---- WebContent/localization/OSRM.Locale.en.js | 3 ++- WebContent/localization/OSRM.Locale.es.js | 5 +---- WebContent/localization/OSRM.Locale.fi.js | 5 +---- WebContent/localization/OSRM.Locale.fr.js | 5 +---- WebContent/localization/OSRM.Locale.it.js | 5 +---- WebContent/localization/OSRM.Locale.lv.js | 5 +---- WebContent/localization/OSRM.Locale.pl.js | 5 +---- WebContent/localization/OSRM.Locale.ru.js | 5 +---- WebContent/main.css | 7 +++++++ WebContent/main.html | 13 +++++++++---- 14 files changed, 33 insertions(+), 47 deletions(-) diff --git a/WebContent/gui/OSRM.MainGUI.js b/WebContent/gui/OSRM.MainGUI.js index ba7544e4d..d0c57b45a 100644 --- a/WebContent/gui/OSRM.MainGUI.js +++ b/WebContent/gui/OSRM.MainGUI.js @@ -69,7 +69,10 @@ setLabels: function() { document.getElementById("gui-config-label").innerHTML = OSRM.loc("GUI_CONFIGURATION"); document.getElementById("gui-language-2-label").innerHTML = OSRM.loc("GUI_LANGUAGE")+":"; document.getElementById("gui-units-label").innerHTML = OSRM.loc("GUI_UNITS")+":"; - document.getElementById('gui-data-timestamp').innerHTML = OSRM.loc("GUI_DATA_TIMESTAMP")+": " + OSRM.G.data_timestamp; + document.getElementById('gui-data-timestamp-label').innerHTML = OSRM.loc("GUI_DATA_TIMESTAMP"); + document.getElementById('gui-data-timestamp').innerHTML = OSRM.G.data_timestamp; + document.getElementById('gui-timestamp-label').innerHTML = OSRM.loc("GUI_VERSION"); + document.getElementById('gui-timestamp').innerHTML = OSRM.DATE+"; v"+OSRM.VERSION; document.getElementById("gui-units-toggle").getElementsByTagName("option")[0].innerHTML = OSRM.loc("GUI_KILOMETERS"); document.getElementById("gui-units-toggle").getElementsByTagName("option")[1].innerHTML = OSRM.loc("GUI_MILES"); @@ -130,7 +133,7 @@ setDataTimestamp: function(response) { return; OSRM.G.data_timestamp = response.timestamp.slice(0,25).replace(/<\/?[^>]+(>|$)/g ,""); // discard tags - document.getElementById('gui-data-timestamp').innerHTML = OSRM.loc("GUI_DATA_TIMESTAMP")+": " + OSRM.G.data_timestamp; + document.getElementById('gui-data-timestamp').innerHTML = OSRM.G.data_timestamp; } }); \ No newline at end of file diff --git a/WebContent/localization/OSRM.Locale.cs.js b/WebContent/localization/OSRM.Locale.cs.js index 5dbb0bb12..e765cff96 100644 --- a/WebContent/localization/OSRM.Locale.cs.js +++ b/WebContent/localization/OSRM.Locale.cs.js @@ -38,7 +38,6 @@ OSRM.Localization["cs"] = { "GUI_UNITS": "Jednotky", "GUI_KILOMETERS": "kilometry", "GUI_MILES": "míle", -"GUI_DATA_TIMESTAMP": "datum", // mapping "GUI_MAPPING_TOOLS": "Mapovací nástroje", "GUI_HIGHLIGHT_UNNAMED_ROADS": "Zvýraznit nepojmenované ulice", @@ -98,9 +97,7 @@ OSRM.Localization["cs"] = { "DIRECTION_11-8":"Najeďte na kruhový objezd a opusťte jej osmým výjezdem[ na silnici %s]", "DIRECTION_11-9":"Najeďte na kruhový objezd a opusťte jej devátým výjezdem[ na silnici %s]", "DIRECTION_11-1":"Najeďte na kruhový objezd a opusťte jej vámi vybraným výjezdem[ na silnici %s]", -"DIRECTION_15":"Jste u cíle", -//do not translate below this line -"GUI_LEGAL_NOTICE": "Routing by Project OSRM - Geocoder by Nominatim - OSRM hosting by KIT", +"DIRECTION_15":"Jste u cíle" }; //set GUI language on load diff --git a/WebContent/localization/OSRM.Locale.de.js b/WebContent/localization/OSRM.Locale.de.js index ddf2555b2..49a4f193f 100644 --- a/WebContent/localization/OSRM.Locale.de.js +++ b/WebContent/localization/OSRM.Locale.de.js @@ -38,7 +38,6 @@ OSRM.Localization["de"] = { "GUI_UNITS": "Einheiten", "GUI_KILOMETERS": "Kilometer", "GUI_MILES": "Meilen", -"GUI_DATA_TIMESTAMP": "data", // mapping "GUI_MAPPING_TOOLS": "Kartenwerkzeuge", "GUI_HIGHLIGHT_UNNAMED_ROADS": "Unbenannte Straßen hervorheben", @@ -98,9 +97,7 @@ OSRM.Localization["de"] = { "DIRECTION_11-8":"In den Kreisverkehr einfahren und bei achter Möglichkeit[ in Richtung %s] verlassen", "DIRECTION_11-9":"In den Kreisverkehr einfahren und bei neunter Möglichkeit[ in Richtung %s] verlassen", "DIRECTION_11-x":"In den Kreisverkehr einfahren und bei einer der vielen Möglichkeiten[ in Richtung %s] verlassen", -"DIRECTION_15":"Sie haben Ihr Ziel erreicht", -// do not translate below this line -"GUI_LEGAL_NOTICE": "Routing by Project OSRM - Geocoder by Nominatim - OSRM hosting by KIT", +"DIRECTION_15":"Sie haben Ihr Ziel erreicht" }; // set GUI language on load diff --git a/WebContent/localization/OSRM.Locale.dk.js b/WebContent/localization/OSRM.Locale.dk.js index c05277313..e2fd073a5 100644 --- a/WebContent/localization/OSRM.Locale.dk.js +++ b/WebContent/localization/OSRM.Locale.dk.js @@ -38,7 +38,6 @@ OSRM.Localization["dk"] = { "GUI_UNITS": "Enheder", "GUI_KILOMETERS": "Kilometer", "GUI_MILES": "Miles", -"GUI_DATA_TIMESTAMP": "data", // mapping "GUI_MAPPING_TOOLS": "Kortlægnings værktøjer", "GUI_HIGHLIGHT_UNNAMED_ROADS": "Fremhæv unavngivne veje", @@ -98,9 +97,7 @@ OSRM.Localization["dk"] = { "DIRECTION_11-8":"Kør ind i rundkørslen og tag ottende udkørsel[ ad %s]", "DIRECTION_11-9":"Kør ind i rundkørslen og tag niende udkørsel[ ad %s]", "DIRECTION_11-x":"Kør ind i rundkørslen og tag en af de alt for mange udkørsler[ ad %s]", -"DIRECTION_15":"Du er ankommet til din destination", -//do not translate below this line -"GUI_LEGAL_NOTICE": "Routing by Project OSRM - Geocoder by Nominatim - OSRM hosting by KIT", +"DIRECTION_15":"Du er ankommet til din destination" }; //set GUI language on load diff --git a/WebContent/localization/OSRM.Locale.en.js b/WebContent/localization/OSRM.Locale.en.js index 51f28b2a0..34c6c58b2 100644 --- a/WebContent/localization/OSRM.Locale.en.js +++ b/WebContent/localization/OSRM.Locale.en.js @@ -38,7 +38,6 @@ OSRM.Localization["en"] = { "GUI_UNITS": "Units", "GUI_KILOMETERS": "Kilometers", "GUI_MILES": "Miles", -"GUI_DATA_TIMESTAMP": "data", // mapping "GUI_MAPPING_TOOLS": "Mapping Tools", "GUI_HIGHLIGHT_UNNAMED_ROADS": "Highlight unnamed streets", @@ -126,6 +125,8 @@ OSRM.Localization["en"] = { "You can even create intermediate markers by dragging them off of the main route! ", // do not translate below this line "GUI_LEGAL_NOTICE": "Routing by Project OSRM - Geocoder by Nominatim - OSRM hosting by KIT", +"GUI_DATA_TIMESTAMP": "data: ", +"GUI_VERSION": "gui: " }; // set GUI language on load diff --git a/WebContent/localization/OSRM.Locale.es.js b/WebContent/localization/OSRM.Locale.es.js index 16e43363b..b73071fa8 100644 --- a/WebContent/localization/OSRM.Locale.es.js +++ b/WebContent/localization/OSRM.Locale.es.js @@ -38,7 +38,6 @@ OSRM.Localization["es"] = { "GUI_UNITS": "Unidades", "GUI_KILOMETERS": "Kilometros", "GUI_MILES": "Millas", -"GUI_DATA_TIMESTAMP": "datos", // mapping "GUI_MAPPING_TOOLS": "Herramientas del mapa", "GUI_HIGHLIGHT_UNNAMED_ROADS": "Resaltar calles sin nombre", @@ -98,9 +97,7 @@ OSRM.Localization["es"] = { "DIRECTION_11-8":"En la rotonda, tome la octava salida[ en dirección %s]", "DIRECTION_11-9":"En la rotonda, tome la novena salida[ en dirección %s]", "DIRECTION_11-x":"En la rotonda, tome una de sus muchas salidas [ en dirección %s]", -"DIRECTION_15":"Ha llegado a su destino", -//do not translate below this line -"GUI_LEGAL_NOTICE": "Routing by Project OSRM - Geocoder by Nominatim - OSRM hosting by KIT", +"DIRECTION_15":"Ha llegado a su destino" }; // set GUI language on load diff --git a/WebContent/localization/OSRM.Locale.fi.js b/WebContent/localization/OSRM.Locale.fi.js index ec21c0087..2ec632d3c 100644 --- a/WebContent/localization/OSRM.Locale.fi.js +++ b/WebContent/localization/OSRM.Locale.fi.js @@ -38,7 +38,6 @@ OSRM.Localization["fi"] = { "GUI_UNITS": "Yksiköt", "GUI_KILOMETERS": "Kilometri", "GUI_MILES": "Miles", -"GUI_DATA_TIMESTAMP": "data", // mapping "GUI_MAPPING_TOOLS": "Kartoitustyökalut", "GUI_HIGHLIGHT_UNNAMED_ROADS": "Korosta nimettömät tiet", @@ -98,9 +97,7 @@ OSRM.Localization["fi"] = { "DIRECTION_11-8":"Aja liikenneympyrään ja poistu kahdeksannesta haarasta[ tielle %s]", "DIRECTION_11-9":"Aja liikenneympyrään ja poistu yhdeksännestä haarasta[ tielle %s]", "DIRECTION_11-x":"Aja liikenneympyrään ja poistu monen haaran jälkeen[ tielle %s]", -"DIRECTION_15":"Saavuit määränpäähän", -//do not translate below this line -"GUI_LEGAL_NOTICE": "Routing by Project OSRM - Geocoder by Nominatim - OSRM hosting by KIT", +"DIRECTION_15":"Saavuit määränpäähän" }; //set GUI language tielle load diff --git a/WebContent/localization/OSRM.Locale.fr.js b/WebContent/localization/OSRM.Locale.fr.js index ad011678b..7cd1ce992 100644 --- a/WebContent/localization/OSRM.Locale.fr.js +++ b/WebContent/localization/OSRM.Locale.fr.js @@ -38,7 +38,6 @@ OSRM.Localization["fr"] = { "GUI_UNITS": "Unités", "GUI_KILOMETERS": "Kilomètres", "GUI_MILES": "Miles", -"GUI_DATA_TIMESTAMP": "data", // mapping "GUI_MAPPING_TOOLS": "Outils de cartographie", "GUI_HIGHLIGHT_UNNAMED_ROADS": "Surligner les rues sans nom", @@ -97,9 +96,7 @@ OSRM.Localization["fr"] = { "DIRECTION_11-8":"Au rond-point, prenez la huitième sortie[ sur %s]", "DIRECTION_11-9":"Au rond-point, prenez la neuvième sortie[ sur %s]", "DIRECTION_11-x":"Au rond-point, prenez l’une des trop nombreuses sorties[ sur %s]", -"DIRECTION_15":"Vous êtes arrivé", -//do not translate below this line -"GUI_LEGAL_NOTICE": "Routing by Project OSRM - Geocoder by Nominatim - OSRM hosting by KIT", +"DIRECTION_15":"Vous êtes arrivé" }; //set GUI language on load diff --git a/WebContent/localization/OSRM.Locale.it.js b/WebContent/localization/OSRM.Locale.it.js index 330de5837..01b061d4e 100644 --- a/WebContent/localization/OSRM.Locale.it.js +++ b/WebContent/localization/OSRM.Locale.it.js @@ -38,7 +38,6 @@ OSRM.Localization["it"] = { "GUI_UNITS": "Unità", "GUI_KILOMETERS": "Chilometri", "GUI_MILES": "Miles", -"GUI_DATA_TIMESTAMP": "data", // mapping "GUI_MAPPING_TOOLS": "Strumenti per la Mappatura", "GUI_HIGHLIGHT_UNNAMED_ROADS": "Evidenzia strade senza nome", @@ -97,9 +96,7 @@ OSRM.Localization["it"] = { "DIRECTION_11-8":"Immettersi nella rotonda ed abbandonarla alla ottava uscita[ su %s]", "DIRECTION_11-9":"Immettersi nella rotonda ed abbandonarla alla nona uscita[ su %s]", "DIRECTION_11-x":"Immettersi nella rotonda ed abbandonarla ad una delle tante uscite[ su %s]", -"DIRECTION_15":"Hai raggiunto la tua destinazione", -//do not translate below this line -"GUI_LEGAL_NOTICE": "Routing by Project OSRM - Geocoder by Nominatim - OSRM hosting by KIT", +"DIRECTION_15":"Hai raggiunto la tua destinazione" }; //set GUI language on load diff --git a/WebContent/localization/OSRM.Locale.lv.js b/WebContent/localization/OSRM.Locale.lv.js index 361e5700f..d4ee396f0 100644 --- a/WebContent/localization/OSRM.Locale.lv.js +++ b/WebContent/localization/OSRM.Locale.lv.js @@ -38,7 +38,6 @@ OSRM.Localization["lv"] = { "GUI_UNITS": "Mērvienība", "GUI_KILOMETERS": "Kilometri", "GUI_MILES": "Jūdzes", -"GUI_DATA_TIMESTAMP": "data", // mapping "GUI_MAPPING_TOOLS": "Kartēšanas rīki", "GUI_HIGHLIGHT_UNNAMED_ROADS": "Izcelt ielas bez nosaukumiem", @@ -98,9 +97,7 @@ OSRM.Localization["lv"] = { "DIRECTION_11-8":"Iebrauciet aplī, brauciet pa astoto izeju[ uz %s]", "DIRECTION_11-9":"Iebrauciet aplī, brauciet pa devīto izeju[ uz %s]", "DIRECTION_11-x":"Ieprauciet aplī, brauciet pa vienu no pārāk daudzajām izejām[ uz %s]", -"DIRECTION_15":"Sasniegts galamērķis", -//do not translate below this line -"GUI_LEGAL_NOTICE": "Routing by Project OSRM - Geocoder by Nominatim - OSRM hosting by KIT", +"DIRECTION_15":"Sasniegts galamērķis" }; // set GUI language on load diff --git a/WebContent/localization/OSRM.Locale.pl.js b/WebContent/localization/OSRM.Locale.pl.js index 0d5154529..6acaf1f32 100644 --- a/WebContent/localization/OSRM.Locale.pl.js +++ b/WebContent/localization/OSRM.Locale.pl.js @@ -38,7 +38,6 @@ OSRM.Localization["pl"] = { "GUI_UNITS": "Jednostki", "GUI_KILOMETERS": "Kilometrów", "GUI_MILES": "Miles", -"GUI_DATA_TIMESTAMP": "data", // mapping "GUI_MAPPING_TOOLS": "Narzędzia mapowania", "GUI_HIGHLIGHT_UNNAMED_ROADS": "Zaznacz ulice bez nazwy", @@ -97,9 +96,7 @@ OSRM.Localization["pl"] = { "DIRECTION_11-8":"Wjedź na rondo, zjedź ósmym zjazdem[ na drogę %s]", "DIRECTION_11-9":"Wjedź na rondo, zjedź dziewiątym zjazdem[ na drogę %s]", "DIRECTION_11-x":"Wjedź na rondo, zjedź wybranym przez siebie zjazdem [ na drogę %s]", -"DIRECTION_15":"Cel został osiągnięty", -//do not translate below this line -"GUI_LEGAL_NOTICE": "Routing by Project OSRM - Geocoder by Nominatim - OSRM hosting by KIT", +"DIRECTION_15":"Cel został osiągnięty" }; //set GUI language on load diff --git a/WebContent/localization/OSRM.Locale.ru.js b/WebContent/localization/OSRM.Locale.ru.js index 3b4c21bcb..4007c5bf7 100644 --- a/WebContent/localization/OSRM.Locale.ru.js +++ b/WebContent/localization/OSRM.Locale.ru.js @@ -38,7 +38,6 @@ OSRM.Localization["ru"] = { "GUI_UNITS": "Единицы", "GUI_KILOMETERS": "Километры", "GUI_MILES": "Мили", -"GUI_DATA_TIMESTAMP": "версия", // mapping "GUI_MAPPING_TOOLS": "Настройки карты", "GUI_HIGHLIGHT_UNNAMED_ROADS": "Выделить безымянные улицы", @@ -98,9 +97,7 @@ OSRM.Localization["ru"] = { "DIRECTION_11-8":"На кольцевой дороге выполните 8-ой съезд[ на %s]", "DIRECTION_11-9":"На кольцевой дороге выполните 9-ый съезд[ на %s]", "DIRECTION_11-x":"На кольцевой дороге выполните съезд[ на %s]", -"DIRECTION_15":"Вы прибыли в пункт назначения", -// do not translate below this line -"GUI_LEGAL_NOTICE": "Routing by Project OSRM - Geocoder by Nominatim - OSRM hosting by KIT", +"DIRECTION_15":"Вы прибыли в пункт назначения" }; // set GUI language on load diff --git a/WebContent/main.css b/WebContent/main.css index cc2c982d8..56f5681b4 100644 --- a/WebContent/main.css +++ b/WebContent/main.css @@ -550,6 +550,13 @@ html, body { { width:100px; } +#config-timestamps +{ + display:table; + position:absolute; + right: 5px; /* equal to box-content padding */ + bottom: 5px; +} .mapping-checkbox { margin: 0px 5px 3px 5px; diff --git a/WebContent/main.html b/WebContent/main.html index a699f1825..31e3ea88c 100644 --- a/WebContent/main.html +++ b/WebContent/main.html @@ -134,11 +134,16 @@ or see http://www.gnu.org/licenses/agpl.txt. - -
-
-
data: n/a
+ +
+
+
gui:
+
v0.0.0 010180
+
+
data:
+
n/a
+