Fixed date bug which surfaced in Chromium Browser

r833 www/trunk

www/events.js

@@ -44,10 +44,12 @@ function getGeolocation(id, lat, lng) {
 		$.getJSON( config['ajax']['nominatimURL'], { lat: lat, lon: lng, zoom: 10, format: "json" } )
 			.done(function( json ) {
 				var city = json.address["city"];
+				if ( ~city ) { city = json.address["town"]; };
+				if ( ~city ) { city = json.address["village"]; };
 				var country = json.address["country"];
 				var countryCode = json.address["country_code"].toUpperCase();
 				geolocationTable[id] = city;
-				( country != "Deutschland" ) ? geolocationTable[id] = geolocationTable[id] + " ("+countryCode+")" : null;
+				( countryCode != "DE" ) ? geolocationTable[id] = geolocationTable[id] + " ("+countryCode+")" : null;
 				if ( city ) {
 					$("#eventstable a.toggle[eventid="+id+"]").text(geolocationTable[id]);
 					var sort = [[0,1],[1,1],[2,1]];
@@ -55,7 +57,7 @@ function getGeolocation(id, lat, lng) {
 					$("#eventstable").trigger("updateCache");
 					$("#eventstable").trigger("sorton", [sort]);
 				} else {
-					console.log("Nominatim did not provide a city tag for "+lat+" / "+lng);
+					// console.log("Nominatim did not provide a city tag for "+lat+" / "+lng);
 				};
 			})
 			.fail(function( jqxhr, textStatus, error ) {
@@ -137,6 +139,9 @@ function ajaxLoadEvents(stime, etime, eventid, url, target) {
 					// setting up download links (3nd line)
 					var xmlurl = sprintf('%s?formatted=true&includearrivals=true&eventid=%s', config['ajax']['eventURL'], id);
 					var oTime = new Date(otime);
+					if ( ~oTime ) {
+						oTime = new Date(otime.split('.')[0]);
+					};
 					var sTime = new Date(oTime.getTime()-10*1000.-oTime.getMilliseconds());
 					var eTime = new Date(oTime.getTime()+50*1000.-oTime.getMilliseconds());
 					var mseedurl = sprintf('%s?net=GE,GR,RN&cha=EH?,HH?&start=%04d-%02d-%02dT%02d:%02d:%02d&end=%04d-%02d-%02dT%02d:%02d:%02d', config['ajax']['mseedURL'], Number(sTime.getUTCFullYear()), Number(sTime.getUTCMonth())+1, Number(sTime.getUTCDate()), Number(sTime.getUTCHours()), Number(sTime.getUTCMinutes()), Number(sTime.getUTCSeconds()), Number(eTime.getUTCFullYear()), Number(eTime.getUTCMonth())+1, Number(eTime.getUTCDate()), Number(eTime.getUTCHours()), Number(eTime.getUTCMinutes()), Number(eTime.getUTCSeconds()));
@@ -155,11 +160,11 @@ function ajaxLoadEvents(stime, etime, eventid, url, target) {
 					if ((stime <= oTime && etime >= oTime ) || ( id == eventid )) {
 						var marker = addEventMarker(id, Number(lat), Number(lng), Number(mag), type);
 						var text = sprintf('<h3 eventid="%s">%s</h3>', id, location)
-								+ sprintf('<p>Ereignis: %s</br>', id)
-								+ sprintf('Type: %s</br>', type)
-								+ sprintf('Magnitude: %3.1f</br>', Number(mag))
-								+ sprintf('Ort: %.4f °N, %.4f °O </br>', Number(lat), Number(lng))
-								+ sprintf('Tiefe: %.1f km</br>', Number(depth)/1000.)
+								+ sprintf('<p>Ereignis: %s<br />', id)
+								+ sprintf('Type: %s<br />', type)
+								+ sprintf('Magnitude: %3.1f<br />', Number(mag))
+								+ sprintf('Ort: %.4f °N, %.4f °O <br />', Number(lat), Number(lng))
+								+ sprintf('Tiefe: %.1f km<br />', Number(depth)/1000.)
 								+ sprintf('Zeit: <span class="utctime">%sZ</span></p>', otime.split('.')[0], otime.split('.')[0]);
 						marker.bindPopup(text);
 					};

www/events.js.en

@@ -44,10 +44,12 @@ function getGeolocation(id, lat, lng) {
 		$.getJSON( config['ajax']['nominatimURL'], { lat: lat, lon: lng, zoom: 10, format: "json" } )
 			.done(function( json ) {
 				var city = json.address["city"];
+				if ( ~city ) { city = json.address["town"]; };
+				if ( ~city ) { city = json.address["village"]; };
 				var country = json.address["country"];
 				var countryCode = json.address["country_code"].toUpperCase();
 				geolocationTable[id] = city;
-				( country != "Deutschland" ) ? geolocationTable[id] = geolocationTable[id] + " ("+countryCode+")" : null;
+				( countryCode != "DE" ) ? geolocationTable[id] = geolocationTable[id] + " ("+countryCode+")" : null;
 				if ( city ) {
 					$("#eventstable a.toggle[eventid="+id+"]").text(geolocationTable[id]);
 					var sort = [[0,1],[1,1],[2,1]];
@@ -55,7 +57,7 @@ function getGeolocation(id, lat, lng) {
 					$("#eventstable").trigger("updateCache");
 					$("#eventstable").trigger("sorton", [sort]);
 				} else {
-					console.log("Nominatim did not provide a city tag for "+lat+" / "+lng);
+					// console.log("Nominatim did not provide a city tag for "+lat+" / "+lng);
 				};
 			})
 			.fail(function( jqxhr, textStatus, error ) {
@@ -137,6 +139,9 @@ function ajaxLoadEvents(stime, etime, eventid, url, target) {
 					// setting up download links (3nd line)
 					var xmlurl = sprintf('%s?formatted=true&includearrivals=true&eventid=%s', config['ajax']['eventURL'], id);
 					var oTime = new Date(otime);
+					if ( ~oTime ) {
+						oTime = new Date(otime.split('.')[0]);
+					};
 					var sTime = new Date(oTime.getTime()-10*1000.-oTime.getMilliseconds());
 					var eTime = new Date(oTime.getTime()+50*1000.-oTime.getMilliseconds());
 					var mseedurl = sprintf('%s?net=GE,GR,RN&cha=EH?,HH?&start=%04d-%02d-%02dT%02d:%02d:%02d&end=%04d-%02d-%02dT%02d:%02d:%02d', config['ajax']['mseedURL'], Number(sTime.getUTCFullYear()), Number(sTime.getUTCMonth())+1, Number(sTime.getUTCDate()), Number(sTime.getUTCHours()), Number(sTime.getUTCMinutes()), Number(sTime.getUTCSeconds()), Number(eTime.getUTCFullYear()), Number(eTime.getUTCMonth())+1, Number(eTime.getUTCDate()), Number(eTime.getUTCHours()), Number(eTime.getUTCMinutes()), Number(eTime.getUTCSeconds()));
@@ -155,11 +160,11 @@ function ajaxLoadEvents(stime, etime, eventid, url, target) {
 					if ((stime <= oTime && etime >= oTime ) || ( id == eventid )) {
 						var marker = addEventMarker(id, Number(lat), Number(lng), Number(mag), type);
 						var text = sprintf('<h3 eventid="%s">%s</h3>', id, location)
-								+ sprintf('<p>Ereignis: %s</br>', id)
-								+ sprintf('Type: %s</br>', type)
-								+ sprintf('Magnitude: %3.1f</br>', Number(mag))
-								+ sprintf('Ort: %.4f °N, %.4f °O </br>', Number(lat), Number(lng))
-								+ sprintf('Tiefe: %.1f km</br>', Number(depth)/1000.)
+								+ sprintf('<p>Ereignis: %s<br />', id)
+								+ sprintf('Type: %s<br />', type)
+								+ sprintf('Magnitude: %3.1f<br />', Number(mag))
+								+ sprintf('Ort: %.4f °N, %.4f °O <br />', Number(lat), Number(lng))
+								+ sprintf('Tiefe: %.1f km<br />', Number(depth)/1000.)
 								+ sprintf('Zeit: <span class="utctime">%sZ</span></p>', otime.split('.')[0], otime.split('.')[0]);
 						marker.bindPopup(text);
 					};

www/impressum.inc.de

@@ -1,23 +1,23 @@
 <div class="accordioncontent">
     <h4>Anschrift</h4>
-    Seismologisches Observatorium der</br>
-    Ruhr-Universität Bochum</br>
-    NA 3/174</br>
-    44780 Bochum</br>
-    Tel.: 0234 32-27574</br>
-    Fax: 0234 32-07574</br>
+    Seismologisches Observatorium der<br />
+    Ruhr-Universität Bochum<br />
+    NA 3/174<br />
+    44780 Bochum<br />
+    Tel.: 0234 32-27574<br />
+    Fax: 0234 32-07574<br />
 
     <p>Die Ruhr-Universität ist eine Körperschaft des Öffentlichen Rechts. Sie wird durch ihren Rektor Herrn Prof. Dr. Elmar W. Weiler gesetzlich vertreten.</p>
     <p>Zuständige Aufsichtsbehörde ist das Ministerium für Innovation, Wissenschaft und Forschung des Landes Nordrhein-Westfalen, Völklinger Straße 49, 40221 Düsseldorf.</p>
     <p>Umsatzsteuer-Identifikationsnummer: DE 127 056 261</p>
     
     <h4>Inhaltliche und technische Verantwortung für die Seiten des Seismologischen Observatoriums der Ruhr-Universität Bochum</h4>
-    Herr Dr. Kasper D. Fischer</br>
-    Ruhr-Universität Bochum</br>
-    44780 Bochum</br>
-    Tel.: 0234 32-27574</br>
-    Fax: 0234 32-07574</br>
-    E-Mail: kasper.fischer@ruhr-uni-bochum.de</br>
+    Herr Dr. Kasper D. Fischer<br />
+    Ruhr-Universität Bochum<br />
+    44780 Bochum<br />
+    Tel.: 0234 32-27574<br />
+    Fax: 0234 32-07574<br />
+    E-Mail: kasper.fischer@ruhr-uni-bochum.de<br />
 
     <p>Meldungen über missbräuchliche Nutzungen, die von Stationen aus dem IP-Namensbereich ruhr-uni-bochum.de ausgehen, senden Sie bitte an die Email-Adresse
     abuse@ruhr-uni-bochum.de. Gleichfalls bittet die Ruhr-Universität um Mitteilung an dieselbe Email-Adresse, wenn rechtswidrige Inhalte durch Links auf Seiten der Ruhr-Universität zu

www/index.html.de

@@ -178,6 +178,6 @@
 	<div class="rublogo"><a href="http://www.gmg.ruhr-uni-bochum.de/geophysik/seisobs"><img class="rublogo" src="logo_RUB_155x30.png" alt="Ruhr-Universität Bochum" title="Ruhr-Universität Bochum" border="0"/></a></div>
 	<!-- Map --> 
 	<div id="map" class="map"></div>
-	<div id="spinner" class="spinner" style="display:none;"><img id="img-spinner" src="spinner.gif" alt="Loading"/></br>Loading ...</div>
+	<div id="spinner" class="spinner" style="display:none;"><img id="img-spinner" src="spinner.gif" alt="Loading"/><br />Loading ...</div>
 </body>
 </html>

www/index.html.en

@@ -179,6 +179,6 @@
 	<div class="rublogo"><a href="http://www.gmg.ruhr-uni-bochum.de/geophysik/seisobs"><img class="rublogo" src="logo_RUB_155x30.png" alt="Ruhr-University Bochum" title="Ruhr-University Bochum" border="0"/></a></div>
 	<!-- Map -->
 	<div id="map" class="map"></div>
-	<div id="spinner" class="spinner" style="display:none;"><img id="img-spinner" src="spinner.gif" alt="Loading"/></br>Loading ...</div>
+	<div id="spinner" class="spinner" style="display:none;"><img id="img-spinner" src="spinner.gif" alt="Loading"/><br />Loading ...</div>
 </body>
 </html>

www/info.inc.de

@@ -1,7 +1,7 @@
 <div class="accordioncontent">
     <h4>Navigation zu den Internetseiten</h4>
         <ul>
-            <li>des <a class="intern" href="http://www.gmg.ruhr-uni-bochum.de/geophysik/seisobs">Seismologisches Observatorium</a></br> der Ruhr-Universität Bochum</li>
+            <li>des <a class="intern" href="http://www.gmg.ruhr-uni-bochum.de/geophysik/seisobs">Seismologisches Observatorium</a><br /> der Ruhr-Universität Bochum</li>
             <li>der <a class="intern" href="http://www.gmg.ruhr-uni-bochum.de/geophysik/seismology">Arbeitsgruppe Seismologie</a></li>
             <li>des <a class="intern" href="http://www.gmg.ruhr-uni-bochum.de">Instituts für Geologie, Mineralogie und Geophysik</a></li>
             <li>der  <a class="intern" href="http://www.rub.de">Ruhr-Universität Bochum</a></li>

www/map.js

@@ -32,7 +32,7 @@ function addStationMarker(id, lat, lng, station) {
 			color: config['station']['markerColor'],
 			weight: 1,
 			opacity: 1,
-			radius: config['station']['markerSize'][id] || config['station']['markerSize']['default'],
+			radius: config['station']['markerSize'][id] || config['station']['markerSize']['defaultSize'],
 			className: id+' stationMarker',
 		});
 	marker.bindLabel('Station '+station);

www/map.js.en

@@ -32,7 +32,7 @@ function addStationMarker(id, lat, lng, station) {
 			color: config['station']['markerColor'],
 			weight: 1,
 			opacity: 1,
-			radius: config['station']['markerSize'][id] || config['station']['markerSize']['default'],
+			radius: config['station']['markerSize'][id] || config['station']['markerSize']['defaultSize'],
 			className: id+' stationMarker',
 		});
 	marker.bindLabel('Station '+station);

www/misc.js

@@ -119,7 +119,7 @@ var config = {
 		markerColor: 'darkgreen',
 		markerOpacity: 1,
 		markerSize: {
-			default: 8,
+			defaultSize: 8,
 			GE_IBBN: 10,
 			GR_BUG: 10,
 			GR_KAST: 10,
@@ -211,4 +211,4 @@ $(document).ready(function() {
 	}).bind("ajaxStop", function() {
 			$("#spinner").hide();
 	});
-});
+});

www/stations.js

@@ -66,7 +66,7 @@ function loadStations(stime, etime) {
 							var row = sprintf('<tr><td><a href="#" class="toggle">%s</a></td><td><a href="#" class="toggle">%s</a></td><td class="ar">%7.4f</td><td class="ar">%7.4f</td></tr>' , network, station, Number(lat), Number(lng));
 							// setting up network details (2nd line)
 							row += sprintf('<tr class="tablesorter-childRow station-details"><td colspan="4">%s', networkText[network] || '');
-							row += ( $.inArray(station, bochumStation)+1 ) ? '</br><em>Betreiber:</em> Ruhr-Universität Bochum</td></tr>' : '</td></tr>' ;
+							row += ( $.inArray(station, bochumStation)+1 ) ? '<br /><em>Betreiber:</em> Ruhr-Universität Bochum</td></tr>' : '</td></tr>' ;
 							if ( network == 'RN' || network == 'X5' || $.inArray(station, bochumStation)+1 ) {
 								// setting up station details (3rd line)
 								row += '<tr class="tablesorter-childRow station-details"><td colspan="4">';
@@ -81,7 +81,7 @@ function loadStations(stime, etime) {
 								sc3mlRespURL = URL + '&level=response&format=sc3ml';
 								dlsvFile = sprintf('%s_%s.dlsv', network.toUpperCase(), station.toUpperCase());
 								row += '<tr class="tablesorter-childRow station-download"><td colspan="4">'
-									+ sprintf('Download details: <a download="%s.xml" href="%s" target="_blank">FDSNxml</a> or <a download="%s.sc3" href="%s" target="_blank">SC3ml</a></br> ', stationID, fdsnxmlURL, stationID, sc3mlURL)
+									+ sprintf('Download details: <a download="%s.xml" href="%s" target="_blank">FDSNxml</a> or <a download="%s.sc3" href="%s" target="_blank">SC3ml</a><br /> ', stationID, fdsnxmlURL, stationID, sc3mlURL)
 									+ sprintf('Response files:  <a download="%s_response.xml" href="%s" target="_blank">FDSNxml</a>, <a download="%s_response.sc3" href="%s" target="_blank">SC3ml</a> ', stationID, fdsnxmlRespURL, stationID, sc3mlRespURL)
 									+ sprintf('or <a href="%s" download="%s" type="application/octet-stream">datalessSEED</a>', config['ajax']['dlsvURL'] + '/' + dlsvFile, dlsvFile.toLowerCase())
 									+ '</td></tr>';
@@ -124,13 +124,13 @@ function stationDetails(station, network, lat, lng, stationId, stationText, stat
 	var elevation = stationObject.find('Elevation:first').text();
 	var name = stationObject.find('Site > Name').text();
 	output = '<pre>'
-		+ name + '</br>'
-		+ 'Position: ' + lat + '°N ' + lng + '°E, Höhe: ' + elevation + ' m NN</br>';
+		+ name + '<br />'
+		+ 'Position: ' + lat + '°N ' + lng + '°E, Höhe: ' + elevation + ' m NN<br />';
 	stationObject.find('Channel').each(function() {
 		var code = $(this).attr('code');
 		var sensor = $(this).find('Sensor > Type').text().split(',')[0];
 		var sampleRate = $(this).find('SampleRate').text();
-		output += '</br>Kanal ' + code + ', Abtastrate ' + sampleRate + ' Hz, Sensor ' + sensor;
+		output += '<br />Kanal ' + code + ', Abtastrate ' + sampleRate + ' Hz, Sensor ' + sensor;
 	});
 	output += '</pre>';
 	return output;

www/stations.js.en

@@ -66,7 +66,7 @@ function loadStations(stime, etime) {
 							var row = sprintf('<tr><td><a href="#" class="toggle">%s</a></td><td><a href="#" class="toggle">%s</a></td><td class="ar">%7.4f</td><td class="ar">%7.4f</td></tr>' , network, station, Number(lat), Number(lng));
 							// setting up network details (2nd line)
 							row += sprintf('<tr class="tablesorter-childRow station-details"><td colspan="4">%s', networkText[network] || '');
-							row += ( $.inArray(station, bochumStation)+1 ) ? '</br><em>Operator:</em> Ruhr-University Bochum</td></tr>' : '</td></tr>' ;
+							row += ( $.inArray(station, bochumStation)+1 ) ? '<br /><em>Operator:</em> Ruhr-University Bochum</td></tr>' : '</td></tr>' ;
 							if ( network == 'RN' || network == 'X5' || $.inArray(station, bochumStation)+1 ) {
 								// setting up station details (3rd line)
 								row += '<tr class="tablesorter-childRow station-details"><td colspan="4">';
@@ -81,7 +81,7 @@ function loadStations(stime, etime) {
 								sc3mlRespURL = URL + '&level=response&format=sc3ml';
 								dlsvFile = sprintf('%s_%s.dlsv', network.toUpperCase(), station.toUpperCase());
 								row += '<tr class="tablesorter-childRow station-download"><td colspan="4">'
-									+ sprintf('Download details: <a download="%s.xml" href="%s" target="_blank">FDSNxml</a> or <a download="%s.sc3" href="%s" target="_blank">SC3ml</a></br> ', stationID, fdsnxmlURL, stationID, sc3mlURL)
+									+ sprintf('Download details: <a download="%s.xml" href="%s" target="_blank">FDSNxml</a> or <a download="%s.sc3" href="%s" target="_blank">SC3ml</a><br /> ', stationID, fdsnxmlURL, stationID, sc3mlURL)
 									+ sprintf('Response files:  <a download="%s_response.xml" href="%s" target="_blank">FDSNxml</a>, <a download="%s_response.sc3" href="%s" target="_blank">SC3ml</a> ', stationID, fdsnxmlRespURL, stationID, sc3mlRespURL)
 									+ sprintf('or <a href="%s" download="%s" type="application/octet-stream">datalessSEED</a>', config['ajax']['dlsvURL'] + '/' + dlsvFile, dlsvFile.toLowerCase())
 									+ '</td></tr>';
@@ -124,13 +124,13 @@ function stationDetails(station, network, lat, lng, stationId, stationText, stat
 	var elevation = stationObject.find('Elevation:first').text();
 	var name = stationObject.find('Site > Name').text();
 	output = '<pre>'
-		+ name + '</br>'
-		+ 'Position: ' + lat + '°N ' + lng + '°E, height: ' + elevation + ' m a.s.l.</br>';
+		+ name + '<br />'
+		+ 'Position: ' + lat + '°N ' + lng + '°E, height: ' + elevation + ' m a.s.l.<br />';
 	stationObject.find('Channel').each(function() {
 		var code = $(this).attr('code');
 		var sensor = $(this).find('Sensor > Type').text().split(',')[0];
 		var sampleRate = $(this).find('SampleRate').text();
-		output += '</br>Chanel ' + code + ', Samplingrate ' + sampleRate + ' Hz, Sensor ' + sensor;
+		output += '<br />Chanel ' + code + ', Samplingrate ' + sampleRate + ' Hz, Sensor ' + sensor;
 	});
 	output += '</pre>';
 	return output;