From aa8bb402f369025d7e2a408504096fb6d5213368 Mon Sep 17 00:00:00 2001 From: Elena.Budnik Date: Fri, 24 May 2019 11:03:03 +0200 Subject: [PATCH] new icon, target : sun --- generic_data/rank.json | 6 +++--- js/app/models/LocalParamNode.js | 6 +++--- js/app/views/ExplorerUI.js | 2 +- js/resources/css/amda.css | 6 ++++++ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/generic_data/rank.json b/generic_data/rank.json index 0217c72..aeb6020 100644 --- a/generic_data/rank.json +++ b/generic_data/rank.json @@ -1,4 +1,4 @@ -{"Mercury": 1, "Venus": 2, "Heliosphere.NearEarth": 3, "Heliosphere.Remote1AU": 4, -"Earth.Magnetosheath": 5, "Earth.Magnetosphere": 5, "Earth": 5, "Earth.Surface": 6, -"Mars": 7, "Jupiter": 8, "Ganymede" : 8, "Saturn": 9, "Uranus" : 10, "Neptune" : 11, "Comet" : 93, +{"Sun" : 1, "Mercury": 2, "Venus": 3, "Heliosphere.NearEarth": 4, "Heliosphere.Remote1AU": 5, +"Earth.Magnetosheath": 6, "Earth.Magnetosphere": 6, "Earth": 6, "Earth.Surface": 7, +"Mars": 8, "Jupiter": 9, "Ganymede" : 9, "Saturn": 91, "Uranus" : 92, "Neptune" : 93, "Comet" : 94, "Heliosphere" : 99 } \ No newline at end of file diff --git a/js/app/models/LocalParamNode.js b/js/app/models/LocalParamNode.js index acb0035..e54f225 100644 --- a/js/app/models/LocalParamNode.js +++ b/js/app/models/LocalParamNode.js @@ -28,9 +28,9 @@ Ext.define('amdaModel.LocalParamNode', {name: 'rank', type: 'integer', persist: false, defaultValue: null} ], - icons : {'1' : 'icon-mercury','2' : 'icon-venus','3' : 'icon-sw','4' : 'icon-sw','5' : 'icon-earth','6' : 'icon-earth', - '7' : 'icon-mars','8' : 'icon-jupiter','9' : 'icon-saturn','10' : 'icon-uranus','11' : 'icon-neptune', - '93' :'icon-comet', '99' :'icon-solarsystem', '999' :'icon-solarsystem' + icons : {'1' : 'icon-sun', '2' : 'icon-mercury','3' : 'icon-venus','4' : 'icon-sw','5' : 'icon-sw','6' : 'icon-earth','7' : 'icon-earth', + '8' : 'icon-mars','9' : 'icon-jupiter','91' : 'icon-saturn','92' : 'icon-uranus','93' : 'icon-neptune', + '94' :'icon-comet', '99' :'icon-solarsystem', '999' :'icon-solarsystem' }, constructor : function(config) diff --git a/js/app/views/ExplorerUI.js b/js/app/views/ExplorerUI.js index e2c4d47..cbd8346 100644 --- a/js/app/views/ExplorerUI.js +++ b/js/app/views/ExplorerUI.js @@ -232,7 +232,7 @@ Ext.define('amdaUI.ExplorerUI', { toggleGroup: 'sorting', handler: function(){ var tree = Ext.getCmp(amdaUI.ExplorerUI.RESRC_TAB.TREE_ID); - tree.getStore().sort([{ property : 'rank' }]); + tree.getStore().sort('rank'); this.updateFilter(); } }] diff --git a/js/resources/css/amda.css b/js/resources/css/amda.css index f8c2bae..5a0ffeb 100644 --- a/js/resources/css/amda.css +++ b/js/resources/css/amda.css @@ -354,6 +354,12 @@ background-image: url(../images/16x16/error.png) !important; opacity:0.5 !important; } +.icon-sun { + background-image:url(../images/icons/sun.png) !important; + background-position: center; + background-repeat: no-repeat; +} + .icon-mercury { background-image:url(../images/icons/mercury.png) !important; background-position: center; -- libgit2 0.21.2