CDPP / AMDA_IHM

Commit 09f71b598582e54d7fcd22f9eb596238e8a59d10

Authored by Benjamin Renard
2 parents 073d0df3 4ac88d61
Exists in master and in 2 other branches SpeasyGet, amdadev

Merge branch 'FER_6265' into amdadev

Showing 3 changed files with 8 additions and 3 deletions   Show diff stats
Inline Side-by-side
js/app/views/AstroImagesUI.js
  Diff comments   View file @09f71b5
... ... @@ -80,7 +80,7 @@ Ext.define('amdaUI.AstroImagesUI', {
80 80 {
81 81 var imageSrc = this.getPreviewUrl(image);
82 82 image.set('icon',imageSrc);
83   - image.set('iconCls','x-tree-icon-leaf');
  83 + image.set('iconCls','amda-astro-tree-icon-leaf');
84 84 }
85 85 else
86 86 {
... ... @@ -105,8 +105,6 @@ Ext.define('amdaUI.AstroImagesUI', {
105 105 if(image.get('checked'))
106 106 {
107 107 var name = image.get('name');
108   - if (!name.substr(name.lastIndexOf('.') + 1) != "fits")
109   - name+='.fits';
110 108 imgList.push({name:name,
111 109 url:me.getImageToSendUrl(image)});
112 110 }
... ...
js/resources/css/amda.css
  Diff comments   View file @09f71b5
... ... @@ -638,4 +638,9 @@ p + p {
638 638 .cm-s-default .cm-amda {
639 639 color: rgb(9, 134, 218);
640 640 font-weight: bold;
  641 +}
  642 +
  643 +.amda-astro-tree-icon-leaf {
  644 + background-image: url(images/tree/leaf.gif);
  645 + background-size: contain;
641 646 }
642 647 \ No newline at end of file
... ...
php/classes/AmdaAction.php
  Diff comments   View file @09f71b5
... ... @@ -1076,6 +1076,8 @@ class AmdaAction
1076 1076 // just convert TT / Catalog
1077 1077 if ($obj->nodeType == "download" && $obj->downloadSrc == "1")
1078 1078 return $this->executeRequest($obj, FunctionTypeEnumClass::TTCONVERT);
  1079 + else if ($obj->nodeType == "download" && $obj->downloadSrc == "2")
  1080 + return $this->executeRequest($obj, FunctionTypeEnumClass::DLOBJECT);
1079 1081 else if (isset($obj->action))
1080 1082 return $this->executeRequest($obj, FunctionTypeEnumClass::ACTION);
1081 1083 else
... ...