CDPP / AMDA_IHM

Commit 6d4a5fa17107a793803c67ca65719e6afe15d65b

Authored by Erdogan Furkan
Committed by Benjamin Renard
1 parent 27990ec8
Exists in master and in 24 other branches FER_10828_2, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_6265, FER_6951, FER_7618, FER_7862, FER_9629, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_11362, MAZ_11427, SpeasyGet, akkodis/amdadev, amdadev, amdadev_test, openam

Some modifications

Showing 4 changed files with 334 additions and 36 deletions   Show diff stats
Inline Side-by-side
catalogTTList.html
  Diff comments   View file @6d4a5fa
... ... @@ -2,7 +2,7 @@
2 2 <html xmlns="http://www.w3.org/1999/xhtml">
3 3 <head>
4 4 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
5   - <title>AMDA Statistics</title>
  5 + <title>AMDA Catalogs & Time Tables</title>
6 6 <link rel="stylesheet" type="text/css" href="js/lib/ext/resources/css/ext-all.css"/>
7 7 <link rel="stylesheet" type="text/css" href="js/resources/css/amda.css"/>
8 8 <script type="text/javascript" src="js/lib/ext/ext-all.js"></script>
... ...
js/app/catalogTTList.js
  Diff comments   View file @6d4a5fa
... ... @@ -3,6 +3,12 @@ function columnWrap(val){
3 3 return '<div style="white-space:normal !important;">'+val+'</div>';
4 4 }
5 5  
  6 +function dlLink(format, record){
  7 + return 'php/getSharedObject.php?type='+record.get('type')
  8 + +'&id='+record.get('id')+'&format='+format
  9 + +'&nameToGive='+record.get('name');
  10 +}
  11 +
6 12 Ext.onReady(function () {
7 13 Ext.define('CatalogTTModel', {
8 14 extend: 'Ext.data.Model',
... ... @@ -21,7 +27,41 @@ Ext.onReady(function () {
21 27 url : 'php/catalogTTList.php'
22 28 }
23 29 });
24   -
  30 + var presentationPanel = Ext.create('Ext.panel.Panel', {
  31 + height: 80,
  32 + layout:'hbox',
  33 + bodyStyle: { background : '#dfe8f6'},
  34 + items:[
  35 + {
  36 + xtype:'image',
  37 + src: 'js/resources/images/Amda_coul_sur_blanc.svg',
  38 + height:80,
  39 + width:120,
  40 + margin: '0 10 0 10',
  41 + bodyStyle: { background : '#000000'},
  42 +
  43 + },
  44 + {
  45 + xtype:'panel',
  46 + border:false,
  47 + autoScroll : true,
  48 + padding:5,
  49 + bodyStyle: { background : '#dfe8f6'},
  50 + flex:1,
  51 + height:100,
  52 + 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> \
  54 + (see the "Shared" folders). These items come from published articles or \
  55 + community/project websites and can be downloaded in several formats \
  56 + (<a href="https://www.ivoa.net/documents/VOTable/20130315/PR-VOTable-1.3-20130315.html" target="_blank">VOTable</a>, \
  57 + <a href="https://spase-group.org/docs/conventions/HDMC-Event-List-Specification-v1.0.4.pdf" target="_blank">HPEvents</a> \
  58 + 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>',
  61 + }
  62 + ]
  63 +
  64 + });
25 65 var grid = Ext.create('Ext.grid.Panel', {
26 66 xtype:'grouped-grid',
27 67 requires: [
... ... @@ -37,56 +77,55 @@ Ext.onReady(function () {
37 77 id: 'typeGrouping'
38 78 }],
39 79 columns: [
40   - { text: 'Id', width:100, dataIndex: 'id' },
  80 + //{ text: 'Id', width:100, dataIndex: 'id' },
41 81 { text: 'Name', width:100, dataIndex: 'name' },
42   - { text: 'Creation Date', width:135, dataIndex: 'created' },
43 82 { text: 'Description', flex:1, dataIndex: 'description', renderer:columnWrap },
44 83 { text: '#', width:50, dataIndex: 'nbIntervals',tooltip: 'Number of line',align:'center' },
45   - { text: 'Survey Start', width:135, dataIndex: 'surveyStart' },
46   - { text: 'Survey Stop', width:135, dataIndex: 'surveyStop' },
47   - { text: 'Shared Date', width:135, dataIndex: 'sharedDate' },
  84 + { text: 'Survey start', width:135, dataIndex: 'surveyStart' },
  85 + { text: 'Survey stop', width:135, dataIndex: 'surveyStop' },
  86 + { text: 'Creation date', width:135, dataIndex: 'created' },
  87 + { text: 'Sharing date', width:135, dataIndex: 'sharedDate' },
48 88 { text: 'Type', dataIndex: 'type' },
49 89 {
50   - width: 30, menuDisabled: true, xtype: 'actioncolumn', tooltip: 'Download the shared TT/Cat', align: 'center',
51   - icon: 'js/resources/images/16x16/download_manager.png',
52   - handler: function(grid, rowIndex, colIndex, actionItem, event, record, row) {
53   - var url="";
54   - if(record.data.type==="catalog")
55   - url = 'php/rest/getCatalog.php?catID='+record.data.id+'&outputFormat=ASCII';
56   - if(record.data.type==="timeTable")
57   - url = 'php/rest/getTimeTable.php?ttID='+record.data.id+'&outputFormat=ASCII';
58   - if(url.length !== 0){
59   - Ext.Ajax.request({
60   - url: url,
61   - method: 'GET', // set the HTTP method to GET
62   - success: function(response) {
63   - window.open(response.responseText, '_blank');
64   - },
65   - failure: function(response) {
66   - alert('Request failed:', response.statusText);
67   - }
  90 + width: 40, menuDisabled: true, xtype: 'actioncolumn', tooltip: 'Download the shared TT/Cat', align: 'center',
  91 + renderer: function(value, metaData, record, rowIndex, colIndex, store) {
  92 + var buttonId = Ext.id();
  93 + Ext.defer(function() {
  94 + var button = Ext.create('Ext.button.Button', {
  95 + icon: 'js/resources/images/16x16/download_manager.png',
  96 + renderTo: buttonId,
  97 + menu: [
  98 + {
  99 + text: 'ASCII',
  100 + handler: function() {window.location.href = dlLink('ASCII', record);}
  101 + },
  102 + {
  103 + text: 'VOTable',
  104 + handler: function() { window.location.href = dlLink('VOTable', record);}
  105 + },
  106 + {
  107 + text: 'HPEvent',
  108 + handler: function() {window.location.href = dlLink('HPEvent', record);}
  109 + },
  110 + ]
68 111 });
69   - }
70   - else{
71   - alert('This data is not a TT/Cat.')
72   - }
73   -
74   -
75   -
  112 + }, 10);
  113 + return '<div style="height:1px;margin-top:-2px;" id="' + buttonId + '"></div>';
76 114 }
77 115 }
78 116 ]
79 117 });
80 118  
81 119 var win = Ext.create('Ext.window.Window', {
82   - width: 1000,
83   - height: 500,
  120 + width: 1100,
  121 + height: 675,
  122 + title: 'List of shared catalogs and time tables',
84 123 closable:false,
85 124 autoScroll : true,
86 125 maximizable: true,
87   - title: 'List of shared catalogs and time tables',
88   - layout:'fit',
  126 + layout:'anchor',
89 127 items: [
  128 + presentationPanel,
90 129 grid
91 130 ]
92 131 }).show();
... ...
js/resources/images/Amda_coul_sur_blanc.svg 0 → 100644
  Diff comments   View file @6d4a5fa
... ... @@ -0,0 +1,223 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
  3 +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
  4 + viewBox="0 0 348.2 175" enable-background="new 0 0 348.2 175" xml:space="preserve">
  5 +<g id="gris_x5F_sur_x5F_noir_1_" display="none">
  6 +
  7 + <radialGradient id="SVGID_1_" cx="-3165.8584" cy="-5064.4795" r="28.585" gradientTransform="matrix(0.88 -0.1361 0.1361 0.88 3626.592 4098.9229)" gradientUnits="userSpaceOnUse">
  8 + <stop offset="0" style="stop-color:#FFFFFF"/>
  9 + <stop offset="8.760076e-02" style="stop-color:#FCFCFC"/>
  10 + <stop offset="0.1915" style="stop-color:#F1F1F1"/>
  11 + <stop offset="0.3036" style="stop-color:#E0E0E0"/>
  12 + <stop offset="0.4207" style="stop-color:#C6C6C6"/>
  13 + <stop offset="0.5109" style="stop-color:#AEAEAE"/>
  14 + <stop offset="1" style="stop-color:#454444"/>
  15 + </radialGradient>
  16 + <path display="inline" fill="url(#SVGID_1_)" d="M145.7,101.7c-11.2,0-20.9-8.3-22.6-19.4c-1.9-12.5,6.6-24.2,19.1-26.1
  17 + c1.2-0.2,2.4-0.3,3.5-0.3c11.2,0,20.9,8.3,22.6,19.4c1.9,12.5-6.6,24.2-19.1,26.1C148.1,101.6,146.9,101.7,145.7,101.7z"/>
  18 + <radialGradient id="SVGID_2_" cx="206.819" cy="125.5404" r="9.4071" gradientUnits="userSpaceOnUse">
  19 + <stop offset="0" style="stop-color:#FFFFFF"/>
  20 + <stop offset="8.760076e-02" style="stop-color:#FCFCFC"/>
  21 + <stop offset="0.1915" style="stop-color:#F1F1F1"/>
  22 + <stop offset="0.3036" style="stop-color:#E0E0E0"/>
  23 + <stop offset="0.4207" style="stop-color:#C6C6C6"/>
  24 + <stop offset="0.5109" style="stop-color:#AEAEAE"/>
  25 + <stop offset="1" style="stop-color:#454444"/>
  26 + </radialGradient>
  27 + <path display="inline" fill="url(#SVGID_2_)" d="M204.5,135.2c-0.4,0-0.8,0-1.1-0.1c-4.4-0.6-7.4-4.7-6.8-9
  28 + c0.6-3.9,3.9-6.9,7.9-6.9c0.4,0,0.8,0,1.1,0.1c4.4,0.6,7.4,4.7,6.8,9C211.9,132.3,208.5,135.2,204.5,135.2z"/>
  29 + <g display="inline">
  30 + <g>
  31 + <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="34.5526" y1="87.498" x2="294.1466" y2="87.498">
  32 + <stop offset="0.1895" style="stop-color:#979696"/>
  33 + <stop offset="0.8665" style="stop-color:#575756"/>
  34 + </linearGradient>
  35 + <path fill="url(#SVGID_3_)" d="M283,109.3c-9.8,2.7-19,5.7-27.9,8.6c-7.8,2.5-15.1,4.9-22.5,7c-6.5,1.8-12.6,3.3-18.2,4.3
  36 + c-0.9,4.7-5.1,8.1-9.8,8.1c-0.5,0-0.9,0-1.4-0.1c-3.7-0.5-6.6-2.9-7.9-6.1c-20.3-0.1-32.7-8.7-39.2-26.2c-1.3,0.5-2.6,0.9-4,1.2
  37 + c-0.2,0-0.4,0.1-0.5,0.1c-0.4,0.1-0.9,0.2-1.3,0.2c-1.6,0.2-3.1,0.3-4.7,0.3l-0.1,0c-2.5,0-4.9-0.4-7.2-1.1
  38 + c-16.4,22.9-34.5,25.6-46.3,20.3c-12.9-5.8-23.7-23.5-16.9-48.7c4.8-17.6,16.9-30.6,30.9-33.1c9.5-1.7,18.7,1.8,26.6,9.8
  39 + c2.8-1.5,5.8-2.5,9.1-3.1c1.2-0.2,2.4-0.3,3.6-0.3C133.9,36.5,119,30,103.7,32.7C85.3,36,69.5,52.4,63.6,74.4
  40 + c-3.7,13.7-3.2,27,1.3,38.5c4.4,11,12.2,19.5,22.1,24c6.4,2.9,14,4.2,22.2,2.9c12.2-1.9,25.6-9.5,37.8-26
  41 + c13.3,28.6,40.3,31.7,65.8,27.7c8-1.2,15.9-3.2,23.1-5.2c7.7-2.2,15.1-4.6,23-7.2c8-2.6,16.1-5.3,24.6-7.7L283,109.3z
  42 + M120.3,64.3c0.5-0.1,1-0.1,1.5-0.1c2.5-4.1,6-7.5,10.3-9.9c-0.9-0.4-1.8-0.7-2.7-0.9c-3.6-1-7.3-1.3-11-0.7
  43 + C107.3,54.3,97.9,63.1,94.4,75c-4.7,16.2,3.3,32.9,17.9,37.1c3.6,1,7.3,1.3,11,0.7c5.4-0.8,10.5-3.4,14.6-7.1
  44 + c-4.2-1.2-8.1-3.4-11.2-6.4c-1.6,0.9-3.4,1.5-5.2,1.8c-2,0.3-4,0.2-5.8-0.4c-8.3-2.4-12.8-12.5-9.9-22.5
  45 + C107.9,70.9,113.7,65.3,120.3,64.3z"/>
  46 + </g>
  47 + </g>
  48 + <g display="inline">
  49 + <path fill="#FFFFFF" d="M181.7,66.3h15.2c1.2,0,2.2,0.4,3,1.3c0.8,0.8,1.3,1.9,1.3,3v19.5h-3.6v-8.3H181v8.3h-3.6V70.6
  50 + c0-1.2,0.4-2.2,1.3-3C179.5,66.8,180.5,66.3,181.7,66.3z M181,78.3h16.7v-7.6c0-0.2-0.1-0.4-0.2-0.5c-0.1-0.1-0.3-0.2-0.5-0.2
  51 + h-15.2c-0.2,0-0.4,0.1-0.5,0.2c-0.1,0.1-0.2,0.3-0.2,0.5V78.3z"/>
  52 + <path fill="#FFFFFF" d="M231.1,71c1.2,0,2.2,0.4,3,1.3c0.8,0.8,1.3,1.9,1.3,3v14.9h-3.5V75.3c0-0.2-0.1-0.4-0.2-0.5
  53 + c-0.1-0.1-0.3-0.2-0.5-0.2h-7.6c-0.2,0-0.4,0.1-0.5,0.2c-0.1,0.1-0.2,0.3-0.2,0.5v14.9h-3.6V75.3c0-0.2-0.1-0.4-0.2-0.5
  54 + c-0.1-0.1-0.3-0.2-0.5-0.2h-7.6c-0.2,0-0.4,0.1-0.5,0.2c-0.1,0.1-0.2,0.3-0.2,0.5v14.9h-3.6V71H231.1z"/>
  55 + <path fill="#FFFFFF" d="M255.5,64.7h3.6v25.5h-15.2c-1.2,0-2.2-0.4-3-1.3s-1.3-1.9-1.3-3V75.3c0-1.2,0.4-2.2,1.3-3s1.9-1.3,3-1.3
  56 + h11.6V64.7z M243.9,86.6h10.9c0.2,0,0.4-0.1,0.5-0.2c0.1-0.1,0.2-0.3,0.2-0.5V75.3c0-0.2-0.1-0.4-0.2-0.5
  57 + c-0.1-0.1-0.3-0.2-0.5-0.2h-10.9c-0.2,0-0.4,0.1-0.5,0.2c-0.1,0.1-0.2,0.3-0.2,0.5v10.6c0,0.2,0.1,0.4,0.2,0.5
  58 + C243.5,86.5,243.7,86.6,243.9,86.6z"/>
  59 + <path fill="#FFFFFF" d="M279.4,71c1.2,0,2.2,0.4,3,1.3c0.8,0.8,1.3,1.9,1.3,3v14.9h-15.2c-1.2,0-2.2-0.4-3-1.3s-1.3-1.9-1.3-3
  60 + v-7.1h15.9v-3.5c0-0.2-0.1-0.4-0.2-0.5c-0.1-0.1-0.3-0.2-0.5-0.2h-15.2V71H279.4z M280.2,86.6v-4.2h-12.4v3.5
  61 + c0,0.2,0.1,0.4,0.2,0.5c0.1,0.1,0.3,0.2,0.5,0.2H280.2z"/>
  62 + </g>
  63 +</g>
  64 +<g id="gris_x5F_sur_x5F_blanc" display="none">
  65 +
  66 + <radialGradient id="SVGID_4_" cx="-3165.8584" cy="-5064.4795" r="28.585" gradientTransform="matrix(0.88 -0.1361 0.1361 0.88 3626.592 4098.9229)" gradientUnits="userSpaceOnUse">
  67 + <stop offset="0" style="stop-color:#FFFFFF"/>
  68 + <stop offset="8.760076e-02" style="stop-color:#FCFCFC"/>
  69 + <stop offset="0.1915" style="stop-color:#F1F1F1"/>
  70 + <stop offset="0.3036" style="stop-color:#E0E0E0"/>
  71 + <stop offset="0.4207" style="stop-color:#C6C6C6"/>
  72 + <stop offset="0.5109" style="stop-color:#AEAEAE"/>
  73 + <stop offset="1" style="stop-color:#454444"/>
  74 + </radialGradient>
  75 + <path display="inline" fill="url(#SVGID_4_)" d="M145.7,101.7c-11.2,0-20.9-8.3-22.6-19.4c-1.9-12.5,6.6-24.2,19.1-26.1
  76 + c1.2-0.2,2.4-0.3,3.5-0.3c11.2,0,20.9,8.3,22.6,19.4c1.9,12.5-6.6,24.2-19.1,26.1C148.1,101.6,146.9,101.7,145.7,101.7z"/>
  77 + <radialGradient id="SVGID_5_" cx="206.819" cy="125.5404" r="9.4071" gradientUnits="userSpaceOnUse">
  78 + <stop offset="0" style="stop-color:#FFFFFF"/>
  79 + <stop offset="8.760076e-02" style="stop-color:#FCFCFC"/>
  80 + <stop offset="0.1915" style="stop-color:#F1F1F1"/>
  81 + <stop offset="0.3036" style="stop-color:#E0E0E0"/>
  82 + <stop offset="0.4207" style="stop-color:#C6C6C6"/>
  83 + <stop offset="0.5109" style="stop-color:#AEAEAE"/>
  84 + <stop offset="1" style="stop-color:#454444"/>
  85 + </radialGradient>
  86 + <path display="inline" fill="url(#SVGID_5_)" d="M204.5,135.2c-0.4,0-0.8,0-1.1-0.1c-4.4-0.6-7.4-4.7-6.8-9
  87 + c0.6-3.9,3.9-6.9,7.9-6.9c0.4,0,0.8,0,1.1,0.1c4.4,0.6,7.4,4.7,6.8,9C211.9,132.3,208.5,135.2,204.5,135.2z"/>
  88 + <g display="inline">
  89 + <g>
  90 + <linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="34.5526" y1="87.498" x2="294.1466" y2="87.498">
  91 + <stop offset="0.1895" style="stop-color:#979696"/>
  92 + <stop offset="0.8665" style="stop-color:#575756"/>
  93 + </linearGradient>
  94 + <path fill="url(#SVGID_6_)" d="M283,109.3c-9.8,2.7-19,5.7-27.9,8.6c-7.8,2.5-15.1,4.9-22.5,7c-6.5,1.8-12.6,3.3-18.2,4.3
  95 + c-0.9,4.7-5.1,8.1-9.8,8.1c-0.5,0-0.9,0-1.4-0.1c-3.7-0.5-6.6-2.9-7.9-6.1c-20.3-0.1-32.7-8.7-39.2-26.2c-1.3,0.5-2.6,0.9-4,1.2
  96 + c-0.2,0-0.4,0.1-0.5,0.1c-0.4,0.1-0.9,0.2-1.3,0.2c-1.6,0.2-3.1,0.3-4.7,0.3l-0.1,0c-2.5,0-4.9-0.4-7.2-1.1
  97 + c-16.4,22.9-34.5,25.6-46.3,20.3c-12.9-5.8-23.7-23.5-16.9-48.7c4.8-17.6,16.9-30.6,30.9-33.1c9.5-1.7,18.7,1.8,26.6,9.8
  98 + c2.8-1.5,5.8-2.5,9.1-3.1c1.2-0.2,2.4-0.3,3.6-0.3C133.9,36.5,119,30,103.7,32.7C85.3,36,69.5,52.4,63.6,74.4
  99 + c-3.7,13.7-3.2,27,1.3,38.5c4.4,11,12.2,19.5,22.1,24c6.4,2.9,14,4.2,22.2,2.9c12.2-1.9,25.6-9.5,37.8-26
  100 + c13.3,28.6,40.3,31.7,65.8,27.7c8-1.2,15.9-3.2,23.1-5.2c7.7-2.2,15.1-4.6,23-7.2c8-2.6,16.1-5.3,24.6-7.7L283,109.3z
  101 + M120.3,64.3c0.5-0.1,1-0.1,1.5-0.1c2.5-4.1,6-7.5,10.3-9.9c-0.9-0.4-1.8-0.7-2.7-0.9c-3.6-1-7.3-1.3-11-0.7
  102 + C107.3,54.3,97.9,63.1,94.4,75c-4.7,16.2,3.3,32.9,17.9,37.1c3.6,1,7.3,1.3,11,0.7c5.4-0.8,10.5-3.4,14.6-7.1
  103 + c-4.2-1.2-8.1-3.4-11.2-6.4c-1.6,0.9-3.4,1.5-5.2,1.8c-2,0.3-4,0.2-5.8-0.4c-8.3-2.4-12.8-12.5-9.9-22.5
  104 + C107.9,70.9,113.7,65.3,120.3,64.3z"/>
  105 + </g>
  106 + </g>
  107 + <g display="inline">
  108 + <path d="M181.7,66.3h15.2c1.2,0,2.2,0.4,3,1.3c0.8,0.8,1.3,1.9,1.3,3v19.5h-3.6v-8.3H181v8.3h-3.6V70.6c0-1.2,0.4-2.2,1.3-3
  109 + C179.5,66.8,180.5,66.3,181.7,66.3z M181,78.3h16.7v-7.6c0-0.2-0.1-0.4-0.2-0.5c-0.1-0.1-0.3-0.2-0.5-0.2h-15.2
  110 + c-0.2,0-0.4,0.1-0.5,0.2c-0.1,0.1-0.2,0.3-0.2,0.5V78.3z"/>
  111 + <path d="M231.1,71c1.2,0,2.2,0.4,3,1.3c0.8,0.8,1.3,1.9,1.3,3v14.9h-3.5V75.3c0-0.2-0.1-0.4-0.2-0.5c-0.1-0.1-0.3-0.2-0.5-0.2
  112 + h-7.6c-0.2,0-0.4,0.1-0.5,0.2c-0.1,0.1-0.2,0.3-0.2,0.5v14.9h-3.6V75.3c0-0.2-0.1-0.4-0.2-0.5c-0.1-0.1-0.3-0.2-0.5-0.2h-7.6
  113 + c-0.2,0-0.4,0.1-0.5,0.2c-0.1,0.1-0.2,0.3-0.2,0.5v14.9h-3.6V71H231.1z"/>
  114 + <path d="M255.5,64.7h3.6v25.5h-15.2c-1.2,0-2.2-0.4-3-1.3s-1.3-1.9-1.3-3V75.3c0-1.2,0.4-2.2,1.3-3s1.9-1.3,3-1.3h11.6V64.7z
  115 + M243.9,86.6h10.9c0.2,0,0.4-0.1,0.5-0.2c0.1-0.1,0.2-0.3,0.2-0.5V75.3c0-0.2-0.1-0.4-0.2-0.5c-0.1-0.1-0.3-0.2-0.5-0.2h-10.9
  116 + c-0.2,0-0.4,0.1-0.5,0.2c-0.1,0.1-0.2,0.3-0.2,0.5v10.6c0,0.2,0.1,0.4,0.2,0.5C243.5,86.5,243.7,86.6,243.9,86.6z"/>
  117 + <path d="M279.4,71c1.2,0,2.2,0.4,3,1.3c0.8,0.8,1.3,1.9,1.3,3v14.9h-15.2c-1.2,0-2.2-0.4-3-1.3s-1.3-1.9-1.3-3v-7.1h15.9v-3.5
  118 + c0-0.2-0.1-0.4-0.2-0.5c-0.1-0.1-0.3-0.2-0.5-0.2h-15.2V71H279.4z M280.2,86.6v-4.2h-12.4v3.5c0,0.2,0.1,0.4,0.2,0.5
  119 + c0.1,0.1,0.3,0.2,0.5,0.2H280.2z"/>
  120 + </g>
  121 +</g>
  122 +<g id="coul_x5F_sur_x5F_noir" display="none">
  123 +
  124 + <radialGradient id="SVGID_7_" cx="-3166.0349" cy="-5064.5068" r="25.8382" gradientTransform="matrix(0.88 -0.1361 0.1361 0.88 3626.592 4098.9229)" gradientUnits="userSpaceOnUse">
  125 + <stop offset="0" style="stop-color:#BFE5FB"/>
  126 + <stop offset="0.496" style="stop-color:#009FE3"/>
  127 + <stop offset="1" style="stop-color:#023E85"/>
  128 + </radialGradient>
  129 + <path display="inline" fill="url(#SVGID_7_)" d="M145.7,101.7c-11.2,0-20.9-8.3-22.6-19.4c-1.9-12.5,6.6-24.2,19.1-26.1
  130 + c1.2-0.2,2.4-0.3,3.5-0.3c11.2,0,20.9,8.3,22.6,19.4c1.9,12.5-6.6,24.2-19.1,26.1C148.1,101.6,146.9,101.7,145.7,101.7z"/>
  131 + <radialGradient id="SVGID_8_" cx="206.819" cy="125.5404" r="8.0184" gradientUnits="userSpaceOnUse">
  132 + <stop offset="0" style="stop-color:#BFE5FB"/>
  133 + <stop offset="0.496" style="stop-color:#009FE3"/>
  134 + <stop offset="1" style="stop-color:#023E85"/>
  135 + </radialGradient>
  136 + <path display="inline" fill="url(#SVGID_8_)" d="M204.5,135.2c-0.4,0-0.8,0-1.1-0.1c-4.4-0.6-7.4-4.7-6.8-9
  137 + c0.6-3.9,3.9-6.9,7.9-6.9c0.4,0,0.8,0,1.1,0.1c4.4,0.6,7.4,4.7,6.8,9C211.9,132.3,208.5,135.2,204.5,135.2z"/>
  138 + <g display="inline">
  139 + <g>
  140 + <linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="34.5526" y1="87.498" x2="294.1466" y2="87.498">
  141 + <stop offset="0.2851" style="stop-color:#4CC2F1"/>
  142 + <stop offset="1" style="stop-color:#005AA7"/>
  143 + </linearGradient>
  144 + <path fill="url(#SVGID_9_)" d="M283,109.3c-9.8,2.7-19,5.7-27.9,8.6c-7.8,2.5-15.1,4.9-22.5,7c-6.5,1.8-12.6,3.3-18.2,4.3
  145 + c-0.9,4.7-5.1,8.1-9.8,8.1c-0.5,0-0.9,0-1.4-0.1c-3.7-0.5-6.6-2.9-7.9-6.1c-20.3-0.1-32.7-8.7-39.2-26.2c-1.3,0.5-2.6,0.9-4,1.2
  146 + c-0.2,0-0.4,0.1-0.5,0.1c-0.4,0.1-0.9,0.2-1.3,0.2c-1.6,0.2-3.1,0.3-4.7,0.3l-0.1,0c-2.5,0-4.9-0.4-7.2-1.1
  147 + c-16.4,22.9-34.5,25.6-46.3,20.3c-12.9-5.8-23.7-23.5-16.9-48.7c4.8-17.6,16.9-30.6,30.9-33.1c9.5-1.7,18.7,1.8,26.6,9.8
  148 + c2.8-1.5,5.8-2.5,9.1-3.1c1.2-0.2,2.4-0.3,3.6-0.3C133.9,36.5,119,30,103.7,32.7C85.3,36,69.5,52.4,63.6,74.4
  149 + c-3.7,13.7-3.2,27,1.3,38.5c4.4,11,12.2,19.5,22.1,24c6.4,2.9,14,4.2,22.2,2.9c12.2-1.9,25.6-9.5,37.8-26
  150 + c13.3,28.6,40.3,31.7,65.8,27.7c8-1.2,15.9-3.2,23.1-5.2c7.7-2.2,15.1-4.6,23-7.2c8-2.6,16.1-5.3,24.6-7.7L283,109.3z
  151 + M120.3,64.3c0.5-0.1,1-0.1,1.5-0.1c2.5-4.1,6-7.5,10.3-9.9c-0.9-0.4-1.8-0.7-2.7-0.9c-3.6-1-7.3-1.3-11-0.7
  152 + C107.3,54.3,97.9,63.1,94.4,75c-4.7,16.2,3.3,32.9,17.9,37.1c3.6,1,7.3,1.3,11,0.7c5.4-0.8,10.5-3.4,14.6-7.1
  153 + c-4.2-1.2-8.1-3.4-11.2-6.4c-1.6,0.9-3.4,1.5-5.2,1.8c-2,0.3-4,0.2-5.8-0.4c-8.3-2.4-12.8-12.5-9.9-22.5
  154 + C107.9,70.9,113.7,65.3,120.3,64.3z"/>
  155 + </g>
  156 + </g>
  157 + <g display="inline">
  158 + <path fill="#FFFFFF" d="M181.7,66.3h15.2c1.2,0,2.2,0.4,3,1.3c0.8,0.8,1.3,1.9,1.3,3v19.5h-3.6v-8.3H181v8.3h-3.6V70.6
  159 + c0-1.2,0.4-2.2,1.3-3C179.5,66.8,180.5,66.3,181.7,66.3z M181,78.3h16.7v-7.6c0-0.2-0.1-0.4-0.2-0.5c-0.1-0.1-0.3-0.2-0.5-0.2
  160 + h-15.2c-0.2,0-0.4,0.1-0.5,0.2c-0.1,0.1-0.2,0.3-0.2,0.5V78.3z"/>
  161 + <path fill="#FFFFFF" d="M231.1,71c1.2,0,2.2,0.4,3,1.3c0.8,0.8,1.3,1.9,1.3,3v14.9h-3.5V75.3c0-0.2-0.1-0.4-0.2-0.5
  162 + c-0.1-0.1-0.3-0.2-0.5-0.2h-7.6c-0.2,0-0.4,0.1-0.5,0.2c-0.1,0.1-0.2,0.3-0.2,0.5v14.9h-3.6V75.3c0-0.2-0.1-0.4-0.2-0.5
  163 + c-0.1-0.1-0.3-0.2-0.5-0.2h-7.6c-0.2,0-0.4,0.1-0.5,0.2c-0.1,0.1-0.2,0.3-0.2,0.5v14.9h-3.6V71H231.1z"/>
  164 + <path fill="#FFFFFF" d="M255.5,64.7h3.6v25.5h-15.2c-1.2,0-2.2-0.4-3-1.3s-1.3-1.9-1.3-3V75.3c0-1.2,0.4-2.2,1.3-3s1.9-1.3,3-1.3
  165 + h11.6V64.7z M243.9,86.6h10.9c0.2,0,0.4-0.1,0.5-0.2c0.1-0.1,0.2-0.3,0.2-0.5V75.3c0-0.2-0.1-0.4-0.2-0.5
  166 + c-0.1-0.1-0.3-0.2-0.5-0.2h-10.9c-0.2,0-0.4,0.1-0.5,0.2c-0.1,0.1-0.2,0.3-0.2,0.5v10.6c0,0.2,0.1,0.4,0.2,0.5
  167 + C243.5,86.5,243.7,86.6,243.9,86.6z"/>
  168 + <path fill="#FFFFFF" d="M279.4,71c1.2,0,2.2,0.4,3,1.3c0.8,0.8,1.3,1.9,1.3,3v14.9h-15.2c-1.2,0-2.2-0.4-3-1.3s-1.3-1.9-1.3-3
  169 + v-7.1h15.9v-3.5c0-0.2-0.1-0.4-0.2-0.5c-0.1-0.1-0.3-0.2-0.5-0.2h-15.2V71H279.4z M280.2,86.6v-4.2h-12.4v3.5
  170 + c0,0.2,0.1,0.4,0.2,0.5c0.1,0.1,0.3,0.2,0.5,0.2H280.2z"/>
  171 + </g>
  172 +</g>
  173 +<g id="coul_x5F_sur_x5F_blanc_1_">
  174 +
  175 + <radialGradient id="SVGID_10_" cx="-3166.0349" cy="-5064.5068" r="25.8382" gradientTransform="matrix(0.88 -0.1361 0.1361 0.88 3626.592 4098.9229)" gradientUnits="userSpaceOnUse">
  176 + <stop offset="0" style="stop-color:#BFE5FB"/>
  177 + <stop offset="0.496" style="stop-color:#009FE3"/>
  178 + <stop offset="1" style="stop-color:#023E85"/>
  179 + </radialGradient>
  180 + <path fill="url(#SVGID_10_)" d="M145.7,101.7c-11.2,0-20.9-8.3-22.6-19.4c-1.9-12.5,6.6-24.2,19.1-26.1c1.2-0.2,2.4-0.3,3.5-0.3
  181 + c11.2,0,20.9,8.3,22.6,19.4c1.9,12.5-6.6,24.2-19.1,26.1C148.1,101.6,146.9,101.7,145.7,101.7z"/>
  182 + <radialGradient id="SVGID_11_" cx="206.819" cy="125.5404" r="8.0184" gradientUnits="userSpaceOnUse">
  183 + <stop offset="0" style="stop-color:#BFE5FB"/>
  184 + <stop offset="0.496" style="stop-color:#009FE3"/>
  185 + <stop offset="1" style="stop-color:#023E85"/>
  186 + </radialGradient>
  187 + <path fill="url(#SVGID_11_)" d="M204.5,135.2c-0.4,0-0.8,0-1.1-0.1c-4.4-0.6-7.4-4.7-6.8-9c0.6-3.9,3.9-6.9,7.9-6.9
  188 + c0.4,0,0.8,0,1.1,0.1c4.4,0.6,7.4,4.7,6.8,9C211.9,132.3,208.5,135.2,204.5,135.2z"/>
  189 + <g>
  190 + <g>
  191 + <linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="34.5526" y1="87.498" x2="294.1466" y2="87.498">
  192 + <stop offset="0.2851" style="stop-color:#4CC2F1"/>
  193 + <stop offset="1" style="stop-color:#005AA7"/>
  194 + </linearGradient>
  195 + <path fill="url(#SVGID_12_)" d="M283,109.3c-9.8,2.7-19,5.7-27.9,8.6c-7.8,2.5-15.1,4.9-22.5,7c-6.5,1.8-12.6,3.3-18.2,4.3
  196 + c-0.9,4.7-5.1,8.1-9.8,8.1c-0.5,0-0.9,0-1.4-0.1c-3.7-0.5-6.6-2.9-7.9-6.1c-20.3-0.1-32.7-8.7-39.2-26.2c-1.3,0.5-2.6,0.9-4,1.2
  197 + c-0.2,0-0.4,0.1-0.5,0.1c-0.4,0.1-0.9,0.2-1.3,0.2c-1.6,0.2-3.1,0.3-4.7,0.3l-0.1,0c-2.5,0-4.9-0.4-7.2-1.1
  198 + c-16.4,22.9-34.5,25.6-46.3,20.3c-12.9-5.8-23.7-23.5-16.9-48.7c4.8-17.6,16.9-30.6,30.9-33.1c9.5-1.7,18.7,1.8,26.6,9.8
  199 + c2.8-1.5,5.8-2.5,9.1-3.1c1.2-0.2,2.4-0.3,3.6-0.3C133.9,36.5,119,30,103.7,32.7C85.3,36,69.5,52.4,63.6,74.4
  200 + c-3.7,13.7-3.2,27,1.3,38.5c4.4,11,12.2,19.5,22.1,24c6.4,2.9,14,4.2,22.2,2.9c12.2-1.9,25.6-9.5,37.8-26
  201 + c13.3,28.6,40.3,31.7,65.8,27.7c8-1.2,15.9-3.2,23.1-5.2c7.7-2.2,15.1-4.6,23-7.2c8-2.6,16.1-5.3,24.6-7.7L283,109.3z
  202 + M120.3,64.3c0.5-0.1,1-0.1,1.5-0.1c2.5-4.1,6-7.5,10.3-9.9c-0.9-0.4-1.8-0.7-2.7-0.9c-3.6-1-7.3-1.3-11-0.7
  203 + C107.3,54.3,97.9,63.1,94.4,75c-4.7,16.2,3.3,32.9,17.9,37.1c3.6,1,7.3,1.3,11,0.7c5.4-0.8,10.5-3.4,14.6-7.1
  204 + c-4.2-1.2-8.1-3.4-11.2-6.4c-1.6,0.9-3.4,1.5-5.2,1.8c-2,0.3-4,0.2-5.8-0.4c-8.3-2.4-12.8-12.5-9.9-22.5
  205 + C107.9,70.9,113.7,65.3,120.3,64.3z"/>
  206 + </g>
  207 + </g>
  208 + <g>
  209 + <path d="M181.7,66.3h15.2c1.2,0,2.2,0.4,3,1.3c0.8,0.8,1.3,1.9,1.3,3v19.5h-3.6v-8.3H181v8.3h-3.6V70.6c0-1.2,0.4-2.2,1.3-3
  210 + C179.5,66.8,180.5,66.3,181.7,66.3z M181,78.3h16.7v-7.6c0-0.2-0.1-0.4-0.2-0.5c-0.1-0.1-0.3-0.2-0.5-0.2h-15.2
  211 + c-0.2,0-0.4,0.1-0.5,0.2c-0.1,0.1-0.2,0.3-0.2,0.5V78.3z"/>
  212 + <path d="M231.1,71c1.2,0,2.2,0.4,3,1.3c0.8,0.8,1.3,1.9,1.3,3v14.9h-3.5V75.3c0-0.2-0.1-0.4-0.2-0.5c-0.1-0.1-0.3-0.2-0.5-0.2
  213 + h-7.6c-0.2,0-0.4,0.1-0.5,0.2c-0.1,0.1-0.2,0.3-0.2,0.5v14.9h-3.6V75.3c0-0.2-0.1-0.4-0.2-0.5c-0.1-0.1-0.3-0.2-0.5-0.2h-7.6
  214 + c-0.2,0-0.4,0.1-0.5,0.2c-0.1,0.1-0.2,0.3-0.2,0.5v14.9h-3.6V71H231.1z"/>
  215 + <path d="M255.5,64.7h3.6v25.5h-15.2c-1.2,0-2.2-0.4-3-1.3s-1.3-1.9-1.3-3V75.3c0-1.2,0.4-2.2,1.3-3s1.9-1.3,3-1.3h11.6V64.7z
  216 + M243.9,86.6h10.9c0.2,0,0.4-0.1,0.5-0.2c0.1-0.1,0.2-0.3,0.2-0.5V75.3c0-0.2-0.1-0.4-0.2-0.5c-0.1-0.1-0.3-0.2-0.5-0.2h-10.9
  217 + c-0.2,0-0.4,0.1-0.5,0.2c-0.1,0.1-0.2,0.3-0.2,0.5v10.6c0,0.2,0.1,0.4,0.2,0.5C243.5,86.5,243.7,86.6,243.9,86.6z"/>
  218 + <path d="M279.4,71c1.2,0,2.2,0.4,3,1.3c0.8,0.8,1.3,1.9,1.3,3v14.9h-15.2c-1.2,0-2.2-0.4-3-1.3s-1.3-1.9-1.3-3v-7.1h15.9v-3.5
  219 + c0-0.2-0.1-0.4-0.2-0.5c-0.1-0.1-0.3-0.2-0.5-0.2h-15.2V71H279.4z M280.2,86.6v-4.2h-12.4v3.5c0,0.2,0.1,0.4,0.2,0.5
  220 + c0.1,0.1,0.3,0.2,0.5,0.2H280.2z"/>
  221 + </g>
  222 +</g>
  223 +</svg>
... ...
php/getSharedObject.php 0 → 100644
  Diff comments   View file @6d4a5fa
... ... @@ -0,0 +1,36 @@
  1 +<?php
  2 +
  3 +require_once 'config.php';
  4 +
  5 +$parameters = array();
  6 +
  7 +$type = (isset($_GET['type'])) ? $_GET['type'] : "catalog";
  8 +$id = (isset($_GET['id'])) ? $_GET['id'] : exit;
  9 +
  10 +$url = ($type == "catalog") ? webAlias.'/php/rest/getCatalog.php' : webAlias.'/php/rest/getTimeTable.php' ;
  11 +if($type == "catalog")
  12 + $parameters["catID"] = $id;
  13 +else
  14 + $parameters["ttID"] = $id;
  15 +
  16 +$parameters["outputFormat"] = (isset($_GET['format'])) ? $_GET['format'] : "ASCII";
  17 +
  18 +$nameToGive = (isset($_GET['nameToGive'])) ? $_GET['nameToGive'] : $type;
  19 +$nameToGive .= ($parameters["outputFormat"] == "VOTable") ? ".xml":".txt";
  20 +
  21 +
  22 +$url .= "?".http_build_query($parameters);
  23 +$fileUrl = str_replace("\n", '',file_get_contents($url));
  24 +
  25 +// headers to send your file
  26 +header("Content-Type: text/plain");
  27 +header('Content-Disposition: attachment; filename="' . $nameToGive . '"');
  28 +
  29 +ob_clean();
  30 +flush();
  31 +
  32 +// upload the file to the user and quit
  33 +readfile($fileUrl);
  34 +exit;
  35 +
  36 +?>
... ...