diff --git a/scm-webapp/src/main/webapp/resources/js/group/sonia.group.panel.js b/scm-webapp/src/main/webapp/resources/js/group/sonia.group.panel.js index d193ca71df..5dfdca2414 100644 --- a/scm-webapp/src/main/webapp/resources/js/group/sonia.group.panel.js +++ b/scm-webapp/src/main/webapp/resources/js/group/sonia.group.panel.js @@ -30,11 +30,8 @@ */ -Sonia.group.Panel = Ext.extend(Ext.Panel, { +Sonia.group.Panel = Ext.extend(Sonia.rest.Panel, { - addText: 'Add', - removeText: 'Remove', - reloadText: 'Reload', titleText: 'Group Form', emptyText: 'Add or select a Group', removeTitleText: 'Remove Group', @@ -44,11 +41,6 @@ Sonia.group.Panel = Ext.extend(Ext.Panel, { initComponent: function(){ var config = { - layout: 'border', - hideMode: 'offsets', - enableTabScroll: true, - region:'center', - autoScroll: true, tbar: [ {xtype: 'tbbutton', text: this.addText, scope: this, handler: this.showAddForm}, {xtype: 'tbbutton', id: 'groupRmButton', disabled: true, text: this.removeText, scope: this, handler: this.removeGroup}, diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js index 1fdf7e13f8..9892e401ff 100644 --- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js +++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js @@ -31,12 +31,9 @@ // RepositoryPanel -Sonia.repository.Panel = Ext.extend(Ext.Panel, { +Sonia.repository.Panel = Ext.extend(Sonia.rest.Panel, { titleText: 'Repository Form', - addText: 'Add', - removeText: 'Remove', - reloadText: 'Reload', emptyText: 'Add or select an Repository', removeTitleText: 'Remove Repository', removeMsgText: 'Remove Repository "{0}"?', @@ -58,11 +55,6 @@ Sonia.repository.Panel = Ext.extend(Ext.Panel, { ); var config = { - layout: 'border', - hideMode: 'offsets', - enableTabScroll: true, - region:'center', - autoScroll: true, tbar: toolbar, items: [{ id: 'repositoryGrid', diff --git a/scm-webapp/src/main/webapp/resources/js/rest/sonia.rest.panel.js b/scm-webapp/src/main/webapp/resources/js/rest/sonia.rest.panel.js new file mode 100644 index 0000000000..bb0e2c9e88 --- /dev/null +++ b/scm-webapp/src/main/webapp/resources/js/rest/sonia.rest.panel.js @@ -0,0 +1,62 @@ +/* * + * Copyright (c) 2010, Sebastian Sdorra + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. Neither the name of SCM-Manager; nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + +Sonia.rest.Panel = Ext.extend(Ext.Panel, { + + // TODO i18n + addText: 'Add', + removeText: 'Remove', + reloadText: 'Reload', + + // icons + addIcon: '', + removeIcon: '', + reloadIcon: '', + + initComponent: function(){ + + var config = { + layout: 'border', + hideMode: 'offsets', + enableTabScroll: true, + region:'center', + autoScroll: true + } + + Ext.apply(this, Ext.apply(this.initialConfig, config)); + Sonia.rest.Panel.superclass.initComponent.apply(this, arguments); + } + +}); + +// register xtype +Ext.reg('restPanel', Sonia.rest.Panel); \ No newline at end of file diff --git a/scm-webapp/src/main/webapp/resources/js/user/sonia.user.panel.js b/scm-webapp/src/main/webapp/resources/js/user/sonia.user.panel.js index 4518f12409..f831fe8eb5 100644 --- a/scm-webapp/src/main/webapp/resources/js/user/sonia.user.panel.js +++ b/scm-webapp/src/main/webapp/resources/js/user/sonia.user.panel.js @@ -30,11 +30,8 @@ */ -Sonia.user.Panel = Ext.extend(Ext.Panel, { +Sonia.user.Panel = Ext.extend(Sonia.rest.Panel, { - addText: 'Add', - removeText: 'Remove', - reloadText: 'Reload', titleText: 'User Form', emptyText: 'Add or select an User', removeTitleText: 'Remove User', @@ -45,12 +42,7 @@ Sonia.user.Panel = Ext.extend(Ext.Panel, { initComponent: function(){ var config = { - layout: 'border', - hideMode: 'offsets', bodyCssClass: 'x-panel-mc', - enableTabScroll: true, - region:'center', - autoScroll: true, tbar: [ {xtype: 'tbbutton', text: this.addText, scope: this, handler: this.showAddPanel}, {xtype: 'tbbutton', text: this.removeText, scope: this, handler: this.removeUser},