commit 6fba3f48838c4dc6278fb993ed8a48f28117e460 parent 1deadd3b219ca6d99c7a5b6f19c873f5dd7b4d76 Author: Felicitus <felicitus@felicitus.org> Date: Wed, 24 Jun 2015 17:49:44 +0200 Replaced the direct fugue icons repository with the proper packagist bundle Diffstat:
18 files changed, 75 insertions(+), 33 deletions(-)
diff --git a/.gitmodules b/.gitmodules @@ -7,9 +7,6 @@ [submodule "frontend/resources/mimetypes"] path = src/frontend/resources/mimetypes url = git://github.com/partkeepr/splitbrain_mimetypes.git -[submodule "frontend/resources/fugue-icons"] - path = src/frontend/resources/fugue-icons - url = git://github.com/yusukekamiyamane/fugue-icons.git [submodule "3rdparty/extjs"] path = 3rdparty/extjs diff --git a/app/AppKernel.php b/app/AppKernel.php @@ -60,6 +60,7 @@ class AppKernel extends Kernel new PartKeepr\RESTBundle\PartKeeprRESTBundle(), new PartKeepr\ApiDocBundle\PartKeeprApiDocBundle(), new Dunglas\ApiBundle\DunglasApiBundle(), + new Brainbits\FugueIconsBundle\BrainbitsFugueIconsBundle(), ); // Developer bundles diff --git a/composer.json b/composer.json @@ -46,7 +46,8 @@ "symfony/doctrine-bridge": "2.7.x-dev", "knplabs/knp-paginator-bundle": "2.4.1", "dunglas/api-bundle": "1.0.*@dev", - "symfony/serializer": "2.7.1" + "symfony/serializer": "2.7.1", + "brainbits/fugue-icons-bundle": "^3.5" }, "autoload": { "psr-0": { "": "src/", diff --git a/composer.lock b/composer.lock @@ -4,9 +4,52 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "377099a71e0b722b77a8b6255c5f54e7", + "hash": "c391c64cc6451d5d25a24f1a4911f621", "packages": [ { + "name": "brainbits/fugue-icons-bundle", + "version": "3.5.6", + "source": { + "type": "git", + "url": "https://github.com/brainbits/fugue-icons-bundle.git", + "reference": "3b621552dd2f3d3172235f69f2963b70a23f4597" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/brainbits/fugue-icons-bundle/zipball/3b621552dd2f3d3172235f69f2963b70a23f4597", + "reference": "3b621552dd2f3d3172235f69f2963b70a23f4597", + "shasum": "" + }, + "type": "library", + "autoload": { + "psr-0": { + "Brainbits": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "CC-BY-3.0" + ], + "authors": [ + { + "name": "Stephan Wentz", + "email": "swentz@brainbits.net", + "role": "Packager" + }, + { + "name": "Yusuke Kamiyamane", + "homepage": "http://p.yusukekamiyamane.com/" + } + ], + "description": "Bundle including the fugue icon set.", + "homepage": "http://p.yusukekamiyamane.com/", + "keywords": [ + "fugue", + "icons" + ], + "time": "2013-05-15 12:31:26" + }, + { "name": "cbsi/doctrine2-nestedset", "version": "dev-master", "source": { diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/CategoryEditor/CategoryEditorTree.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/CategoryEditor/CategoryEditorTree.js @@ -106,14 +106,14 @@ Ext.define("PartKeepr.CategoryEditorTree", { }, createToolbar: function () { this.toolbarExpandButton = Ext.create("Ext.button.Button", { - icon: 'resources/fugue-icons/icons/toggle-expand.png', + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/toggle-expand.png', tooltip: i18n("Expand All"), handler: this._onExpandClick, scope: this }); this.toolbarCollapseButton = Ext.create("Ext.button.Button", { - icon: 'resources/fugue-icons/icons/toggle.png', + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/toggle.png', tooltip: i18n("Collapse All"), handler: this._onCollapseClick, scope: this diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Editor/Editor.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Editor/Editor.js @@ -35,7 +35,7 @@ Ext.define('PartKeepr.Editor', { if (this.enableButtons) { this.saveButton = Ext.create("Ext.button.Button", { text: this.saveText, - icon: 'resources/fugue-icons/icons/disk.png', + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/disk.png', handler: Ext.bind(this._onItemSave, this) }); diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Grid/GridMenuPlugin.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Grid/GridMenuPlugin.js @@ -33,7 +33,7 @@ Ext.define("PartKeepr.GridMenuPlugin", { handler: this.exportCSV, scope: this },,{ - icon: 'resources/fugue-icons/icons/blue-document-excel.png', + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/blue-document-excel.png', text: i18n('Export as Excel XML (.xlsx)'), handler: this.exportXLSX, scope: this diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/MenuBar.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/MenuBar.js @@ -8,12 +8,12 @@ Ext.define('PartKeepr.MenuBar', { this.editMenu = Ext.create('Ext.menu.Menu', { items: [{ text: i18n('Projects'), - icon: 'resources/fugue-icons/icons/drill.png', + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/drill.png', handler: this.editProjects }, { text: i18n('Footprints'), - icon: 'resources/fugue-icons/icons/fingerprint.png', + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/fingerprint.png', handler: this.editFootprints },{ text: i18n('Manufacturers'), @@ -21,7 +21,7 @@ Ext.define('PartKeepr.MenuBar', { handler: this.editManufacturers },{ text: i18n('Storage Locations'), - icon: 'resources/fugue-icons/icons/wooden-box.png', + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/wooden-box.png', handler: this.editStorageLocations },{ text: i18n('Distributors'), @@ -35,7 +35,7 @@ Ext.define('PartKeepr.MenuBar', { },{ text: i18n('Part Measurement Units'), handler: this.editPartUnits, - icon: "resources/fugue-icons/icons/ruler.png" + icon: "bundles/brainbitsfugueicons/icons/fugue/16/ruler.png" },{ text: i18n("Units"), handler: this.editUnits, @@ -61,19 +61,19 @@ Ext.define('PartKeepr.MenuBar', { { text: i18n("System Information"), handler: this.showSystemInformation, - icon: 'resources/fugue-icons/icons/system-monitor.png' + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/system-monitor.png' },{ text: i18n("Project Reports"), handler: this.showProjectReports, - icon: 'resources/fugue-icons/icons/drill.png' + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/drill.png' },{ text: i18n("System Notices"), handler: this.showSystemNotices, - icon: 'resources/fugue-icons/icons/service-bell.png' + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/service-bell.png' },{ text: i18n("Stock History"), handler: this.showStockHistory, - icon: 'resources/fugue-icons/icons/notebook.png' + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/notebook.png' },{ text: i18n("Print and Labeling"), glyph: 0xf02f, @@ -99,7 +99,7 @@ Ext.define('PartKeepr.MenuBar', { handler: this.disconnect },{ text: i18n("User Preferences"), - icon: 'resources/fugue-icons/icons/gear.png', + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/gear.png', handler: this.showUserPreferences } ] 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 @@ -58,7 +58,7 @@ Ext.define('PartKeepr.PartEditorWindow', { this.saveButton = Ext.create("Ext.button.Button", { text: this.saveText, - icon: 'resources/fugue-icons/icons/disk.png', + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/disk.png', handler: Ext.bind(this.onItemSave, this) }); diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartParameterGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartParameterGrid.js @@ -29,7 +29,7 @@ Ext.define('PartKeepr.PartParameterGrid', { disabled: true, itemId: 'delete', scope: this, - icon: 'resources/fugue-icons/icons/table--minus.png', + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/table--minus.png', handler: this.onDeleteClick }); @@ -38,7 +38,7 @@ Ext.define('PartKeepr.PartParameterGrid', { items: [{ text: i18n('Add'), scope: this, - icon: 'resources/fugue-icons/icons/table--plus.png', + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/table--plus.png', handler: this.onAddClick }, this.deleteButton] }]; diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/PartCategoryTree.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/PartCategoryTree.js @@ -10,7 +10,7 @@ Ext.define("PartKeepr.PartCategoryTree", { this.syncButton = Ext.create("Ext.button.Button", { tooltip: i18n("Reveal Category for selected part"), - icon: 'resources/fugue-icons/icons/arrow-split-180.png', + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/arrow-split-180.png', handler: Ext.bind(function () { this.fireEvent("syncCategory"); }, this), diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/PartMeasurementUnit/PartMeasurementUnitGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/PartMeasurementUnit/PartMeasurementUnitGrid.js @@ -6,10 +6,10 @@ Ext.define('PartKeepr.PartMeasurementUnitGrid', { {header: i18n("Default"), dataIndex: 'isDefault', width: 60, renderer: function (val) { if (val === true) { return "✓"; } else { return ""; }}} ], addButtonText: i18n("Add Part Measurement Unit"), - addButtonIcon: "resources/fugue-icons/icons/ruler--plus.png", + addButtonIcon: "bundles/brainbitsfugueicons/icons/fugue/16/ruler--plus.png", deleteButtonText: i18n("Delete Part Measurement Unit"), - deleteButtonIcon: "resources/fugue-icons/icons/ruler--minus.png", - defaultButtonIcon: "resources/fugue-icons/icons/ruler--pencil.png", + deleteButtonIcon: "bundles/brainbitsfugueicons/icons/fugue/16/ruler--minus.png", + defaultButtonIcon: "bundles/brainbitsfugueicons/icons/fugue/16/ruler--pencil.png", automaticPageSize: true, initComponent: function () { this.callParent(); diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Project/ProjectGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Project/ProjectGrid.js @@ -8,8 +8,8 @@ Ext.define('PartKeepr.ProjectGrid', { {header: i18n("Project"), dataIndex: 'name', flex: 1} ], addButtonText: i18n("Add Project"), - addButtonIcon: 'resources/fugue-icons/icons/drill--plus.png', + addButtonIcon: 'bundles/brainbitsfugueicons/icons/fugue/16/drill--plus.png', deleteButtonText: i18n("Delete Project"), - deleteButtonIcon: 'resources/fugue-icons/icons/drill--minus.png', + deleteButtonIcon: 'bundles/brainbitsfugueicons/icons/fugue/16/drill--minus.png', automaticPageSize: true }); \ No newline at end of file diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/StorageLocation/StorageLocationGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/StorageLocation/StorageLocationGrid.js @@ -8,9 +8,9 @@ Ext.define('PartKeepr.StorageLocationGrid', { {header: i18n("Storage Location"), dataIndex: 'name', flex: 1} ], addButtonText: i18n("Add Storage Location"), - addButtonIcon: 'resources/fugue-icons/icons/wooden-box--plus.png', + addButtonIcon: 'bundles/brainbitsfugueicons/icons/fugue/16/wooden-box--plus.png', deleteButtonText: i18n("Delete Storage Location"), - deleteButtonIcon: 'resources/fugue-icons/icons/wooden-box--minus.png', + deleteButtonIcon: 'bundles/brainbitsfugueicons/icons/fugue/16/wooden-box--minus.png', initComponent: function () { this.callParent(); diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Widgets/AttachmentGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Widgets/AttachmentGrid.js @@ -46,7 +46,7 @@ Ext.define('PartKeepr.AttachmentGrid', { text: i18n("Take image"), handler: this.onWebcamClick, scope: this, - icon: 'resources/fugue-icons/icons/webcam.png' + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/webcam.png' }); this.dockedItems = [{ diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Widgets/SystemNoticeButton.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Widgets/SystemNoticeButton.js @@ -1,6 +1,6 @@ Ext.define('PartKeepr.SystemNoticeButton', { extend: 'PartKeepr.FadingButton', - icon: 'resources/fugue-icons/icons/service-bell.png', + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/service-bell.png', tooltip: i18n("Unacknowledged System Notices"), /** diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Widgets/WebcamPanel.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Widgets/WebcamPanel.js @@ -9,7 +9,7 @@ Ext.define('PartKeepr.WebcamPanel', { this.takePhotoButton = Ext.create("Ext.button.Button", { text: i18n("Take picture and upload"), - icon: 'resources/fugue-icons/icons/webcam.png', + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/webcam.png', handler: this.takePhoto }); diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Dialogs/FileUploadDialog.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Dialogs/FileUploadDialog.js @@ -92,7 +92,7 @@ Ext.define('PartKeepr.FileUploadDialog', { this.uploadSizeButton = Ext.create("Ext.button.Button", { xtype: 'button', - icon: 'resources/fugue-icons/icons/information-frame.png', + icon: 'bundles/brainbitsfugueicons/icons/fugue/16/information-frame.png', handler: this.showUploadSizeInformation, scope: this });