Reintegrated changes from branches/life.

r825 www/trunk
2015-04-10 08:56:21 +00:00 · 2015-04-10 08:56:21 +00:00 · 331b529834 · 2018-03-07 17:59:10 +01:00
commit 331b529834
parent b074f0e695 f8a4a0abf2
7 changed files with 12 additions and 11 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,5 +1,6 @@
 * text=auto !eol
 scripts/mkEvents.csh -text
+www/.htaccess -text
 www/copyright.inc.de -text
 www/external/TileLayer.Grayscale.js -text
 www/external/css/dvf.css -text
--- a/scripts/mkEvents.csh
+++ b/scripts/mkEvents.csh
@ -1 +1 @@
-curl -o events.xml "https://ariadne.geophysik.ruhr-uni-bochum.de/fdsnws/event/1/query?starttime=2014-01-01&orderby=time-asc&minlat=50.92&maxlat=52.76&minlon=4.26&maxlon=9.74&minmag=1.1"
+curl -o events.xml "https://ariadne.geophysik.ruhr-uni-bochum.de/fdsnws/event/1/query?starttime=2014-08-01&orderby=time&minlat=50.92&maxlat=52.76&minlon=4.26&maxlon=9.74&minmag=1.1"
--- a/www/.htaccess
+++ b/www/.htaccess
@ -0,0 +1 @@
+Allow from all
--- a/www/index.html.de
+++ b/www/index.html.de
@ -96,7 +96,6 @@
 					<col width="50" />
 					<col width="50" />
 					<col />
-					<col width="30" />
 				</colgroup>
 				<thead>
 					<tr>
--- a/www/map.js
+++ b/www/map.js
@ -217,5 +217,4 @@ $(document).ready(function() {

 	// print icon
 	L.easyPrint().addTo(map);
-
 });
--- a/www/specialevents.js
+++ b/www/specialevents.js
@ -9,5 +9,6 @@ var specialEvents = [
 	//'bug2014ilxd', // Bassum
 	//'bug2014gfzw', // Darmstadt
 	//'bug2014datb', // Groningen
-	//'bug2013yvko', // Haltern 3.4
+	'bug2013yvko', // Haltern 3.4
+	'bug2015fdpy', // Darmstadt 3.0
 ];