From 166237d0c15ea228105afa65958d8a2889aab05b Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 5 Nov 2016 00:09:04 +1300 Subject: Use icons for save and cancel buttons --- web/app/view/AttributeAliasDialog.js | 10 ++++++++-- web/app/view/AttributeAliases.js | 4 +++- web/app/view/AttributeDialog.js | 10 ++++++++-- web/app/view/BaseEditDialog.js | 10 ++++++++-- web/app/view/DeviceDistanceDialog.js | 12 ++++++++---- web/app/view/GeofenceDialog.js | 10 ++++++++-- web/app/view/GeofenceMap.js | 12 +++++++++--- web/app/view/ReportConfigDialog.js | 10 ++++++++-- web/app/view/ServerDialog.js | 10 ++++++++-- web/app/view/UserDialog.js | 10 ++++++++-- 10 files changed, 76 insertions(+), 22 deletions(-) diff --git a/web/app/view/AttributeAliasDialog.js b/web/app/view/AttributeAliasDialog.js index 4a62f3e..74b1249 100644 --- a/web/app/view/AttributeAliasDialog.js +++ b/web/app/view/AttributeAliasDialog.js @@ -42,10 +42,16 @@ Ext.define('Traccar.view.AttributeAliasDialog', { }, buttons: [{ - text: Strings.sharedSave, + glyph: 'xf00c@FontAwesome', + tooltip: Strings.sharedSave, + tooltipType: 'title', + minWidth: 0, handler: 'onSaveClick' }, { - text: Strings.sharedCancel, + glyph: 'xf00d@FontAwesome', + tooltip: Strings.sharedCancel, + tooltipType: 'title', + minWidth: 0, handler: 'closeView' }] }); diff --git a/web/app/view/AttributeAliases.js b/web/app/view/AttributeAliases.js index 7788ab2..c693435 100644 --- a/web/app/view/AttributeAliases.js +++ b/web/app/view/AttributeAliases.js @@ -32,8 +32,10 @@ Ext.define('Traccar.view.AttributeAliases', { tbar: { xtype: 'editToolbar', items: ['-', { + xtype: 'tbtext', + html: Strings.sharedDevice + }, { xtype: 'combobox', - fieldLabel: Strings.sharedDevice, reference: 'deviceField', store: 'Devices', displayField: 'name', diff --git a/web/app/view/AttributeDialog.js b/web/app/view/AttributeDialog.js index 64448ad..7d4908f 100644 --- a/web/app/view/AttributeDialog.js +++ b/web/app/view/AttributeDialog.js @@ -39,10 +39,16 @@ Ext.define('Traccar.view.AttributeDialog', { }, buttons: [{ - text: Strings.sharedSave, + glyph: 'xf00c@FontAwesome', + tooltip: Strings.sharedSave, + tooltipType: 'title', + minWidth: 0, handler: 'onSaveClick' }, { - text: Strings.sharedCancel, + glyph: 'xf00d@FontAwesome', + tooltip: Strings.sharedCancel, + tooltipType: 'title', + minWidth: 0, handler: 'closeView' }] }); diff --git a/web/app/view/BaseEditDialog.js b/web/app/view/BaseEditDialog.js index ee72965..7ccaad3 100644 --- a/web/app/view/BaseEditDialog.js +++ b/web/app/view/BaseEditDialog.js @@ -24,10 +24,16 @@ Ext.define('Traccar.view.BaseEditDialog', { }, { xtype: 'tbfill' }, { - text: Strings.sharedSave, + glyph: 'xf00c@FontAwesome', + tooltip: Strings.sharedSave, + tooltipType: 'title', + minWidth: 0, handler: 'onSaveClick' }, { - text: Strings.sharedCancel, + glyph: 'xf00d@FontAwesome', + tooltip: Strings.sharedCancel, + tooltipType: 'title', + minWidth: 0, handler: 'closeView' }] }); diff --git a/web/app/view/DeviceDistanceDialog.js b/web/app/view/DeviceDistanceDialog.js index 677a6c1..ea85bec 100644 --- a/web/app/view/DeviceDistanceDialog.js +++ b/web/app/view/DeviceDistanceDialog.js @@ -44,12 +44,16 @@ Ext.define('Traccar.view.DeviceDistanceDialog', { }], buttons: [{ - text: Strings.sharedSet, - disabled: true, - reference: 'setButton', + glyph: 'xf00c@FontAwesome', + tooltip: Strings.sharedSet, + tooltipType: 'title', + minWidth: 0, handler: 'onSetClick' }, { - text: Strings.sharedCancel, + glyph: 'xf00d@FontAwesome', + tooltip: Strings.sharedCancel, + tooltipType: 'title', + minWidth: 0, handler: 'closeView' }] }); diff --git a/web/app/view/GeofenceDialog.js b/web/app/view/GeofenceDialog.js index df8331e..9f5bdbf 100644 --- a/web/app/view/GeofenceDialog.js +++ b/web/app/view/GeofenceDialog.js @@ -50,10 +50,16 @@ Ext.define('Traccar.view.GeofenceDialog', { }, { xtype: 'tbfill' }, { - text: Strings.sharedSave, + glyph: 'xf00c@FontAwesome', + tooltip: Strings.sharedSave, + tooltipType: 'title', + minWidth: 0, handler: 'onSaveClick' }, { - text: Strings.sharedCancel, + glyph: 'xf00d@FontAwesome', + tooltip: Strings.sharedCancel, + tooltipType: 'title', + minWidth: 0, handler: 'closeView' }] }); diff --git a/web/app/view/GeofenceMap.js b/web/app/view/GeofenceMap.js index 71d52f1..e175a04 100644 --- a/web/app/view/GeofenceMap.js +++ b/web/app/view/GeofenceMap.js @@ -40,11 +40,17 @@ Ext.define('Traccar.view.GeofenceMap', { }, { xtype: 'tbfill' }, { - text: Strings.sharedSave, + glyph: 'xf00c@FontAwesome', + tooltip: Strings.sharedSave, + tooltipType: 'title', + minWidth: 0, handler: 'onSaveClick' }, { - text: Strings.sharedCancel, - handler: 'onCancelClick' + glyph: 'xf00d@FontAwesome', + tooltip: Strings.sharedCancel, + tooltipType: 'title', + minWidth: 0, + handler: 'closeView' }] }, diff --git a/web/app/view/ReportConfigDialog.js b/web/app/view/ReportConfigDialog.js index d1161e0..39e6ae1 100644 --- a/web/app/view/ReportConfigDialog.js +++ b/web/app/view/ReportConfigDialog.js @@ -90,10 +90,16 @@ Ext.define('Traccar.view.ReportConfigDialog', { }], buttons: [{ - text: Strings.sharedSave, + glyph: 'xf00c@FontAwesome', + tooltip: Strings.sharedSave, + tooltipType: 'title', + minWidth: 0, handler: 'onSaveClick' }, { - text: Strings.sharedCancel, + glyph: 'xf00d@FontAwesome', + tooltip: Strings.sharedCancel, + tooltipType: 'title', + minWidth: 0, handler: 'closeView' }] }); diff --git a/web/app/view/ServerDialog.js b/web/app/view/ServerDialog.js index c812230..0f96588 100644 --- a/web/app/view/ServerDialog.js +++ b/web/app/view/ServerDialog.js @@ -119,10 +119,16 @@ Ext.define('Traccar.view.ServerDialog', { }, { xtype: 'tbfill' }, { - text: Strings.sharedSave, + glyph: 'xf00c@FontAwesome', + tooltip: Strings.sharedSave, + tooltipType: 'title', + minWidth: 0, handler: 'onSaveClick' }, { - text: Strings.sharedCancel, + glyph: 'xf00d@FontAwesome', + tooltip: Strings.sharedCancel, + tooltipType: 'title', + minWidth: 0, handler: 'closeView' }] }); diff --git a/web/app/view/UserDialog.js b/web/app/view/UserDialog.js index e77a952..479d66d 100644 --- a/web/app/view/UserDialog.js +++ b/web/app/view/UserDialog.js @@ -125,10 +125,16 @@ Ext.define('Traccar.view.UserDialog', { }, { xtype: 'tbfill' }, { - text: Strings.sharedSave, + glyph: 'xf00c@FontAwesome', + tooltip: Strings.sharedSave, + tooltipType: 'title', + minWidth: 0, handler: 'onSaveClick' }, { - text: Strings.sharedCancel, + glyph: 'xf00d@FontAwesome', + tooltip: Strings.sharedCancel, + tooltipType: 'title', + minWidth: 0, handler: 'closeView' }] }); -- cgit v1.2.3