diff --git a/core/css/icons.scss b/core/css/icons.scss
index fbf36e2fbbc..3c3dff56c1a 100644
--- a/core/css/icons.scss
+++ b/core/css/icons.scss
@@ -516,6 +516,20 @@ img, object, video, button, textarea, input, select, div[contenteditable=true] {
background-image: url('../img/places/picture.svg?v=1');
}
+/* CLIENTS ------------------------------------------------------------------- */
+
+.icon-desktop {
+ background-image: url('../img/clients/desktop.svg?v=1');
+}
+
+.icon-phone {
+ background-image: url('../img/clients/phone.svg?v=1');
+}
+
+.icon-tablet {
+ background-image: url('../img/clients/tablet.svg?v=1');
+}
+
/* APP CATEGORIES ------------------------------------------------------------------- */
.icon-category-installed {
background-image: url('../img/actions/user.svg?v=1');
diff --git a/core/img/clients/desktop.svg b/core/img/clients/desktop.svg
new file mode 100644
index 00000000000..df4f5b6884a
--- /dev/null
+++ b/core/img/clients/desktop.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/core/img/clients/phone.svg b/core/img/clients/phone.svg
new file mode 100644
index 00000000000..a45c5c4c729
--- /dev/null
+++ b/core/img/clients/phone.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/core/img/clients/tablet.svg b/core/img/clients/tablet.svg
new file mode 100644
index 00000000000..a4d41be3057
--- /dev/null
+++ b/core/img/clients/tablet.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index 59f32cc7131..05d62423d17 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -329,11 +329,23 @@ table.nostyle {
}
}
.token-list td {
- &.more {
+ &%icon {
overflow: visible;
position: relative;
width: 16px;
}
+ &.more {
+ @extend %icon;
+ }
+ &.client {
+ @extend %icon;
+
+ div {
+ opacity: 0.57;
+ width: inherit;
+ padding-top: 5px;
+ }
+ }
border-top: 1px solid #DDD;
text-overflow: ellipsis;
max-width: 200px;
@@ -342,7 +354,7 @@ table.nostyle {
vertical-align: top;
position: relative;
}
- tr > *:nth-child(2) {
+ tr > *:nth-child(3) {
text-align: right;
}
.token-list {
diff --git a/settings/js/authtoken_view.js b/settings/js/authtoken_view.js
index a20434be872..b8645e4cc85 100644
--- a/settings/js/authtoken_view.js
+++ b/settings/js/authtoken_view.js
@@ -27,6 +27,9 @@
var TEMPLATE_TOKEN =
''
+ + '| '
+ + ''
+ + ' | '
+ ''
+ '{{name}}'
+ ' | '
@@ -146,6 +149,22 @@
sailfishBrowser: 'SailfishBrowser'
};
+ var iconMap = {
+ ie: 'icon-desktop',
+ edge: 'icon-desktop',
+ firefox: 'icon-desktop',
+ chrome: 'icon-desktop',
+ safari: 'icon-desktop',
+ androidChrome: 'icon-phone',
+ iphone: 'icon-phone',
+ ipad: 'icon-tablet',
+ iosClient: 'icon-phone',
+ androidClient: 'icon-phone',
+ davDroid: 'icon-phone',
+ webPirate: 'icon-link',
+ sailfishBrowser: 'icon-link'
+ };
+
if (matches) {
viewData.name = t('settings', 'Sync client - {os}', {
os: matches[1],
@@ -161,6 +180,11 @@
} else {
viewData.name = nameMap[client];
}
+
+ // update title - for easier view
+ viewData.title = viewData.name;
+
+ viewData.icon = iconMap[client];
}
}
if (viewData.current) {
diff --git a/settings/templates/settings/personal/security.php b/settings/templates/settings/personal/security.php
index 3a324bf8d21..cf52315ff04 100644
--- a/settings/templates/settings/personal/security.php
+++ b/settings/templates/settings/personal/security.php
@@ -37,6 +37,7 @@ script('settings', [