CDPP / AMDA_IHM

Commit aa8bb402f369025d7e2a408504096fb6d5213368

Authored by Elena.Budnik
1 parent 7e7933a4
Exists in master and in 101 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

new icon, target : sun

Showing 4 changed files with 13 additions and 7 deletions   Show diff stats
Inline Side-by-side
generic_data/rank.json
  Diff comments   View file @aa8bb40
1   -{"Mercury": 1, "Venus": 2, "Heliosphere.NearEarth": 3, "Heliosphere.Remote1AU": 4,
2   -"Earth.Magnetosheath": 5, "Earth.Magnetosphere": 5, "Earth": 5, "Earth.Surface": 6,
3   -"Mars": 7, "Jupiter": 8, "Ganymede" : 8, "Saturn": 9, "Uranus" : 10, "Neptune" : 11, "Comet" : 93,
  1 +{"Sun" : 1, "Mercury": 2, "Venus": 3, "Heliosphere.NearEarth": 4, "Heliosphere.Remote1AU": 5,
  2 +"Earth.Magnetosheath": 6, "Earth.Magnetosphere": 6, "Earth": 6, "Earth.Surface": 7,
  3 +"Mars": 8, "Jupiter": 9, "Ganymede" : 9, "Saturn": 91, "Uranus" : 92, "Neptune" : 93, "Comet" : 94,
4 4 "Heliosphere" : 99 }
5 5 \ No newline at end of file
... ...
js/app/models/LocalParamNode.js
  Diff comments   View file @aa8bb40
... ... @@ -28,9 +28,9 @@ Ext.define('amdaModel.LocalParamNode',
28 28 {name: 'rank', type: 'integer', persist: false, defaultValue: null}
29 29 ],
30 30  
31   - icons : {'1' : 'icon-mercury','2' : 'icon-venus','3' : 'icon-sw','4' : 'icon-sw','5' : 'icon-earth','6' : 'icon-earth',
32   - '7' : 'icon-mars','8' : 'icon-jupiter','9' : 'icon-saturn','10' : 'icon-uranus','11' : 'icon-neptune',
33   - '93' :'icon-comet', '99' :'icon-solarsystem', '999' :'icon-solarsystem'
  31 + icons : {'1' : 'icon-sun', '2' : 'icon-mercury','3' : 'icon-venus','4' : 'icon-sw','5' : 'icon-sw','6' : 'icon-earth','7' : 'icon-earth',
  32 + '8' : 'icon-mars','9' : 'icon-jupiter','91' : 'icon-saturn','92' : 'icon-uranus','93' : 'icon-neptune',
  33 + '94' :'icon-comet', '99' :'icon-solarsystem', '999' :'icon-solarsystem'
34 34 },
35 35  
36 36 constructor : function(config)
... ...
js/app/views/ExplorerUI.js
  Diff comments   View file @aa8bb40
... ... @@ -232,7 +232,7 @@ Ext.define('amdaUI.ExplorerUI', {
232 232 toggleGroup: 'sorting',
233 233 handler: function(){
234 234 var tree = Ext.getCmp(amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
235   - tree.getStore().sort([{ property : 'rank' }]);
  235 + tree.getStore().sort('rank');
236 236 this.updateFilter();
237 237 }
238 238 }]
... ...
js/resources/css/amda.css
  Diff comments   View file @aa8bb40
... ... @@ -354,6 +354,12 @@ background-image: url(../images/16x16/error.png) !important;
354 354 opacity:0.5 !important;
355 355 }
356 356  
  357 +.icon-sun {
  358 + background-image:url(../images/icons/sun.png) !important;
  359 + background-position: center;
  360 + background-repeat: no-repeat;
  361 +}
  362 +
357 363 .icon-mercury {
358 364 background-image:url(../images/icons/mercury.png) !important;
359 365 background-position: center;
... ...