Skip to content

Commit eb51fb1

Browse files
committed
use relative urls for resources, border layout for resizable panels, cronjob status in query list, resizable codemirror field
1 parent ad8ce0a commit eb51fb1

File tree

5 files changed

+60
-26
lines changed

5 files changed

+60
-26
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{block name="backend/base/header/css" append}
2-
<link rel="stylesheet" type="text/css" href="{{url module=frontend controller=index}|rtrim:'/'}/custom/plugins/WbmQueryManager/Resources/views/backend/_resources/css/query-manager.css" />
2+
<link rel="stylesheet" type="text/css" href="{link file='custom/plugins/WbmQueryManager/Resources/views/backend/_resources/css/query-manager.css'}" />
33
{/block}
44

55
{block name="backend/base/header/javascript" append}
6-
<script type="text/javascript" src="{{url module=frontend controller=index}|rtrim:'/'}/custom/plugins/WbmQueryManager/Resources/views/backend/_resources/js/show-hint.js"></script>
7-
<script type="text/javascript" src="{{url module=frontend controller=index}|rtrim:'/'}/custom/plugins/WbmQueryManager/Resources/views/backend/_resources/js/sql-hint.js"></script>
6+
<script type="text/javascript" src="{link file='custom/plugins/WbmQueryManager/Resources/views/backend/_resources/js/show-hint.js'}"></script>
7+
<script type="text/javascript" src="{link file='custom/plugins/WbmQueryManager/Resources/views/backend/_resources/js/sql-hint.js'}"></script>
88
{/block}

Resources/views/backend/wbm_query_manager/view/main/detail.js

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ Ext.define('Shopware.apps.WbmQueryManager.view.main.Detail', {
2525
region : 'center',
2626
defaultType : 'textfield',
2727
autoScroll : true,
28+
layout : {
29+
type: 'vbox',
30+
align : 'stretch',
31+
pack : 'start'
32+
},
2833
items : [],
2934
initComponent: function() {
3035
var me = this;
@@ -52,7 +57,7 @@ Ext.define('Shopware.apps.WbmQueryManager.view.main.Detail', {
5257
labelAlign: 'top',
5358
anchor: '100%',
5459
name: 'sqlString',
55-
height: 328,
60+
flex: 1,
5661
allowBlank: true
5762
});
5863

@@ -84,6 +89,10 @@ Ext.define('Shopware.apps.WbmQueryManager.view.main.Detail', {
8489
//{/if}
8590
//
8691
});
92+
93+
me.on('resize', function(cmp, width, height) {
94+
me.resizeEditor(cmp, cmp.editorField, width, height);
95+
});
8796

8897
me.items = me.getItems();
8998

@@ -333,5 +342,19 @@ Ext.define('Shopware.apps.WbmQueryManager.view.main.Detail', {
333342
}
334343
}
335344
];
345+
},
346+
resizeEditor : function(cmp, editorField, width, height) {
347+
var editor = editorField.editor;
348+
349+
if(!editor || !editor.hasOwnProperty('display')) {
350+
return false;
351+
}
352+
353+
editor.setSize(0, 0);
354+
355+
width = editorField.getEl().down('tbody').getWidth();
356+
height = editorField.getEl().down('tbody').getHeight() - 20;
357+
358+
editor.setSize(width, height);
336359
}
337360
});

Resources/views/backend/wbm_query_manager/view/main/list.js

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,36 +48,42 @@ Ext.define('Shopware.apps.WbmQueryManager.view.main.List', {
4848
return true;
4949
},
5050
getColumns:function () {
51-
var me = this,
52-
columnsData = [
51+
var me = this;
52+
return [
5353
{
5454
header: '{s name="nameColumnHeader"}Name{/s}',
5555
dataIndex:'name',
5656
flex:1
5757
},
58+
{
59+
header: 'C',
60+
width:25,
61+
dataIndex: 'hasCronjob',
62+
xtype: 'booleancolumn',
63+
renderer: me.activeColumnRenderer
64+
},
5865
{
5966
xtype:'actioncolumn',
6067
width:50,
6168
items:me.getActionColumnItems()
6269
}
6370
];
64-
return columnsData;
6571
},
6672
getButtons : function()
6773
{
6874
var me = this;
69-
return [
70-
{
71-
text : '{s name="add"}Hinzufügen{/s}',
72-
scope : me,
73-
iconCls : 'sprite-plus-circle-frame',
74-
action : 'addQuery'
75-
}
76-
];
75+
return [
76+
{
77+
text : '{s name="add"}Hinzufügen{/s}',
78+
scope : me,
79+
iconCls : 'sprite-plus-circle-frame',
80+
action : 'addQuery'
81+
}
82+
];
7783
},
7884
getActionColumnItems: function () {
79-
var me = this,
80-
actionColumnData = [
85+
var me = this;
86+
return [
8187
{
8288
iconCls:'x-action-col-icon sprite-minus-circle-frame',
8389
cls:'duplicateColumn',
@@ -104,7 +110,13 @@ Ext.define('Shopware.apps.WbmQueryManager.view.main.List', {
104110
me.fireEvent('cloneQuery', view, rowIndex, colIndex, item);
105111
}
106112
}
107-
];
108-
return actionColumnData;
113+
];
114+
},
115+
activeColumnRenderer: function(value) {
116+
if (value) {
117+
return '<div class="sprite-tick-small">&nbsp;</div>';
118+
} else {
119+
return '<div class="sprite-cross-small">&nbsp;</div>';
120+
}
109121
}
110122
});

Resources/views/backend/wbm_query_manager/view/main/window.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,18 @@ Ext.define('Shopware.apps.WbmQueryManager.view.main.Window', {
2828
var me = this;
2929
me.items = [
3030
Ext.create('Ext.panel.Panel', {
31-
layout: {
32-
type: 'hbox',
33-
pack: 'start',
34-
align: 'stretch'
35-
},
31+
layout: 'border',
3632
flex: 1,
3733
items: [
3834
{
35+
region: 'west',
3936
xtype: 'query-manager-list',
4037
store: me.mainStore,
38+
split: true,
4139
width: 200
4240
},
4341
{
42+
region: 'center',
4443
xtype: 'query-manager-detail',
4544
record: me.record,
4645
flex: 1

plugin.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<label lang="de">Query Manager</label>
44
<label lang="en">Query Manager</label>
55

6-
<version>2.0.0</version>
6+
<version>2.0.1</version>
77
<link>http://www.webmatch.de</link>
88
<author>Webmatch GmbH</author>
99
<compatibility minVersion="5.2.0" />
1010

11-
<changelog version="2.0.0">
11+
<changelog version="2.0.1">
1212
<changes lang="de">Veröffentlichung Open-Source</changes>
1313
<changes lang="en">Release Open-Source</changes>
1414
</changelog>

0 commit comments

Comments
 (0)