From d8ebd9773110b9189b46d14b6c807af7eb8e4174 Mon Sep 17 00:00:00 2001 From: yflory Date: Thu, 7 May 2020 11:51:40 +0200 Subject: [PATCH] New search results UI --- customize.dist/src/less2/include/drive.less | 74 ++++-------- www/common/drive-ui.js | 121 ++++++++------------ 2 files changed, 69 insertions(+), 126 deletions(-) diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less index 226e3a84b..20aaff649 100644 --- a/customize.dist/src/less2/include/drive.less +++ b/customize.dist/src/less2/include/drive.less @@ -109,6 +109,7 @@ min-height: 0; @media screen and (max-width: @browser_media-medium-screen) { display: block; + overflow-y: auto; #cp-app-drive-toolbar { .path .element { display: none; @@ -483,61 +484,31 @@ #cp-app-drive-content-folder { li { &.cp-app-drive-search-result { - border-bottom: 1px solid @drive_info-box-border; - display: block; - &:hover { - background-color: initial; - } - table { - width: 100%; - .cp-app-drive-search-label2 { - width: 150px; - font-size: 15px; - text-align: right; - padding-right: 15px; - } - .cp-app-drive-search-opendir { + display: flex; + height: 2 * @variables_bar-height; + .cp-app-drive-search-path { + .cp-app-drive-path-inner { display: flex; - justify-content: space-between; - a { + flex-flow: row-reverse wrap-reverse; + justify-content: flex-end; + .cp-app-drive-path-element { + flex-shrink: 0; + display: inline-block; + margin-right: 5px; + white-space: normal; + word-wrap: break-word; + max-width: 100%; + } + .cp-app-drive-path-clickable { cursor: pointer; - color: #41b7d8; &:hover { - color: #014c8c; - text-decoration: underline; + background-color: #eee; } } } - .cp-app-drive-search-path { - font-style: italic; - .cp-app-drive-path-inner { - display: flex; - flex-flow: row-reverse wrap-reverse; - justify-content: flex-end; - .cp-app-drive-path-element { - flex-shrink: 0; - display: inline-block; - margin-right: 5px; - white-space: normal; - word-wrap: break-word; - max-width: 100%; - } - } - } - .cp-app-drive-search-title { - font-weight: bold; - cursor: pointer; - &:hover { - background-color: @drive_hover; - } - } - .cp-app-drive-search-col2 { - width: 250px; - } - td.cp-app-drive-search-icon { - width: 50px; - font-size: 40px; - } + font-size: 12px; + line-height: 16px; + color: @drive_table-header-fg; } } &.cp-app-drive-tags-list { @@ -671,6 +642,8 @@ text-align: right; display: flex; align-items: center; + justify-content: end; + height: @variables_bar-height; .fa, .cptools { &:not(:last-child) { margin-right: 2px; @@ -678,7 +651,7 @@ } } &.cp-app-drive-element-list { - width: 110px; + width: 120px; } &.cp-app-drive-element-sort { display: none; @@ -708,6 +681,7 @@ height: 1.5 * @variables_bar-height; line-height: 1.5 * @variables_bar-height; span { + line-height: 1.5 * @variables_bar-height; position: absolute; } } diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js index d802637ac..dcb540ee7 100644 --- a/www/common/drive-ui.js +++ b/www/common/drive-ui.js @@ -698,7 +698,6 @@ define([ } }; $content.on('mousedown', function (e) { - if (currentPath[0] === SEARCH) { return; } if (e.which !== 1) { return; } $content.focus(); sel.down = true; @@ -2273,7 +2272,8 @@ define([ if (idx < path.length - 1) { if (!noStyle) { $span.addClass('cp-app-drive-path-clickable'); - $span.click(function () { + $span.click(function (e) { + e.stopPropagation(); var sliceEnd = idx + 1; if (isTrash && idx === 1) { sliceEnd = 4; } // Make sure we don't show the index or 'element' and 'path' APP.displayDirectory(path.slice(0, sliceEnd)); @@ -2812,32 +2812,33 @@ define([ $list.find('.' + classSorted).addClass('cp-app-drive-sort-active').prepend($icon); } }; - var getFileListHeader = function () { + var getFileListHeader = function (clickable) { var $fihElement = $('
  • ', { 'class': 'cp-app-drive-element-header cp-app-drive-element-list' }); + var clickCls = clickable ? 'cp-app-drive-sort-clickable ' : ''; + var onClick = clickable ? onSortByClick : function () {}; //var $fihElement = $('', {'class': 'element'}).appendTo($fileHeader); var $fhIcon = $('', {'class': 'cp-app-drive-content-icon'}); var $fhName = $('', { - 'class': 'cp-app-drive-element-name cp-app-drive-sort-filename ' + - 'cp-app-drive-sort-clickable' - }).text(Messages.fm_fileName).click(onSortByClick); - var $fhSort = getSortDropdown(); + 'class': 'cp-app-drive-element-name cp-app-drive-sort-filename ' + clickCls + }).text(Messages.fm_fileName).click(onClick); + var $fhSort = clickable ? getSortDropdown() : undefined; var $fhState = $('', {'class': 'cp-app-drive-element-state'}); var $fhType = $('', { - 'class': 'cp-app-drive-element-type cp-app-drive-sort-clickable cp-app-drive-element-list' - }).text(Messages.fm_type).click(onSortByClick); + 'class': 'cp-app-drive-element-type cp-app-drive-element-list ' + clickCls + }).text(Messages.fm_type).click(onClick); var $fhAdate = $('', { - 'class': 'cp-app-drive-element-atime cp-app-drive-sort-clickable cp-app-drive-element-list' - }).text(Messages.fm_lastAccess).click(onSortByClick); + 'class': 'cp-app-drive-element-atime cp-app-drive-element-list ' + clickCls + }).text(Messages.fm_lastAccess).click(onClick); var $fhCdate = $('', { - 'class': 'cp-app-drive-element-ctime cp-app-drive-sort-clickable cp-app-drive-element-list' - }).text(Messages.fm_creation).click(onSortByClick); + 'class': 'cp-app-drive-element-ctime cp-app-drive-element-list ' + clickCls + }).text(Messages.fm_creation).click(onClick); // If displayTitle is false, it means the "name" is the title, so do not display the "name" header $fihElement.append($fhIcon).append($fhName).append($fhSort).append($fhState).append($fhType); $fihElement.append($fhAdate).append($fhCdate); - addFileSortIcon($fihElement); + if (clickable) { addFileSortIcon($fihElement); } return $fihElement; }; @@ -3025,7 +3026,7 @@ define([ var displayHrefArray = function ($container, rootName, draggable) { var unsorted = files[rootName]; if (unsorted.length) { - var $fileHeader = getFileListHeader(false); + var $fileHeader = getFileListHeader(true); $container.append($fileHeader); } var keys = unsorted; @@ -3080,7 +3081,7 @@ define([ } var allfiles = files[FILES_DATA]; if (allfiles.length === 0) { return; } - var $fileHeader = getFileListHeader(false); + var $fileHeader = getFileListHeader(true); $container.append($fileHeader); var keys = manager.getFiles([FILES_DATA]); var sortedFiles = sortElements(false, [FILES_DATA], keys, APP.store[SORT_FILE_BY], !getSortFileDesc(), true); @@ -3144,74 +3145,42 @@ define([ }; var displaySearch = function ($list, value) { + getFileListHeader(false).appendTo($list); + $list.closest('#cp-app-drive-content-folder').addClass('cp-app-drive-content-list'); var filesList = manager.search(value); filesList.forEach(function (r) { // if r.id === null, then it's a folder, not a file r.paths.forEach(function (path) { if (!r.inSharedFolder && APP.hideDuplicateOwned && manager.isDuplicateOwned(path)) { return; } - var href = r.data.href || r.data.roHref; - var parsed = Hash.parsePadUrl(href); - var $table = $(''); - var $icon = $('').append($icon).append($title).append($typeName).append($type).appendTo($table); - $('').append($path).append($atimeName).append($atime).appendTo($table); - $('').append($openDir).append($ctimeName).append($ctime).appendTo($table); - $('
  • ', {'class':'cp-app-drive-search-result'}).append($table).appendTo($list); + $list.append($element); }); }); }; @@ -3295,7 +3264,7 @@ define([ var displayOwned = function ($container) { var list = manager.getOwnedPads(); if (list.length === 0) { return; } - var $fileHeader = getFileListHeader(false); + var $fileHeader = getFileListHeader(true); $container.append($fileHeader); var sortedFiles = sortElements(false, false, list, APP.store[SORT_FILE_BY], !getSortFileDesc(), true); sortedFiles.forEach(function (id) {
    • ', {'rowspan': '3', 'class': 'cp-app-drive-search-icon'}); - var $title = $('', { - 'class': 'cp-app-drive-search-col1 cp-app-drive-search-title' - }).text(r.data.title); - if (manager.isPathIn(path, ['hrefArray'])) { - path.pop(); - path.push(r.data.title); - } - var $path = $('', { - 'class': 'cp-app-drive-search-col1 cp-app-drive-search-path' - }); - createTitle($path, path, true); - var $typeName = $('', {'class': 'cp-app-drive-search-label2'}).text(Messages.fm_type); - var $type = $('', {'class': 'cp-app-drive-search-col2'}); - var $atimeName = $('', {'class': 'cp-app-drive-search-label2'}); - var $atime = $('', {'class': 'cp-app-drive-search-col2'}); - var $ctimeName = $('', {'class': 'cp-app-drive-search-label2'}); - var $ctime = $('', {'class': 'cp-app-drive-search-col2'}); - var $openDir = $('', {'class': 'cp-app-drive-search-opendir'}); - if (r.id) { - $icon.append(getFileIcon(r.id)); - $type.text(Messages.type[parsed.type] || parsed.type); - $title.click(function () { - openFile(r.id); - }); - $atimeName.text(Messages.fm_lastAccess); - $atime.text(new Date(r.data.atime).toLocaleString()); - $ctimeName.text(Messages.fm_creation); - $ctime.text(new Date(r.data.ctime).toLocaleString()); - var parentPath = path.slice(); - if (parentPath) { - $('').text(Messages.fm_openParent).click(function (e) { - e.preventDefault(); - if (manager.isInTrashRoot(parentPath)) { parentPath = [TRASH]; } - else { parentPath.pop(); } - APP.displayDirectory(parentPath); - APP.selectedFiles = path.slice(-1); - }).appendTo($openDir); - } - $('').text(Messages.fc_prop).click(function () { - APP.getProperties(r.id, function (e) { - if (e) { return void logError(e); } - }); - }).appendTo($openDir); + var _path = path.slice(); + var key = path.pop(); + var root = manager.find(path); + var isFolder = manager.isFolder(root[key]); + var $element = createElement(path, key, root, isFolder); + $element.addClass('cp-app-drive-element-notrash cp-app-drive-search-result'); + $element.off('contextmenu'); + $element.contextmenu(openContextMenu('default')); + $element.data('context', 'default'); + if (isFolder) { + $element.find('.cp-app-drive-element-list').css({ + visibility: 'hidden' + }).text(''); + $element.find('.cp-app-drive-element-folders').css({ + visibility: '' + }).text(Messages.fm_folder); } - else { - $icon.append($folderIcon.clone()); - $type.text(Messages.fm_folder); - $('').text(Messages.fc_open).click(function (e) { - e.preventDefault(); - APP.displayDirectory(path); - }).appendTo($openDir); + + if (manager.isPathIn(_path, ['hrefArray'])) { + _path.pop(); + _path.push(r.data.title); } + var $path = $('', { + 'class': 'cp-app-drive-search-path' + }).appendTo($element.find('.cp-app-drive-element-name')); + createTitle($path, _path); - // rows 1-3 - $('