sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add icons to devices/sessions 

Signed off by: Pierre Gordon <pierregordon@protonmail.com>
pull/7754/head
Pierre Gordon 2018-01-09 05:14:27 +07:00
parent 9386b07ed8
commit 7109604c01
13 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
settings/css/settings.scss
Unescape Escape View File

@ -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 {

1
settings/img/clients/android.svg
Unescape Escape View File

@ -0,0 +1 @@
<?xml version="1.0" ?><svg enable-background="new 0 0 32 32" version="1.1" viewBox="0 0 32 32" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="Flat_copy"><g><path d="M4.993,8.985c-1.105,0-2.001,0.897-2.001,2.001v8.005c0,1.105,0.897,2.001,2.001,2.001s2.001-0.897,2.001-2.001v-8.005 C6.994,9.88,6.097,8.985,4.993,8.985z"/><path d="M27.007,8.985c-1.105,0-2.001,0.897-2.001,2.001v8.005c0,1.105,0.897,2.001,2.001,2.001c1.105,0,2.001-0.897,2.001-2.001 v-8.005C29.009,9.88,28.112,8.985,27.007,8.985z"/><path d="M7.995,24.995h2.001v5.003c0,1.105,0.897,2.001,2.001,2.001s2.001-0.897,2.001-2.001v-5.003h4.003v5.003 c0,1.105,0.897,2.001,2.001,2.001s2.001-0.897,2.001-2.001v-5.003h2.001V9.985H7.995V24.995z"/><path d="M20.726,2.532l1.028-1.78c0.139-0.24,0.057-0.545-0.184-0.684c-0.238-0.139-0.545-0.057-0.683,0.184l-1.002,1.735 C18.734,1.347,17.411,0.979,16,0.979c-1.41,0-2.733,0.367-3.885,1.009l-1.003-1.737c-0.139-0.239-0.443-0.321-0.684-0.183 c-0.238,0.138-0.32,0.443-0.183,0.683l1.029,1.781C9.29,3.989,7.995,6.333,7.995,8.985h16.011 C24.005,6.333,22.71,3.989,20.726,2.532z M12.998,5.983c-0.553,0-1.001-0.447-1.001-1.001s0.447-1.001,1.001-1.001 c0.553,0,1.001,0.447,1.001,1.001S13.551,5.983,12.998,5.983z M19.002,5.983c-0.553,0-1.001-0.447-1.001-1.001 s0.447-1.001,1.001-1.001c0.553,0,1.001,0.447,1.001,1.001S19.555,5.983,19.002,5.983z"/></g></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

1
settings/img/clients/apple.svg
Unescape Escape View File

@ -0,0 +1 @@
<?xml version="1.0" ?><svg enable-background="new 0 0 32 32" version="1.1" viewBox="0 0 32 32" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="Flat_copy"><g><path d="M29.458,22.818V22.6c-2.624-1.399-4.049-3.454-4.049-6.427c0-2.404,1.068-4.504,3.025-5.858l0.089-0.044 c-1.29-1.573-3.025-3.146-5.695-3.146c-1.868,0-3.426,1.792-6.006,1.792c-2.046,0-2.892-1.705-5.117-1.705 c-4.627,0-9.209,4.066-9.209,9.355c0,2.798,0.934,7.127,3.025,10.887C7.036,30.208,8.904,32,10.995,32 c1.512,0,3.292-1.355,5.428-1.355c1.868,0,3.605,1.225,5.294,1.225c4.05,0,7.786-5.159,7.786-8.611 C29.503,23.081,29.458,22.95,29.458,22.818z"/><path d="M16.73,8.35c3.025-0.918,5.829-3.148,5.829-7.039c0-0.306-0.044-0.699-0.089-1.136L22.426,0 c-3.069,0.829-5.828,3.19-5.828,6.907c0,0.35,0.045,0.787,0.133,1.268L16.73,8.35L16.73,8.35z"/></g></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 888 B

1
settings/img/clients/chrome.svg
Unescape Escape View File

@ -0,0 +1 @@
<?xml version="1.0" ?><svg enable-background="new 0 0 515.91 728.5" height="512" id="Layer_1" version="1.1" viewBox="0 0 512.00003 512" width="512" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"><defs id="defs7"/><g id="g6625" style="fill:#000000;fill-opacity:1" transform="translate(-141.91412,-143.63566)"><path d="m 397.91414,530.64366 c -26.00001,0 -49.66401,-7.008 -71.00801,-20.992 -21.344,-14 -37.344,-32 -48,-54 L 173.91412,271.63565 c -22,39.344 -32,83.344 -32,128.00001 0,64 20.832,119.84 62.496,167.50401 41.66401,47.664 93.50401,76.16 155.50401,85.504 l 74.25601,-128.49601 c -7.472,2.192 -19.936,6.496 -36.256,6.496 z" id="path5-5" style="fill:#000000;fill-opacity:1"/><path d="m 317.41813,296.13165 c 23.648,-18.32 50.496,-24.496 80.49601,-24.496 4,0 220.00001,0 220.00001,0 -22.672,-38.656 -53.504,-71.32801 -92.49601,-94.00001 -39.008,-22.656 -81.504,-34 -127.504,-34 -40.00001,0 -77.34401,8.496 -112.00001,25.504 -34.672,16.992 -66.75201,41.744 -90.25601,73.50401 l 74.25601,124.992 c 7.328,-28.656 23.824,-53.152 47.504,-71.504 z" id="path7-1" style="fill:#000000;fill-opacity:1"/><path d="M 634.66615,303.63565 H 485.91414 c 26,26 43.008,59.344 43.008,96.00001 0,27.344 -7.664,52.336 -23.008,75.008 l -104.992,180.99201 c 70,-0.672 129.664,-26 179.00801,-76 49.312,-50.00001 73.984,-110.00001 73.984,-180.00001 0,-32.65601 -5.504,-67.00801 -19.248,-96.00001 z" id="path9-7" style="fill:#000000;fill-opacity:1"/><circle cx="16" cy="16" d="m 22,16 c 0,3.313708 -2.686292,6 -6,6 -3.313708,0 -6,-2.686292 -6,-6 0,-3.313708 2.686292,-6 6,-6 3.313708,0 6,2.686292 6,6 z" id="circle11" r="6" style="fill:#000000;fill-opacity:1" transform="matrix(16.000001,0,0,16.000001,141.91412,143.63564)"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

1
settings/img/clients/edge.svg
Unescape Escape View File

@ -0,0 +1 @@
<?xml version="1.0" ?><svg height="56.6934px" id="Layer_1" style="enable-background:new 0 0 56.6934 56.6934;" version="1.1" viewBox="0 0 56.6934 56.6934" width="56.6934px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g><path d="M23.9119,16.9729c-1.884,2.141-2.8612,4.6136-3.2311,7.4099c5.6693,0,11.2781,0,16.9289,0 c0-0.4139,0.0223-0.8342-0.0039-1.2515c-0.1145-1.8259-0.5071-3.5784-1.5042-5.1423c-1.336-2.0954-3.3417-3.1383-5.7285-3.5229 c-3.4634-0.5581-6.8051,0.033-10.0522,1.216c-4.7503,1.7307-8.7392,4.5588-11.9133,8.5069 c-0.5335,0.6636-1.0082,1.3745-1.5934,2.178c0.0485-0.3993,0.0764-0.6875,0.1192-0.9734 c0.6841-4.5728,2.3307-8.7442,5.2947-12.3261c3.4833-4.2094,7.9725-6.7032,13.3569-7.5721 c5.2449-0.8464,10.2058,0.0045,14.8107,2.6715c4.2386,2.4549,7.1601,6.0524,8.9041,10.6113 c1.0058,2.6293,1.4971,5.3621,1.5227,8.1777c0.0161,1.7735,0.0324,3.547,0.0482,5.3204c0.0016,0.1771,0.0002,0.3543,0.0002,0.5999 c-10.0212,0-19.9979,0-30.0079,0c0.0115,2.4612,0.7278,4.5816,2.3803,6.3431c1.9199,2.0465,4.3838,3.0406,7.0832,3.4341 c5.6665,0.826,11.0037-0.2087,15.9823-3.0528c0.1275-0.0728,0.2545-0.1465,0.3826-0.2183 c0.0126-0.0071,0.0314-0.0032,0.1075-0.0089c0.0105,0.1715,0.0301,0.3432,0.0301,0.5149c0.0013,3.0229-0.0058,6.0459,0.0078,9.0687 c0.0016,0.3467-0.1105,0.5268-0.417,0.6796c-3.5699,1.7792-7.3483,2.7951-11.3187,3.1029 c-2.5295,0.1961-5.0515,0.1975-7.5561-0.3103c-7.5354-1.5277-13.5458-7.0451-14.925-14.806 c-1.5738-8.8562,2.6413-17.0331,11.1093-20.6493C23.7559,16.963,23.7913,16.9729,23.9119,16.9729z"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

1
settings/img/clients/firefox.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 97 KiB

1
settings/img/clients/globe.svg
Unescape Escape View File

@ -0,0 +1 @@
<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg enable-background="new 0 0 50 50" height="50px" id="Layer_1" version="1.1" viewBox="0 0 50 50" width="50px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><rect fill="none" height="50" width="50"/><circle cx="25" cy="25" fill="none" r="24" stroke="#000000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/><ellipse cx="25" cy="25" fill="none" rx="12" ry="24" stroke="#000000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/><path d="M6.365,40.438C10.766,37.729,17.479,36,25,36 c7.418,0,14.049,1.682,18.451,4.325" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-width="2"/><path d="M43.635,9.563C39.234,12.271,32.521,14,25,14 c-7.417,0-14.049-1.682-18.451-4.325" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-width="2"/><line fill="none" stroke="#000000" stroke-miterlimit="10" stroke-width="2" x1="1" x2="49" y1="25" y2="25"/><line fill="none" stroke="#000000" stroke-miterlimit="10" stroke-width="2" x1="25" x2="25" y1="1" y2="49"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

1
settings/img/clients/ie.svg
Unescape Escape View File

@ -0,0 +1 @@
<?xml version="1.0" ?><svg enable-background="new 0 0 32 32" version="1.1" viewBox="0 0 32 32" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="Flat_copy"><g><path d="M11.456,18.421v0.064c0,1.051,0.24,2.061,0.725,3.023c0.569,1.008,1.35,1.807,2.337,2.398 c0.987,0.59,2.085,0.886,3.292,0.886c1.207,0,2.306-0.296,3.294-0.886c0.986-0.592,1.766-1.391,2.336-2.398h7.837 c-1.011,2.848-2.766,5.181-5.267,6.997c-2.503,1.818-5.313,2.727-8.429,2.727c-2.326,0-4.521-0.503-6.584-1.512 c-4.609,2.235-7.924,2.344-9.943,0.329C0.35,29.395,0,28.299,0,26.765c0-1.533,0.296-3.242,0.889-5.125 c0.592-1.883,1.58-3.954,2.963-6.21c1.382-2.256,3.017-4.304,4.904-6.144c1.098-1.14,1.8-1.841,2.106-2.103 c-2.722,1.313-5.18,3.352-7.373,6.11c0.789-3.197,2.491-5.826,5.102-7.886c2.611-2.059,5.608-3.088,8.988-3.088 c0.351,0,0.701,0.022,1.052,0.065c2.459-1.096,4.697-1.708,6.717-1.84c2.019-0.132,3.445,0.197,4.279,0.985 c1.668,1.709,1.822,4.381,0.461,8.017c1.273,2.238,1.91,4.648,1.91,7.232c0,0.613-0.022,1.161-0.065,1.644h-7.771L11.456,18.421 L11.456,18.421z M10.075,29.199c-2.94-1.796-5.005-4.314-6.191-7.558c-1.975,3.856-2.238,6.506-0.79,7.952 C4.367,30.863,6.693,30.731,10.075,29.199z M23.638,14.611c-0.088-1.578-0.724-2.924-1.909-4.042 c-1.186-1.117-2.579-1.676-4.181-1.676c-1.604,0-2.996,0.559-4.181,1.676c-1.187,1.118-1.823,2.464-1.911,4.042H23.638z M22.914,3.373c2.808,1.139,5.047,2.978,6.715,5.52c1.01-2.716,0.965-4.621-0.131-5.718C28.312,1.95,26.117,2.016,22.914,3.373z"/></g></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

1
settings/img/clients/ipad.svg
Unescape Escape View File

@ -0,0 +1 @@
<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg enable-background="new 0 0 57 82" height="82px" id="Layer_1" version="1.1" viewBox="0 0 57 82" width="57px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M53,0H4C1.791,0,0,1.791,0,4v74c0,2.209,1.791,4,4,4h49c2.209,0,4-1.791,4-4V4C57,1.791,55.209,0,53,0z M28,79c-2.209,0-4-1.791-4-4s1.791-4,4-4c2.209,0,4,1.791,4,4S30.209,79,28,79z M51,70H6V11h45V70z" fill="#231F20"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 564 B

1
settings/img/clients/iphone.svg
Unescape Escape View File

@ -0,0 +1 @@
<?xml version="1.0" ?><svg id="Layer_1" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M21,1H9C7.895,1,7,1.895,7,3v24c0,1.105,0.895,2,2,2h12c1.105,0,2-0.895,2-2V3C23,1.895,22.105,1,21,1z M15,27 c-0.552,0-1-0.448-1-1c0-0.552,0.448-1,1-1s1,0.448,1,1C16,26.552,15.552,27,15,27z M21,24H9V4h12V24z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 438 B

1
settings/img/clients/safari.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 96 KiB

24
settings/js/authtoken_view.js
Unescape Escape View File

@ -27,6 +27,9 @@
var TEMPLATE_TOKEN =
'<tr data-id="{{id}}">'
+ '<td class="client">'
+ '<img src="{{icon}}" />'
+ '</td>'
+ '<td class="has-tooltip" title="{{title}}">'
+ '<span class="token-name">{{name}}</span>'
+ '</td>'
@ -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) {

1
settings/templates/settings/personal/security.php
Unescape Escape View File

@ -37,6 +37,7 @@ script('settings', [
<table class="icon-loading">
<thead class="token-list-header">
<tr>
<th></th>
<th><?php p($l->t('Device'));?></th>
<th><?php p($l->t('Last activity'));?></th>
<th></th>