From f41270e16f2c1f2fe823393d37f74cea567d75a3 Mon Sep 17 00:00:00 2001 From: Andreas Brachold Date: Thu, 8 Jan 2009 19:49:36 +0000 Subject: * Skin/jason: expand title column, clean filter if view changed --- skins/jason/autotimers.js | 10 ++++++---- skins/jason/chronicle.js | 6 ++++-- skins/jason/files.lst | 1 - skins/jason/main.js | 6 +++++- skins/jason/now.js | 11 ++++++----- skins/jason/program.js | 27 +++++++++++++-------------- skins/jason/recordings.js | 25 +++++++++++++++---------- skins/jason/timers.js | 10 ++++++---- skins/jason/ux/sessionprovider.js | 20 -------------------- 9 files changed, 55 insertions(+), 61 deletions(-) delete mode 100644 skins/jason/ux/sessionprovider.js diff --git a/skins/jason/autotimers.js b/skins/jason/autotimers.js index f7a9087..df456f4 100644 --- a/skins/jason/autotimers.js +++ b/skins/jason/autotimers.js @@ -52,8 +52,9 @@ Ext.xxv.autotimerGrid = function(viewer, channels) { }); this.columns = [ - { - header: this.szColSearch + { + id:'expand' + ,header: this.szColSearch ,dataIndex: 'title' ,width: 200 ,renderer: this.formatTitle @@ -61,11 +62,11 @@ Ext.xxv.autotimerGrid = function(viewer, channels) { this.activeColumn, { header: this.szColChannels ,dataIndex: 'channels' - ,width: 130 + ,width: 150 },{ header: this.szColDirectory ,dataIndex: 'directory' - ,width: 200 + ,width: 250 },{ header: this.szColStart ,dataIndex: 'start' @@ -90,6 +91,7 @@ Ext.xxv.autotimerGrid = function(viewer, channels) { ,loadMask: true ,plugins:[this.activeColumn] ,clicksToEdit:1 + ,autoExpandColumn:'expand' ,cm: cm ,sm: new Ext.grid.RowSelectionModel({ singleSelect:false diff --git a/skins/jason/chronicle.js b/skins/jason/chronicle.js index b702baf..d447a0c 100644 --- a/skins/jason/chronicle.js +++ b/skins/jason/chronicle.js @@ -39,8 +39,9 @@ Ext.xxv.chronicleGrid = function(viewer, channels) { this.store.setDefaultSort('title', "ASC"); this.columns = [ - { - header: this.szColTitle + { + id:'expand' + ,header: this.szColTitle ,dataIndex: 'title' ,width: 200 ,renderer: this.formatTitle @@ -72,6 +73,7 @@ Ext.xxv.chronicleGrid = function(viewer, channels) { ,id: 'chronicle-view-grid' ,loadMask: true ,clicksToEdit:1 + ,autoExpandColumn:'expand' ,cm: cm ,sm: new Ext.grid.RowSelectionModel({ singleSelect:false diff --git a/skins/jason/files.lst b/skins/jason/files.lst index 222df29..a4f76a9 100644 --- a/skins/jason/files.lst +++ b/skins/jason/files.lst @@ -3,7 +3,6 @@ extjs/adapter/ext/ext-base.js \ extjs/ext-all.js \ ux/DDView.js \ ux/multiselect.js \ -ux/sessionprovider.js \ ux/tabclosemenu.js \ ux/filter.js \ common.js \ diff --git a/skins/jason/main.js b/skins/jason/main.js index 5dce6ca..a385bf6 100644 --- a/skins/jason/main.js +++ b/skins/jason/main.js @@ -16,7 +16,11 @@ Ext.onReady(function(){ Ext.BLANK_IMAGE_URL = 'extjs/resources/images/default/s.gif'; Ext.QuickTips.init(); - Ext.state.Manager.setProvider(new Ext.state.SessionProvider({state: Ext.appState})); + Ext.state.Manager.setProvider(new Ext.state.CookieProvider( + { + // state: Ext.appState, + expires: new Date(new Date().getTime()+(1000*3600*24*365)) + })); var tpl = Ext.Template.from('preview-tpl', { compiled:true diff --git a/skins/jason/now.js b/skins/jason/now.js index a0998cb..a6b8b2d 100644 --- a/skins/jason/now.js +++ b/skins/jason/now.js @@ -86,10 +86,11 @@ Ext.xxv.NowGrid = function(viewer) { width: 20, hidden: true },{ - header: this.szColTitle, - dataIndex: 'title', - width: 150, - renderer: this.formatTitle + id:'expand' + ,header: this.szColTitle + ,dataIndex: 'title' + ,width: 150 + ,renderer: this.formatTitle },{ header: this.szColChannel, dataIndex: 'channel', width: 50 @@ -115,7 +116,7 @@ Ext.xxv.NowGrid = function(viewer) { region: 'center' ,id: 'now-grid' ,loadMask: true - ,autoExpandColumn:'title' + ,autoExpandColumn:'expand' ,cm: cm ,sm: new Ext.grid.RowSelectionModel({ singleSelect:true diff --git a/skins/jason/program.js b/skins/jason/program.js index 0109046..8d8ac4f 100644 --- a/skins/jason/program.js +++ b/skins/jason/program.js @@ -47,11 +47,12 @@ Ext.xxv.programGrid = function(viewer, record) { this.store = new Ext.xxv.programStore(record); this.store.setDefaultSort('day', "ASC"); - this.columns = [{ - header: this.szColTitle, - dataIndex: 'title', - width: 150, - renderer: this.formatTitle + this.columns = [{ + id:'expand' + ,header: this.szColTitle + ,dataIndex: 'title' + ,width: 150 + ,renderer: this.formatTitle },{ header: this.szColDay, dataIndex: 'day', width: 50, @@ -71,8 +72,7 @@ Ext.xxv.programGrid = function(viewer, record) { cm.defaultSortable = true; this.filter = new Ext.ux.grid.Search({ - id:'program-filter' - ,position:'top' + position:'top' ,shortcutKey:null ,paramNames: { fields:'cmd' @@ -86,7 +86,7 @@ Ext.xxv.programGrid = function(viewer, record) { region: 'center' ,id: 'program-grid' ,loadMask: true - ,autoExpandColumn:'title' + ,autoExpandColumn:'expand' ,cm: cm ,sm: new Ext.grid.RowSelectionModel({ singleSelect:true @@ -177,17 +177,16 @@ Ext.extend(Ext.xxv.programGrid, Ext.grid.GridPanel, { } ,reload : function(data) { + var f = this.filter.field.getValue(); + if(f && f != '') { + this.filter.field.setValue(''); + } this.store.baseParams = { cmd: 'p' ,data: data.id }; - var p = {start:0, limit:configuration.pageSize}; - var f = this.filter.field.getValue(); - if(f && f != '') { - p.filter = f; - } this.store.title = data.name; - this.store.load({params:p}); + this.store.load({params:{start:0, limit:configuration.pageSize}}); } ,formatTitle: function(value, p, record) { return String.format( diff --git a/skins/jason/recordings.js b/skins/jason/recordings.js index 1d21b63..e7ced1d 100644 --- a/skins/jason/recordings.js +++ b/skins/jason/recordings.js @@ -211,6 +211,16 @@ Ext.xxv.recordingsDataView = function(viewer, preview, store, config) { } ); + this.filter = new Ext.ux.grid.Search({ + position:'owner' + ,shortcutKey:null + ,paramNames: { + fields:'cmd' + ,all:'rl' + ,cmd:'rs' + ,query:'data' + } + }); Ext.xxv.recordingsDataView.superclass.constructor.call(this, { region: 'center' ,store: store @@ -259,16 +269,7 @@ Ext.xxv.recordingsDataView = function(viewer, preview, store, config) { } ,plugins: [ new Ext.DataView.DragSelector() //,new Ext.DataView.LabelEditor({dataIndex: 'fulltitle', allow: 'isrecording'}) - ,new Ext.ux.grid.Search({ - position:'owner' - ,shortcutKey:null - ,paramNames: { - fields:'cmd' - ,all:'rl' - ,cmd:'rs' - ,query:'data' - } - }) + ,this.filter ] } ); @@ -361,6 +362,10 @@ Ext.extend(Ext.xxv.recordingsDataView, Ext.DataView, { this.store.baseParams.cmd = 'rl'; if(record.id == 'up') { + var f = this.filter.field.getValue(); + if(f && f != '') { + this.filter.field.setValue(''); + } var Woerter = this.store.lastOptions.params.data.split("~"); var title = ''; for(var i = 0, len = Woerter.length - 1; i < len; i++){ diff --git a/skins/jason/timers.js b/skins/jason/timers.js index 6453ee1..abc9d8f 100644 --- a/skins/jason/timers.js +++ b/skins/jason/timers.js @@ -76,7 +76,7 @@ Ext.xxv.timerGrid = function(viewer) { this.ChannelsCombo = new Ext.xxv.ChannelsCombo({ header: this.szColChannel, dataIndex: 'pos', - width: 100, + width: 200, store: channels, editor: new Ext.form.ComboBox({ tpl: new Ext.XTemplate('', @@ -102,10 +102,11 @@ Ext.xxv.timerGrid = function(viewer) { ); this.columns = [ - { - header: this.szColTitle + { + id:'expand' + ,header: this.szColTitle ,dataIndex: 'title' - ,width: 150 + ,width: 250 ,renderer: this.formatTitle //,editor: new Ext.form.TextField({allowBlank: false}) }, @@ -145,6 +146,7 @@ Ext.xxv.timerGrid = function(viewer) { ,loadMask: true ,plugins:[this.activeColumn,this.vpsColumn,this.ChannelsCombo] ,clicksToEdit:1 + ,autoExpandColumn:'expand' ,cm: cm ,sm: new Ext.grid.RowSelectionModel({ singleSelect:false diff --git a/skins/jason/ux/sessionprovider.js b/skins/jason/ux/sessionprovider.js deleted file mode 100644 index fb944a2..0000000 --- a/skins/jason/ux/sessionprovider.js +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Ext JS Library 2.2 - * Copyright(c) 2006-2008, Ext JS, LLC. - * licensing@extjs.com - * - * http://extjs.com/license - */ - -Ext.state.SessionProvider = Ext.extend(Ext.state.CookieProvider, { - readCookies : function(){ - if(this.state){ - for(var k in this.state){ - if(typeof this.state[k] == 'string'){ - this.state[k] = this.decodeValue(this.state[k]); - } - } - } - return Ext.apply(this.state || {}, Ext.state.SessionProvider.superclass.readCookies.call(this)); - } -}); -- cgit v1.2.3