diff --git a/src/gui/src/UI/UIWindowShare.js b/src/gui/src/UI/UIWindowShare.js index 506e9477..1421865c 100644 --- a/src/gui/src/UI/UIWindowShare.js +++ b/src/gui/src/UI/UIWindowShare.js @@ -164,11 +164,11 @@ async function UIWindowShare(items, recipient){ //check if this user has been printed here before, important for multiple items if(!printed_users.includes(fsentry.owner.username)){ perm_list += `
` + perm_list += `
owner
`; if(fsentry.owner.username === window.user.username) perm_list += `You (${fsentry.owner.email ?? fsentry.owner.username})`; else perm_list += fsentry.owner.email ?? fsentry.owner.username; - perm_list += `
owner
`; perm_list += `
`; // add this user to the list of printed users printed_users.push(fsentry.owner.username); @@ -182,9 +182,19 @@ async function UIWindowShare(items, recipient){ //check if this user has been printed here before, important for multiple items if(!printed_users.includes(perm.user.username)){ perm_list += `
` + // viewer/editor + perm_list += `
`; + if(perm.access === 'read') + perm_list += `viewer`; + else if(perm.access === 'write') + perm_list += `editor`; + perm_list += `
`; + // username perm_list += `${perm.user.email ?? perm.user.username}`; perm_list += `
`; + perm_list += `
`; + // add this user to the list of printed users printed_users.push(perm.user.username); } @@ -250,7 +260,7 @@ async function UIWindowShare(items, recipient){ let cancelled_due_to_error = false; let share_result; let access_level = 'write'; - + if($(el_window).find('.access-type').val() === 'Viewer') access_level = 'read'; @@ -290,6 +300,14 @@ async function UIWindowShare(items, recipient){ // append recipient to list let perm_list = ''; perm_list += `
` + // viewer/editor + perm_list += `
`; + if(access_level === 'read') + perm_list += `viewer`; + else if(access_level === 'write') + perm_list += `editor`; + perm_list += `
`; + // recipient username perm_list += `${recipient_username}`; perm_list += `
`; perm_list += `
`; diff --git a/src/gui/src/css/style.css b/src/gui/src/css/style.css index ec357548..0d595792 100644 --- a/src/gui/src/css/style.css +++ b/src/gui/src/css/style.css @@ -1978,6 +1978,7 @@ label { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; color: #2f3f53; + font-size: 14px; } .unsupported-device-notice { @@ -2112,10 +2113,26 @@ label { .permission-owner-badge { background-color: #9dacbd; - border-radius: 2px; +} + +.permission-editor-badge{ + background-color: #007cff; +} + +.permission-viewer-badge{ + background-color: #41c95d; +} + +.permission-owner-badge, .permission-editor-badge, .permission-viewer-badge { + display: inline-block; + width: 45px; + text-align: center; padding: 2px 4px; + border-radius: 2px; color: white; - font-size: 13px; + font-size: 12px; + margin-right: 10px; + margin-top: -2px; } .remove-permission-link:hover, .disassociate-website-link:hover { @@ -2130,6 +2147,7 @@ label { border-radius: 3px; border: 1px solid #e0e0e0; color: #65707b; + font-size: 13px; } .remove-permission-icon {