From 7109604c012768a7bd8f547db0f466d6fda69ca2 Mon Sep 17 00:00:00 2001 From: Pierre Gordon Date: Tue, 9 Jan 2018 05:14:27 -0500 Subject: [PATCH] Add icons to devices/sessions Signed off by: Pierre Gordon --- settings/css/settings.scss | 15 ++++++++++-- settings/img/clients/android.svg | 1 + settings/img/clients/apple.svg | 1 + settings/img/clients/chrome.svg | 1 + settings/img/clients/edge.svg | 1 + settings/img/clients/firefox.svg | 1 + settings/img/clients/globe.svg | 1 + settings/img/clients/ie.svg | 1 + settings/img/clients/ipad.svg | 1 + settings/img/clients/iphone.svg | 1 + settings/img/clients/safari.svg | 1 + settings/js/authtoken_view.js | 24 +++++++++++++++++++ .../templates/settings/personal/security.php | 1 + 13 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 settings/img/clients/android.svg create mode 100644 settings/img/clients/apple.svg create mode 100644 settings/img/clients/chrome.svg create mode 100644 settings/img/clients/edge.svg create mode 100644 settings/img/clients/firefox.svg create mode 100644 settings/img/clients/globe.svg create mode 100644 settings/img/clients/ie.svg create mode 100644 settings/img/clients/ipad.svg create mode 100644 settings/img/clients/iphone.svg create mode 100644 settings/img/clients/safari.svg diff --git a/settings/css/settings.scss b/settings/css/settings.scss index 268cb0eee5d..1025a862b17 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -329,11 +329,22 @@ table.nostyle { } } .token-list td { - &.more { + &%icon { overflow: visible; position: relative; width: 16px; } + &.more { + @extend %icon; + } + &.client { + @extend %icon; + + img { + opacity: 0.57; + width: inherit; + } + } border-top: 1px solid #DDD; text-overflow: ellipsis; max-width: 200px; @@ -342,7 +353,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/img/clients/android.svg b/settings/img/clients/android.svg new file mode 100644 index 00000000000..1b03ede23c8 --- /dev/null +++ b/settings/img/clients/android.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings/img/clients/apple.svg b/settings/img/clients/apple.svg new file mode 100644 index 00000000000..ffc122c173d --- /dev/null +++ b/settings/img/clients/apple.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings/img/clients/chrome.svg b/settings/img/clients/chrome.svg new file mode 100644 index 00000000000..99d1a81550d --- /dev/null +++ b/settings/img/clients/chrome.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings/img/clients/edge.svg b/settings/img/clients/edge.svg new file mode 100644 index 00000000000..e053010ca9f --- /dev/null +++ b/settings/img/clients/edge.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings/img/clients/firefox.svg b/settings/img/clients/firefox.svg new file mode 100644 index 00000000000..a8e48546227 --- /dev/null +++ b/settings/img/clients/firefox.svg @@ -0,0 +1 @@ + diff --git a/settings/img/clients/globe.svg b/settings/img/clients/globe.svg new file mode 100644 index 00000000000..5c0333eed88 --- /dev/null +++ b/settings/img/clients/globe.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings/img/clients/ie.svg b/settings/img/clients/ie.svg new file mode 100644 index 00000000000..95732574560 --- /dev/null +++ b/settings/img/clients/ie.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings/img/clients/ipad.svg b/settings/img/clients/ipad.svg new file mode 100644 index 00000000000..d4a0b343cba --- /dev/null +++ b/settings/img/clients/ipad.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings/img/clients/iphone.svg b/settings/img/clients/iphone.svg new file mode 100644 index 00000000000..797de4a95ad --- /dev/null +++ b/settings/img/clients/iphone.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings/img/clients/safari.svg b/settings/img/clients/safari.svg new file mode 100644 index 00000000000..b747f961689 --- /dev/null +++ b/settings/img/clients/safari.svg @@ -0,0 +1 @@ + diff --git a/settings/js/authtoken_view.js b/settings/js/authtoken_view.js index a20434be872..1e2a6643d59 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: 'ie.svg', + edge: 'edge.svg', + firefox: 'firefox.svg', + chrome: 'chrome.svg', + safari: 'apple.svg', + androidChrome: 'chrome.svg', + iphone: 'iphone.svg', + ipad: 'ipad.svg', + iosClient: 'apple.svg', + androidClient: 'android.svg', + davDroid: 'android.svg', + webPirate: 'globe.svg', + sailfishBrowser: 'globe.svg' + }; + 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 = '/settings/img/clients/' + 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', [ +
t('Device'));?> t('Last activity'));?>