From 0cfa0d717aecf8d414e1557bbb10a96aa027b7f8 Mon Sep 17 00:00:00 2001 From: vfilippov Date: Thu, 25 Aug 2011 10:27:03 +0000 Subject: [PATCH] Bug 82807 - Fix layout in RunPanel/CaseRunPanel git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@1351 6955db30-a419-402b-8a0d-67ecbb4d7f56 --- extensions/testopia/js/caserun.js | 10 +- .../en/default/testopia/run/show.html.tmpl | 93 ++++++++++--------- extensions/testopia/testopia.all.js | 10 +- extensions/testopia/testopia.all.ycomp.js | 9 +- extensions/testopia/ycomp.sh | 4 +- 5 files changed, 75 insertions(+), 51 deletions(-) diff --git a/extensions/testopia/js/caserun.js b/extensions/testopia/js/caserun.js index a2dfeab82..d9587bbaa 100644 --- a/extensions/testopia/js/caserun.js +++ b/extensions/testopia/js/caserun.js @@ -75,9 +75,15 @@ Testopia.TestCaseRun.Panel = function(params, run){ this.store = cgrid.store; this.params = params; this.caserun = cr; - + filter.flex = 1; + cgrid.flex = 1; + cr.flex = 2; Testopia.TestCaseRun.Panel.superclass.constructor.call(this, { - layout: 'border', + layout: 'vbox', + layoutConfig: { + align : 'stretch', + pack : 'start', + }, title: 'Test Cases', id: 'caserun-panel', border: false, diff --git a/extensions/testopia/template/en/default/testopia/run/show.html.tmpl b/extensions/testopia/template/en/default/testopia/run/show.html.tmpl index 93caf4a2a..141b5c65b 100644 --- a/extensions/testopia/template/en/default/testopia/run/show.html.tmpl +++ b/extensions/testopia/template/en/default/testopia/run/show.html.tmpl @@ -178,66 +178,69 @@ Ext.onReady(function(){ [% END %] ); var runpanel = new Ext.Panel({ - layout: 'border', + layout: 'vbox', + layoutConfig: { + align : 'stretch', + pack : 'start', + }, applyTo: 'run-body-div', monitorResize: true, id: 'runpanel', height: Ext.state.Manager.get('run_height', 1200), footer: true, items:[{ - split: true, - region: 'north', - xtype: 'tabpanel', - activeTab: 0, - id: 'object_panel', - items: [new Testopia.TestCaseRun.Panel(Testopia.Util.urlQueryToJSON(window.location.search), run), - { - title: 'Notes', - layout: 'fit', - items: [{ - id: 'run_notes', - xtype:'textarea', - value: '[% run.notes FILTER js %]' - }], - buttons: [{ - text: 'Submit', - disabled: run.canedit ? false : true, - handler: function(){ - submitEdits('run_notes', Ext.getCmp('run_notes').getValue()); - } - }] + layout: 'hbox', + layoutConfig: { + align : 'stretch', + pack : 'start', }, - new Testopia.Util.HistoryList('run', [% run.id FILTER none %]) - ] - },{ - split: true, - id: 'run_overview_pane', - title: '[% title FILTER js %]', - headerAsText: true, - region: 'center', - collapsible: true, - contentEl: 'run_overview', - height: 'auto' - },{ - collapsible: true, - title: ' ', - split: true, - region:'east', - layout: 'fit', - width: 200, - items: [{ + flex: 3, + items:[{ + xtype: 'tabpanel', + flex: 10, + activeTab: 0, + id: 'object_panel', + items: [ + new Testopia.TestCaseRun.Panel(Testopia.Util.urlQueryToJSON(window.location.search), run), + { + title: 'Notes', + layout: 'fit', + items: [{ + id: 'run_notes', + xtype:'textarea', + value: '[% run.notes FILTER js %]' + }], + buttons: [{ + text: 'Submit', + disabled: run.canedit ? false : true, + handler: function(){ + submitEdits('run_notes', Ext.getCmp('run_notes').getValue()); + } + }] + }, + new Testopia.Util.HistoryList('run', [% run.id FILTER none %]) + ] + },{ + split: true, + width: 200, xtype: 'tabpanel', activeTab: 0, id: 'run_east_panel', items:[ new Testopia.Tags.ObjectTags('run', [% run.id FILTER none %]), - // { - // title: 'CC List' - // }, + //{ title: 'CC List' }, new Testopia.TestRun.FiltersList(run) - ] }] + },{ + split: true, + flex: 1, + id: 'run_overview_pane', + title: '[% title FILTER js %]', + headerAsText: true, + collapsible: true, + contentEl: 'run_overview', + height: 'auto' }] }); [% IF run.canedit %] diff --git a/extensions/testopia/testopia.all.js b/extensions/testopia/testopia.all.js index 226198afa..ff3e5b765 100644 --- a/extensions/testopia/testopia.all.js +++ b/extensions/testopia/testopia.all.js @@ -2735,9 +2735,15 @@ Testopia.TestCaseRun.Panel = function(params, run){ this.store = cgrid.store; this.params = params; this.caserun = cr; - + filter.flex = 1; + cgrid.flex = 1; + cr.flex = 2; Testopia.TestCaseRun.Panel.superclass.constructor.call(this, { - layout: 'border', + layout: 'vbox', + layoutConfig: { + align : 'stretch', + pack : 'start', + }, title: 'Test Cases', id: 'caserun-panel', border: false, diff --git a/extensions/testopia/testopia.all.ycomp.js b/extensions/testopia/testopia.all.ycomp.js index 1d2bdbd15..9b6098dc2 100644 --- a/extensions/testopia/testopia.all.ycomp.js +++ b/extensions/testopia/testopia.all.ycomp.js @@ -2529,8 +2529,15 @@ this.cgrid = cgrid; this.store = cgrid.store; this.params = params; this.caserun = cr; +filter.flex = 1; +cgrid.flex = 1; +cr.flex = 2; Testopia.TestCaseRun.Panel.superclass.constructor.call(this, { -layout: 'border', +layout: 'vbox', +layoutConfig: { +align : 'stretch', +pack : 'start', +}, title: 'Test Cases', id: 'caserun-panel', border: false, diff --git a/extensions/testopia/ycomp.sh b/extensions/testopia/ycomp.sh index de8c75784..218f1833a 100755 --- a/extensions/testopia/ycomp.sh +++ b/extensions/testopia/ycomp.sh @@ -1,3 +1,5 @@ #!/bin/sh -perl ycomp.pl testopia.all.js > testopia.all.ycomp.js +cat js/vars.js js/attachments.js js/build.js js/case.js js/caserun.js js/category.js js/diff-tabs.js js/environment.js js/plan.js js/product.js js/run.js js/search.js js/strings.js js/tags.js js/util.js > testopia-new.all.js +perl ycomp.pl testopia-new.all.js > testopia-new.all.ycomp.js +echo Check testopia-new.all[ycomp].js and copy them over testopia.all[.ycomp].js