commit 641ffbe44190ae37a82ab4e398d94b8a92ec9ed1 parent 661e23593457968dbd9e40ed5bac8de726ca376c Author: Felicitus <felicitus@felicitus.org> Date: Sun, 11 Oct 2015 13:34:16 +0200 Added PartKeepr icons, fixed many icon locations Diffstat:
21 files changed, 49 insertions(+), 66 deletions(-)
diff --git a/app/config/config.yml b/app/config/config.yml @@ -70,6 +70,16 @@ sprite_generator: cssFormat: css imagePositioning: one-column imageGenerator: gd2 + partkeepr: + inDir: %kernel.root_dir%/../src/PartKeepr/FrontendBundle/Resources/public/images/icons/ + outImage: %kernel.root_dir%/../web/spritesheets/partkeepr.png + outCss: %kernel.root_dir%/../web/spritesheets/partkeepr.css + relativeImagePath: ./ + padding: 5 + spriteClass: partkeepr-icon + cssFormat: css + imagePositioning: one-column + imageGenerator: gd2 fr3d_ldap: driver: diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Editor/Editor.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Editor/Editor.js @@ -26,13 +26,13 @@ Ext.define('PartKeepr.Editor', { if (this.enableButtons) { this.saveButton = Ext.create("Ext.button.Button", { text: this.saveText, - icon: 'bundles/brainbitsfugueicons/icons/fugue/16/disk.png', + iconCls: 'fugue-icon disk', handler: Ext.bind(this._onItemSave, this) }); this.cancelButton = Ext.create("Ext.button.Button", { text: this.cancelText, - icon: 'resources/silkicons/cancel.png', + iconCls: 'web-icon cancel', handler: Ext.bind(this.onCancelEdit, this) }); diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Footprint/FootprintGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Footprint/FootprintGrid.js @@ -5,11 +5,9 @@ Ext.define('PartKeepr.FootprintGrid', { {header: i18n("Footprint"), dataIndex: 'name', flex: 1} ], addButtonText: i18n("Add Footprint"), - addButtonIcon: 'bundles/partkeeprfrontend/images/icons/footprint_add.png', - addButtonIconCls: '', + addButtonIconCls: 'partkeepr-icon footprint_add', deleteButtonText: i18n("Delete Footprint"), - deleteButtonIcon: 'bundles/partkeeprfrontend/images/icons/footprint_delete.png', - deleteButtonIconCls: '', + deleteButtonIconCls: 'partkeepr-icon footprint_delete', features: [ { ftype: 'grouping', diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Footprint/FootprintTree.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Footprint/FootprintTree.js @@ -13,16 +13,6 @@ Ext.define("PartKeepr.FootprintTree", { categoryModel: "PartKeepr.FootprintBundle.Entity.FootprintCategory", - /** - * @cfg {String} text The path to the 'add' icon - */ - addButtonIcon: 'bundles/partkeeprfrontend/images/icons/footprint_add.png', - - /** - * @cfg {String} text The path to the 'delete' icon - */ - deleteButtonIcon: 'bundles/partkeeprfrontend/images/icons/footprint_delete.png', - initComponent: function () { this.store = Ext.create("PartKeepr.data.store.FootprintCategoryStore"); diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Manufacturer/ManufacturerEditor.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Manufacturer/ManufacturerEditor.js @@ -13,13 +13,13 @@ Ext.define('PartKeepr.ManufacturerEditor', { '</tpl>'); this.addLogoButton = Ext.create("Ext.button.Button", { - icon: "resources/silkicons/add.png", + iconCls: "web-icon add", text: i18n("Add Logo"), handler: Ext.bind(this.uploadImage, this) }); this.deleteLogoButton = Ext.create("Ext.button.Button", { - icon: "resources/silkicons/delete.png", + iconCls: "web-icon delete", text: i18n("Delete Logo"), disabled: true, handler: Ext.bind(this.deleteImage, this) diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/MenuBar.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/MenuBar.js @@ -39,7 +39,7 @@ Ext.define('PartKeepr.MenuBar', { },{ text: i18n("Units"), handler: this.editUnits, - iconCls: 'fugue-icon unit' + iconCls: 'partkeepr-icon unit' }] }); @@ -186,7 +186,7 @@ Ext.define('PartKeepr.MenuBar', { editUnits: function () { var j = Ext.create("PartKeepr.UnitEditorComponent", { title: i18n("Units"), - iconCls: 'bundles/partkeeprfrontend/images/icons/unit', + iconCls: 'partkeepr-icon unit', closable: true }); diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartDistributorGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartDistributorGrid.js @@ -41,7 +41,7 @@ Ext.define('PartKeepr.PartDistributorGrid', { disabled: true, itemId: 'delete', scope: this, - icon: 'resources/silkicons/lorry_delete.png', + iconCls: 'web-icon lorry_delete', handler: this.onDeleteClick }); @@ -52,7 +52,7 @@ Ext.define('PartKeepr.PartDistributorGrid', { { text: 'Add', scope: this, - icon: 'resources/silkicons/lorry_add.png', + iconCls: 'web-icon lorry_add', handler: this.onAddClick }, this.deleteButton ] diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartEditorWindow.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartEditorWindow.js @@ -64,7 +64,7 @@ Ext.define('PartKeepr.PartEditorWindow', { this.cancelButton = Ext.create("Ext.button.Button", { text: this.cancelText, - icon: 'web-icon cancel.png', + iconCls: 'web-icon cancel', handler: Ext.bind(this.onCancelEdit, this) }); diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartManufacturerGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartManufacturerGrid.js @@ -26,7 +26,7 @@ Ext.define('PartKeepr.PartManufacturerGrid', { disabled: true, itemId: 'delete', scope: this, - icon: 'resources/silkicons/building_delete.png', + iconCls: 'web-icon building_delete', handler: this.onDeleteClick }); @@ -37,7 +37,7 @@ Ext.define('PartKeepr.PartManufacturerGrid', { { text: 'Add', scope: this, - icon: 'resources/silkicons/building_add.png', + iconCls: 'web-icon building_add', handler: this.onAddClick }, this.deleteButton ] @@ -110,4 +110,4 @@ Ext.define('PartKeepr.PartManufacturerGrid', { { this.deleteButton.setDisabled(selections.length === 0); } -});- \ No newline at end of file +}); diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/PartStockWindow.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/PartStockWindow.js @@ -112,7 +112,7 @@ Ext.define('PartKeepr.PartStockWindow', { this.buttons = [ { text : i18n("Close"), handler : this.onCloseClick, - icon : "resources/silkicons/cancel.png", + icon : "web-icon cancel", scope : this }, this.okButton ]; this.on("show", function() { @@ -160,7 +160,7 @@ Ext.define('PartKeepr.PartStockWindow', { this.callbackFn = fn; this.callbackScope = scope; this.setTitle(this.addPartText); - this.okButton.setIcon("resources/silkicons/brick_add.png"); + this.okButton.setIconCls("web-icon brick_add"); this.show(); }, /** @@ -180,7 +180,7 @@ Ext.define('PartKeepr.PartStockWindow', { this.priceCheckbox.hide(); this.commentField.hide(); this.setHeight(105); - this.okButton.setIcon("resources/silkicons/brick_delete.png"); + this.okButton.setIconCls("web-icon brick_delete"); this.show(); } }); diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/PartsGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/PartsGrid.js @@ -34,12 +34,12 @@ Ext.define('PartKeepr.PartsGrid', { /** * @cfg {String} Defines the icon of the "Expand Row" button */ - expandRowButtonIcon: 'bundles/partkeeprfrontend/images/icons/group-expand.png', + expandRowButtonIconCls: 'partkeepr-icon group-expand', /** * @cfg {String} Defines the icon of the "Collapse Row" button */ - collapseRowButtonIcon: 'bundles/partkeeprfrontend/images/icons/group-collapse.png', + collapseRowButtonIconCls: 'partkeepr-icon group-collapse', /** * Configure drag'n'drop. @@ -100,7 +100,7 @@ Ext.define('PartKeepr.PartsGrid', { this.bottomToolbar.add({ xtype: 'button', tooltip: i18n("Expand all Groups"), - icon: this.expandRowButtonIcon, + iconCls: this.expandRowButtonIconCls, listeners: { scope: this.groupingFeature, click: this.groupingFeature.expandAll @@ -111,7 +111,7 @@ Ext.define('PartKeepr.PartsGrid', { this.bottomToolbar.add({ xtype: 'button', tooltip: i18n("Collapse all Groups"), - icon: this.collapseRowButtonIcon, + iconCls: this.collapseRowButtonIconCls, listeners: { scope: this.groupingFeature, click: this.groupingFeature.collapseAll @@ -232,7 +232,7 @@ Ext.define('PartKeepr.PartsGrid', { { this.columns = [ { - header: '<span class="fugue-icon paper-clip"></span>', + header: '<span class="web-icon fugue-icon paper-clip"></span>', dataIndex: "", width: 30, tooltip: i18n("Has attachments?"), @@ -240,7 +240,7 @@ Ext.define('PartKeepr.PartsGrid', { }, { text: '<span class="web-icon accept"></span>', dataIndex: "needsReview", - width: 25, + width: 30, tooltip: i18n("Needs Review?"), renderer: this.reviewRenderer }, { diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/PartMeasurementUnit/PartMeasurementUnitGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/PartMeasurementUnit/PartMeasurementUnitGrid.js @@ -15,7 +15,7 @@ Ext.define('PartKeepr.PartMeasurementUnitGrid', { } ], addButtonText: i18n("Add Part Measurement Unit"), - addButtonIconCls: 'fugue-icon ruler--plus.png', + addButtonIconCls: 'fugue-icon ruler--plus', deleteButtonText: i18n("Delete Part Measurement Unit"), deleteButtonIconCls: 'fugue-icon ruler--minus', defaultButtonIconCls: "fugue-icon ruler--pencil", diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/StorageLocation/StorageLocationGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/StorageLocation/StorageLocationGrid.js @@ -14,7 +14,7 @@ Ext.define('PartKeepr.StorageLocationGrid', { {header: i18n("Storage Location"), dataIndex: 'name', flex: 1} ], addButtonText: i18n("Add Storage Location"), - addButtonIconCls: 'fugue-icon wooden-box--plus.png', + addButtonIconCls: 'fugue-icon wooden-box--plus', deleteButtonText: i18n("Delete Storage Location"), deleteButtonIconCls: 'fugue-icon wooden-box--minus', initComponent: function () @@ -23,7 +23,7 @@ Ext.define('PartKeepr.StorageLocationGrid', { // Adds a button which shows the multi-create window this.multiCreateButton = Ext.create("Ext.button.Button", { - icon: 'bundles/partkeeprfrontend/images/icons/storagelocation_multiadd.png', + iconCls: 'partkeepr-icon storagelocation_multiadd', tooltip: i18n("Multi-create storage locations"), handler: this.onMultiCreateClick, scope: this diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/StorageLocation/StorageLocationMultiAddWindow.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/StorageLocation/StorageLocationMultiAddWindow.js @@ -24,7 +24,7 @@ Ext.define("PartKeepr.StorageLocationMultiCreateWindow", { // Creates the add button as instance, so we can disable it easily. this.addButton = Ext.create("Ext.button.Button", { text: i18n("Create Storage Locations"), - icon: 'resources/silkicons/add.png', + iconCls: 'web-icon add', handler: this.onAddClick, scope: this }); @@ -40,7 +40,7 @@ Ext.define("PartKeepr.StorageLocationMultiCreateWindow", { text: i18n("Close"), handler: this.onCloseClick, scope: this, - icon: 'resources/silkicons/cancel.png' + iconCls: 'web-icon cancel' }] }]; @@ -94,4 +94,4 @@ Ext.define("PartKeepr.StorageLocationMultiCreateWindow", { this.close(); } -});- \ No newline at end of file +}); diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/StorageLocation/StorageLocationTree.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/StorageLocation/StorageLocationTree.js @@ -13,16 +13,6 @@ Ext.define("PartKeepr.StorageLocationTree", { categoryModel: "PartKeepr.StorageLocationBundle.Entity.StorageLocationCategory", - /** - * @cfg {String} text The path to the 'add' icon - */ - addButtonIcon: 'bundles/partkeeprfrontend/images/icons/footprint_add.png', - - /** - * @cfg {String} text The path to the 'delete' icon - */ - deleteButtonIcon: 'bundles/partkeeprfrontend/images/icons/footprint_delete.png', - initComponent: function () { this.store = Ext.create("PartKeepr.data.store.StorageLocationCategoryStore"); diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/SystemNotice/SystemNoticeEditor.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/SystemNotice/SystemNoticeEditor.js @@ -26,7 +26,7 @@ Ext.define('PartKeepr.SystemNoticeEditor', { this.acknowledgeButton = Ext.create("Ext.button.Button", { text: i18n("Acknowledge Notice"), - icon: 'resources/silkicons/accept.png' + iconCls: 'web-icon accept' }); this.acknowledgeButton.on("click", this.onAcknowledgeClick, this); diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/TipOfTheDay/TipOfTheDayWindow.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/TipOfTheDay/TipOfTheDayWindow.js @@ -56,13 +56,13 @@ Ext.define("PartKeepr.TipOfTheDayWindow", { this.previousButton = Ext.create("Ext.button.Button", { text: i18n("Previous Tip"), handler: Ext.bind(this.displayPreviousTip, this), - icon: 'bundles/partkeeprfrontend/images/icons/tip_previous.png', + iconCls: 'partkeepr-icon tip_previous', disabled: true }); this.nextButton = Ext.create("Ext.button.Button", { text: i18n("Next Tip"), - icon: 'bundles/partkeeprfrontend/images/icons/tip_next.png', + iconCls: 'partkeepr-icon tip_next', handler: Ext.bind(this.displayNextTip, this) }); diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Unit/UnitGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Unit/UnitGrid.js @@ -6,11 +6,9 @@ Ext.define('PartKeepr.UnitGrid', { {header: i18n("Symbol"), dataIndex: 'symbol', width: 60} ], addButtonText: i18n("Add Unit"), - addButtonIcon: 'bundles/partkeeprfrontend/images/icons/unit_add.png', - addButtonIconCls: '', + addButtonIconCls: 'partkeepr-icon unit_add', deleteButtonText: i18n("Delete Unit"), - deleteButtonIcon: 'bundles/partkeeprfrontend/images/icons/unit_delete.png', - deleteButtonIconCls: '', + deleteButtonIconCls: 'partkeepr-icon unit_delete', automaticPageSize: true, initComponent: function () { diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/User/Preferences/UserPasswordChangePanel.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/User/Preferences/UserPasswordChangePanel.js @@ -45,7 +45,7 @@ Ext.define('PartKeepr.UserPasswordChangePanel', { handler: this.onChangePassword, scope: this, width: 145, - icon: 'resources/silkicons/accept.png', + iconCls: 'web-icon accept', text: i18n("Change Password") } }]; @@ -72,4 +72,4 @@ Ext.define('PartKeepr.UserPasswordChangePanel', { return true; } -});- \ No newline at end of file +}); diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Widgets/AttachmentGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Widgets/AttachmentGrid.js @@ -26,7 +26,7 @@ Ext.define('PartKeepr.AttachmentGrid', { disabled: true, itemId: 'delete', scope: this, - iconCls: 'web-icon delete.png', + iconCls: 'web-icon delete', handler: this.onDeleteClick }); @@ -161,4 +161,4 @@ Ext.define('PartKeepr.AttachmentGrid', { }] }).show(); } -});- \ No newline at end of file +}); diff --git a/src/PartKeepr/FrontendBundle/Resources/views/index.html.twig b/src/PartKeepr/FrontendBundle/Resources/views/index.html.twig @@ -19,6 +19,7 @@ 'js/packages/extjs6/build/packages/charts/classic/neptune/resources/charts-all.css' 'atelierspierrot/famfamfam-silk-sprite/silk-icons-sprite.css' 'spritesheets/fugue-16.css' + 'spritesheets/partkeepr.css' 'bundles/partkeeprfrontend/css/PartKeepr.css' %} <link rel="stylesheet" href="{{ asset_url }}"/> {% endstylesheets %}