commit fc0ef55ea98d18cda7f443ec8d6d777ca647492e
parent 4f0e5c2e539c7085cb6638afec09ef7061e967fc
Author: Felicitus <felicitus@felicitus.org>
Date: Thu, 24 Sep 2015 23:11:24 +0200
Fixed several icons
Diffstat:
6 files changed, 95 insertions(+), 74 deletions(-)
diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Distributor/DistributorGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Distributor/DistributorGrid.js
@@ -1,12 +1,12 @@
Ext.define('PartKeepr.DistributorGrid', {
- extend: 'PartKeepr.EditorGrid',
- alias: 'widget.DistributorGrid',
- columns: [
- {header: i18n("Distributor"), dataIndex: 'name', flex: 1}
- ],
- addButtonText: i18n("Add Distributor"),
- addButtonIcon: 'resources/silkicons/lorry_add.png',
+ extend: 'PartKeepr.EditorGrid',
+ alias: 'widget.DistributorGrid',
+ columns: [
+ {header: i18n("Distributor"), dataIndex: 'name', flex: 1}
+ ],
+ addButtonText: i18n("Add Distributor"),
+ addButtonIconCls: 'web-icon lorry_add',
deleteButtonText: i18n("Delete Distributor"),
- deleteButtonIcon: 'resources/silkicons/lorry_delete.png',
+ deleteButtonIconCls: 'web-icon lorry_delete',
automaticPageSize: true
-});-
\ No newline at end of file
+});
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,8 +5,11 @@ Ext.define('PartKeepr.FootprintGrid', {
{header: i18n("Footprint"), dataIndex: 'name', flex: 1}
],
addButtonText: i18n("Add Footprint"),
+ addButtonIcon: 'bundles/partkeeprfrontend/images/icons/footprint_add.png',
+ addButtonIconCls: '',
deleteButtonText: i18n("Delete Footprint"),
-
+ deleteButtonIcon: 'bundles/partkeeprfrontend/images/icons/footprint_delete.png',
+ deleteButtonIconCls: '',
features: [
{
ftype: 'grouping',
@@ -14,4 +17,4 @@ Ext.define('PartKeepr.FootprintGrid', {
enableNoGroups: true
}
]
-});-
\ No newline at end of file
+});
diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Manufacturer/ManufacturerGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Manufacturer/ManufacturerGrid.js
@@ -1,12 +1,12 @@
Ext.define('PartKeepr.ManufacturerGrid', {
- extend: 'PartKeepr.EditorGrid',
- alias: 'widget.ManufacturerGrid',
- columns: [
- {header: i18n("Manufacturer"), dataIndex: 'name', flex: 1}
- ],
- addButtonText: i18n("Add Manufacturer"),
- addButtonIcon: 'resources/silkicons/building_add.png',
+ extend: 'PartKeepr.EditorGrid',
+ alias: 'widget.ManufacturerGrid',
+ columns: [
+ {header: i18n("Manufacturer"), dataIndex: 'name', flex: 1}
+ ],
+ addButtonText: i18n("Add Manufacturer"),
+ addButtonIconCls: 'web-icon building_add',
deleteButtonText: i18n("Delete Manufacturer"),
- deleteButtonIcon: 'resources/silkicons/building_delete.png',
+ deleteButtonIconCls: 'web-icon building_delete',
automaticPageSize: true
-});-
\ No newline at end of file
+});
diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/PartMeasurementUnit/PartMeasurementUnitGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/PartMeasurementUnit/PartMeasurementUnitGrid.js
@@ -1,45 +1,61 @@
Ext.define('PartKeepr.PartMeasurementUnitGrid', {
- extend: 'PartKeepr.EditorGrid',
- alias: 'widget.PartMeasurementUnitGrid',
- columns: [
- {header: i18n("Part Measurement Unit"), dataIndex: 'name', flex: 1},
- {header: i18n("Default"), dataIndex: 'default', width: 60, renderer: function (val) { if (val === true) { return "✓"; } else { return ""; }}}
- ],
- addButtonText: i18n("Add Part Measurement Unit"),
- addButtonIcon: "bundles/brainbitsfugueicons/icons/fugue/16/ruler--plus.png",
+ extend: 'PartKeepr.EditorGrid',
+ alias: 'widget.PartMeasurementUnitGrid',
+ columns: [
+ {header: i18n("Part Measurement Unit"), dataIndex: 'name', flex: 1},
+ {
+ header: i18n("Default"), dataIndex: 'default', width: 60, renderer: function (val)
+ {
+ if (val === true) {
+ return "✓";
+ } else {
+ return "";
+ }
+ }
+ }
+ ],
+ addButtonText: i18n("Add Part Measurement Unit"),
+ addButtonIcon: "bundles/brainbitsfugueicons/icons/fugue/16/ruler--plus.png",
+ addButtonIconCls: '',
deleteButtonText: i18n("Delete Part Measurement Unit"),
deleteButtonIcon: "bundles/brainbitsfugueicons/icons/fugue/16/ruler--minus.png",
+ deleteButtonIconCls: '',
defaultButtonIcon: "bundles/brainbitsfugueicons/icons/fugue/16/ruler--pencil.png",
automaticPageSize: true,
- initComponent: function () {
- this.callParent();
-
- this.defaultButton = Ext.create("Ext.button.Button", {
- icon: this.defaultButtonIcon,
- tooltip: i18n('Mark Part Measurement Unit as Default'),
- disabled: true,
- handler: this.onDefaultClick,
- scope: this
- });
-
- this.getSelectionModel().on("deselect",
- Ext.bind(function (rsm, r, i) {
- this.defaultButton.disable();
- }, this));
-
- this.getSelectionModel().on("select",
- Ext.bind(function (rsm, r, i) {
- this.defaultButton.enable();
- }, this));
- this.topToolbar.insert(2, {xtype: 'tbseparator'});
- this.topToolbar.insert(3, this.defaultButton);
+ initComponent: function ()
+ {
+ this.callParent();
+
+ this.defaultButton = Ext.create("Ext.button.Button", {
+ icon: this.defaultButtonIcon,
+ tooltip: i18n('Mark Part Measurement Unit as Default'),
+ disabled: true,
+ handler: this.onDefaultClick,
+ scope: this
+ });
+
+ this.getSelectionModel().on("deselect",
+ Ext.bind(function (rsm, r, i)
+ {
+ this.defaultButton.disable();
+ }, this));
+
+ this.getSelectionModel().on("select",
+ Ext.bind(function (rsm, r, i)
+ {
+ this.defaultButton.enable();
+ }, this));
+ this.topToolbar.insert(2, {xtype: 'tbseparator'});
+ this.topToolbar.insert(3, this.defaultButton);
},
- onDefaultClick: function () {
- var r = this.getSelectionModel().getLastSelected();
+ onDefaultClick: function ()
+ {
+ var r = this.getSelectionModel().getLastSelected();
- r.callAction("setDefault", {}, this.onDefaultHandler.bind(this));
+ r.callAction("setDefault", {}, this.onDefaultHandler.bind(this));
},
- onDefaultHandler: function () {
- this.store.load();
+ onDefaultHandler: function ()
+ {
+ this.store.load();
}
});
diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/StorageLocation/StorageLocationGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/StorageLocation/StorageLocationGrid.js
@@ -15,9 +15,12 @@ Ext.define('PartKeepr.StorageLocationGrid', {
],
addButtonText: i18n("Add Storage Location"),
addButtonIcon: 'bundles/brainbitsfugueicons/icons/fugue/16/wooden-box--plus.png',
+ addButtonIconCls: '',
deleteButtonText: i18n("Delete Storage Location"),
deleteButtonIcon: 'bundles/brainbitsfugueicons/icons/fugue/16/wooden-box--minus.png',
- initComponent: function () {
+ deleteButtonIconCls: '',
+ initComponent: function ()
+ {
this.callParent();
// Adds a button which shows the multi-create window
@@ -34,7 +37,8 @@ Ext.define('PartKeepr.StorageLocationGrid', {
/**
* Creates a new storage location multi-create window.
*/
- onMultiCreateClick: function () {
+ onMultiCreateClick: function ()
+ {
this.fireEvent("storageLocationMultiAdd")
}
-});-
\ No newline at end of file
+});
diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Unit/UnitGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Unit/UnitGrid.js
@@ -1,16 +1,19 @@
Ext.define('PartKeepr.UnitGrid', {
- extend: 'PartKeepr.EditorGrid',
- alias: 'widget.UnitGrid',
- columns: [
- {header: i18n("Unit"), dataIndex: 'name', flex: 1},
- {header: i18n("Symbol"), dataIndex: 'symbol', width: 60}
- ],
- addButtonText: i18n("Add Unit"),
- addButtonIcon: 'bundles/partkeeprfrontend/images/icons/unit_add.png',
+ extend: 'PartKeepr.EditorGrid',
+ alias: 'widget.UnitGrid',
+ columns: [
+ {header: i18n("Unit"), dataIndex: 'name', flex: 1},
+ {header: i18n("Symbol"), dataIndex: 'symbol', width: 60}
+ ],
+ addButtonText: i18n("Add Unit"),
+ addButtonIcon: 'bundles/partkeeprfrontend/images/icons/unit_add.png',
+ addButtonIconCls: '',
deleteButtonText: i18n("Delete Unit"),
deleteButtonIcon: 'bundles/partkeeprfrontend/images/icons/unit_delete.png',
+ deleteButtonIconCls: '',
automaticPageSize: true,
- initComponent: function () {
- this.callParent();
+ initComponent: function ()
+ {
+ this.callParent();
}
-});-
\ No newline at end of file
+});