Merge.
This commit is contained in:
		
						commit
						4c4429f000
					
				
				
				Notes:
				
					subgit
				
				2018-03-07 17:59:02 +01:00 
			
			r697 www/branches/life
							
								
								
									
										2
									
								
								.gitattributes
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitattributes
									
									
									
									
										vendored
									
									
								
							| @ -18,4 +18,6 @@ www/external/prev.png -text | |||||||
| www/external/sprintf.min.js -text | www/external/sprintf.min.js -text | ||||||
| www/external/theme.blue.css -text | www/external/theme.blue.css -text | ||||||
| www/external/widget-pager.js -text | www/external/widget-pager.js -text | ||||||
|  | www/impressum.inc.de -text | ||||||
|  | www/info.inc.de -text | ||||||
| www/logo_RUB_155x30.png -text | www/logo_RUB_155x30.png -text | ||||||
|  | |||||||
| @ -131,7 +131,7 @@ function ajaxLoadEvents(stime, etime, id, target) { | |||||||
| 					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())); | 					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())); | ||||||
| 					row +=  '<tr class="tablesorter-childRow event-download">' | 					row +=  '<tr class="tablesorter-childRow event-download">' | ||||||
| 						+ '<td colspan="4" eventid="'+id+'">' | 						+ '<td colspan="4" eventid="'+id+'">' | ||||||
| 						+ sprintf('Download <a class="xml-link" target="_blank" href="%s">QuakeML</a> or <a class="mseed-link" target="_blank" href="%s">miniSEED</a>', xmlurl, mseedurl) | 						+ sprintf('Download <a class="xml-link" target="_blank" download="%s.xml" href="%s">QuakeML</a> or <a class="mseed-link" target="_blank" download="%s.mseed" href="%s">miniSEED</a>', id, xmlurl, id, mseedurl) | ||||||
| 						+ '</td></tr>'; | 						+ '</td></tr>'; | ||||||
| 					// add row to table
 | 					// add row to table
 | ||||||
| 					if ( stime <= oTime && etime >= oTime ) { | 					if ( stime <= oTime && etime >= oTime ) { | ||||||
|  | |||||||
							
								
								
									
										29
									
								
								www/impressum.inc.de
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										29
									
								
								www/impressum.inc.de
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,29 @@ | |||||||
|  | <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> | ||||||
|  | 
 | ||||||
|  |     <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> | ||||||
|  | 
 | ||||||
|  |     <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 | ||||||
|  |     erreichen sind.</p> | ||||||
|  | 
 | ||||||
|  |     <h4>Rechtliche Hinweise</h4> | ||||||
|  |     <p>Die Ruhr-Universität Bochum übernimmt keine Gewähr für die Richtigkeit und Vollständigkeit der auf ihren Internetseiten befindlichen Informationen. Das gleiche gilt für die | ||||||
|  |     Inhalte verlinkter Seiten.</p> | ||||||
|  | </div> | ||||||
							
								
								
									
										16
									
								
								www/index.html.de
									
									
									
									
									
										
										
										Normal file → Executable file
									
								
							
							
						
						
									
										16
									
								
								www/index.html.de
									
									
									
									
									
										
										
										Normal file → Executable file
									
								
							| @ -47,14 +47,20 @@ | |||||||
| </head> | </head> | ||||||
| 
 | 
 | ||||||
| <body> | <body> | ||||||
|  | 	<!-- noscript --> | ||||||
| 	<noscript> | 	<noscript> | ||||||
| 		<div class="noscript"> | 		<div class="noscript"> | ||||||
| 			<h1>Kein JavaScript verfügbar!</h1> | 			<div class="noscriptcontent"> | ||||||
|  | 				<h2>Kein JavaScript verfügbar!</h2> | ||||||
| 				<p>Diese Seite benötigt JavaScript. Bitte schalten Sie JavaScript ein.</p> | 				<p>Diese Seite benötigt JavaScript. Bitte schalten Sie JavaScript ein.</p> | ||||||
| 			<h1>JavaScript disabled!</h1> | 				<h2>JavaScript disabled!</h2> | ||||||
| 				<p>This page requires JavaScript to work. Please enable JavaScript.</p> | 				<p>This page requires JavaScript to work. Please enable JavaScript.</p> | ||||||
|  | 				<h2>Impressum</h2> | ||||||
|  | 				<!--#include virtual="impressum.inc.de" --> | ||||||
|  | 			</div> | ||||||
| 		</div> | 		</div> | ||||||
| 	</noscript> | 	</noscript> | ||||||
|  | 	<!-- Tabs --> | ||||||
| 	<div class="info" id="tabs"> | 	<div class="info" id="tabs"> | ||||||
| 		<ul> | 		<ul> | ||||||
| 			<li><a href="#eventstab"><span>Ereignisse</span></a></li> | 			<li><a href="#eventstab"><span>Ereignisse</span></a></li> | ||||||
| @ -149,11 +155,13 @@ | |||||||
| 			<p class="table-caption">Download als <a id="stations-csv-link" href="link" download="stations.csv">CSV-Datei</a>.</p> | 			<p class="table-caption">Download als <a id="stations-csv-link" href="link" download="stations.csv">CSV-Datei</a>.</p> | ||||||
| 		</div> | 		</div> | ||||||
| 		<!-- More --> | 		<!-- More --> | ||||||
| 		<div class="tab" id="moretab"></div> | 		<div class="tab" id="moretab"><!--include virtual="more.html.de" --></div> | ||||||
| 		<!-- Info --> | 		<!-- Info --> | ||||||
| 		<div class="tab" id="infotab"></div> | 		<div class="tab" id="infotab"><!--#include virtual="info.inc.de" --></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> | 	<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="map" class="map"></div> | ||||||
| </body> | </body> | ||||||
| </html> | </html> | ||||||
|  | |||||||
							
								
								
									
										24
									
								
								www/info.inc.de
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								www/info.inc.de
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,24 @@ | |||||||
|  | <div id="infoaccordion"> | ||||||
|  |     <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> | ||||||
|  |             <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> | ||||||
|  |         </ul> | ||||||
|  |         <h4>Informationen zu Erdbeben</h4> | ||||||
|  |             <ul> | ||||||
|  |                 <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> | ||||||
|  |     <h3 class="aheader">Copyright / Lizenz</h3> | ||||||
|  |     <div> | ||||||
|  |     </div> | ||||||
|  |     <h3 class="aheader">Impressum</h3> | ||||||
|  |     <!--#include virtual="impressum.inc.de" --> | ||||||
|  | </div> | ||||||
							
								
								
									
										13
									
								
								www/main.css
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								www/main.css
									
									
									
									
									
								
							| @ -19,9 +19,14 @@ | |||||||
| 		left: 0px; | 		left: 0px; | ||||||
| 		top: 0px; | 		top: 0px; | ||||||
| 		width: 100%; | 		width: 100%; | ||||||
| 		height: 100%; | 		height: 200%; | ||||||
| 		background: rgb(255, 255, 255); | 		background: rgb(255, 255, 255); | ||||||
| 	} | 	} | ||||||
|  | 	div.noscriptcontent { | ||||||
|  | 		z-index: 20010; | ||||||
|  | 		margin: 45px; | ||||||
|  | 		font-size: small; | ||||||
|  | 	} | ||||||
| 	div.info { | 	div.info { | ||||||
| 		z-index: 10000; | 		z-index: 10000; | ||||||
| 		position: absolute; | 		position: absolute; | ||||||
| @ -47,6 +52,12 @@ | |||||||
| 		background: rgb(255, 255, 255); | 		background: rgb(255, 255, 255); | ||||||
| 		background: rgba(25, 255, 255, 0.95); | 		background: rgba(25, 255, 255, 0.95); | ||||||
| 	} | 	} | ||||||
|  | 	div.accordioncontent { | ||||||
|  | 		z-index: 10010; | ||||||
|  | 		margin: 0px!important; | ||||||
|  | 		padding: 5px!important; | ||||||
|  | 		font: sans-serif; | ||||||
|  | 	} | ||||||
| 	div.rublogo { | 	div.rublogo { | ||||||
| 		z-index: 10000; | 		z-index: 10000; | ||||||
| 		position: absolute; | 		position: absolute; | ||||||
|  | |||||||
							
								
								
									
										15
									
								
								www/misc.js
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								www/misc.js
									
									
									
									
									
								
							| @ -179,11 +179,18 @@ $(document).ready(function() { | |||||||
| 	setInfoHeight(); | 	setInfoHeight(); | ||||||
| 
 | 
 | ||||||
| 	// create tabs
 | 	// create tabs
 | ||||||
| 	var tabOptions = { | 	$('#tabs').tabs({ | ||||||
| 		active: 0, | 		active: 0, | ||||||
| 		disabled: [2, 3], | 		disabled: [2], | ||||||
| 		activate: function( event, ui ) { ui['newPanel'].find('table').trigger("update", [true]); }, | 		activate: function( event, ui ) { ui['newPanel'].find('table').trigger("update", [true]); }, | ||||||
| 	}; | 	}); | ||||||
| 	$('#tabs').tabs(tabOptions); | 	// create accordions
 | ||||||
|  | 	$( '#infoaccordion' ).accordion({ | ||||||
|  | 		active: 0, | ||||||
|  | 		header: 'h3.aheader', | ||||||
|  | 		heightStyle: 'content', | ||||||
|  | 		animate: 200, | ||||||
|  | 	}); | ||||||
|  | 
 | ||||||
| }); | }); | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -1,5 +1,6 @@ | |||||||
| /* $Id$ */ | /* $Id$ */ | ||||||
| var specialEvents = [ | var specialEvents = [ | ||||||
|  | 	'bug2014ldts', // Darmstadt
 | ||||||
| 	'bug2014kowj', // Vogtland 5.0
 | 	'bug2014kowj', // Vogtland 5.0
 | ||||||
| 	'bug2014jptq', // Seeheim-Jugenheim
 | 	'bug2014jptq', // Seeheim-Jugenheim
 | ||||||
| 	'bug2014infb', // Troisdorf
 | 	'bug2014infb', // Troisdorf
 | ||||||
|  | |||||||
| @ -81,8 +81,8 @@ function loadStations(stime, etime) { | |||||||
| 								sc3mlRespURL = URL + '&level=response&format=sc3ml'; | 								sc3mlRespURL = URL + '&level=response&format=sc3ml'; | ||||||
| 								dlsvFile = sprintf('%s_%s.dlsv', network.toUpperCase(), station.toUpperCase()); | 								dlsvFile = sprintf('%s_%s.dlsv', network.toUpperCase(), station.toUpperCase()); | ||||||
| 								row += '<tr class="tablesorter-childRow station-download"><td colspan="4">' | 								row += '<tr class="tablesorter-childRow station-download"><td colspan="4">' | ||||||
| 									+ sprintf('Download details: <a href="%s" target="_blank">FDSNxml</a> or <a href="%s" target="_blank">SC3ml</a></br> ', fdsnxmlURL, 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 href="%s" target="_blank">FDSNxml</a>, <a href="%s" target="_blank">SC3ml</a> ', fdsnxmlRespURL, sc3mlRespURL) | 									+ 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()) | 									+ sprintf('or <a href="%s" download="%s" type="application/octet-stream">datalessSEED</a>', config['ajax']['dlsvURL'] + '/' + dlsvFile, dlsvFile.toLowerCase()) | ||||||
| 									+ '</td></tr>'; | 									+ '</td></tr>'; | ||||||
| 							} | 							} | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user