This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a commit to branch media-library in repository https://gitbox.apache.org/repos/asf/roller.git
commit 2ee4cb3b00b6ff0aa6ddef4ad7c7108b98956043 Author: David M. Johnson <[email protected]> AuthorDate: Sat Oct 31 19:16:57 2026 -0400 Media library: one search box, type chips, selection bar, aligned cards --- .../weblogger/ui/struts2/editor/MediaFileView.java | 16 +- .../main/resources/ApplicationResources.properties | 8 +- .../webapp/WEB-INF/jsps/editor/MediaFileCard.jsp | 12 +- .../webapp/WEB-INF/jsps/editor/MediaFileView.jsp | 215 +++++++------ .../main/webapp/roller-ui/scripts/media-library.js | 24 +- app/src/main/webapp/roller-ui/styles/roller.css | 355 +++++++++++++++------ docs/roller-user-guide.adoc | 30 +- .../roller/playwright/WeblogMediaLibraryIT.java | 18 +- 8 files changed, 434 insertions(+), 244 deletions(-) diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java index d58c2f514..75693bcee 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java @@ -108,15 +108,13 @@ public class MediaFileView extends MediaFileBase { getText("mediaFileView.le")), new KeyValueObject( "mediaFileView.lt", getText("mediaFileView.lt"))); - FILE_TYPES = Arrays.asList(new KeyValueObject("mediaFileView.any", - getText("mediaFileView.any")), new KeyValueObject( - "mediaFileView.others", getText("mediaFileView.others")), - new KeyValueObject("mediaFileView.image", - getText("mediaFileView.image")), - new KeyValueObject("mediaFileView.video", - getText("mediaFileView.video")), - new KeyValueObject("mediaFileView.audio", - getText("mediaFileView.audio"))); + // in the order the type chips show them + FILE_TYPES = Arrays.asList( + new KeyValueObject("mediaFileView.any", getText("mediaFileView.any")), + new KeyValueObject("mediaFileView.image", getText("mediaFileView.image")), + new KeyValueObject("mediaFileView.video", getText("mediaFileView.video")), + new KeyValueObject("mediaFileView.audio", getText("mediaFileView.audio")), + new KeyValueObject("mediaFileView.others", getText("mediaFileView.others"))); SIZE_UNITS = Arrays.asList(new KeyValueObject( "mediaFileView.bytes", getText("mediaFileView.bytes")), diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties index 2cef04545..888f3f87f 100644 --- a/app/src/main/resources/ApplicationResources.properties +++ b/app/src/main/resources/ApplicationResources.properties @@ -909,15 +909,17 @@ mediaFileView.upload=Upload files mediaFileView.folders=Folders mediaFileView.newFolder=New folder mediaFileView.nameStartsWith=Name starts with +mediaFileView.searchPlaceholder=Search by file name +mediaFileView.allTypes=All mediaFileView.filters=Filters mediaFileView.clearSearch=Clear search mediaFileView.sizeComparison=Size comparison mediaFileView.sizeUnit=Size unit -mediaFileView.selectPage=Select this page +mediaFileView.selectPage=Select all on this page mediaFileView.clearSelection=Clear selection -mediaFileView.selectedCount={0} selected on this page +mediaFileView.selectedCount={0} selected mediaFileView.moveTo=Folder to move the selected files to -mediaFileView.move=Move +mediaFileView.move=Move to mediaFileView.confirmDelete=Permanently delete {0} selected file(s)? This cannot be undone. mediaFileView.openDetails=Open details for {0} mediaFileView.selectFile=Select {0} diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileCard.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileCard.jsp index b7e8a3049..dd6540dc6 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileCard.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileCard.jsp @@ -19,7 +19,7 @@ <%-- One media file in the library grid or list, or in the editor's media chooser. Expects #mediaFile on the value stack. In the library (libraryQuery on the action) the - checkbox selects the file and the preview and name open its details page, which links + checkbox (shown over the preview on hover) selects the file and the preview and name open its details page, which links back to this library page. In the chooser (#chooserMode set) the preview and name insert the file into the entry, with its description as the alt text. --%> @@ -65,6 +65,12 @@ <li class="media-card"> + <%-- over the preview in the grid; the first column in the list --%> + <input type="checkbox" class="form-check-input media-select" name="selectedMediaFiles" + id="select-<s:property value='#mediaFile.id'/>" + value="<s:property value='#mediaFile.id'/>" + aria-label="<s:text name='mediaFileView.selectFile' escapeHtml='true'><s:param value='#mediaFile.name'/></s:text>"/> + <a class="media-card-preview" href="<s:property value='%{detailsURL}'/>" tabindex="-1" aria-hidden="true"> <s:if test="#mediaFile.imageFile"> <img src="<s:property value='#mediaFile.thumbnailURL'/>" alt="" loading="lazy" @@ -76,10 +82,6 @@ </a> <div class="media-card-body"> - <input type="checkbox" class="form-check-input media-select" name="selectedMediaFiles" - id="select-<s:property value='#mediaFile.id'/>" - value="<s:property value='#mediaFile.id'/>" - aria-label="<s:text name='mediaFileView.selectFile' escapeHtml='true'><s:param value='#mediaFile.name'/></s:text>"/> <div class="media-card-text"> <a class="media-card-name" href="<s:property value='%{detailsURL}'/>" title="<s:property value='#mediaFile.name'/>"><s:property value="#mediaFile.name"/></a> diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp index 9e12e57f3..d8cdb9442 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp @@ -32,22 +32,24 @@ <div id="mediaLibrary" class="media-library" data-confirm-delete="<s:text name='mediaFileView.confirmDelete'/>" - data-confirm-move="<s:text name='mediaFile.move.confirm'/>" data-confirm-delete-folder="<s:text name='mediaFile.deleteFolder.confirm'/>" data-selected-count="<s:text name='mediaFileView.selectedCount'/>"> -<%-- Heading: where we are, and the main action --%> +<%-- Heading: where we are, how many files, and the main action --%> <div class="media-header"> <h3 class="media-heading"> - <s:if test="search"> + <s:if test="search && bean.allFolders"> <span class="bi bi-search" aria-hidden="true"></span> - <s:text name="mediaFileView.searchTitle"/> + <s:text name="mediaFileView.allFolders"/> </s:if> <s:else> <span class="bi bi-folder2" aria-hidden="true"></span> <s:property value="currentDirectory.name"/> </s:else> + <s:if test="!search && pager.totalCount > 0"> + <span class="media-count"><s:text name="mediaFileView.fileCount"><s:param value="pager.totalCount"/></s:text></span> + </s:if> </h3> <div class="media-folder-picker"> <label class="form-label" for="folderPicker"><s:text name="mediaFileView.viewFolder"/></label> @@ -68,7 +70,8 @@ </a> </div> -<%-- Search: name, type and scope first; size and tags behind Filters --%> +<%-- Search: one box with its scope; size and tags behind Filters. The type chips, + sort and layout below belong to this form through their form attribute. --%> <s:form id="mediaFileSearchForm" name="mediaFileSearchForm" action="mediaFileView" method="get" theme="simple" cssClass="media-search" role="search"> @@ -76,31 +79,25 @@ <s:hidden name="directoryId"/> <div class="media-search-row"> - <div class="media-search-name"> - <label class="form-label" for="beanName"><s:text name="mediaFileView.nameStartsWith"/></label> - <s:textfield id="beanName" name="bean.name" maxlength="255" cssClass="form-control"/> - </div> - <div class="media-search-type"> - <label class="form-label" for="beanType"><s:text name="mediaFileView.type"/></label> - <s:select id="beanType" name="bean.type" list="fileTypes" listKey="key" listValue="value" - cssClass="form-select"/> - </div> - <div class="media-search-scope"> - <label class="form-label" for="beanScope"><s:text name="mediaFileView.searchIn"/></label> - <select id="beanScope" name="bean.scope" class="form-select"> + <div class="input-group media-search-box"> + <span class="input-group-text"><span class="bi bi-search" aria-hidden="true"></span></span> + <label class="visually-hidden" for="beanName"><s:text name="mediaFileView.nameStartsWith"/></label> + <s:textfield id="beanName" name="bean.name" maxlength="255" cssClass="form-control" + placeholder="%{getText('mediaFileView.searchPlaceholder')}"/> + <label class="visually-hidden" for="beanScope"><s:text name="mediaFileView.searchIn"/></label> + <select id="beanScope" name="bean.scope" class="form-select media-search-scope"> <option value="folder"><s:text name="mediaFileView.thisFolder" escapeHtml="true"><s:param value="currentDirectory.name"/></s:text></option> <option value="all" <s:if test="bean.allFolders">selected</s:if>><s:text name="mediaFileView.allFolders"/></option> </select> - </div> - <div class="media-search-buttons"> - <button type="button" class="btn btn-outline-secondary" data-bs-toggle="collapse" - data-bs-target="#mediaFilters" aria-controls="mediaFilters" - aria-expanded="<s:property value='bean.filtersSet'/>"> - <span class="bi bi-sliders" aria-hidden="true"></span> - <s:text name="mediaFileView.filters"/> - </button> <button type="submit" class="btn btn-primary"><s:text name="generic.search"/></button> </div> + <button type="button" class="btn btn-outline-secondary media-filters-button" data-bs-toggle="collapse" + data-bs-target="#mediaFilters" aria-controls="mediaFilters" + aria-expanded="<s:property value='bean.filtersSet'/>"> + <span class="bi bi-sliders" aria-hidden="true"></span> + <s:text name="mediaFileView.filters"/> + <s:if test="bean.filtersSet"><span class="media-filters-dot" aria-hidden="true"></span></s:if> + </button> </div> <div id="mediaFilters" class="collapse media-filters <s:if test='bean.filtersSet'>show</s:if>"> @@ -122,62 +119,8 @@ </div> </s:form> -<%-- What is shown: criteria, scope and count, then sort order and layout --%> - -<div class="media-results-bar"> -<div class="media-result-summary" role="status"> - <s:if test="search"> - <s:text name="mediaFileView.matchCount"><s:param value="pager.totalCount"/></s:text> - <ul class="media-criteria"> - <s:if test="bean.name != null && !bean.name.trim().isEmpty()"> - <li><s:text name="mediaFileView.criterionName" escapeHtml="true"><s:param value="bean.name.trim()"/></s:text></li> - </s:if> - <s:if test="bean.typeSet"> - <li><s:text name="mediaFileView.type"/>: <s:property value="bean.typeLabel"/></li> - </s:if> - <s:if test="bean.size > 0"> - <li><s:text name="mediaFileView.size"/> <s:property value="bean.sizeFilterTypeLabel"/> - <s:property value="bean.size"/> <s:property value="bean.sizeUnitLabel"/></li> - </s:if> - <s:if test="bean.tags != null && !bean.tags.trim().isEmpty()"> - <li><s:text name="mediaFileView.tags"/>: <s:property value="bean.tags.trim()"/></li> - </s:if> - <li> - <s:if test="bean.allFolders"><s:text name="mediaFileView.allFolders"/></s:if> - <s:else><s:text name="mediaFileView.thisFolder" escapeHtml="true"><s:param value="currentDirectory.name"/></s:text></s:else> - </li> - </ul> - <a href="<s:property value='%{clearSearchURL}'/>"><s:text name="mediaFileView.clearSearch"/></a> - </s:if> - <s:elseif test="pager.totalCount > 0"> - <s:text name="mediaFileView.fileCount"><s:param value="pager.totalCount"/></s:text> - </s:elseif> -</div> -<s:if test="pager.items.size() > 0"> - <div class="media-toolbar-group media-view-options"> - <label for="sortByMenu"><s:text name="mediaFileView.sortBy"/></label> - <%-- belongs to the GET search form, so sorting keeps the criteria --%> - <select id="sortByMenu" name="bean.sortBy" form="mediaFileSearchForm" class="form-select form-select-sm"> - <s:iterator var="option" value="sortOptions"> - <option value="<s:property value='#option.key'/>" - <s:if test="#option.key == bean.sortBy">selected</s:if>><s:property value="#option.value"/></option> - </s:iterator> - </select> - <div class="btn-group btn-group-sm" role="group" aria-label="<s:text name='mediaFileView.layout'/>"> - <button type="button" class="btn btn-outline-secondary" data-media-view="grid" aria-pressed="true" - title="<s:text name='mediaFileView.gridView'/>"> - <span class="bi bi-grid-3x3-gap" aria-hidden="true"></span> - <span class="visually-hidden"><s:text name="mediaFileView.gridView"/></span></button> - <button type="button" class="btn btn-outline-secondary" data-media-view="list" aria-pressed="false" - title="<s:text name='mediaFileView.listView'/>"> - <span class="bi bi-list-ul" aria-hidden="true"></span> - <span class="visually-hidden"><s:text name="mediaFileView.listView"/></span></button> - </div> - </div> -</s:if> -</div> - -<%-- Files, with the selection toolbar above them --%> +<%-- Files. The bar above them shows type, sort and layout; while files are selected, + it shows what can be done with them instead. --%> <s:form id="mediaFileViewForm" name="mediaFileViewForm" action="mediaFileView" theme="simple"> <s:hidden name="salt"/> @@ -185,36 +128,112 @@ <s:hidden name="directoryId"/> <s:hidden name="newDirectoryName"/> <input type="hidden" name="mediaFileId" value=""/> + <input type="hidden" name="selectedDirectory" id="selectedDirectory" value=""/> <%-- the page state, so actions return to the same page --%> <s:iterator value="bean.toParams()"> <input type="hidden" name="<s:property value='key'/>" value="<s:property value='value'/>"/> </s:iterator> <input type="hidden" name="bean.page" value="<s:property value='bean.page'/>"/> - <s:if test="pager.items.size() > 0"> + <s:if test="pager.items.size() > 0 || search"> + <div class="media-bar"> - <div class="media-toolbar"> - <div class="media-toolbar-group"> - <button type="button" class="btn btn-outline-secondary btn-sm" id="selectPageButton"> - <s:text name="mediaFileView.selectPage"/></button> - <button type="button" class="btn btn-outline-secondary btn-sm" id="clearSelectionButton" disabled> - <s:text name="mediaFileView.clearSelection"/></button> - <span class="media-selected-count" id="selectedCount" aria-live="polite"></span> + <div class="media-results-bar"> + <div class="media-type-chips" role="radiogroup" aria-label="<s:text name='mediaFileView.type'/>"> + <s:iterator var="option" value="fileTypes"> + <input type="radio" class="btn-check" name="bean.type" form="mediaFileSearchForm" + id="type-<s:property value='#option.key'/>" value="<s:property value='#option.key'/>" + <s:if test="#option.key == bean.type || (#option.key == 'mediaFileView.any' && !bean.typeSet)">checked</s:if>/> + <label class="btn btn-sm media-chip" for="type-<s:property value='#option.key'/>"> + <s:if test="#option.key == 'mediaFileView.any'"><s:text name="mediaFileView.allTypes"/></s:if> + <s:else><s:property value="#option.value"/></s:else></label> + </s:iterator> + </div> + <s:if test="pager.items.size() > 0"> + <div class="media-view-options"> + <label class="visually-hidden" for="sortByMenu"><s:text name="mediaFileView.sortBy"/></label> + <span class="bi bi-sort-down" aria-hidden="true"></span> + <select id="sortByMenu" name="bean.sortBy" form="mediaFileSearchForm" class="form-select form-select-sm media-sort"> + <s:iterator var="option" value="sortOptions"> + <option value="<s:property value='#option.key'/>" + <s:if test="#option.key == bean.sortBy">selected</s:if>><s:property value="#option.value"/></option> + </s:iterator> + </select> + <div class="btn-group btn-group-sm" role="group" aria-label="<s:text name='mediaFileView.layout'/>"> + <button type="button" class="btn btn-outline-secondary" data-media-view="grid" aria-pressed="true" + title="<s:text name='mediaFileView.gridView'/>"> + <span class="bi bi-grid-3x3-gap" aria-hidden="true"></span> + <span class="visually-hidden"><s:text name="mediaFileView.gridView"/></span></button> + <button type="button" class="btn btn-outline-secondary" data-media-view="list" aria-pressed="false" + title="<s:text name='mediaFileView.listView'/>"> + <span class="bi bi-list-ul" aria-hidden="true"></span> + <span class="visually-hidden"><s:text name="mediaFileView.listView"/></span></button> + </div> </div> - <div class="media-toolbar-group"> - <label class="visually-hidden" for="moveTargetMenu"><s:text name="mediaFileView.moveTo"/></label> - <s:select id="moveTargetMenu" name="selectedDirectory" list="allDirectories" listKey="id" - listValue="name" cssClass="form-select form-select-sm" disabled="true"/> - <button type="button" class="btn btn-outline-primary btn-sm" id="moveButton" disabled> - <span class="bi bi-folder-symlink" aria-hidden="true"></span> - <s:text name="mediaFileView.move"/></button> - <button type="button" class="btn btn-outline-danger btn-sm" id="deleteButton" disabled> + </s:if> + </div> + + <s:if test="pager.items.size() > 0"> + <div class="media-selection-bar" id="selectionBar" hidden> + <button type="button" class="btn btn-sm btn-link media-selection-close" id="clearSelectionButton" + title="<s:text name='mediaFileView.clearSelection'/>"> + <span class="bi bi-x-lg" aria-hidden="true"></span> + <span class="visually-hidden"><s:text name="mediaFileView.clearSelection"/></span></button> + <span class="media-selected-count" id="selectedCount" aria-live="polite"></span> + <button type="button" class="btn btn-sm btn-link" id="selectPageButton"> + <s:text name="mediaFileView.selectPage"/></button> + <div class="media-selection-actions"> + <div class="dropdown"> + <button type="button" class="btn btn-sm btn-outline-primary dropdown-toggle" id="moveButton" + data-bs-toggle="dropdown" aria-expanded="false"> + <span class="bi bi-folder-symlink" aria-hidden="true"></span> + <s:text name="mediaFileView.move"/></button> + <ul class="dropdown-menu dropdown-menu-end" id="moveTargetMenu"> + <s:iterator var="folder" value="allDirectories"> + <li><button type="button" class="dropdown-item" data-folder-id="<s:property value='#folder.id'/>" + <s:if test="!search && #folder.id == currentDirectory.id">disabled</s:if>> + <span class="bi bi-folder2" aria-hidden="true"></span> + <s:property value="#folder.name"/></button></li> + </s:iterator> + </ul> + </div> + <button type="button" class="btn btn-sm btn-outline-danger" id="deleteButton"> <span class="bi bi-trash" aria-hidden="true"></span> <s:text name="generic.delete"/></button> </div> </div> + </s:if> + + </div> + </s:if> + + <s:if test="search"> + <div class="media-result-summary" role="status"> + <s:text name="mediaFileView.matchCount"><s:param value="pager.totalCount"/></s:text> + <ul class="media-criteria"> + <s:if test="bean.name != null && !bean.name.trim().isEmpty()"> + <li><s:text name="mediaFileView.criterionName" escapeHtml="true"><s:param value="bean.name.trim()"/></s:text></li> + </s:if> + <s:if test="bean.typeSet"> + <li><s:text name="mediaFileView.type"/>: <s:property value="bean.typeLabel"/></li> + </s:if> + <s:if test="bean.size > 0"> + <li><s:text name="mediaFileView.size"/> <s:property value="bean.sizeFilterTypeLabel"/> + <s:property value="bean.size"/> <s:property value="bean.sizeUnitLabel"/></li> + </s:if> + <s:if test="bean.tags != null && !bean.tags.trim().isEmpty()"> + <li><s:text name="mediaFileView.tags"/>: <s:property value="bean.tags.trim()"/></li> + </s:if> + <li> + <s:if test="bean.allFolders"><s:text name="mediaFileView.allFolders"/></s:if> + <s:else><s:text name="mediaFileView.thisFolder" escapeHtml="true"><s:param value="currentDirectory.name"/></s:text></s:else> + </li> + </ul> + <a href="<s:property value='%{clearSearchURL}'/>"><s:text name="mediaFileView.clearSearch"/></a> + </div> + </s:if> - <s:include value="/WEB-INF/jsps/editor/Pager.jsp"/> + <s:if test="pager.items.size() > 0"> <ul class="media-grid" id="mediaGrid"> <li class="media-list-header" aria-hidden="true"> diff --git a/app/src/main/webapp/roller-ui/scripts/media-library.js b/app/src/main/webapp/roller-ui/scripts/media-library.js index 863d94927..7d369935a 100644 --- a/app/src/main/webapp/roller-ui/scripts/media-library.js +++ b/app/src/main/webapp/roller-ui/scripts/media-library.js @@ -34,7 +34,7 @@ $(function () { var icon = document.createElement("span"); icon.className = "bi " + (img.getAttribute("data-fallback-icon") || "bi-file-earmark"); icon.setAttribute("aria-hidden", "true"); - (img.closest("a") || img).replaceWith(icon); + img.replaceWith(icon); } }, true); @@ -57,13 +57,16 @@ $(function () { return $(".media-select:checked"); } + // while files are selected, the selection bar replaces the type, sort and layout bar function updateSelection() { var count = selected().length; $(".media-select").each(function () { $(this).closest(".media-card").toggleClass("selected", this.checked); }); + library.toggleClass("selecting", count > 0); + $(".media-results-bar").prop("hidden", count > 0); + $("#selectionBar").prop("hidden", count === 0); $("#selectedCount").text(count > 0 ? format(library.data("selected-count"), count) : ""); - $("#moveButton, #deleteButton, #moveTargetMenu, #clearSelectionButton").prop("disabled", count === 0); } $(document).on("change", ".media-select", updateSelection); @@ -93,10 +96,10 @@ $(function () { } }); - $("#moveButton").on("click", function () { - if (confirm(library.data("confirm-move"))) { - submitTo(urls.data("move-selected-url")); - } + // moving can be undone, so it needs no confirmation + $("#moveTargetMenu").on("click", "[data-folder-id]", function () { + form.selectedDirectory.value = $(this).data("folder-id"); + submitTo(urls.data("move-selected-url")); }); $("#deleteFolderButton").on("click", function () { @@ -109,9 +112,10 @@ $(function () { var searchForm = $("#mediaFileSearchForm"); - // leave empty and default criteria out of the URL + // leave empty and default criteria out of the URL; the type chips and the + // sort menu sit outside the form and join it through their form attribute searchForm.on("submit", function () { - $(this).find("[name]").add("#sortByMenu").each(function () { + $(this.elements).filter("[name]").each(function () { var empty = this.value === "" || this.value === "mediaFileView.any" || (this.name === "bean.scope" && this.value === "folder") || (this.name === "bean.sortBy" && this.value === "newest"); @@ -124,10 +128,10 @@ $(function () { // fields disabled above stay disabled when the browser restores this page $(window).on("pageshow", function () { - searchForm.find("[name]").add("#sortByMenu").prop("disabled", false); + $(searchForm[0].elements).prop("disabled", false); }); - $("#sortByMenu").on("change", function () { + $("#sortByMenu, [name='bean.type']").on("change", function () { searchForm.trigger("submit"); }); diff --git a/app/src/main/webapp/roller-ui/styles/roller.css b/app/src/main/webapp/roller-ui/styles/roller.css index 3405b0a75..47a19308b 100644 --- a/app/src/main/webapp/roller-ui/styles/roller.css +++ b/app/src/main/webapp/roller-ui/styles/roller.css @@ -336,34 +336,67 @@ body { } .media-heading { + display: flex; + flex-wrap: wrap; + align-items: baseline; + gap: 0.5rem; font-size: 1.25rem; margin: 0; overflow-wrap: anywhere; } +.media-count { + font-size: 0.875rem; + font-weight: normal; + color: var(--bs-secondary-color); +} + +/* Search: one box holding the name, its scope and the button, then Filters */ .media-search { - margin: 1rem 0; + margin: 1rem 0 0.5rem; } .media-search-row { display: flex; flex-wrap: wrap; - align-items: flex-end; - gap: 0.75rem; + gap: 0.5rem; } -.media-search-name { - flex: 1 1 14rem; +.media-search-box { + flex: 1 1 20rem; + flex-wrap: nowrap; } -.media-search-type { - flex: 0 1 10rem; +.media-search-box .input-group-text { + background-color: var(--bs-body-bg); + color: var(--bs-secondary-color); } -.media-search-buttons { - display: flex; - flex-wrap: wrap; - gap: 0.5rem; +.media-search-box .form-control { + border-left: 0; + min-width: 6rem; +} + +.media-search-box .media-search-scope { + flex: 0 1 auto; + width: auto; + max-width: 13rem; + background-color: var(--bs-tertiary-bg); +} + +.media-filters-button { + position: relative; +} + +/* a set filter that the collapsed panel would otherwise hide */ +.media-filters-dot { + position: absolute; + top: 0.3rem; + right: 0.3rem; + width: 0.5rem; + height: 0.5rem; + border-radius: 50%; + background-color: var(--bs-primary); } .media-filters { @@ -403,92 +436,182 @@ body { flex: 1 1 14rem; } -.media-result-summary { - color: var(--bs-secondary-color); +/* The bar above the files: type, sort and layout, or the selection's actions. + It stays in view while scrolling, so the actions are always at hand. */ +.media-bar { + position: sticky; + top: 0; + z-index: 2; + padding: 0.5rem 0; + background-color: var(--bs-body-bg); } -.media-toolbar { +.media-results-bar, +.media-selection-bar { display: flex; flex-wrap: wrap; align-items: center; + justify-content: space-between; gap: 0.5rem 1rem; - padding: 0.5rem 0; - border-bottom: 1px solid var(--bs-border-color); - background-color: var(--bs-body-bg); - position: sticky; - top: 0; - z-index: 2; + min-height: 2.5rem; +} + +.media-results-bar[hidden], +.media-selection-bar[hidden] { + display: none; } -.media-toolbar-group { +.media-type-chips { display: flex; flex-wrap: wrap; - align-items: center; - gap: 0.5rem; + gap: 0.375rem; +} + +.media-chip { + border-radius: var(--bs-border-radius-pill); + padding: 0.2rem 0.85rem; + border: 1px solid var(--bs-border-color); + color: var(--bs-body-color); + background-color: var(--bs-body-bg); +} + +.media-chip:hover { + background-color: var(--bs-tertiary-bg); +} + +.btn-check:checked + .media-chip { + border-color: var(--bs-primary-bg-subtle); + background-color: var(--bs-primary-bg-subtle); + color: var(--bs-primary-text-emphasis); + font-weight: 600; +} + +.btn-check:focus-visible + .media-chip { + box-shadow: var(--bs-focus-ring-x, 0) var(--bs-focus-ring-y, 0) 0 0.25rem rgba(var(--bs-primary-rgb), 0.25); } -.media-results-bar { +.media-view-options { display: flex; - flex-wrap: wrap; align-items: center; - justify-content: space-between; - gap: 0.5rem 1rem; + gap: 0.25rem; + color: var(--bs-secondary-color); } -.media-toolbar .form-select, -.media-view-options .form-select { +.media-sort { width: auto; - max-width: 12rem; + border-color: transparent; + background-color: transparent; + color: var(--bs-body-color); +} + +.media-sort:hover { + background-color: var(--bs-tertiary-bg); +} + +.media-view-options .btn-group { + margin-left: 0.5rem; +} + +.media-selection-bar { + justify-content: flex-start; + padding: 0 0.5rem; + border-radius: var(--bs-border-radius-lg); + background-color: var(--bs-primary-bg-subtle); +} + +.media-selection-close { + color: var(--bs-body-color); } .media-selected-count { - font-size: 0.875rem; + font-weight: 600; +} + +.media-selection-actions { + display: flex; + gap: 0.5rem; + margin-left: auto; +} + +.media-selection-actions .btn { + background-color: var(--bs-body-bg); +} + +.media-selection-actions .btn-outline-danger:hover { + background-color: var(--bs-danger); +} + +.media-selection-actions .btn-outline-primary:hover, +.media-selection-actions .btn-outline-primary.show { + background-color: var(--bs-primary); +} + +.media-result-summary { + display: flex; + flex-wrap: wrap; + align-items: baseline; + gap: 0.25rem 0.75rem; + margin: 0.25rem 0 0.5rem; color: var(--bs-secondary-color); } -/* Equal cards whatever the thumbnail shape; the preview keeps the whole image */ +.media-criteria { + display: contents; + list-style: none; +} + +.media-criteria li { + padding: 0 0.5rem; + border-radius: var(--bs-border-radius-pill); + background-color: var(--bs-secondary-bg); + color: var(--bs-body-color); + font-size: 0.875rem; + overflow-wrap: anywhere; +} + +/* Grid: equal tiles whatever the image shape. The preview box has a fixed shape + and keeps the whole image inside it, so names line up across a row. */ .media-grid { display: grid; - grid-template-columns: repeat(auto-fill, minmax(8.5rem, 1fr)); - gap: 1rem; + grid-template-columns: repeat(auto-fill, minmax(9rem, 1fr)); + gap: 1.25rem 1rem; list-style: none; padding: 0; - margin: 1rem 0; + margin: 0.5rem 0 1.5rem; } .media-card { + position: relative; display: flex; flex-direction: column; min-width: 0; - border: 1px solid var(--bs-border-color); - border-radius: var(--bs-border-radius); - background-color: var(--bs-body-bg); -} - -.media-card.selected { - outline: 2px solid var(--bs-primary); - outline-offset: -1px; } .media-card-preview { + position: relative; display: flex; align-items: center; justify-content: center; - aspect-ratio: 4 / 3; + aspect-ratio: 1; width: 100%; - padding: 0.5rem; + min-height: 0; + overflow: hidden; + padding: 0; border: 0; - border-bottom: 1px solid var(--bs-border-color); - border-radius: var(--bs-border-radius) var(--bs-border-radius) 0 0; + border-radius: var(--bs-border-radius-lg); /* a tinted frame keeps white and transparent images visible */ background-color: var(--bs-tertiary-bg); cursor: pointer; + transition: box-shadow 0.15s ease-in-out; } .media-card-preview img { - max-width: 100%; - max-height: 100%; + position: absolute; + inset: 0.5rem; + width: calc(100% - 1rem); + height: calc(100% - 1rem); object-fit: contain; + transition: transform 0.15s ease-in-out; } .media-card-preview .bi { @@ -496,43 +619,80 @@ body { color: var(--bs-secondary-color); } +.media-card:hover .media-card-preview { + box-shadow: 0 0.25rem 0.75rem rgba(0, 0, 0, 0.15); +} + +.media-card.selected .media-card-preview { + box-shadow: inset 0 0 0 3px var(--bs-primary); + background-color: var(--bs-primary-bg-subtle); +} + +.media-card.selected .media-card-preview img { + transform: scale(0.88); +} + +/* The checkbox sits over the preview, shown on hover or focus, and always + while files are selected or on touch screens */ +.media-card > .media-select { + position: absolute; + top: 0.5rem; + left: 0.5rem; + z-index: 1; + width: 1.35rem; + height: 1.35rem; + margin: 0; + border-radius: 50%; + box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.8); + opacity: 0; + transition: opacity 0.15s ease-in-out; + cursor: pointer; +} + +.media-card:hover > .media-select, +.media-card > .media-select:focus-visible, +.media-card > .media-select:checked, +.media-library.selecting .media-card > .media-select { + opacity: 1; +} + +@media (hover: none) { + .media-card > .media-select { + opacity: 1; + } +} + .media-card-body { display: flex; - align-items: flex-start; - gap: 0.5rem; - padding: 0.5rem; + padding: 0.4rem 0.125rem 0; min-width: 0; } -.media-card-body .form-check-input { - flex: none; - margin-top: 0.2rem; -} - .media-card-text { display: flex; flex-direction: column; min-width: 0; + width: 100%; } -/* Long names wrap within two lines; the full name is on the details page */ +/* One line per name; the full name is in the tooltip and on the details page */ .media-card-name { - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; + display: block; overflow: hidden; - overflow-wrap: anywhere; + white-space: nowrap; + text-overflow: ellipsis; padding: 0; border: 0; background: none; text-align: start; font-size: 0.875rem; - color: var(--bs-link-color); + color: var(--bs-body-color); text-decoration: none; cursor: pointer; } .media-card-name:hover { + color: var(--bs-link-color); text-decoration: underline; } @@ -563,34 +723,8 @@ body { text-align: end; } -.media-search-scope { - flex: 0 1 12rem; -} - -.media-result-summary { - display: flex; - flex-wrap: wrap; - align-items: baseline; - gap: 0.25rem 0.75rem; - margin-bottom: 0.5rem; -} - -.media-criteria { - display: contents; - list-style: none; -} - -.media-criteria li { - padding: 0 0.5rem; - border-radius: var(--bs-border-radius-pill); - background-color: var(--bs-secondary-bg); - color: var(--bs-body-color); - font-size: 0.875rem; - overflow-wrap: anywhere; -} - -.media-view-options .btn-group { - margin-left: 0.5rem; +.media-library .roller-pager { + justify-content: center; } .media-list-header { @@ -606,13 +740,19 @@ body { .media-grid.media-list .media-list-header, .media-grid.media-list .media-card { display: grid; - grid-template-columns: 1.25rem 3rem minmax(0, 1fr) 5rem 5rem 6rem; + grid-template-columns: 1.35rem 3rem minmax(0, 1fr) 5rem 5rem 6rem; align-items: center; gap: 0.75rem; padding: 0.35rem 0.5rem; - border: 0; border-bottom: 1px solid var(--bs-border-color); - border-radius: 0; +} + +.media-grid.media-list .media-card:hover { + background-color: var(--bs-tertiary-bg); +} + +.media-grid.media-list .media-card.selected { + background-color: var(--bs-primary-bg-subtle); } .media-grid.media-list .media-list-header { @@ -627,18 +767,28 @@ body { display: contents; } -.media-grid.media-list .media-card-body .form-check-input { +.media-grid.media-list .media-card > .media-select { order: 1; - margin-top: 0; + position: static; + width: 1.1rem; + height: 1.1rem; + border-radius: 0.25em; + box-shadow: none; + opacity: 1; } .media-grid.media-list .media-card-preview { order: 2; width: 3rem; - aspect-ratio: 1; - padding: 2px; - border: 0; border-radius: var(--bs-border-radius-sm); + box-shadow: none; +} + +.media-grid.media-list .media-card-preview img { + inset: 2px; + width: calc(100% - 4px); + height: calc(100% - 4px); + transform: none; } .media-grid.media-list .media-card-preview .bi { @@ -647,7 +797,6 @@ body { .media-grid.media-list .media-card-name { order: 3; - -webkit-line-clamp: 1; } .media-grid.media-list .media-card-type { @@ -670,9 +819,13 @@ body { } @media (max-width: 575.98px) { + .media-grid { + grid-template-columns: repeat(auto-fill, minmax(7rem, 1fr)); + } + .media-grid.media-list .media-list-header, .media-grid.media-list .media-card { - grid-template-columns: 1.25rem 3rem minmax(0, 1fr) 4.5rem; + grid-template-columns: 1.35rem 3rem minmax(0, 1fr) 4.5rem; } .media-grid.media-list .media-list-header span:nth-child(4), diff --git a/docs/roller-user-guide.adoc b/docs/roller-user-guide.adoc index 215d150ae..b79d2c693 100644 --- a/docs/roller-user-guide.adoc +++ b/docs/roller-user-guide.adoc @@ -431,10 +431,10 @@ weblog. The library shows one folder at a time. The folders are listed on the left; on a narrow screen, choose the folder from the list at the top instead. Files show as a grid of previews, or as a list with name, type, size and upload -date; use the buttons next to *Sort by* to switch. Your choice is kept in -your browser. The library shows 48 files a page, newest first. Use *Sort by* -to sort by oldest first, name or type, and the buttons above and below the -files to move between pages. +date; use the two buttons at the right above the files to switch. Your choice +is kept in your browser. The library shows 48 files a page, newest first. Use +the menu next to those buttons to sort by oldest first, name or type, and the +buttons below the files to move between pages. ==== How to upload files @@ -467,10 +467,11 @@ the library. ==== How to find files -Above the files, enter the start of a file name and click *Search*. Upper and -lower case do not matter. You can also limit the search to a file type, and -choose whether to search the current folder or all folders. *Filters* has -more criteria: file size and tags. The line above the results shows what you +Enter the start of a file name in the search box and click *Search*. Upper +and lower case do not matter. Next to the box, choose whether to search the +current folder or all folders. To show only one type of file, click *Image*, +*Video*, *Audio* or *Others* above the files; *All* shows every type. +*Filters* has more criteria: file size and tags. The line above the results shows what you searched for and how many files match; *Clear search* returns to the folder. ==== How to see and edit a file @@ -494,14 +495,17 @@ file URLs. To create a folder, click *New folder* above the folder list, enter a name and click *Create*. -To move files, select them with their checkboxes, choose the destination -folder in the toolbar above the files, and click *Move*. *Select this page* -selects every file on the current page. +To select a file, point at its preview and click the checkbox that appears +in the corner; on a touch screen the checkboxes are always shown. While files +are selected, the bar above the files shows how many are selected and what +you can do with them. *Select all on this page* selects every file on the +current page, and the *X* clears the selection. + +To move the selected files, click *Move to* and choose the folder. ==== How to delete files and folders -To delete files, select them with their checkboxes and click *Delete* in the -toolbar above the files, or click *Delete* on a file’s details page. You will +To delete files, select them and click *Delete* in the bar above the files, or click *Delete* on a file’s details page. You will have to confirm the delete before it executes. Deleting a file cannot be undone, and links to it stop working. diff --git a/it-playwright/src/test/java/org/apache/roller/playwright/WeblogMediaLibraryIT.java b/it-playwright/src/test/java/org/apache/roller/playwright/WeblogMediaLibraryIT.java index 14a150021..2ef56f371 100644 --- a/it-playwright/src/test/java/org/apache/roller/playwright/WeblogMediaLibraryIT.java +++ b/it-playwright/src/test/java/org/apache/roller/playwright/WeblogMediaLibraryIT.java @@ -78,7 +78,8 @@ class WeblogMediaLibraryIT extends BaseIT { private static final String CARD_NAME = ".media-card-name"; private static final String CARD_CHECKBOX = ".media-select"; private static final String SELECTED_COUNT = "#selectedCount"; - private static final String MOVE_TARGET = "#moveTargetMenu"; + private static final String SELECTION_BAR = "#selectionBar"; + private static final String MOVE_MENU = "#moveTargetMenu"; private static final String MOVE_BUTTON = "#moveButton"; private static final String DELETE_BUTTON = "#deleteButton"; private static final String SEARCH_NAME = "#beanName"; @@ -145,7 +146,7 @@ class WeblogMediaLibraryIT extends BaseIT { openFolder(folder); assertThat(page.locator(CARD)).hasCount(3); - assertThat(page.locator(RESULT_SUMMARY)).containsText("3 file(s)"); + assertThat(page.locator(FOLDER_HEADING)).containsText("3 file(s)"); } @Test @@ -188,11 +189,12 @@ class WeblogMediaLibraryIT extends BaseIT { assertThat(page).hasTitle(Pattern.compile("Media File Upload Complete")); openFolder(source); + assertThat(page.locator(SELECTION_BAR)).isHidden(); card("one.png").locator(CARD_CHECKBOX).check(); - assertThat(page.locator(SELECTED_COUNT)).hasText("1 selected on this page"); - page.locator(MOVE_TARGET).selectOption(new SelectOption().setLabel(target)); - page.onceDialog(dialog -> dialog.accept()); + assertThat(page.locator(SELECTION_BAR)).isVisible(); + assertThat(page.locator(SELECTED_COUNT)).hasText("1 selected"); page.locator(MOVE_BUTTON).click(); + page.locator(MOVE_MENU).getByText(target, new Locator.GetByTextOptions().setExact(true)).click(); assertThat(page.locator(MESSAGES)).containsText("moved"); assertThat(page.locator(FOLDER_HEADING)).containsText(source); @@ -229,6 +231,12 @@ class WeblogMediaLibraryIT extends BaseIT { page.getByText("Clear search").first().click(); assertThat(page.locator(FOLDER_HEADING)).containsText(first); assertThat(page.locator(CARD)).hasCount(2); + + // a type chip searches at once + page.locator("label[for='type-mediaFileView.others']").click(); + assertThat(page.locator(RESULT_SUMMARY)).containsText("0 matching file(s)"); + page.locator("label[for='type-mediaFileView.image']").click(); + assertThat(page.locator(RESULT_SUMMARY)).containsText("2 matching file(s)"); } @Test
