[Lada-commits] [PATCH] Updated viewport layout

[Wald Commits]

# HG changeset patch
# User Raimund Renkert <raimund.renkert at intevation.de>
# Date 1418750185 -3600
# Node ID 16fbbad55589052fede6b51b9a45e86e5ec11d5f
# Parent  48593a6181c9f4d35e95b3556cb3614e6a7b610f
Updated viewport layout.

diff -r 48593a6181c9 -r 16fbbad55589 app/controller/Sql.js
--- a/app/controller/Sql.js	Tue Dec 16 16:56:46 2014 +0100
+++ b/app/controller/Sql.js	Tue Dec 16 18:16:25 2014 +0100
@@ -59,7 +59,7 @@
     selectSql: function(element, record) {
         var result = Ext.getCmp('result');
         var filters = Ext.getCmp('queryfilters');
-        var sqlquery = Ext.getCmp('sqlquery');
+        //var sqlquery = Ext.getCmp('sqlquery');
         var sqldesc = Ext.getCmp('sqldesc');
         var buttons = Ext.getCmp('SearchBtnPanel');
         var displayFields = record[0].data.results;
@@ -67,7 +67,7 @@
 
         this.reset();
 
-        sqlquery.setValue(record[0].data.sql);
+        //sqlquery.setValue(record[0].data.sql);
         sqldesc.setValue(record[0].data.description);
 
         // Setup Columns of the probenlist
diff -r 48593a6181c9 -r 16fbbad55589 app/view/Viewport.js
--- a/app/view/Viewport.js	Tue Dec 16 16:56:46 2014 +0100
+++ b/app/view/Viewport.js	Tue Dec 16 18:16:25 2014 +0100
@@ -156,82 +156,72 @@
      */
     initSearch: function() {
         this.items = [{
-            xtype: 'panel',
             title: '<center>Probenauswahlmaske</center>',
-            bodyPadding: '10 10',
-            layout: {
-                type: 'vbox',
-                align: 'stretch'
-            },
-            dockedItems: [{
-                xtype: 'toolbar',
-                dock: 'top',
+            layout: 'border',
+            items: [{
+                layout: {
+                    type: 'vbox',
+                    align: 'stretch'
+                },
+                region: 'west',
+                split: true,
+                border: 1,
+                flex: 1,
+                dockedItems: [{
+                    xtype: 'toolbar',
+                    dock: 'top',
+                    items: [{
+                        xtype: 'splitbutton',
+                        text: 'Info',
+                        menu: {
+                            items: [{
+                                id: 'AboutBtn',
+                                text: 'About'
+                            }]
+                        }
+                    }, '->', {
+                        xtype: 'box',
+                        autoEl: {
+                            tag: 'img',
+                            src: 'gfx/user-identity.png'
+                        }
+                    }, {
+                        xtype: 'tbtext',
+                        id: 'userinfo',
+                        text: ''
+                    }, {
+                        xtype: 'box',
+                        autoEl: {
+                            tag: 'img',
+                            src: 'gfx/network-workgroup.png'
+                        }
+                    }, {
+                        xtype: 'tbtext',
+                        id: 'groupinfo',
+                        text: ''
+                    }]
+                }],
                 items: [{
-                    xtype: 'splitbutton',
-                    text: 'Info',
-                    menu: {
-                        items: [{
-                            id: 'AboutBtn',
-                            text: 'About'
-                        }]
-                    }
-                }, '->', {
-                    xtype: 'box',
-                    autoEl: {
-                        tag: 'img',
-                        src: 'gfx/user-identity.png'
-                    }
+                    // Auswahl einer Abfrage.
+                    xtype: 'queryselector',
+                    margin: '0, 10, 0, 10',
+                    id: 'queryselector'
                 }, {
-                    xtype: 'tbtext',
-                    id: 'userinfo',
-                    text: ''
-                }, {
-                    xtype: 'box',
-                    autoEl: {
-                        tag: 'img',
-                        src: 'gfx/network-workgroup.png'
-                    }
-                }, {
-                    xtype: 'tbtext',
-                    id: 'groupinfo',
-                    text: ''
+                // Variables settings for the current selected sql statement.
+                    xtype: 'fieldset',
+                    id: 'queryfilters',
+                    title: 'Variablenbelegung',
+                    hidden: true,
+                    margin: '0, 10, 0, 10',
+                    items: []
                 }]
-            }],
-            items: [{
-                // Auswahl einer Abfrage.
-                xtype: 'queryselector',
-                id: 'queryselector',
-                margin: '0 0 10 0'
-            }, {
-            // Variables settings for the current selected sql statement.
-                xtype: 'fieldset',
-                id: 'queryfilters',
-                title: 'Variablenbelegung',
-                hidden: true,
-                items: []
-            }, {
-            // Buttons to trigger the search.
-                id: 'SearchBtnPanel',
-                xtype: 'panel',
-                border: false,
-                margin: '0 0 10 0',
-                items: [{
-                    id: 'SearchBtn',
-                    text: 'Suchen',
-                    xtype: 'button',
-                    margin: '0 10 0 0'
-                }, {
-                    id: 'ResetBtn',
-                    text: 'Zurücksetzen',
-                    xtype: 'button'
-                }],
-                hidden: false
             }, {
             // Resultlist for the query.
                 id: 'result',
-                flex: 1,
+                flex: 3,
                 xtype: 'probenlist',
-                hidden: false
+                hidden: false,
+                region: 'center'
             }]
         }];
     }
diff -r 48593a6181c9 -r 16fbbad55589 app/view/search/List.js
--- a/app/view/search/List.js	Tue Dec 16 16:56:46 2014 +0100
+++ b/app/view/search/List.js	Tue Dec 16 18:16:25 2014 +0100
@@ -19,7 +19,10 @@
 
     title: 'SQL-Auswahl',
     initComponent: function() {
-        this.layout = 'column';
+        this.layout = {
+            type: 'vbox',
+            align: 'stretch'
+        };
         this.items = [{
             id: 'search',
             xtype: 'combobox',
@@ -29,6 +32,23 @@
             valueField: 'id',
             emptyText: 'Wählen Sie eine Abfrage'
         }, {
+        // Buttons to trigger the search.
+            id: 'SearchBtnPanel',
+            xtype: 'panel',
+            border: false,
+            margin: '0 0 10 0',
+            items: [{
+                id: 'SearchBtn',
+                text: 'Suchen',
+                xtype: 'button',
+                margin: '0 10 0 0'
+            }, {
+                id: 'ResetBtn',
+                text: 'Zurücksetzen',
+                xtype: 'button'
+            }],
+            hidden: false
+        }, {
             xtype: 'panel',
             maxWidth: '500',
             border: false,
@@ -37,6 +57,7 @@
                 id: 'sqldesc',
                 xtype: 'displayfield',
                 fieldLabel: 'Beschreibung',
+                shrinkWrap: 3,
                 value: '-/-'
             }, {
                 id: 'sqlquery',