Commit 928d3d39 authored by ba yaye-awa's avatar ba yaye-awa
Browse files

add modal popup for aladin

parent 45ce53f8
......@@ -21,14 +21,14 @@
<script src="../javascript/FITSHeaderTable.js"></script>
<script src="../javascript/olqv_utils.js"></script>
<!-- <script src="https://openlayers.org/en/v4.6.4/build/ol.js" type="text/javascript"></script> -->
<!-- Conditional code generation -->
<%if(useSAMP){%>
<script src="../javascript/samp.js"></script>
<script src="../javascript/flXHR.js"></script>
<%}%>
<%
include ./launchsamphub ;
}%>
<!-- End of conditional code generation -->
<style>
......@@ -272,7 +272,7 @@
<p>This link is intended to send the current artemix spectrum to Cassis tool, or any other tool that runs with the SAMP protocol and accepts our file fits format.
</br></br>
For the transfer to work, Check that Cassis is running.</br></br>
How to launch Cassis</br>
<strong>- Cassis with command line:</strong></br>
Open a terminal and run: javaws http://cassis.irap.omp.eu/online/cassis.jnlp </br></br>
......@@ -290,7 +290,7 @@
</div>
</div>
<!-- Modal for samp cassis-->
<!-- Modal for samp aladin -->
<div class="modal fade" id="sampModalAladin" role="dialog" style="display:none">
<div class="modal-dialog">
<!-- Modal content-->
......@@ -2322,30 +2322,31 @@ var SAMPPNGPublishControl = (function (Control) {
*/
var publishSpectrumDiv = "#publish_spectrum";
var publishSummedpixelsspectrumDiv ="#publish_summedpixelsspectrum";
var publishPngDiv = ".samp_publish_png";
var publishPngDiv = "div.samp-publish-png";
var configureSampEnabled = function(isHubRunning) {
$(publishSpectrumDiv).click(function(e) {
alert("click on png");
$(publishSpectrumDiv).click(function() {
console.log("click on publish spectrum button");
if(!isHubRunning){
$("#sampModal").modal();
$('#sampModal').modal();
}else{
$("#sampModal").modal('hide');
$('#sampModal').modal('hide');
}
});
$(publishSummedpixelsspectrumDiv).click(function() {
console.log("click on publish sommed pixel");
if(!isHubRunning){
$("#sampModal").modal();
$('#sampModal').modal();
}else{
$("#sampModal").modal('hide');
$('#sampModal').modal('hide');
}
});
$(publishPngDiv).click(function() {
alert("click on png");
$(publishPngDiv).find("button").click(function() {
console.log("click on publish png button");
if(!isHubRunning){
$("#sampModalAladin").modal();
$('#sampModalAladin').modal();
}else{
$("#sampModalAladin").modal('hide');
$('#sampModalAladin').modal('hide');
}
});
};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment