CDPP / AMDA_IHM

Commit 3efc6401e07dff8a1a9ba819a12abb85f1396e99

Authored by Benjamin Renard
1 parent f31bea1c
Exists in master and in 102 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, save-plot-request, special-params, test-merge, ws_get_catalog

Set icons for plot requests

Showing 5 changed files with 20 additions and 11 deletions   Show diff stats
Inline Side-by-side
js/app/models/PlotNode.js
  Diff comments   View file @3efc640
... ... @@ -32,15 +32,19 @@ Ext.define('amdaModel.PlotNode', {
32 32  
33 33 updateTabs : function() {
34 34 if (this.get('tabs')) {
35   - this.set('leaf', this.get('tabs').length <= 1);
36   - this.removeAll();
37   - if (this.get('tabs').length > 1) {
38   - var me = this;
39   - Ext.Array.each(this.get('tabs'), function(tab) {
40   - console.log(tab);
41   - var tabNode = new amdaModel.PlotTabNode({text: tab.name, tabid: tab.id});
42   - me.appendChild(tabNode);
43   - });
  35 + var isFolder = !this.get('leaf');
  36 + if (!isFolder) {
  37 + var oneTab = (this.get('tabs').length == 1);
  38 + this.set('leaf', oneTab);
  39 + this.set('iconCls', oneTab ? 'icon-plot-page' : 'icon-plot-pages');
  40 + this.removeAll();
  41 + if (this.get('tabs').length > 1) {
  42 + var me = this;
  43 + Ext.Array.each(this.get('tabs'), function(tab) {
  44 + var tabNode = new amdaModel.PlotTabNode({text: tab.name, tabid: tab.id});
  45 + me.appendChild(tabNode);
  46 + });
  47 + }
44 48 }
45 49 }
46 50 },
... ...
js/app/models/PlotTabNode.js
  Diff comments   View file @3efc640
... ... @@ -24,6 +24,7 @@ Ext.define(&#39;amdaModel.PlotTabNode&#39;, {
24 24 //this.set('objectDataModel','amdaPlotObj.PlotRequestObject');
25 25 this.set('nodeType',this.self.nodeType);
26 26 this.set('leaf',true);
  27 + this.set('iconCls','icon-plot-page');
27 28 },
28 29  
29 30 allMenuItems : function() {
... ...
js/resources/css/amda.css
  Diff comments   View file @3efc640
... ... @@ -456,6 +456,10 @@ p + p {
456 456 background-image:url( ../images/16x16/plot_page.png ) !important;
457 457 }
458 458  
  459 +.icon-plot-pages {
  460 + background-image:url( ../images/16x16/plot_pages.png ) !important;
  461 +}
  462 +
459 463 .icon-plot-layout {
460 464 background-image:url( ../images/16x16/plot_layout.png ) !important;
461 465 }
... ...
js/resources/images/16x16/plot_pages.png 0 → 100644
View file @3efc640

150 Bytes
php/classes/AmdaAction.php
  Diff comments   View file @3efc640
... ... @@ -186,8 +186,8 @@ class AmdaAction
186 186 $info = $id;
187 187 }
188 188  
189   - $isLeaf = empty($objplot->tabs) || count($objplot->tabs) == 1;
190   - if (!$isLeaf) {
  189 + $isLeaf = isset($objplot->tabs);
  190 + if ($isLeaf) {
191 191 foreach ($objplot->tabs as $index => $tab) {
192 192 $plotTabs[$index] = array(
193 193 "name" => "Plot ".($index+1),
... ...