CDPP / AMDA_IHM

Commit ef969297ba1cb2003b959e33042a9a7516d2833d

Authored by Erdogan Furkan
1 parent 23d8e2b8
Exists in FER_10829

Last modifications

Showing 2 changed files with 8 additions and 11 deletions   Show diff stats
Inline Side-by-side
js/app/catalogTTList.js
  Diff comments   View file @ef96929
... ... @@ -38,7 +38,6 @@ Ext.onReady(function () {
38 38 height:80,
39 39 width:120,
40 40 margin: '0 10 0 10',
41   - bodyStyle: { background : '#000000'},
42 41  
43 42 },
44 43 {
... ... @@ -48,16 +47,16 @@ Ext.onReady(function () {
48 47 padding:5,
49 48 bodyStyle: { background : '#dfe8f6'},
50 49 flex:1,
51   - height:100,
  50 + height:80,
52 51 html: '<p>This page presents catalogs and time tables available in the on-line analysis tool \
53   - <a href="http://amda.irap.omp.eu" target="_blank">AMDA</a> \
  52 + <a href="http://amda.cdpp.eu" target="_blank">AMDA</a> \
54 53 (see the "Shared" folders). These items come from published articles or \
55 54 community/project websites and can be downloaded in several formats \
56 55 (<a href="https://www.ivoa.net/documents/VOTable/20130315/PR-VOTable-1.3-20130315.html" target="_blank">VOTable</a>, \
57 56 <a href="https://spase-group.org/docs/conventions/HDMC-Event-List-Specification-v1.0.4.pdf" target="_blank">HPEvents</a> \
58 57 or ASCII compliant with AMDA). They can be uploaded in other analysis \
59   - tools like <a href="http://3dview.irap.omp.eu/" target="_blank">3DView</a>, \
60   - <a href="https://github.com/SciQLopSciQlop" target="_blank">SciQLop</a>, ...</p>',
  58 + tools like <a href="http://3dview.cdpp.eu/" target="_blank">3DView</a>, \
  59 + <a href="https://github.com/SciQLop/SciQLop" target="_blank">SciQLop</a>, ...</p>',
61 60 }
62 61 ]
63 62  
... ... @@ -97,15 +96,15 @@ Ext.onReady(function () {
97 96 menu: [
98 97 {
99 98 text: 'ASCII',
100   - handler: function() {window.location.href = dlLink('ASCII', record);}
  99 + handler: function() { window.open( dlLink('ASCII', record), '_blank');}
101 100 },
102 101 {
103 102 text: 'VOTable',
104   - handler: function() { window.location.href = dlLink('VOTable', record);}
  103 + handler: function() { window.open( dlLink('VOTable', record), '_blank');}
105 104 },
106 105 {
107 106 text: 'HPEvent',
108   - handler: function() {window.location.href = dlLink('HPEvent', record);}
  107 + handler: function() {window.open( dlLink('HPEvent', record), '_blank');}
109 108 },
110 109 ]
111 110 });
... ...
php/getSharedObject.php
  Diff comments   View file @ef96929
... ... @@ -24,12 +24,10 @@ $fileUrl = str_replace(&quot;\n&quot;, &#39;&#39;,file_get_contents($url));
24 24  
25 25 // headers to send your file
26 26 header("Content-Type: text/plain");
27   -header('Content-Disposition: attachment; filename="' . $nameToGive . '"');
  27 +header('Content-Disposition: inline; filename="' . $nameToGive . '"');
28 28  
29 29 ob_clean();
30 30 flush();
31   -
32   -// upload the file to the user and quit
33 31 readfile($fileUrl);
34 32 exit;
35 33  
... ...