Merge from trunk.

r711 www/branches/life

.gitattributes

@@ -1,4 +1,5 @@
 * text=auto !eol
+www/copyright.inc.de -text
 www/external/TileLayer.Grayscale.js -text
 www/external/css/dvf.css -text
 www/external/css/leaflet.label.css -text

www/copyright.inc.de

@@ -0,0 +1,6 @@
+<div class="accordioncontent">
+    <h4>Kartengrundlage</h4>
+    <h4>Ereignisdaten</h4>
+    <h4>Stationsdaten</h4>
+    <h4>Sonstiger Inhalt</h4>
+</div>

www/events.js

@@ -66,7 +66,7 @@ function getGeolocation(id, lat, lng) {
 };
 
 /* Load events using ajax */
-function ajaxLoadEvents(stime, etime, id, url, target) {
+function ajaxLoadEvents(stime, etime, eventid, url, target) {
 	var mapBounds = map.getBounds();
 	var request_data = {};
 	var rtime;
@@ -75,7 +75,7 @@ function ajaxLoadEvents(stime, etime, id, url, target) {
 		stime = new Date();
 		stime.setDate(stime.getDate()-config['map']['timespan']);
 		rtime = new Date();
-		rtime.setDate(rtime.getDate()-config['ajax']['timespan']);
+		rtime.setDate(rtime.getDate()-Math.min(config['ajax']['timespan'], config['map']['timespan']));
 	} else {
 		rtime = stime;
 	};
@@ -83,8 +83,8 @@ function ajaxLoadEvents(stime, etime, id, url, target) {
 		var ajax_url = url;
 		request_data = {};
 	} else {
-		if ( id ) {
+		if ( eventid ) {
-			request_data = { eventid: id };
+			request_data = { eventid: eventid };
 		} else {
 			request_data = {
 				starttime: sprintf("%d-%02d-%02d", rtime.getFullYear(), rtime.getMonth()+1, rtime.getDate()),
@@ -100,6 +100,7 @@ function ajaxLoadEvents(stime, etime, id, url, target) {
 			};
 		};
 	};
+	//console.log(ajax_url+'?'+$.param(request_data));
 	if ( etime == '' || !etime  ) { etime = new Date(); };
 	$.ajax({
 		type: "GET",
@@ -152,6 +153,7 @@ function ajaxLoadEvents(stime, etime, id, url, target) {
 						addTableRow(row, target);
 					}
 					// create marker
+					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)
@@ -162,10 +164,10 @@ function ajaxLoadEvents(stime, etime, id, url, target) {
 								+ sprintf('Zeit: <span class="utctime">%sZ</span></p>', otime.split('.')[0], otime.split('.')[0]);
 						marker.bindPopup(text);
 					};
+				};
 			});
 		},
 		complete: function () {
-			initStationTable();
 			var sort = [[0,1],[1,1],[2,1]];
 			$("#eventstable").trigger("update", [true]);
 			$("#eventstable").trigger("updateCache");
@@ -181,7 +183,7 @@ function ajaxLoadEvents(stime, etime, id, url, target) {
 	});
 	// create events csv download link
 	request_data['format'] = 'text';
-	if ( id == '' || !id ) { $('#events-csv-link').attr('href', config['ajax']['eventURL']+'?'+$.param(request_data)) };
+	if ( eventid == '' || !eventid ) { $('#events-csv-link').attr('href', config['ajax']['eventURL']+'?'+$.param(request_data)) };
 };
 
 /* ajaxLoadEventInfo */

www/index.html.de

@@ -157,7 +157,19 @@
 		<!-- More -->
 		<div class="tab" id="moretab"><!--include virtual="more.html.de" --></div>
 		<!-- Info -->
-		<div class="tab" id="infotab"><!--#include virtual="info.inc.de" --></div>
+		<div class="tab" id="infotab">
+			<div id="infoaccordion">
+				<h3 class="aheader">Navigation / Links</h3>
+				<!--#include virtual="info.inc.de" -->
+				<h3 class="aheader">Copyright / Lizenz</h3>
+				<!--#include virtual="copyright.inc.de" -->
+				<h3 class="aheader">Impressum</h3>
+				<!--#include virtual="impressum.inc.de" -->
+			<div>
+		</div>
+</div>
+
+		</div>
 	</div>
 	<!-- Logo -->
 	<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>

www/info.inc.de

@@ -1,6 +1,4 @@
-<div id="infoaccordion">
+<div class="accordioncontent">
-    <h3 class="aheader">Navigation / Links</h3>
-    <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>
@@ -10,15 +8,14 @@
         </ul>
     <h4>Informationen zu Erdbeben</h4>
         <ul>
+            <li>in <a class="extern" target="_blank" href="http://www.gd.nrw.de/a_beben.php">NRW</a> (<a class="extern" target="_blank" href="http://www.gd.nrw.de">Geologischer Dienst NRW</a>)</li>
             <li>in <a class="extern" target="_blank" href="http://www.bgr.bund.de/DE/Themen/Erdbeben-Gefaehrdungsanalysen/Seismologie/Seismologie/Seis-Online/Liste_D_1Jahr/li_d_1jahr_node.html">Deutschland</a> (<a class="extern" target="_blank" href="http://www.bgr.bund.de">BGR Hannover</a>)</li>
             <li>in <a class="extern" target="_blank" href="http://www.emsc-csem.org">Europa / Mittelmeerraum</a> (<a class="extern" target="_blank" href="http://www.emsc-csem.org">EMSC</a>)</li>
             <li><a class="extern" target="_blank" href="http://geofon.gfz-potsdam.de/eqinfo/seismon/globmon.php">weltweit</a> (<a class="extern" target="_blank" href="http://geofon.gfz-potsdam.de">GEOFON, GFZ Potsdam</a>)</li>
             <li><a class="extern" target="_blank" href="http://earthquake.usgs.gov/earthquakes/map/">weltweit</a> (<a class="extern" target="_blank" href="http://earthquake.usgs.gov/">USGS</a>)</li>
         </ul>
-    </div>
+    <h4>Informationen zum Steinkohlenabbau in NRW</h4>
-    <h3 class="aheader">Copyright / Lizenz</h3>
+        <ul>
-    <div>
+            <li>Homepage der <a class="extern" target="_blank" href="http://www.rag.de">RAG</a></li>
-    </div>
+            <li><a class="extern" target="_blank" href="http://www.bid.rag.de">Bürgerinformationssystem</a> der RAG</li>
-    <h3 class="aheader">Impressum</h3>
-    <!--#include virtual="impressum.inc.de" -->
 </div>