kasper/seisobs-webapp
1
0
Fork 0
Code Issues 7 Pull Requests Releases 1 Wiki Activity

Compare commits

base: kasper:feature/mapquest
Branches Tags
kasper:main kasper:develop kasper:feature/vagrant kasper:feature/mapquest kasper:feature/docker-nginx kasper:feature/topplus kasper:support/iframe
kasper:v1.1 kasper:release/v1.2 kasper:release/v1.1 kasper:release/v1.0 kasper:release/r20211017.2 kasper:release/r20211017.1 kasper:release/r20211017 kasper:release/r20200714 kasper:release/r20131023 kasper:release/r20140505 kasper:release/r20130222
..
compare: kasper:release/v1.1
Branches Tags
kasper:develop kasper:main kasper:feature/vagrant kasper:feature/mapquest kasper:feature/docker-nginx kasper:feature/topplus kasper:support/iframe
kasper:v1.1 kasper:release/v1.2 kasper:release/v1.1 kasper:release/v1.0 kasper:release/r20211017.2 kasper:release/r20211017.1 kasper:release/r20211017 kasper:release/r20200714 kasper:release/r20131023 kasper:release/r20140505 kasper:release/r20130222

5 Commits
feature/ma ... release/v1

Author SHA1 Message Date
Kasper D. Fischer
952746e6cd create new release v1.1 (2021-10-31) 2021-10-31 13:25:45 +01:00
Kasper D. Fischer
779602d821 create new release v1.1 (2021-10-31) 2021-10-31 13:05:22 +01:00
Kasper D. Fischer
86a65108cc Merge branch 'release/v1.0' into main 2021-10-27 10:30:48 +02:00
Kasper D. Fischer
95fb75ef14 set version to "v1.0 (2021-10-27)" 2021-10-27 10:30:22 +02:00
Kasper D. Fischer
a91616d003 Merge branch 'hotfix/r20211017.2' into main 2021-10-17 15:47:16 +02:00
10 changed files with 36 additions and 8 deletions
Expand all files Collapse all files

6
scripts/patchVersion.sh
View File

@@ -1,9 +1,5 @@
#!/bin/bash #!/bin/bash
# version: VVVVV # version: VVVVV
function fail {
printf '%s\n' "$1" >&2 ## Send message to stderr.
exit "${2-1}" ## Return a code specified by $2, or 1 by default.
}
if [ $# -le 1 ] ; then if [ $# -le 1 ] ; then
echo usage: ${0} version_string files ... echo usage: ${0} version_string files ...
@@ -14,7 +10,7 @@ shift
files="$*" files="$*"
echo ${version} ${files} echo ${version} ${files}
which sponge > /dev/null || fail "sponge util must be installed" which sponge > /dev/null || ( echo "sponge util must be installed" ; exit 0 )
for file in ${files}; do for file in ${files}; do
sed "s/V\{5\}/${version}"/ ${file} | sponge ${file} sed "s/V\{5\}/${version}"/ ${file} | sponge ${file}

7
www/.htaccess Normal file
View File

@@ -0,0 +1,7 @@
Allow from all
Header always set Access-Control-Allow-Origin "https://fdsnws.geophysik.ruhr-uni-bochum.de"
Header always append Access-Control-Allow-Origin "https://photon.komoot.de"
Header always set Access-Control-Allow-Methods "POST, GET, OPTIONS, DELETE, PUT"
Header always set Access-Control-Allow-Headers "x-requested-with, Content-Type, origin, authorization, accept, client-security-token"
Header always set Access-Control-Expose-Headers "Content-Security-Policy, Location"
Header always set Access-Control-Max-Age "600"

2
www/external/easyPrint/bundle.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
www/external/easyPrint/bundle.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

16
www/external/easyPrint/easyPrint.css vendored Normal file
View File

@@ -0,0 +1,16 @@
.leaflet-control-easyPrint-button a {
background:#fff url(external/easyPrint/print.png) no-repeat 5px;
background-size:16px 16px;
display: block;
}
//@media print {
html {padding: 0px!important;}
.leaflet-control-easyPrint-button{display: none!important;}
}
//#map {
width: 1200;
height: 800;
}

BIN
www/external/easyPrint/print.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 219 B

6
www/external/jQuery.print.min.js vendored Normal file
View File

@@ -0,0 +1,6 @@
/* @license
* jQuery.print, version 1.6.0
* (c) Sathvik Ponangi, Doers' Guild
* Licence: CC-By (http://creativecommons.org/licenses/by/3.0/)
*--------------------------------------------------------------------------*/
!function(e){"use strict";function t(t,n,r){for(var o=e(t),i=o.clone(n,r),a=o.find("textarea").add(o.filter("textarea")),l=i.find("textarea").add(i.filter("textarea")),c=o.find("select").add(o.filter("select")),d=i.find("select").add(i.filter("select")),f=0,s=a.length;f<s;++f)e(l[f]).val(e(a[f]).val());for(f=0,s=c.length;f<s;++f)for(var p=0,u=c[f].options.length;p<u;++p)!0===c[f].options[p].selected&&(d[f].options[p].selected=!0);return i}function n(n){var r=e("");try{r=t(n)}catch(t){r=e("<span />").html(n)}return r}function r(t,n,r){var o=e.Deferred();try{var i=(t=t.contentWindow||t.contentDocument||t).document||t.contentDocument||t;r.doctype&&i.write(r.doctype),i.write(n),i.close();var a=!1,l=function(){if(!a){t.focus();try{t.document.execCommand("print",!1,null)||t.print(),e("body").focus()}catch(e){t.print()}t.close(),a=!0,o.resolve()}};e(t).on("load",l),setTimeout(l,r.timeout)}catch(e){o.reject(e)}return o}function o(e,t){return r(window.open(),e,t).always(function(){try{t.deferred.resolve()}catch(e){console.warn("Error notifying deferred",e)}})}function i(e){return!!("object"==typeof Node?e instanceof Node:e&&"object"==typeof e&&"number"==typeof e.nodeType&&"string"==typeof e.nodeName)}e.print=e.fn.print=function(){var a,l,c=this;c instanceof e&&(c=c.get(0)),i(c)?(l=e(c),arguments.length>0&&(a=arguments[0])):arguments.length>0?i((l=e(arguments[0]))[0])?arguments.length>1&&(a=arguments[1]):(a=arguments[0],l=e("html")):l=e("html");var d={globalStyles:!0,mediaPrint:!1,stylesheet:null,noPrintSelector:".no-print",iframe:!0,append:null,prepend:null,manuallyCopyFormValues:!0,deferred:e.Deferred(),timeout:750,title:null,doctype:"<!doctype html>"};a=e.extend({},d,a||{});var f=e("");a.globalStyles?f=e("style, link, meta, base, title"):a.mediaPrint&&(f=e("link[media=print]")),a.stylesheet&&(f=e.merge(f,e('<link rel="stylesheet" href="'+a.stylesheet+'">')));var s=t(l);if((s=e("<span/>").append(s)).find(a.noPrintSelector).remove(),s.append(t(f)),a.title){var p=e("title",s);0===p.length&&(p=e("<title />"),s.append(p)),p.text(a.title)}s.append(n(a.append)),s.prepend(n(a.prepend)),a.manuallyCopyFormValues&&(s.find("input").each(function(){var t=e(this);t.is("[type='radio']")||t.is("[type='checkbox']")?t.prop("checked")&&t.attr("checked","checked"):t.attr("value",t.val())}),s.find("select").each(function(){e(this).find(":selected").attr("selected","selected")}),s.find("textarea").each(function(){var t=e(this);t.text(t.val())}));var u,h,m,y,v=s.html();try{a.deferred.notify("generated_markup",v,s)}catch(e){console.warn("Error notifying deferred",e)}if(s.remove(),a.iframe)try{u=v,m=e((h=a).iframe+""),0===(y=m.length)&&(m=e('<iframe height="0" width="0" border="0" wmode="Opaque"/>').prependTo("body").css({position:"absolute",top:-999,left:-999})),r(m.get(0),u,h).done(function(){setTimeout(function(){0===y&&m.remove()},1e3)}).fail(function(e){console.error("Failed to print from iframe",e),o(u,h)}).always(function(){try{h.deferred.resolve()}catch(e){console.warn("Error notifying deferred",e)}})}catch(e){console.error("Failed to print from iframe",e.stack,e.message),o(v,a)}else o(v,a);return this}}(jQuery);

2
www/index.html.de
View File

@@ -111,7 +111,7 @@
<span id="events-type">Symbole:</span> <span id="events-type">Symbole:</span>
</p> </p>
<p class="table-caption"> <p class="table-caption">
Reverse Geolocation courtesy of <a href="http://photon.komoot.io/" target="_blank">Photon by Komoot</a> Reverse Geolocation courtesy of <a href="http://photon.komoot.de/" target="_blank">Photon by Komoot</a>
</p> </p>
</div> </div>
<!-- Stations --> <!-- Stations -->

2
www/index.html.en
View File

@@ -112,7 +112,7 @@
<span id="events-type">Symbols:</span> <span id="events-type">Symbols:</span>
</p> </p>
<p class="table-caption"> <p class="table-caption">
Reverse Geolocation courtesy of <a href="http://photon.komoot.io/" target="_blank">Photon by Komoot</a> Reverse Geolocation courtesy of <a href="http://photon.komoot.de/" target="_blank">Photon by Komoot</a>
</p> </p>
</div> </div>
<!-- Stations --> <!-- Stations -->

2
www/misc.js
View File

@@ -94,7 +94,7 @@ var config = {
dlsvURL: 'dlsv', dlsvURL: 'dlsv',
mseedURL: 'https://fdsnws.geophysik.ruhr-uni-bochum.de/fdsnws/dataselect/1/query', mseedURL: 'https://fdsnws.geophysik.ruhr-uni-bochum.de/fdsnws/dataselect/1/query',
stationURL: 'https://fdsnws.geophysik.ruhr-uni-bochum.de/fdsnws/station/1/query', stationURL: 'https://fdsnws.geophysik.ruhr-uni-bochum.de/fdsnws/station/1/query',
nominatimURL: 'https://photon.komoot.io/reverse', nominatimURL: 'https://photon.komoot.de/reverse',
timespan: 400, timespan: 400,
}, },
event: { event: {