Mercurial > lada > lada-client
changeset 393:92a960b691a4
merged.
author | Raimund Renkert <rrenkert@intevation.de> |
---|---|
date | Fri, 30 Aug 2013 12:52:59 +0200 |
parents | 63396d62a292 (current diff) 73341090a12d (diff) |
children | 6fa3b50949c9 |
files | app/view/Viewport.js |
diffstat | 4 files changed, 48 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Aug 30 12:52:05 2013 +0200 +++ b/.hgtags Fri Aug 30 12:52:59 2013 +0200 @@ -4,3 +4,4 @@ 1179b3a1251bc5b9b4a48d00fca44a0e5d82635c 0.3 1179b3a1251bc5b9b4a48d00fca44a0e5d82635c 0.3 eba7ba244968d5ee215f0f6ca9b06bb71ed1eda8 0.3 +9591ca90d58d6a3cdba41e9708384f71549e2c65 0.4
--- a/app/controller/Sql.js Fri Aug 30 12:52:05 2013 +0200 +++ b/app/controller/Sql.js Fri Aug 30 12:52:59 2013 +0200 @@ -9,12 +9,14 @@ stores: [ 'Proben', // List of found Proben 'ProbenList', // List of found Proben - 'Queries' + 'Queries', + 'Info', ], requires: [ 'Lada.view.widgets.Mst', 'Lada.view.widgets.Uwb', - 'Lada.view.widgets.Datetime' + 'Lada.view.widgets.Datetime', + 'Lada.view.About' ], init: function() { console.log('Initialising the Sql controller'); @@ -34,6 +36,10 @@ '#ResetBtn': { // Map click event on Button. click: this.reset + }, + '#AboutBtn': { + // Map click event on Button. + click: this.about } }); }, @@ -162,5 +168,9 @@ //} //result.hide(); //buttons.hide(); + }, + about: function(element, record, index) { + var info = this.getInfoStore(); + var view = Ext.widget('about', {info: info}); } });
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/view/About.js Fri Aug 30 12:52:59 2013 +0200 @@ -0,0 +1,34 @@ +/* + * Window to edit a Probe + */ +Ext.define('Lada.view.About', { + extend: 'Ext.window.Window', + alias: 'widget.about', + + title: 'Lada Information', + // Make size of the dialog dependend of the available space. + // TODO: Handle resizing the browser window. + width: 200, + height: 200, + autoShow: true, + autoScroll: true, + modal: true, + layout: "fit", + + initComponent: function() { + var sver = "0.4 (rev. 345)"; + var cver = "0.4 (rev. 388)"; + this.buttons = [ + { + text: 'Abbrechen', + scope: this, + handler: this.close, + } + ]; + this.items = [ + { html: "<h1>Lada</h1>Server version: " + sver + "<br>Client version: " + cver } + ]; + this.callParent(); + }, +}); +
--- a/app/view/Viewport.js Fri Aug 30 12:52:05 2013 +0200 +++ b/app/view/Viewport.js Fri Aug 30 12:52:59 2013 +0200 @@ -40,14 +40,10 @@ var clientVersion = "r261 (2013-07-26)"; var user = info.get('user'); var groups = info.get('groups'); - var serverVersion = info.get('version'); - var info = Ext.getCmp('systeminfo'); var groupinfo = Ext.getCmp('groupinfo'); var userinfo = Ext.getCmp('userinfo'); userinfo.update(user); groupinfo.update(groups); - info.update('Server: '+serverVersion+' | Client: '+clientVersion); - info.show(); console.log(info); } }); @@ -160,6 +156,7 @@ text: "Info", menu: { items: [{ + id: 'AboutBtn', text: "About" }] } @@ -173,13 +170,6 @@ } ], items: [ - // Informationen über Nutzer/Gruppe/Version - { - xtype: 'panel', - id: 'systeminfo', - bodyPadding: '5', - hidden: true, - }, // Auswahl einer Abfrage. { xtype: 'queryselector',