commit efdc091c7c79c75a0720cb0120696c3466ffe510 parent de317321a02cf4a9a9a393bcbc1b25da84e56466 Author: Timo A. Hummel <felicitus@felicitus.org> Date: Tue, 2 Aug 2016 16:17:56 +0200 Fixed several icon problems due to upgrade to !important css sprites Diffstat:
7 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Manufacturer/ManufacturerEditorComponent.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Manufacturer/ManufacturerEditorComponent.js @@ -19,7 +19,7 @@ Ext.define('PartKeepr.ManufacturerEditorComponent', { this.callParent(); }, statics: { - iconCls: 'web-icon building', + iconCls: 'fugue-icon building', title: i18n('Manufacturers'), closable: true, menuPath: [{text: i18n("Edit")}] diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Manufacturer/ManufacturerGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Manufacturer/ManufacturerGrid.js @@ -5,8 +5,8 @@ Ext.define('PartKeepr.ManufacturerGrid', { {header: i18n("Manufacturer"), dataIndex: 'name', flex: 1} ], addButtonText: i18n("Add Manufacturer"), - addButtonIconCls: 'web-icon building_add', + addButtonIconCls: 'fugue-icon building--plus', deleteButtonText: i18n("Delete Manufacturer"), - deleteButtonIconCls: 'web-icon building_delete', + deleteButtonIconCls: 'fugue-icon building--minus', automaticPageSize: true }); diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartEditor.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartEditor.js @@ -200,7 +200,7 @@ Ext.define('PartKeepr.PartEditor', { // Creates the manufacturer grid this.partManufacturerGrid = Ext.create("PartKeepr.PartManufacturerGrid", { title: i18n("Manufacturers"), - iconCls: 'web-icon building', + iconCls: 'fugue-icon building', layout: 'fit' }); 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, - iconCls: 'web-icon building_delete', + iconCls: 'fugue-icon building--minus', handler: this.onDeleteClick }); @@ -37,7 +37,7 @@ Ext.define('PartKeepr.PartManufacturerGrid', { { text: 'Add', scope: this, - iconCls: 'web-icon building_add', + iconCls: 'fugue-icon building--plus', handler: this.onAddClick }, this.deleteButton ] diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/User/UserEditorComponent.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/User/UserEditorComponent.js @@ -26,7 +26,7 @@ Ext.define('PartKeepr.UserEditorComponent', { this.callParent(); }, statics: { - iconCls: 'web-icon user', + iconCls: 'fugue-icon user', title: i18n('Users'), closable: true, menuPath: [{text: i18n("Edit")}] diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/User/UserGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/User/UserGrid.js @@ -30,9 +30,9 @@ Ext.define('PartKeepr.UserGrid', { } ], addButtonText: i18n("Add User"), - addButtonIconCls: 'web-icon user_add', + addButtonIconCls: 'fugue-icon user--plus', deleteButtonText: i18n("Delete User"), - deleteButtonIconCls: 'web-icon user_delete', + deleteButtonIconCls: 'fugue-icon user--minus', automaticPageSize: true, initComponent: function () diff --git a/src/PartKeepr/FrontendBundle/Resources/views/index.html.twig b/src/PartKeepr/FrontendBundle/Resources/views/index.html.twig @@ -45,7 +45,11 @@ {% else %} {% javascripts output='js/compiled/extjs.js' 'js/packages/extjs6/build/ext-all.js' - 'js/packages/extjs6/build/packages/ux/classic/ux.js' %} + 'js/packages/extjs6/packages/ux/classic/src/TreePicker.js' + 'js/packages/extjs6/packages/ux/classic/src/TabCloseMenu.js' + 'js/packages/extjs6/packages/ux/classic/src/statusbar/StatusBar.js' + 'js/packages/extjs6/packages/ux/classic/src/IFrame.js' + %} <script type="text/javascript" src="{{ asset_url }}"></script> {% endjavascripts %} @@ -66,9 +70,9 @@ {% javascripts output='js/compiled/models.js' - 'bundles/doctrinereflection/*' + 'bundles/doctrinereflection/*' %} - <script type="text/javascript" src="{{ asset_url }}"></script> + <script type="text/javascript" src="{{ asset_url }}"></script> {% endjavascripts %} {% javascripts output='js/compiled/main2.js' @@ -87,7 +91,6 @@ '@PartKeeprFrontendBundle/Resources/public/js/Components/Auth/WSSEAuthenticationProvider.js' '@PartKeeprFrontendBundle/Resources/public/js/Data/store/TipOfTheDayStore.js' '@PartKeeprFrontendBundle/Resources/public/js/Data/store/TipOfTheDayHistoryStore.js' - '@PartKeeprFrontendBundle/Resources/public/js/Data/store/SystemPreferenceStore.js' '@PartKeeprFrontendBundle/Resources/public/js/Data/store/UserProvidersStore.js' '@PartKeeprFrontendBundle/Resources/public/js/Models/ProjectReport.js' '@PartKeeprFrontendBundle/Resources/public/js/Models/ProjectReportList.js' @@ -235,11 +238,6 @@ '@PartKeeprFrontendBundle/Resources/public/js/Components/CategoryEditor/CategoryEditorForm.js' '@PartKeeprFrontendBundle/Resources/public/js/Components/Picker/CharPicker.js' '@PartKeeprFrontendBundle/Resources/public/js/Components/Widgets/StorageLocationPicker.js' - '@PartKeeprFrontendBundle/Resources/public/js/Components/SystemPreferences/Panel.js' - '@PartKeeprFrontendBundle/Resources/public/js/Components/SystemPreferences/Tree.js' - '@PartKeeprFrontendBundle/Resources/public/js/Components/SystemPreferences/PreferenceEditor.js' - '@PartKeeprFrontendBundle/Resources/public/js/Components/SystemPreferences/Preferences/FulltextSearch.js' - '@PartKeeprFrontendBundle/Resources/public/js/Components/Widgets/FieldSelector.js' '@PartKeeprFrontendBundle/Resources/public/js/Models/Message.js' '@PartKeeprFrontendBundle/Resources/public/js/Ext.ux.Wizard.Card.js' '@PartKeeprFrontendBundle/Resources/public/js/Ext.ux.Wizard.Header.js'