Commit 52cc0f1735331d9a26971093a0ea87e73161e48d
Exists in
master
and in
110 other branches
Merge branch 'sort_ws_log' into 'master'
Sort ws log Fix resize bug on log panel issue: https://projects.irap.omp.eu/issues/5943 See merge request !14
Showing
4 changed files
with
24 additions
and
18 deletions
Show diff stats
js/app/controllers/ExplorerModule.js
... | ... | @@ -105,29 +105,19 @@ Ext.define('amdaDesktop.ExplorerModule', |
105 | 105 | region: 'center' |
106 | 106 | }, |
107 | 107 | { |
108 | - xtype: 'label', | |
109 | - text: 'Log:', | |
110 | - margin: '10 0 -5 0', | |
111 | - region: 'south', | |
112 | - height: 20 | |
113 | - }, | |
114 | - { | |
115 | 108 | xtype: 'panel', |
109 | + title: 'Log', | |
116 | 110 | id: 'LogPanel', |
111 | + collapsible: true, | |
112 | + iconCls: 'icon-align-left', | |
117 | 113 | region: 'south', |
118 | - height: 150, | |
119 | 114 | split: true, |
120 | - layout: { | |
121 | - type: 'vbox', | |
122 | - align: 'stretch', | |
123 | - autoSize: true | |
124 | - }, | |
125 | - autoScroll: true, | |
115 | + height: 150, | |
126 | 116 | stateful: true, |
127 | 117 | stateId: 'LogPanel', |
128 | - buttons: [{ | |
129 | - scope: this, | |
130 | - text: 'Clear', | |
118 | + tools: [{ | |
119 | + type: 'trash', | |
120 | + tooltip: 'Clear logs', | |
131 | 121 | handler: function () { |
132 | 122 | var logPanel = win.items.get('LogPanel') |
133 | 123 | logPanel.removeAll() | ... | ... |
js/resources/css/amda.css
... | ... | @@ -104,6 +104,10 @@ |
104 | 104 | background-image:url( ../images/16x16/workspaces.png ) !important; |
105 | 105 | } |
106 | 106 | |
107 | +.icon-align-left { | |
108 | + background-image: url(../images/16x16/align_left.png); | |
109 | +} | |
110 | + | |
107 | 111 | .icon-delete { |
108 | 112 | background-image:url( ../images/icons/fam/delete.gif ) !important; |
109 | 113 | } |
... | ... | @@ -121,6 +125,14 @@ background-image: url(../images/small_cancel_centered.png); |
121 | 125 | } |
122 | 126 | |
123 | 127 | /** |
128 | +Custom tool typ icons | |
129 | + */ | |
130 | + | |
131 | +.x-tool-trash { | |
132 | + background-image: url(../images/trash.png) !important; | |
133 | +} | |
134 | + | |
135 | +/** | |
124 | 136 | * RangeMenu Styles |
125 | 137 | **/ |
126 | 138 | |
... | ... | @@ -489,6 +501,10 @@ p + p { |
489 | 501 | opacity: 1.0 !important; |
490 | 502 | } |
491 | 503 | |
504 | +#LogPanel-splitter-collapseEl { | |
505 | + display: none; | |
506 | +} | |
507 | + | |
492 | 508 | .epntap_grid .disabled_row { |
493 | 509 | color: gray; |
494 | 510 | } |
... | ... | @@ -504,4 +520,4 @@ p + p { |
504 | 520 | .epntap_cell { |
505 | 521 | padding: 4px; |
506 | 522 | white-space: normal; |
507 | -} | |
508 | 523 | \ No newline at end of file |
524 | +} | ... | ... |
201 Bytes
356 Bytes