Commit 3b70cb6b authored by ba yaye-awa's avatar ba yaye-awa
Browse files

add popup for aladin

parent b0e96de6
......@@ -27,6 +27,7 @@
<!-- Conditional code generation -->
<%if(useSAMP){%>
<script src="../javascript/samp.js"></script>
<script src="../javascript/flXHR.js"></script>
<%}%>
<!-- End of conditional code generation -->
......@@ -258,7 +259,7 @@
</div>
</div>
<!-- Modal for samp-->
<!-- Modal for samp cassis-->
<div class="modal fade" id="sampModal" role="dialog" style="display:none">
<div class="modal-dialog">
<!-- Modal content-->
......@@ -288,6 +289,37 @@
</div>
</div>
</div>
<!-- Modal for samp cassis-->
<div class="modal fade" id="sampModalAladin" role="dialog" style="display:none">
<div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Send image by SAMP (Aladin)</h4>
</div>
<div class="modal-body">
<p>This link is intended to send the current Artemix image to Aladin tool, or any other tool that runs with the SAMP protocol and accepts our file png format.
</br></br>
For the transfer to work, Check that Aladin is running.</br></br>
How to launch Aladin</br>
<strong>- Aladin with command line:</strong></br>
Open a terminal and run: javaws https://aladin.u-strasbg.fr/java/nph-aladin.pl</br></br>
<strong>- Aladin online:</strong></br>
<ul>
<li>1- Go to the Aladin <a href="https://aladin.u-strasbg.fr/java/nph-aladin.pl?frame=downloading"> website</a></li>
<li>2- Use Aladin online application or download the latest version </li></ul>
If you encounter a problem during the installation, check that you have the correct Java version compatible with Aladin, and allow the installation in your computer. Found <a href="images/enablejava.png">here</a> how to do with Mac </br></br>
In case of problems with Aladin please contact the Aladin team cds-question AT <a href="#"> unistra.fr?Subject=Aladin</a></p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
</body>
<script>
......@@ -2244,7 +2276,7 @@ var SAMPPNGPublishControl = (function (Control) {
this.setSummedSlicesRelPNGPath = function(relSummedSlicesPNGPath) {
_relSummedSlicesPNGPath = relSummedSlicesPNGPath;
console.log("Slice relative PNG path set to '"+_relSlicePNGPath+"'");
console.log("Slice relative PNG path set to '"+_relSummedSlicesPNGPath+"'");
};
this.setAverageSpectrumFile = function(averageSpectrumPath) {
......@@ -2292,9 +2324,11 @@ var SAMPPNGPublishControl = (function (Control) {
*/
var publishSpectrumDiv = "#publish_spectrum";
var publishSummedpixelsspectrumDiv ="#publish_summedpixelsspectrum";
var publishPngDiv = ".samp_publish_png";
var configureSampEnabled = function(isHubRunning) {
$(publishSpectrumDiv).click(function(e) {
alert("click on png");
if(!isHubRunning){
$("#sampModal").modal();
}else{
......@@ -2308,6 +2342,14 @@ var SAMPPNGPublishControl = (function (Control) {
$("#sampModal").modal('hide');
}
});
$(publishPngDiv).click(function() {
alert("click on png");
if(!isHubRunning){
$("#sampModalAladin").modal();
}else{
$("#sampModalAladin").modal('hide');
}
});
};
var connector = new samp.Connector("Artemix");
......
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