Skip to content
Snippets Groups Projects
Commit dfd107ba authored by Nico Vermaas's avatar Nico Vermaas
Browse files

Merge branch 'esap-general#53' into 'master'

Warn that SAMP doesn't work in Safari

See merge request astron-sdc/esap-gui!44
parents 979e6121 1e7dafee
No related branches found
No related tags found
2 merge requests!45Master,!44Warn that SAMP doesn't work in Safari
Pipeline #16160 passed
......@@ -92,8 +92,9 @@ export default function SampPage(props) {
return (
<div className="App">
<div>
<h2>SAMP demo</h2>
<p>Start a SAMP enabled application (like Topcat), register to the hub and transmit data from Topcat.</p>
<h2>IVOA SAMP</h2>
<p>Start an application which provides a <a href="http://www.ivoa.net/documents/SAMP/">SAMP</a> hub (like <a href="http://www.star.bris.ac.uk/~mbt/topcat/">TOPCAT</a>), hit &quot;register&quot;, and transmit data into ESAP.</p>
<p>Be aware that SAMP <a href="https://wiki.ivoa.net/twiki/bin/view/IVOA/WebSampHttps">only works in some browsers</a>; in particular, Safari is generally incompatible.</p>
<button variant="outline-warning" onClick={() => register()}>register</button>&nbsp;
<button variant="outline-warning" onClick={() => unregister()}>unregister</button>&nbsp;
......@@ -101,4 +102,4 @@ export default function SampPage(props) {
</div>
</div>
);
}
\ No newline at end of file
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment