Commit Graph

140 Commits

Author SHA1 Message Date
3c35af9493 Merge with changes (r790) in trunk. 2014-12-19 08:18:09 +00:00
22f656a5fe Added Haltern 3.6 (2014-11-15) and Vechta 3.0 (2014-12-19) events. 2014-12-19 08:14:05 +00:00
2892708399 SVN merge with latest changes in trunk. 2014-09-24 09:05:59 +00:00
61d272ec72 Use relative instead of absolute links. 2014-09-24 09:04:27 +00:00
87da50a1f4 Removed outdated special events. 2014-09-24 09:04:05 +00:00
a7f19281ff SVN merge r763. 2014-09-23 16:00:18 +00:00
2843c584a9 Added query string parameter 'tab' to select active tab on loading. 2014-09-23 15:53:05 +00:00
1a8d59d9cf Merging copyright / licensing information. 2014-09-16 14:55:36 +00:00
c30e7ad781 Updated copyright / licensing information for event / station map. 2014-09-16 14:50:33 +00:00
20de44f50d Merging revisions 738-739 (Adding Spinner image) and 743 (Workaround fo rmissing console.log). 2014-09-16 12:24:19 +00:00
fdc8b9f65b Removed some debuging output. Added workaround for missing console.log function on some browsers (e. g. Firefox). 2014-09-16 12:16:01 +00:00
c9786126b8 Added print button to web map. 2014-09-16 11:38:06 +00:00
db8703ab7a Added print button to web map. 2014-09-16 11:23:01 +00:00
3b41bc4dfc Added spinner image while loading data. 2014-09-16 11:16:14 +00:00
fd632f2af6 Added spinner image while loading data. 2014-09-16 11:15:13 +00:00
1ac4702a75 Added support for event type explosion. 2014-09-16 11:11:51 +00:00
80045a3f54 Update of permissions, added .htaccess to allow free access to life website. 2014-09-16 09:53:47 +00:00
deea103fdf Merge from trunk. 2014-08-28 15:26:00 +00:00
170ee33d07 Comitting changes in info tab. 2014-08-28 15:18:52 +00:00
81204d76c7 Use cachec events list. 2014-06-25 15:35:39 +00:00
91b1f6f28c Merge. 2014-06-13 15:04:44 +00:00
9a5c2650e4 Loading events from chached xml file and performing FDSNWS request for a shorter time only to boost performance. 2014-06-13 15:02:38 +00:00
4c4429f000 Merge. 2014-06-13 13:57:38 +00:00
f83b3aed22 Updated specialevents.js 2014-06-13 13:31:00 +00:00
f07c55d3bf Updated include files for index.html.de 2014-06-06 14:53:08 +00:00
1aaecbb879 Renamed info.html to info.html.de 2014-06-05 11:56:43 +00:00
9e9862b3d0 Added impressum to info.html. Cleaned up links and noscript section. 2014-06-04 16:56:19 +00:00
142ac10dd0 Added info.html for the contents of the info tab. Added SSI directives in index.html.de. Using XBitHack in server config. 2014-06-04 15:40:47 +00:00
c858c586cd Added download attributes to download links. 2014-06-04 15:38:41 +00:00
d1f9b64ab0 Merge 2014-06-03 13:59:42 +00:00
ce43a0a07d Set event tab as default. 2014-06-03 13:56:20 +00:00
84479f45e1 Added special event for 2014-05-31 Vogtland (Nový Kostel) event. 2014-06-03 13:55:53 +00:00
80fab7459c Removed link border around RUB logo. This was visible e. g. in Firefox. 2014-06-03 13:54:16 +00:00
25d397fb0e merge. 2014-05-27 11:38:23 +00:00
9617cc5fa3 Fixed bug: locations where shown as 'undefined' if nominatim lookup times out. 2014-05-27 11:37:07 +00:00
f467b77f48 Added detailed station info. 2014-05-23 16:27:59 +00:00
6501b3fff7 merge. 2014-05-20 16:21:52 +00:00
210ea26747 Added some more special events. Which should be included? When should they be removed from the list? 2014-05-20 16:16:11 +00:00
b42911ada5 Updated table caption text. 2014-05-20 16:11:30 +00:00
264036fe53 Added error handler to AJAX request in stations.js. 2014-05-20 16:10:26 +00:00
2238086066 Bug fix: really don't show preliminary or automatic results. 2014-05-20 16:09:36 +00:00
021046ec29 Added eventstable caption with symbol information and download link. Removed type column from table. 2014-05-20 13:46:00 +00:00
63f9d9d43a Added noscript information. 2014-05-20 12:35:55 +00:00
78ea7b0397 Added column for type information in eventstable. 2014-05-20 12:27:07 +00:00
8d8e0c5ff7 Added support for special events. use different markers for EQ, quarry blast or induced events. 2014-05-20 11:08:59 +00:00
5bfa403288 Merge. 2014-05-19 20:12:14 +00:00
873a21f539 Added new funcionality: special events can now be loaded to the table and map, eg. Seeheim-Jugenheim event of May 17th, 2014. 2014-05-19 20:08:38 +00:00
9ea976c762 Added support for detailed station information and download links. Download links and some information are now visible. TODO: add detailed station info. 2014-05-16 16:32:24 +00:00
5a1b780eaf Added support for detailed station information and download links. Funcionality is still missing. 2014-05-15 15:57:52 +00:00
f374ee0a1c Added parametes to set map centre. Added station size config for all NL stations. 2014-05-15 12:50:56 +00:00
6b3c421ba8 Merge. 2014-05-15 10:17:06 +00:00
855826d2bb Added station labels. Resorted index.html.de 2014-05-15 10:15:52 +00:00
a89a1af22c Merge. 2014-05-14 16:13:38 +00:00
fdbade688a Added pagerComplete event to highlight first event of visible table. 2014-05-14 16:13:05 +00:00
fc8133a954 Merge. 2014-05-14 16:04:59 +00:00
ddba2012bb Added link for the SeisObs homepage to the RUB logo. 2014-05-14 16:04:35 +00:00
1814e81cdb Merge. 2014-05-14 15:44:55 +00:00
76f269d297 Added plugin "Data Visualisation Framework" for nicer markers. 2014-05-14 15:42:36 +00:00
8321e19a4a Merge. 2014-05-14 15:35:26 +00:00
e50c816f05 Added plugin "Data Visualisation Framework" for nicer markers. 2014-05-14 15:33:43 +00:00
11fcdbb305 Merge. 2014-05-14 09:52:23 +00:00
49b9e492ac Added config for station color. Changed colors of events to blue. 2014-05-14 09:48:04 +00:00
1c947c98d2 Removed console.log. 2014-05-14 09:40:19 +00:00
338d54ade4 Merge changes from trunk, except parsing URL get parameters. 2014-05-14 05:30:09 +00:00
8770857bd7 Changed request_parameters. Endtime will only be used when necessary. Truncated numerical values to 1 or 2 digits after the decimal point. Added orderby parameter.
Shortend construct to determine event location.
2014-05-14 05:24:41 +00:00
acb023cd20 small changes only. 2014-05-14 05:22:21 +00:00
a73450ac92 Added function to parse the URL query string to set config parameters. 2014-05-14 05:21:19 +00:00
271caf6f20 Fixed HTML code. Should validate now. 2014-05-14 05:20:06 +00:00
14d988b0b4 Merge. 2014-05-12 16:16:01 +00:00
3161f1542e Show event details when selecting a marker. Hide when popup closes. TODO: do this without a global variable. 2014-05-12 16:10:29 +00:00
4ed2af95c0 Adding scale control to map. 2014-05-12 15:54:07 +00:00
55a6c166b6 Added missing call of getLocation if getGeolocation fails. 2014-05-12 15:46:37 +00:00
43178d916e Merge of branches/life with trunk. 2014-05-11 18:55:45 +00:00
33ed07b142 Added class to detail and download row of event table to prevent substituting even tent details in both rows. 2014-05-09 09:37:28 +00:00
2e27ccf170 Added skipped line of previous reversal. 2014-05-09 09:28:11 +00:00
ca182f594e Reverted r622. Detail will, as before, be loaded on request only. 2014-05-09 09:21:33 +00:00
fa0ef11337 Adding download links to event table. 2014-05-09 07:00:03 +00:00
b7ad42c462 Small fixes to comforme to standard in index.html.de 2014-05-08 20:24:27 +00:00
b38fcddad7 Load event details together with the event table. 2014-05-08 11:36:20 +00:00
882bd9aa14 Added config value for event marker colors. Added 'quarry blast' to event whitelist. 2014-05-08 09:08:48 +00:00
02de112405 Blacklist rejected events. 2014-05-07 12:30:27 +00:00
7f3d188f9e Add phase information for event details. TODO: sorting by P-arrival
removed obsolete function addEventRow.
2014-05-07 12:15:52 +00:00
6f2bfad0e5 New functionality: loading event details. TODO: add phase information 2014-05-06 16:55:31 +00:00
3f3754a5e4 Creating more config paramters. Removing unused function sleep. 2014-05-06 14:40:32 +00:00
8886ea4abb Moving configuration parameters to new array config. 2014-05-06 14:18:20 +00:00
4b6fb951b2 Adding copyright / license information to javascript files.
Reoorganizing code blocks.
2014-05-06 13:14:30 +00:00
d23b9f2a7c Changing some more html tags... 2014-05-06 12:51:27 +00:00
1736a73973 Forgot 3 files ... 2014-05-06 12:50:02 +00:00
32d89b91f8 Creating new directory 'external' for external stuff. 2014-05-06 12:45:39 +00:00
a38905569c Moving map2014 to trunk. 2014-05-06 11:26:47 +00:00