moved gui version/timestamp to configuration box

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;
 }
 
 });

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 <b>%s</b>]",
 "DIRECTION_11-9":"Najeďte na kruhový objezd a opusťte jej devátým výjezdem[ na silnici <b>%s</b>]",
 "DIRECTION_11-1":"Najeďte na kruhový objezd a opusťte jej vámi vybraným výjezdem[ na silnici <b>%s</b>]",
-"DIRECTION_15":"Jste u cíle",
+"DIRECTION_15":"Jste u cíle"
-//do not translate below this line
-"GUI_LEGAL_NOTICE": "Routing by <a href='http://project-osrm.org/'>Project OSRM</a> - Geocoder by <a href='http://wiki.openstreetmap.org/wiki/Nominatim/'>Nominatim</a> - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a>",
 };
 
 //set GUI language on load

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 <b>%s</b>] verlassen",
 "DIRECTION_11-9":"In den Kreisverkehr einfahren und bei neunter Möglichkeit[ in Richtung <b>%s</b>] verlassen",
 "DIRECTION_11-x":"In den Kreisverkehr einfahren und bei einer der vielen Möglichkeiten[ in Richtung <b>%s</b>] verlassen",
-"DIRECTION_15":"Sie haben Ihr Ziel erreicht",
+"DIRECTION_15":"Sie haben Ihr Ziel erreicht"
-// do not translate below this line
-"GUI_LEGAL_NOTICE": "Routing by <a href='http://project-osrm.org/'>Project OSRM</a> - Geocoder by <a href='http://wiki.openstreetmap.org/wiki/Nominatim/'>Nominatim</a> - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a>",
 };
 
 // set GUI language on load

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 <b>%s</b>]",
 "DIRECTION_11-9":"Kør ind i rundkørslen og tag niende udkørsel[ ad <b>%s</b>]",
 "DIRECTION_11-x":"Kør ind i rundkørslen og tag en af de alt for mange udkørsler[ ad <b>%s</b>]",
-"DIRECTION_15":"Du er ankommet til din destination",
+"DIRECTION_15":"Du er ankommet til din destination"
-//do not translate below this line
-"GUI_LEGAL_NOTICE": "Routing by <a href='http://project-osrm.org/'>Project OSRM</a> - Geocoder by <a href='http://wiki.openstreetmap.org/wiki/Nominatim/'>Nominatim</a> - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a>",
 };
 
 //set GUI language on load

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 <a href='http://project-osrm.org/'>Project OSRM</a> - Geocoder by <a href='http://wiki.openstreetmap.org/wiki/Nominatim/'>Nominatim</a> - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a>",
+"GUI_DATA_TIMESTAMP": "data: ",
+"GUI_VERSION": "gui: "
 };
 
 // set GUI language on load

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 <b>%s</b>]",
 "DIRECTION_11-9":"En la rotonda, tome la novena salida[ en dirección <b>%s</b>]",
 "DIRECTION_11-x":"En la rotonda, tome una de sus muchas salidas [ en dirección <b>%s</b>]",
-"DIRECTION_15":"Ha llegado a su destino",
+"DIRECTION_15":"Ha llegado a su destino"
-//do not translate below this line
-"GUI_LEGAL_NOTICE": "Routing by <a href='http://project-osrm.org/'>Project OSRM</a> - Geocoder by <a href='http://wiki.openstreetmap.org/wiki/Nominatim/'>Nominatim</a> - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a>",
 };
 
 // set GUI language on load

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 <b>%s</b>]",
 "DIRECTION_11-9":"Aja liikenneympyrään ja poistu yhdeksännestä haarasta[ tielle <b>%s</b>]",
 "DIRECTION_11-x":"Aja liikenneympyrään ja poistu monen haaran jälkeen[ tielle <b>%s</b>]",
-"DIRECTION_15":"Saavuit määränpäähän",
+"DIRECTION_15":"Saavuit määränpäähän"
-//do not translate below this line
-"GUI_LEGAL_NOTICE": "Routing by <a href='http://project-osrm.org/'>Project OSRM</a> - Geocoder by <a href='http://wiki.openstreetmap.org/wiki/Nominatim/'>Nominatim</a> - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a>",
 };
 
 //set GUI language tielle load

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 <b>%s</b>]",
 "DIRECTION_11-9":"Au rond-point, prenez la neuvième sortie[ sur <b>%s</b>]",
 "DIRECTION_11-x":"Au rond-point, prenez l’une des trop nombreuses sorties[ sur <b>%s</b>]",
-"DIRECTION_15":"Vous êtes arrivé",
+"DIRECTION_15":"Vous êtes arrivé"
-//do not translate below this line
-"GUI_LEGAL_NOTICE": "Routing by <a href='http://project-osrm.org/'>Project OSRM</a> - Geocoder by <a href='http://wiki.openstreetmap.org/wiki/Nominatim/'>Nominatim</a> - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a>",
 };
 
 //set GUI language on load

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 <b>%s</b>]",
 "DIRECTION_11-9":"Immettersi nella rotonda ed abbandonarla alla nona uscita[ su <b>%s</b>]",
 "DIRECTION_11-x":"Immettersi nella rotonda ed abbandonarla ad una delle tante uscite[ su <b>%s</b>]",
-"DIRECTION_15":"Hai raggiunto la tua destinazione",
+"DIRECTION_15":"Hai raggiunto la tua destinazione"
-//do not translate below this line
-"GUI_LEGAL_NOTICE": "Routing by <a href='http://project-osrm.org/'>Project OSRM</a> - Geocoder by <a href='http://wiki.openstreetmap.org/wiki/Nominatim/'>Nominatim</a> - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a>",
 };
 
 //set GUI language on load

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 <b>%s</b>]",
 "DIRECTION_11-9":"Iebrauciet aplī, brauciet pa devīto izeju[ uz <b>%s</b>]",
 "DIRECTION_11-x":"Ieprauciet aplī, brauciet pa vienu no pārāk daudzajām izejām[ uz <b>%s</b>]",
-"DIRECTION_15":"Sasniegts galamērķis",
+"DIRECTION_15":"Sasniegts galamērķis"
-//do not translate below this line
-"GUI_LEGAL_NOTICE": "Routing by <a href='http://project-osrm.org/'>Project OSRM</a> - Geocoder by <a href='http://wiki.openstreetmap.org/wiki/Nominatim/'>Nominatim</a> - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a>",
 };
 
 // set GUI language on load

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ę <b>%s</b>]",
 "DIRECTION_11-9":"Wjedź na rondo, zjedź dziewiątym zjazdem[ na drogę <b>%s</b>]",
 "DIRECTION_11-x":"Wjedź na rondo, zjedź wybranym przez siebie zjazdem [ na drogę <b>%s</b>]",
-"DIRECTION_15":"Cel został osiągnięty",
+"DIRECTION_15":"Cel został osiągnięty"
-//do not translate below this line
-"GUI_LEGAL_NOTICE": "Routing by <a href='http://project-osrm.org/'>Project OSRM</a> - Geocoder by <a href='http://wiki.openstreetmap.org/wiki/Nominatim/'>Nominatim</a> - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a>",
 };
 
 //set GUI language on load

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-ой съезд[ на <b>%s</b>]",
 "DIRECTION_11-9":"На кольцевой дороге выполните 9-ый съезд[ на <b>%s</b>]",
 "DIRECTION_11-x":"На кольцевой дороге выполните съезд[ на <b>%s</b>]",
-"DIRECTION_15":"Вы прибыли в пункт назначения",
+"DIRECTION_15":"Вы прибыли в пункт назначения"
-// do not translate below this line
-"GUI_LEGAL_NOTICE": "Routing by <a href='http://project-osrm.org/'>Project OSRM</a> - Geocoder by <a href='http://wiki.openstreetmap.org/wiki/Nominatim/'>Nominatim</a> - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a>",
 };
 
 // set GUI language on load

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;

WebContent/main.html

@@ -134,11 +134,16 @@ or see http://www.gnu.org/licenses/agpl.txt.
 	</div>
 	</div>
 	
-	<!-- data timestamp -->
+	<!-- gui & data timestamps -->
-	<div class="full">
+	<div id="config-timestamps">
-	<div class="row">	
+	<div class="row">
-	<div class="right small-font"><span id="gui-data-timestamp">data: n/a</span></div>
+	<div class="right small-font"><span id="gui-timestamp-label">gui:</span></div>
+	<div class="right small-font"><span id="gui-timestamp">v0.0.0 010180</span></div>
 	</div>
+	<div class="row">
+	<div class="right small-font"><span id="gui-data-timestamp-label">data:</span></div>
+	<div class="right small-font"><span id="gui-data-timestamp">n/a</span></div>
+	</div>	
 	</div>
 </div>
 </div>