Use icons for save and cancel buttons

10 files changed, 76 insertions, 22 deletions

diff --git a/web/app/view/AttributeAliasDialog.js b/web/app/view/AttributeAliasDialog.js
index 4a62f3e9..74b12490 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 7788ab21..c6934354 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 64448ad9..7d4908f9 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 ee72965a..7ccaad39 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 677a6c12..ea85bec1 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 df8331e1..9f5bdbf7 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 71d52f1e..e175a043 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 d1161e0d..39e6ae15 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 c8122309..0f965885 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 e77a9527..479d66dc 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'
     }]
 });