partkeepr

fork of partkeepr
git clone https://git.e1e0.net/partkeepr.git
Log | Files | Refs | Submodules | README | LICENSE

commit bde9ba8fa006fc9cc05f7bf94008a8c1410f1db1
parent e51ff83e084b1855837b65dff877c37346a021d6
Author: Felicitus <felicitus@felicitus.org>
Date:   Sat, 31 Dec 2011 12:27:53 +0100

Removed 'x-btn-text-icon' as it's not required in ExtJS4 anymore.

Diffstat:
Msrc/frontend/js/Components/Editor/Editor.js | 2--
Msrc/frontend/js/Components/Manufacturer/ManufacturerEditor.js | 2--
Msrc/frontend/js/Components/Part/Editor/PartEditorWindow.js | 2--
Msrc/frontend/js/Components/Part/PartDisplay.js | 2--
Msrc/frontend/js/Components/Part/PartFilterPanel.js | 2--
Msrc/frontend/js/Components/TipOfTheDay/TipOfTheDayWindow.js | 2--
Msrc/frontend/js/Dialogs/Auth/LoginDialog.js | 2--
Msrc/frontend/js/Dialogs/ExceptionWindow.js | 5+++--
8 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/frontend/js/Components/Editor/Editor.js b/src/frontend/js/Components/Editor/Editor.js @@ -34,14 +34,12 @@ Ext.define('PartKeepr.Editor', { if (this.enableButtons) { this.saveButton = Ext.create("Ext.button.Button", { text: this.saveText, - cls: 'x-btn-text-icon', icon: 'resources/fugue-icons/icons/disk.png', handler: Ext.bind(this.onItemSave, this) }); this.cancelButton = Ext.create("Ext.button.Button", { text: this.cancelText, - cls: 'x-btn-text-icon', icon: 'resources/silkicons/cancel.png', handler: Ext.bind(this.onCancelEdit, this) }); diff --git a/src/frontend/js/Components/Manufacturer/ManufacturerEditor.js b/src/frontend/js/Components/Manufacturer/ManufacturerEditor.js @@ -17,14 +17,12 @@ Ext.define('PartKeepr.ManufacturerEditor', { ]; this.addLogoButton = Ext.create("Ext.button.Button", { - cls:'x-btn-text-icon', icon: "resources/silkicons/add.png", text: i18n("Add Logo"), handler: Ext.bind(this.uploadImage, this) }); this.deleteLogoButton = Ext.create("Ext.button.Button", { - cls:'x-btn-text-icon', icon: "resources/silkicons/delete.png", text: i18n("Delete Logo"), disabled: true, diff --git a/src/frontend/js/Components/Part/Editor/PartEditorWindow.js b/src/frontend/js/Components/Part/Editor/PartEditorWindow.js @@ -52,14 +52,12 @@ Ext.define('PartKeepr.PartEditorWindow', { this.saveButton = Ext.create("Ext.button.Button", { text: this.saveText, - cls: 'x-btn-text-icon', icon: 'resources/fugue-icons/icons/disk.png', handler: Ext.bind(this.onItemSave, this) }); this.cancelButton = Ext.create("Ext.button.Button", { text: this.cancelText, - cls: 'x-btn-text-icon', icon: 'resources/silkicons/cancel.png', handler: Ext.bind(this.onCancelEdit, this) }); diff --git a/src/frontend/js/Components/Part/PartDisplay.js b/src/frontend/js/Components/Part/PartDisplay.js @@ -59,7 +59,6 @@ Ext.define('PartKeepr.PartDisplay', { */ this.addButton = new Ext.Button({ text: i18n("Add Stock"), - cls:'x-btn-text-icon', icon: 'resources/silkicons/brick_add.png', handler: Ext.bind(this.addPartPrompt, this) }); @@ -69,7 +68,6 @@ Ext.define('PartKeepr.PartDisplay', { */ this.deleteButton = new Ext.Button({ text: i18n("Remove Stock"), - cls:'x-btn-text-icon', icon: 'resources/silkicons/brick_delete.png', handler: Ext.bind(this.deletePartPrompt, this) }); diff --git a/src/frontend/js/Components/Part/PartFilterPanel.js b/src/frontend/js/Components/Part/PartFilterPanel.js @@ -41,7 +41,6 @@ Ext.define('PartKeepr.PartFilterPanel', { this.resetButton = Ext.create("Ext.button.Button", { text: i18n("Reset"), handler: this.onReset, - cls: 'x-btn-text-icon', icon: 'resources/diagona-icons/icons/16/101.png', scope: this }); @@ -49,7 +48,6 @@ Ext.define('PartKeepr.PartFilterPanel', { // Create the apply button this.applyButton = Ext.create("Ext.button.Button", { text: i18n("Apply"), - cls: 'x-btn-text-icon', icon: 'resources/diagona-icons/icons/16/102.png', handler: this.onApply, scope: this diff --git a/src/frontend/js/Components/TipOfTheDay/TipOfTheDayWindow.js b/src/frontend/js/Components/TipOfTheDay/TipOfTheDayWindow.js @@ -49,14 +49,12 @@ Ext.define("PartKeepr.TipOfTheDayWindow", { this.previousButton = Ext.create("Ext.button.Button", { text: i18n("Previous Tip"), handler: Ext.bind(this.displayPreviousTip, this), - cls: 'x-btn-text-icon', icon: 'resources/icons/tip_previous.png', disabled: true }); this.nextButton = Ext.create("Ext.button.Button", { text: i18n("Next Tip"), - cls: 'x-btn-text-icon', icon: 'resources/icons/tip_next.png', handler: Ext.bind(this.displayNextTip, this) }); diff --git a/src/frontend/js/Dialogs/Auth/LoginDialog.js b/src/frontend/js/Dialogs/Auth/LoginDialog.js @@ -49,12 +49,10 @@ Ext.define('PartKeepr.LoginDialog', { defaults: {minWidth: 100}, items: [ { - cls: 'x-btn-text-icon', text: i18n("Connect"), icon: 'resources/silkicons/connect.png', handler: Ext.bind(this.login, this) },{ - cls: 'x-btn-text-icon', text: i18n("Close"), handler: Ext.bind(this.close, this), icon: 'resources/silkicons/cancel.png' diff --git a/src/frontend/js/Dialogs/ExceptionWindow.js b/src/frontend/js/Dialogs/ExceptionWindow.js @@ -28,7 +28,8 @@ Ext.define('PartKeepr.ExceptionWindow', { }); this.exceptionDiv = Ext.create('Ext.Component', { autoEl: { tag: 'div' }, - cls: 'ext-mb-text' + cls: 'ext-mb-text', + style: 'overflow: auto' }); this.traceDiv = Ext.create('Ext.Component', { autoEl: { tag: 'div' }, @@ -110,7 +111,7 @@ Ext.define('PartKeepr.ExceptionWindow', { } if (exception.backtrace) { - this.traceDiv.update(exception.backtrace); + this.traceDiv.update(nl2br('<code>'+exception.backtrace+'</code>')); } else { this.traceDiv.update("No backtrace available"); }