Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve clickable area on the item list. #4450

Merged
merged 3 commits into from
Nov 8, 2024
+27 −7
Merged

Improve clickable area on the item list. #4450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3a7581
Improve clickable area on the item list.
corentin-soriano Nov 7, 2024
2c0c784
Fix description truncated and fa-icon on middle.
corentin-soriano Nov 8, 2024
4da8402
Fix XSS issue on item drag and drop.
corentin-soriano Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions includes/css/teampass.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,23 @@

.list-item-description {
position: relative;
height: 50px;
width: 100%;
line-height: 50px;
}

.list-item-clicktoshow .user-fa-icon,
.list-item-description .dragndrop {
line-height: 50px;
}

.list-item-clicktoshow.d-inline-flex {
max-width: 100%;
flex: 1;
}

.list-item-row-description-extend {
flex: 1;
}

.list-item-actions {
Expand Down
17 changes: 10 additions & 7 deletions pages/items.js.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4320,12 +4320,12 @@ function(teampassApplication) {
description = (value.desc.replace(/<.*>/gi, '').trim() !== '' ? '<i>'+itemLabel + '</i><i class="fa-solid fa-heading mr-1 ml-2"></i>' + value.desc : '<i>'+itemLabel + '</i>');
// Consolidate item label
if (description !== '') {
description = '<span class="text-secondary small">' + description + '</span>';
description = '<span class="text-secondary small d-inline-block text-truncate">' + description + '</span>';
}

$('#teampass_items_list').append(
'<tr class="list-item-row' + (value.canMove === 1 ? ' is-draggable' : '') + ((store.get('teampassApplication').highlightFavorites === 1 && value.is_favourited === 1) ? ' bg-yellow' : '') + '" id="list-item-row_' + value.item_id + '" data-item-key="' + value.item_key + '" data-item-edition="' + value.open_edit + '" data-item-id="' + value.item_id + '" data-item-sk="' + value.sk + '" data-item-expired="' + value.expired + '" data-item-rights="' + value.rights + '" data-item-display="' + value.display + '" data-item-open-edit="' + value.open_edit + '" data-item-tree-id="' + value.tree_id + '" data-is-search-result="' + value.is_result_of_search + '" data-label="' + escape(value.label) + '">' +
'<td class="list-item-description" style="width: 100%;">' +
'<td class="list-item-description px-3 py-0 align-middle d-flex">' +
// Show user a grippy bar to move item
(value.canMove === 1 ? '<i class="fa-solid fa-ellipsis-v mr-2 dragndrop"></i>' : '') + //&& value.is_result_of_search === 0
// Show user a ban icon if expired
Expand All @@ -4334,11 +4334,12 @@ function(teampassApplication) {
(value.rights === 10 ? '<i class="fa-regular fa-eye-slash fa-xs mr-2 text-primary infotip" title="<?php echo $lang->get('item_with_restricted_access'); ?>"></i>' : '') +
// Show user that password is badly encrypted
(value.pw_status === 'encryption_error' ? '<i class="fa-solid fa-exclamation-triangle fa-xs text-danger infotip mr-1" title="<?php echo $lang->get('pw_encryption_error'); ?>"></i>' : '') +
// Show item fa_icon if set
(value.fa_icon !== '' ? '<i class="'+value.fa_icon+' mr-1"></i>' : '') +
// Prepare item info
'<span class="list-item-clicktoshow' + (value.rights === 10 ? '' : ' pointer') + '" data-item-id="' + value.item_id + '" data-item-key="' + value.item_key + '">' +
'<span class="list-item-row-description' + (value.rights === 10 ? ' font-weight-light' : '') + '"><i class="item-favorite-star fa-solid' + ((store.get('teampassApplication').highlightFavorites === 1 && value.is_favourited === 1) ? ' fa-star mr-1' : '') + '"></i>' + value.label + '</span>' + (value.rights === 10 ? '' : description) +
'<span class="list-item-clicktoshow d-inline-flex' + (value.rights === 10 ? '' : ' pointer') + '" data-item-id="' + value.item_id + '" data-item-key="' + value.item_key + '">' +
// Show item fa_icon if set
(value.fa_icon !== '' ? '<i class="'+value.fa_icon+' mr-1 user-fa-icon"></i>' : '') +
'<span class="list-item-row-description d-inline-block' + (value.rights === 10 ? ' font-weight-light' : '') + '"><i class="item-favorite-star fa-solid' + ((store.get('teampassApplication').highlightFavorites === 1 && value.is_favourited === 1) ? ' fa-star mr-1' : '') + '"></i>' + value.label + '</span>' + (value.rights === 10 ? '' : description) +
'<span class="list-item-row-description-extend"></span>' +
'</span>' +
'<span class="list-item-actions hidden">' +
(value.rights === 10 ?
Expand Down Expand Up @@ -6484,7 +6485,9 @@ function prepareFolderDragNDrop()
$(this).addClass('bg-warning');
},
helper: function(event) {
return $('<div class="bg-gray p-2 font-weight-light">' + $(this).find('.list-item-row-description').text() + '</div>');
return $('<div>')
.addClass('bg-gray p-2 font-weight-light')
.text($(this).find('.list-item-row-description').text());
}
});
$('.folder').droppable({
Expand Down