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 a0705a5b1fb3cce753d0a7ecffdb1d0b0f54e5a9 Author: David M. Johnson <[email protected]> AuthorDate: Sun Oct 25 13:36:34 2026 -0400 Media library: one paged query for folders and search; details page Browsing a folder and searching now run the same paged query (48 files a page) with an explicit order and the ID as tie-breaker, so pages never repeat or skip files. Newest first is the default. Search can cover the current folder or all folders, matches names that start with the text in any case, and is a GET, so the page state lives in the URL. The shared pager says Previous and Next for media. The library offers a list view (name, type, size, uploaded) beside the grid, remembered in the browser. Actions on the selection return to the same folder, search, sort and page. File details move from an iframe dialog to their own page: preview, facts, Copy URL, Open original, Create entry and Delete, then the metadata form, with a link back to the library page the user came from. --- .../business/jpa/JPAMediaFileManagerImpl.java | 46 ++-- .../roller/weblogger/pojos/MediaFileFilter.java | 286 ++++++++++---------- .../weblogger/ui/struts2/editor/MediaFileEdit.java | 68 ++++- .../ui/struts2/editor/MediaFileSearchBean.java | 149 ++++++++--- .../weblogger/ui/struts2/editor/MediaFileView.java | 189 +++++++------ .../weblogger/ui/struts2/pagers/LinkPager.java | 10 + .../ui/struts2/pagers/MediaFilePager.java | 55 +--- .../main/resources/ApplicationResources.properties | 30 ++- app/src/main/resources/struts.xml | 2 +- .../webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp | 2 +- .../WEB-INF/jsps/editor/MediaFileAddSuccess.jsp | 4 +- .../webapp/WEB-INF/jsps/editor/MediaFileCard.jsp | 24 +- .../webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp | 202 ++++++++------ .../WEB-INF/jsps/editor/MediaFileEditSuccess.jsp | 22 -- .../webapp/WEB-INF/jsps/editor/MediaFilePager.jsp | 83 ------ .../WEB-INF/jsps/editor/MediaFileSidebar.jsp | 32 ++- .../webapp/WEB-INF/jsps/editor/MediaFileView.jsp | 210 ++++++++------- app/src/main/webapp/WEB-INF/jsps/editor/Pager.jsp | 10 +- app/src/main/webapp/WEB-INF/tiles.xml | 9 +- .../main/webapp/roller-ui/scripts/media-library.js | 293 +++++++++++++-------- app/src/main/webapp/roller-ui/styles/roller.css | 223 ++++++++++++++++ .../roller/weblogger/business/MediaFileTest.java | 82 ++++++ .../ui/struts2/editor/MediaFileSearchBeanTest.java | 116 ++++++++ 23 files changed, 1365 insertions(+), 782 deletions(-) diff --git a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java index a3eec1b38..d7cea2411 100644 --- a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java +++ b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java @@ -33,6 +33,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Iterator; import java.util.List; +import java.util.Locale; import java.util.Properties; import java.util.Set; @@ -55,6 +56,7 @@ import org.apache.roller.weblogger.pojos.FileContent; import org.apache.roller.weblogger.pojos.MediaFile; import org.apache.roller.weblogger.pojos.MediaFileDirectory; import org.apache.roller.weblogger.pojos.MediaFileFilter; +import org.apache.roller.weblogger.pojos.MediaFileFilter.MediaFileOrder; import org.apache.roller.weblogger.pojos.MediaFileTag; import org.apache.roller.weblogger.pojos.MediaFileType; import org.apache.roller.weblogger.pojos.User; @@ -584,27 +586,26 @@ public class JPAMediaFileManagerImpl implements MediaFileManager { List<Object> params = new ArrayList<>(); String queryString = "SELECT m " + mediaFilesFromWhere(weblog, filter, params); - StringBuilder orderBy = new StringBuilder(); - - if (filter.getOrder() != null) { - switch (filter.getOrder()) { - case NAME: - orderBy.append(" order by m.name"); - break; - case DATE_UPLOADED: - orderBy.append(" order by m.dateUploaded"); - break; - case TYPE: - orderBy.append(" order by m.contentType"); - break; - default: - } - } else { - orderBy.append(" order by m.name"); + // ID breaks ties, so a page boundary never repeats or skips a file + String orderBy; + MediaFileOrder order = filter.getOrder() != null ? filter.getOrder() : MediaFileOrder.NAME; + switch (order) { + case DATE_UPLOADED: + orderBy = " ORDER BY m.dateUploaded, m.id"; + break; + case DATE_UPLOADED_DESC: + orderBy = " ORDER BY m.dateUploaded DESC, m.id DESC"; + break; + case TYPE: + orderBy = " ORDER BY m.contentType, LOWER(m.name), m.id"; + break; + case NAME: + default: + orderBy = " ORDER BY LOWER(m.name), m.id"; } TypedQuery<MediaFile> query = strategy.getDynamicQuery(queryString - + orderBy.toString(), MediaFile.class); + + orderBy, MediaFile.class); for (int i = 0; i < params.size(); i++) { query.setParameter(i + 1, params.get(i)); } @@ -645,14 +646,19 @@ public class JPAMediaFileManagerImpl implements MediaFileManager { params.add(size++, weblog); whereClause.append("m.directory.weblog = ?").append(size); + if (filter.getDirectory() != null) { + params.add(size++, filter.getDirectory()); + whereClause.append(" AND m.directory = ?").append(size); + } + if (!StringUtils.isEmpty(filter.getName())) { String nameFilter = filter.getName(); nameFilter = nameFilter.trim(); if (!nameFilter.endsWith("%")) { nameFilter = nameFilter + "%"; } - params.add(size++, nameFilter); - whereClause.append(" AND m.name like ?").append(size); + params.add(size++, nameFilter.toLowerCase(Locale.ROOT)); + whereClause.append(" AND LOWER(m.name) like ?").append(size); } if (filter.getSize() > 0) { diff --git a/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileFilter.java b/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileFilter.java index e725d4636..c2780c9c0 100644 --- a/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileFilter.java +++ b/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileFilter.java @@ -1,137 +1,149 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. The ASF licenses this file to You - * under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. For additional information regarding - * copyright in this work, please see the NOTICE file in the top level - * directory of this distribution. - */ - -package org.apache.roller.weblogger.pojos; - -import java.util.List; - -/** - * Represents the search criteria for media files. - * - */ -public class MediaFileFilter { - - /** - * Enumeration of the ways in which size can be used to filter media files. - * - */ - public enum SizeFilterType {GT, GTE, EQ, LT, LTE}; - - /** - * Enumeration of possible sort orders for media files. - * - */ - public enum MediaFileOrder {NAME, DATE_UPLOADED, TYPE}; - - // Search criteria - name - String name; - - // Search criteria - media file type - MediaFileType type; - - // Search criteria - media file size in bytes - long size; - - // Search criteria - way in which media file size should be applied (greater than, less than etc) - SizeFilterType sizeFilterType; - - // Search criteria - list of tags - List<String> tags; - - // sort order for search results - MediaFileOrder order; - - /** - * Indicates the starting index in the complete result set - * from which results should be returned. This is always applied - * along with the length attribute below. - * A value of -1 means that the complete result set should be - * returned. length will be ignored in this case. - */ - int startIndex = -1; - - /** - * Number of results to be returned starting from startIndex. - */ - int length; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public MediaFileType getType() { - return type; - } - - public void setType(MediaFileType type) { - this.type = type; - } - - public List<String> getTags() { - return tags; - } - - public void setTags(List<String> tags) { - this.tags = tags; - } - - public long getSize() { - return size; - } - - public void setSize(long size) { - this.size = size; - } - - public SizeFilterType getSizeFilterType() { - return sizeFilterType; - } - - public void setSizeFilterType(SizeFilterType sizeFilterType) { - this.sizeFilterType = sizeFilterType; - } - - public int getStartIndex() { - return startIndex; - } - - public void setStartIndex(int startIndex) { - this.startIndex = startIndex; - } - - public int getLength() { - return length; - } - - public void setLength(int length) { - this.length = length; - } - - public MediaFileOrder getOrder() { - return order; - } - - public void setOrder(MediaFileOrder order) { - this.order = order; - } - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. The ASF licenses this file to You + * under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. For additional information regarding + * copyright in this work, please see the NOTICE file in the top level + * directory of this distribution. + */ + +package org.apache.roller.weblogger.pojos; + +import java.util.List; + +/** + * Represents the search criteria for media files. + * + */ +public class MediaFileFilter { + + /** + * Enumeration of the ways in which size can be used to filter media files. + * + */ + public enum SizeFilterType {GT, GTE, EQ, LT, LTE}; + + /** + * Enumeration of possible sort orders for media files. NAME and TYPE sort + * ascending; DATE_UPLOADED is oldest first and DATE_UPLOADED_DESC newest + * first. Equal values are ordered by ID, so paging is stable. + */ + public enum MediaFileOrder {NAME, DATE_UPLOADED, DATE_UPLOADED_DESC, TYPE}; + + // Search criteria - name + String name; + + // Search criteria - media file type + MediaFileType type; + + // Search criteria - media file size in bytes + long size; + + // Search criteria - way in which media file size should be applied (greater than, less than etc) + SizeFilterType sizeFilterType; + + // Search criteria - list of tags + List<String> tags; + + // Search criteria - folder; null searches every folder of the weblog + MediaFileDirectory directory; + + // sort order for search results + MediaFileOrder order; + + /** + * Indicates the starting index in the complete result set + * from which results should be returned. This is always applied + * along with the length attribute below. + * A value of -1 means that the complete result set should be + * returned. length will be ignored in this case. + */ + int startIndex = -1; + + /** + * Number of results to be returned starting from startIndex. + */ + int length; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public MediaFileType getType() { + return type; + } + + public void setType(MediaFileType type) { + this.type = type; + } + + public List<String> getTags() { + return tags; + } + + public void setTags(List<String> tags) { + this.tags = tags; + } + + public long getSize() { + return size; + } + + public void setSize(long size) { + this.size = size; + } + + public SizeFilterType getSizeFilterType() { + return sizeFilterType; + } + + public void setSizeFilterType(SizeFilterType sizeFilterType) { + this.sizeFilterType = sizeFilterType; + } + + public MediaFileDirectory getDirectory() { + return directory; + } + + public void setDirectory(MediaFileDirectory directory) { + this.directory = directory; + } + + public int getStartIndex() { + return startIndex; + } + + public void setStartIndex(int startIndex) { + this.startIndex = startIndex; + } + + public int getLength() { + return length; + } + + public void setLength(int length) { + this.length = length; + } + + public MediaFileOrder getOrder() { + return order; + } + + public void setOrder(MediaFileOrder order) { + this.order = order; + } + +} diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java index fe9d46a83..31ec1a48b 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java @@ -28,11 +28,13 @@ import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.FileIOException; import org.apache.roller.weblogger.business.MediaFileManager; import org.apache.roller.weblogger.business.WebloggerFactory; +import org.apache.roller.weblogger.config.WebloggerRuntimeConfig; import org.apache.roller.weblogger.pojos.MediaFile; import org.apache.roller.weblogger.pojos.MediaFileDirectory; import org.apache.struts2.action.UploadedFilesAware; import org.apache.roller.weblogger.ui.core.RollerContext; import org.apache.roller.weblogger.util.RollerMessages; +import org.apache.roller.weblogger.util.URLUtilities; import org.apache.struts2.convention.annotation.AllowedMethods; import org.apache.struts2.dispatcher.multipart.UploadedFile; import org.apache.struts2.interceptor.parameter.StrutsParameter; @@ -41,7 +43,9 @@ import org.apache.struts2.interceptor.validation.SkipValidation; import java.util.List; /** - * Edits metadata for a media file. + * The media file details page: a preview, facts and actions for one file, + * and a form to edit its metadata. It links back to the library page the + * user came from, which the library passes as returnQuery. */ @SuppressWarnings("serial") // TODO: make this work @AllowedMethods({"execute","save"}) @@ -55,10 +59,16 @@ public class MediaFileEdit extends MediaFileBase implements UploadedFilesAware { // by the actionFileUpload interceptor private UploadedFile uploadedFile = null; + // the file shown, as stored; the form edits a copy in the bean + private MediaFile mediaFile = null; + + // library query string (MediaFileView.getLibraryQuery()) to return to + private String returnQuery = null; + public MediaFileEdit() { this.actionName = "mediaFileEdit"; this.desiredMenu = "editor"; - this.pageTitle = "mediaFile.edit.title"; + this.pageTitle = "mediaFileEdit.title"; } /** @@ -103,8 +113,12 @@ public class MediaFileEdit extends MediaFileBase implements UploadedFilesAware { public String execute() { MediaFileManager manager = WebloggerFactory.getWeblogger().getMediaFileManager(); try { - MediaFile mediaFile = manager.getMediaFile(getActionWeblog(), getMediaFileId()); - this.bean.copyFrom(mediaFile); + this.mediaFile = manager.getMediaFile(getActionWeblog(), getMediaFileId()); + if (this.mediaFile == null) { + addError("MediaFile.error.view"); + return INPUT; + } + this.bean.copyFrom(this.mediaFile); } catch (FileIOException ex) { addError("uploadFiles.error.upload", bean.getName()); @@ -123,11 +137,24 @@ public class MediaFileEdit extends MediaFileBase implements UploadedFilesAware { * @return String The result of the action. */ public String save() { + if (this.mediaFile == null) { + try { + this.mediaFile = WebloggerFactory.getWeblogger().getMediaFileManager() + .getMediaFile(getActionWeblog(), getMediaFileId()); + } catch (WebloggerException ex) { + log.error("Error looking up media file " + getMediaFileId(), ex); + } + } + if (this.mediaFile == null) { + addError("MediaFile.error.view"); + return INPUT; + } myValidate(); if (!hasActionErrors()) { MediaFileManager manager = WebloggerFactory.getWeblogger().getMediaFileManager(); try { MediaFile mediaFile = manager.getMediaFile(getActionWeblog(), getMediaFileId()); + this.mediaFile = mediaFile; bean.copyTo(mediaFile); if (uploadedFile != null @@ -164,6 +191,8 @@ public class MediaFileEdit extends MediaFileBase implements UploadedFilesAware { WebloggerFactory.getWeblogger().flush(); addMessage("mediaFile.update.success"); + this.mediaFile = manager.getMediaFile(getActionWeblog(), getMediaFileId()); + this.bean.copyFrom(this.mediaFile); return SUCCESS; } catch (FileIOException ex) { @@ -178,6 +207,37 @@ public class MediaFileEdit extends MediaFileBase implements UploadedFilesAware { return INPUT; } + public MediaFile getMediaFile() { + return mediaFile; + } + + public String getReturnQuery() { + return returnQuery; + } + + /** + * The library page to return to. Only the query string comes from the + * request, and only URL-safe characters are kept, so the link always + * points at the library of this weblog. + */ + @StrutsParameter + public void setReturnQuery(String returnQuery) { + this.returnQuery = returnQuery != null && returnQuery.length() <= 2000 + && returnQuery.matches("[A-Za-z0-9._~%&=+-]*") ? returnQuery : null; + } + + public String getLibraryURL() { + String query = returnQuery; + if (StringUtils.isEmpty(query)) { + query = "weblog=" + URLUtilities.encode(getActionWeblog().getHandle()); + if (mediaFile != null) { + query += "&directoryId=" + URLUtilities.encode(mediaFile.getDirectory().getId()); + } + } + return WebloggerRuntimeConfig.getRelativeContextURL() + + "/roller-ui/authoring/mediaFileView.rol?" + query; + } + @StrutsParameter(depth = 1) public MediaFileBean getBean() { return bean; diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileSearchBean.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileSearchBean.java index d015ae1ad..dea95e04b 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileSearchBean.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileSearchBean.java @@ -18,25 +18,38 @@ package org.apache.roller.weblogger.ui.struts2.editor; import java.util.Arrays; - +import java.util.LinkedHashMap; +import java.util.Map; import java.util.ResourceBundle; + import org.apache.commons.lang3.StringUtils; import org.apache.roller.util.RollerConstants; import org.apache.roller.weblogger.pojos.MediaFileFilter; -import org.apache.roller.weblogger.pojos.MediaFileType; import org.apache.roller.weblogger.pojos.MediaFileFilter.MediaFileOrder; import org.apache.roller.weblogger.pojos.MediaFileFilter.SizeFilterType; +import org.apache.roller.weblogger.pojos.MediaFileType; /** - * Bean for holding media file search criteria. + * What the media library shows: search criteria, scope, sort and page. Folder + * browsing is the same query with no criteria, so one bean serves both. */ public class MediaFileSearchBean { private transient ResourceBundle bundle = ResourceBundle.getBundle("ApplicationResources"); - public static final int PAGE_SIZE = 10; + public static final int PAGE_SIZE = 48; + + public static final String SORT_NEWEST = "newest"; + public static final String SORT_OLDEST = "oldest"; + public static final String SORT_NAME = "name"; + public static final String SORT_TYPE = "type"; - // Media file name as search criteria + public static final String SCOPE_FOLDER = "folder"; + public static final String SCOPE_ALL = "all"; + + private static final String ANY_TYPE = "mediaFileView.any"; + + // Media file name as search criteria; matches names that start with it private String name; // Media file type as search criteria @@ -54,11 +67,14 @@ public class MediaFileSearchBean { // Tags as search criteria private String tags; - // Page number of results - private int pageNum = 0; - - // Sort option for search results - private int sortOption; + // Page number of results, from 0 + private int page = 0; + + // Sort order, one of the SORT_ values + private String sortBy = SORT_NEWEST; + + // Search the current folder or all folders, one of the SCOPE_ values + private String scope = SCOPE_FOLDER; public String getName() { return name; @@ -120,30 +136,87 @@ public class MediaFileSearchBean { this.tags = tags; } - public int getPageNum() { - return pageNum; + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = Math.max(0, page); + } + + public String getSortBy() { + return sortBy; + } + + public void setSortBy(String sortBy) { + this.sortBy = Arrays.asList(SORT_NEWEST, SORT_OLDEST, SORT_NAME, SORT_TYPE).contains(sortBy) + ? sortBy : SORT_NEWEST; + } + + public String getScope() { + return scope; } - public void setPageNum(int pageNum) { - this.pageNum = pageNum; + public void setScope(String scope) { + this.scope = SCOPE_ALL.equals(scope) ? SCOPE_ALL : SCOPE_FOLDER; } - public int getSortOption() { - return sortOption; + public boolean isAllFolders() { + return SCOPE_ALL.equals(scope); } - public void setSortOption(int sortOption) { - this.sortOption = sortOption; + public boolean isTypeSet() { + return StringUtils.isNotEmpty(type) && !ANY_TYPE.equals(type); + } + + /** True when any search criterion is set; otherwise the library browses a folder. */ + public boolean isSearch() { + return StringUtils.isNotBlank(name) || StringUtils.isNotBlank(tags) + || isTypeSet() || size > 0; + } + + /** True when a criterion behind the Filters button is set, so the filters start open. */ + public boolean isFiltersSet() { + return StringUtils.isNotBlank(tags) || size > 0; } /** - * Copies data from this bean to media file filter object. - * + * The library state as request parameters, without the page: criteria + * that are set, sort and scope. Values are not encoded. + */ + public Map<String, String> toParams() { + Map<String, String> params = new LinkedHashMap<>(); + if (StringUtils.isNotBlank(name)) { + params.put("bean.name", name.trim()); + } + if (isTypeSet()) { + params.put("bean.type", type); + } + if (size > 0) { + params.put("bean.sizeFilterType", StringUtils.defaultString(sizeFilterType)); + params.put("bean.size", Long.toString(size)); + params.put("bean.sizeUnit", StringUtils.defaultString(sizeUnit)); + } + if (StringUtils.isNotBlank(tags)) { + params.put("bean.tags", tags.trim()); + } + if (isSearch() && isAllFolders()) { + params.put("bean.scope", SCOPE_ALL); + } + if (!SORT_NEWEST.equals(sortBy)) { + params.put("bean.sortBy", sortBy); + } + return params; + } + + /** + * Copies data from this bean to media file filter object. The folder is + * set by the caller, since it depends on the scope. */ public void copyTo(MediaFileFilter dataHolder) { - dataHolder.setName(this.name); + dataHolder.setName(StringUtils.trimToNull(this.name)); - if (!StringUtils.isEmpty(this.type)) { + if (isTypeSet()) { MediaFileType filterType = null; if ("mediaFileView.audio".equals(this.type)) { filterType = MediaFileType.AUDIO; @@ -153,8 +226,7 @@ public class MediaFileSearchBean { filterType = MediaFileType.IMAGE; } else if ("mediaFileView.others".equals(this.type)) { filterType = MediaFileType.OTHERS; - } - + } dataHolder.setType(filterType); } @@ -173,37 +245,34 @@ public class MediaFileSearchBean { } dataHolder.setSizeFilterType(sftype); - long filterSize = this.size ; + long filterSize = this.size; if ("mediaFileView.kb".equals(this.sizeUnit)) { filterSize = this.size * RollerConstants.ONE_KB_IN_BYTES; } else if ("mediaFileView.mb".equals(this.sizeUnit)) { - filterSize = this.size * RollerConstants.ONE_MB_IN_BYTES; + filterSize = this.size * RollerConstants.ONE_MB_IN_BYTES; } dataHolder.setSize(filterSize); } - if (!StringUtils.isEmpty(this.tags)) { - dataHolder.setTags(Arrays.asList(this.tags.split(" "))); + if (StringUtils.isNotBlank(this.tags)) { + dataHolder.setTags(Arrays.asList(StringUtils.split(this.tags.trim()))); } - dataHolder.setStartIndex(pageNum * PAGE_SIZE); - + dataHolder.setStartIndex(page * PAGE_SIZE); dataHolder.setLength(PAGE_SIZE); - MediaFileOrder order; - switch (this.sortOption) { - case 0: - order = MediaFileOrder.NAME; + switch (sortBy) { + case SORT_OLDEST: + dataHolder.setOrder(MediaFileOrder.DATE_UPLOADED); break; - case 1: - order = MediaFileOrder.DATE_UPLOADED; + case SORT_NAME: + dataHolder.setOrder(MediaFileOrder.NAME); break; - case 2: - order = MediaFileOrder.TYPE; + case SORT_TYPE: + dataHolder.setOrder(MediaFileOrder.TYPE); break; default: - order = null; + dataHolder.setOrder(MediaFileOrder.DATE_UPLOADED_DESC); } - dataHolder.setOrder(order); } } 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 fdf8ba498..d58c2f514 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 @@ -19,7 +19,10 @@ package org.apache.roller.weblogger.ui.struts2.editor; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -28,20 +31,23 @@ import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.FileIOException; import org.apache.roller.weblogger.business.MediaFileManager; import org.apache.roller.weblogger.business.WebloggerFactory; +import org.apache.roller.weblogger.config.WebloggerRuntimeConfig; import org.apache.roller.weblogger.pojos.MediaFile; -import org.apache.roller.weblogger.pojos.MediaFileComparator; -import org.apache.roller.weblogger.pojos.MediaFileComparator.MediaFileComparatorType; import org.apache.roller.weblogger.pojos.MediaFileDirectory; import org.apache.roller.weblogger.pojos.MediaFileFilter; import org.apache.roller.weblogger.ui.struts2.pagers.MediaFilePager; import org.apache.roller.weblogger.ui.struts2.util.KeyValueObject; +import org.apache.roller.weblogger.util.URLUtilities; import org.apache.roller.weblogger.util.cache.CacheManager; import org.apache.struts2.convention.annotation.AllowedMethods; import org.apache.struts2.interceptor.parameter.StrutsParameter; import org.apache.struts2.interceptor.validation.SkipValidation; /** - * View media files. + * The media library: one page of the files in a folder, or of the files that + * match a search in that folder or in all folders. Browsing and searching are + * the same query, so both sort and page the same way. The page state travels + * in GET parameters, so links, the back button and the pager keep it. */ @SuppressWarnings("serial") // TODO: make this work @AllowedMethods({"execute","view","search","delete","deleteSelected","deleteFolder","includeInGallery","moveSelected"}) @@ -51,7 +57,6 @@ public class MediaFileView extends MediaFileBase { private String directoryId; private String directoryName; - private String sortBy; private String newDirectoryName; private List<MediaFile> childFiles; @@ -66,10 +71,10 @@ public class MediaFileView extends MediaFileBase { // Search criteria - drop-down for size unit private static List<KeyValueObject> SIZE_UNITS = null; - // Sort options for search results. + // Sort options private static List<KeyValueObject> SORT_OPTIONS = null; - // Pager for displaying search results. + // the page of files shown private MediaFilePager pager; // Path of new directory to be created. @@ -119,10 +124,11 @@ public class MediaFileView extends MediaFileBase { getText("mediaFileView.kb")), new KeyValueObject( "mediaFileView.mb", getText("mediaFileView.mb"))); - SORT_OPTIONS = Arrays.asList(new KeyValueObject("name", - getText("generic.name")), new KeyValueObject( - "date_uploaded", getText("mediaFileView.date")), - new KeyValueObject("type", getText("mediaFileView.type"))); + SORT_OPTIONS = Arrays.asList( + new KeyValueObject(MediaFileSearchBean.SORT_NEWEST, getText("mediaFileView.sortNewest")), + new KeyValueObject(MediaFileSearchBean.SORT_OLDEST, getText("mediaFileView.sortOldest")), + new KeyValueObject(MediaFileSearchBean.SORT_NAME, getText("generic.name")), + new KeyValueObject(MediaFileSearchBean.SORT_TYPE, getText("mediaFileView.type"))); } refreshAllDirectories(); @@ -154,8 +160,9 @@ public class MediaFileView extends MediaFileBase { addMessage("mediaFile.directoryCreate.success", this.newDirectoryName); - // Switch to folder + // Switch to the new, empty folder setDirectoryId(dir.getId()); + clearSearch(); dirCreated = true; } else { @@ -180,17 +187,9 @@ public class MediaFileView extends MediaFileBase { } /** - * Returns directory content in JSON format. - */ - public String fetchDirectoryContentLight() { - execute(); - return "success.json"; - } - - /** - * Fetches and displays list of media file for the given directory. The - * directory could be chosen by ID or path. - * + * Shows a page of the library: the folder chosen by ID or name (the + * default folder otherwise), filtered by any search criteria. + * * @return String The result of the action. */ @SkipValidation @@ -198,43 +197,37 @@ public class MediaFileView extends MediaFileBase { public String execute() { MediaFileManager manager = WebloggerFactory.getWeblogger().getMediaFileManager(); try { - MediaFileDirectory directory; + MediaFileDirectory directory = null; if (StringUtils.isNotEmpty(this.directoryId)) { directory = manager.getMediaFileDirectory(getActionWeblog(), this.directoryId); - } else if (StringUtils.isNotEmpty(this.directoryName)) { directory = manager.getMediaFileDirectoryByName( getActionWeblog(), this.directoryName); - - } else { + } + if (directory == null) { directory = manager.getDefaultMediaFileDirectory(getActionWeblog()); } + this.currentDirectory = directory; this.directoryId = directory.getId(); this.directoryName = directory.getName(); + setViewDirectoryId(directory.getId()); - this.childFiles = new ArrayList<>(); - this.childFiles.addAll(directory.getMediaFiles()); - - if ("type".equals(sortBy)) { - this.childFiles.sort(new MediaFileComparator(MediaFileComparatorType.TYPE)); - - } else if ("date_uploaded".equals(sortBy)) { - this.childFiles.sort(new MediaFileComparator(MediaFileComparatorType.DATE_UPLOADED)); - - } else { - // default to sort by name - sortBy = "name"; - this.childFiles.sort(new MediaFileComparator(MediaFileComparatorType.NAME)); + MediaFileFilter filter = new MediaFileFilter(); + bean.copyTo(filter); + if (!bean.isSearch() || !bean.isAllFolders()) { + filter.setDirectory(directory); } - this.currentDirectory = directory; - - // set current directory if valid - if (directory != null) { - setViewDirectoryId(directory.getId()); + long totalCount = manager.getMediaFileCount(getActionWeblog(), filter); + if (totalCount > 0 && filter.getStartIndex() >= totalCount) { + // past the end, e.g. after deleting the last files of the last page + bean.setPage((int) ((totalCount - 1) / MediaFileSearchBean.PAGE_SIZE)); + bean.copyTo(filter); } - - return SUCCESS; + List<MediaFile> files = new ArrayList<>(manager.searchMediaFiles(getActionWeblog(), filter)); + this.childFiles = files; + this.pager = new MediaFilePager(getPagerBaseURL(), bean.getPage(), files, + totalCount, MediaFileSearchBean.PAGE_SIZE); } catch (FileIOException ex) { log.error("Error viewing media file directory ", ex); @@ -246,52 +239,75 @@ public class MediaFileView extends MediaFileBase { return SUCCESS; } + /** + * Returns directory content in JSON format. + */ + public String fetchDirectoryContentLight() { + execute(); + return "success.json"; + } + /** * View the contents of another Media folder. */ public String view() { - try { - MediaFileManager manager = WebloggerFactory.getWeblogger() - .getMediaFileManager(); - if (!StringUtils.isEmpty(viewDirectoryId)) { - setDirectoryId(viewDirectoryId); - setCurrentDirectory(manager.getMediaFileDirectory(getActionWeblog(), viewDirectoryId)); - } - } catch (WebloggerException ex) { - log.error("Error looking up directory", ex); + if (!StringUtils.isEmpty(viewDirectoryId)) { + setDirectoryId(viewDirectoryId); } return execute(); } /** - * Save a media file. - * - * @return String The result of the action. + * Search. Kept for old links; the library searches whenever criteria are set. */ + @SkipValidation public String search() { + return execute(); + } - boolean valSuccess = myValidate(); - - if (valSuccess) { - MediaFileFilter filter = new MediaFileFilter(); - bean.copyTo(filter); - MediaFileManager manager = WebloggerFactory.getWeblogger().getMediaFileManager(); - try { - List<MediaFile> results = new ArrayList<>( - manager.searchMediaFiles(getActionWeblog(), filter)); - long totalCount = manager.getMediaFileCount(getActionWeblog(), filter); + private void clearSearch() { + MediaFileSearchBean fresh = new MediaFileSearchBean(); + fresh.setSortBy(bean.getSortBy()); + this.bean = fresh; + } - this.pager = new MediaFilePager(bean.getPageNum(), results, - totalCount, MediaFileSearchBean.PAGE_SIZE); + /** + * The library state, as an encoded query string without a leading "?": + * weblog, folder, criteria, sort and page. Pages linked from the library + * pass it back so the user returns to the same place. + */ + public String getLibraryQuery() { + Map<String, String> params = stateParams(); + if (bean.getPage() > 0) { + params.put("bean.page", Integer.toString(bean.getPage())); + } + return queryString(params); + } - } catch (Exception e) { - log.error("Error applying search criteria", e); - addError("Error applying search criteria - check Roller logs"); - } + private String getPagerBaseURL() { + return WebloggerRuntimeConfig.getRelativeContextURL() + + "/roller-ui/authoring/mediaFileView.rol?" + queryString(stateParams()); + } + private Map<String, String> stateParams() { + Map<String, String> params = new LinkedHashMap<>(); + params.put("weblog", getActionWeblog().getHandle()); + if (directoryId != null) { + params.put("directoryId", directoryId); } + params.putAll(bean.toParams()); + return params; + } - return SUCCESS; + private static String queryString(Map<String, String> params) { + return params.entrySet().stream() + .map(e -> e.getKey() + "=" + URLUtilities.encode(e.getValue())) + .collect(Collectors.joining("&")); + } + + /** True when search criteria are set, rather than browsing a folder. */ + public boolean isSearch() { + return bean.isSearch(); } /** @@ -342,6 +358,7 @@ public class MediaFileView extends MediaFileBase { .getDefaultMediaFileDirectory(getActionWeblog()); setDirectoryId(mediaFileDir.getId()); setDirectoryName(mediaFileDir.getName()); + clearSearch(); } else { log.error("(System error) No directory ID provided for media file folder delete."); } @@ -412,28 +429,6 @@ public class MediaFileView extends MediaFileBase { this.directoryName = path; } - public String getSortBy() { - return sortBy; - } - - @StrutsParameter - public void setSortBy(String sortBy) { - this.sortBy = sortBy; - } - - /** - * Validates search input - */ - public boolean myValidate() { - if (StringUtils.isEmpty(bean.getName()) - && StringUtils.isEmpty(bean.getTags()) - && StringUtils.isEmpty(bean.getType()) && bean.getSize() == 0) { - addError("MediaFile.error.search.empty"); - return false; - } - return true; - } - @StrutsParameter(depth = 1) public MediaFileSearchBean getBean() { return bean; diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/LinkPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/LinkPager.java index d064130e5..be0a5e731 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/LinkPager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/LinkPager.java @@ -85,6 +85,16 @@ public class LinkPager<T> { } + /** Message key for the previous-page button; entry and comment lists run newest first. */ + public String getPrevKey() { + return "generic.newer"; + } + + /** Message key for the next-page button. */ + public String getNextKey() { + return "generic.older"; + } + public List<T> getItems() { return items; } diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/MediaFilePager.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/MediaFilePager.java index ecd3aeee7..4d7a413be 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/MediaFilePager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/MediaFilePager.java @@ -23,55 +23,22 @@ import java.util.List; import org.apache.roller.weblogger.pojos.MediaFile; /** - * A pager implementation for a collection of media files. Media file search - * is a POSTed form, so instead of links this exposes page numbers that the - * page resubmits the search form with. + * Pager for the media library. The library can sort by name or type as well + * as by date, so its buttons say Previous and Next rather than Newer and Older. */ -public class MediaFilePager { - - // the collection for the pager - private final List<MediaFile> items; - - // What page we are on - private final int pageNum; - - // media files matching the search across all pages - private final long totalCount; +public class MediaFilePager extends LinkPager<MediaFile> { - private final int pageSize; - - public MediaFilePager(int page, List<MediaFile> mediaFiles, long totalCount, int pageSize) { - this.pageNum = page; - this.items = mediaFiles; - this.totalCount = totalCount; - this.pageSize = pageSize; - } - - public List<MediaFile> getItems() { - return items; - } - - public boolean isMoreItems() { - return (long) (pageNum + 1) * pageSize < totalCount; - } - - public long getTotalCount() { - return totalCount; - } - - /** Zero-based page number, as the search form submits it. */ - public int getPageNum() { - return pageNum; + public MediaFilePager(String url, int page, List<MediaFile> mediaFiles, long totalCount, int pageSize) { + super(url, page, mediaFiles, totalCount, pageSize); } - /** One-based page number, for display. */ - public int getPageNumber() { - return pageNum + 1; + @Override + public String getPrevKey() { + return "generic.previous"; } - /** Number of pages; at least 1, so an empty result reads "Page 1 of 1". */ - public int getPageCount() { - return (int) Math.max(1, (totalCount + pageSize - 1) / pageSize); + @Override + public String getNextKey() { + return "generic.next"; } - } diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties index ec86bbad9..ad8c505c8 100644 --- a/app/src/main/resources/ApplicationResources.properties +++ b/app/src/main/resources/ApplicationResources.properties @@ -48,6 +48,8 @@ generic.poweredBy=Powered by Apache Roller generic.first=First generic.newer=Newer generic.older=Older +generic.previous=Previous +generic.next=Next generic.last=Last generic.pageNumber=Page {0} of {1} generic.pagination=Pagination @@ -872,7 +874,7 @@ mediaFileView.create=Create mediaFileView.search=Search Media Files mediaFileView.searchTitle=Search Results mediaFileView.matchingResults=Found <b>{0}</b> matching results. -mediaFileView.noResults=No matching results found. Try widening your search. +mediaFileView.noResults=No files match your search. mediaFileView.searchInfo=You searched for all media files matching the following criteria: mediaFileView.filesNamed=Files named like <b>{0}</b> mediaFileView.filesOfSize=Files of <b>size {0} {1} {2}</b> @@ -897,6 +899,32 @@ mediaFileView.move=Move mediaFileView.confirmDelete=Permanently delete {0} selected file(s)? This cannot be undone. mediaFileView.openDetails=Open details for {0} mediaFileView.selectFile=Select {0} +mediaFileView.searchIn=Search in +mediaFileView.thisFolder=This folder ({0}) +mediaFileView.allFolders=All folders +mediaFileView.matchCount={0} matching file(s): +mediaFileView.criterionName=Name starts with "{0}" +mediaFileView.fileCount={0} file(s) +mediaFileView.layout=Layout +mediaFileView.gridView=Grid +mediaFileView.listView=List +mediaFileView.sortNewest=Newest first +mediaFileView.sortOldest=Oldest first +mediaFileEdit.title=Media file details +mediaFileEdit.backToLibrary=Back to the media library +mediaFileEdit.dimensions=Dimensions +mediaFileEdit.pixels={0} \u00d7 {1} pixels +mediaFileEdit.uploaded=Uploaded +mediaFileEdit.copyURL=Copy URL +mediaFileEdit.copied=URL copied. +mediaFileEdit.copyFailed=Could not copy. Select the URL and copy it. +mediaFileEdit.openOriginal=Open original +mediaFileEdit.createEntry=Create entry +mediaFileEdit.confirmDelete=Permanently delete this file? This cannot be undone. +mediaFileEdit.editDetails=Edit details +mediaFileEdit.unsavedChanges=You have unsaved changes. +mediaFileEdit.advanced=Advanced +mediaFileEdit.originalPathHelp=An old /resources/ path that also serves this file, for links made before media files had their own URLs. Changing it breaks links that use the old path. It does not change the URL above. #--- Media File Sidebar diff --git a/app/src/main/resources/struts.xml b/app/src/main/resources/struts.xml index 25e111219..e9713be15 100644 --- a/app/src/main/resources/struts.xml +++ b/app/src/main/resources/struts.xml @@ -336,7 +336,7 @@ <action name="mediaFileEdit" class="org.apache.roller.weblogger.ui.struts2.editor.MediaFileEdit"> <result name="input" type="tiles">.MediaFileEdit</result> - <result name="success" type="tiles">.MediaFileEditSuccess</result> + <result name="success" type="tiles">.MediaFileEdit</result> <allowed-methods>execute,save</allowed-methods> </action> diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp index f3b6e519b..6ed5ad3e0 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp @@ -59,7 +59,7 @@ <div class="col-sm-9 offset-sm-3"> <s:submit id="uploadButton" cssClass="btn btn-primary" theme="simple" value="%{getText('mediaFileAdd.upload')}" action="mediaFileAdd!save"/> - <s:url var="mediaFileViewURL" action="mediaFileView"> + <s:url var="mediaFileViewURL" escapeAmp="false" action="mediaFileView"> <s:param name="weblog" value="%{actionWeblog.handle}"/> <s:param name="directoryName" value="%{directoryName}"/> </s:url> diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp index af5a01f97..9ae9079d1 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp @@ -171,12 +171,12 @@ <%-- buttons for create new weblog, cancel and upload more --%> <div> - <s:url var="mediaFileAddURL" action="mediaFileAdd"> + <s:url var="mediaFileAddURL" escapeAmp="false" action="mediaFileAdd"> <s:param name="weblog" value="%{actionWeblog.handle}"/> <s:param name="directoryName" value="%{directoryName}"/> </s:url> - <s:url var="mediaFileViewURL" action="mediaFileView"> + <s:url var="mediaFileViewURL" escapeAmp="false" action="mediaFileView"> <s:param name="weblog" value="%{actionWeblog.handle}"/> <s:param name="directoryId" value="%{bean.directoryId}"/> </s:url> 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 028db2ed6..e5ccaada2 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileCard.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileCard.jsp @@ -17,15 +17,19 @@ --%> <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> -<%-- One media file in the library grid or list. Expects #mediaFile on the value stack. - The checkbox selects the file; the preview and name open its details. --%> +<%-- One media file in the library grid or list. Expects #mediaFile on the value stack and + libraryQuery on the action. The checkbox selects the file; the preview and name open its + details page, which links back to this library page. --%> + +<s:url var="detailsURL" escapeAmp="false" action="mediaFileEdit"> + <s:param name="weblog" value="%{actionWeblog.handle}"/> + <s:param name="mediaFileId" value="%{#mediaFile.id}"/> + <s:param name="returnQuery" value="%{libraryQuery}"/> +</s:url> <li class="media-card"> - <button type="button" class="media-card-preview mediafile-edit-target" - data-mediafile-id="<s:property value='#mediaFile.id'/>" - data-mediafile-name="<s:property value='#mediaFile.name'/>" - aria-label="<s:text name='mediaFileView.openDetails' 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" data-fallback-icon="<s:property value='typeIcon(#mediaFile.contentType)'/>"/> @@ -33,7 +37,7 @@ <s:else> <span class="bi <s:property value='typeIcon(#mediaFile.contentType)'/>" aria-hidden="true"></span> </s:else> - </button> + </a> <div class="media-card-body"> <input type="checkbox" class="form-check-input media-select" name="selectedMediaFiles" @@ -41,10 +45,8 @@ 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"> - <button type="button" class="media-card-name mediafile-edit-target" - data-mediafile-id="<s:property value='#mediaFile.id'/>" - data-mediafile-name="<s:property value='#mediaFile.name'/>" - title="<s:property value='#mediaFile.name'/>"><s:property value="#mediaFile.name"/></button> + <a class="media-card-name" href="<s:property value='%{detailsURL}'/>" + title="<s:property value='#mediaFile.name'/>"><s:property value="#mediaFile.name"/></a> <span class="media-card-meta"> <span class="media-card-type"><s:property value="formatType(#mediaFile.contentType, #mediaFile.name)"/></span> <span class="media-card-size"><s:property value="formatSize(#mediaFile.length)"/></span> diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp index ca378e9de..da247a3ad 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp @@ -17,106 +17,144 @@ --%> <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> -<p class="pagetip"> - <s:text name="mediaFileEdit.pagetip"/> -</p> - -<s:form id="entry" action="mediaFileEdit!save" method="POST" enctype="multipart/form-data" - theme="bootstrap"> - - <s:hidden name="salt"/> - <s:hidden name="weblog"/> - <s:hidden name="mediaFileId" id="mediaFileId"/> - <s:hidden name="bean.permalink"/> - - <s:if test="bean.isImage"> - <div class="row mb-3"> - <label class="col-form-label col-sm-3">Thumbnail</label> - <div class="controls col-sm-9"> - <a href='<s:property value="bean.permalink" />' target="_blank"> - <img alt="thumbnail" src='<s:property value="bean.thumbnailURL" />' - title='<s:text name="mediaFileEdit.clickToView" />'/> +<%-- Media file details: preview, facts and actions first, then the metadata form. + Links back to the library page the user came from (returnQuery). --%> + +<s:if test="mediaFile != null"> + +<div id="mediaDetails" class="media-details" + data-copied="<s:text name='mediaFileEdit.copied'/>" + data-copy-failed="<s:text name='mediaFileEdit.copyFailed'/>" + data-confirm-delete="<s:text name='mediaFileEdit.confirmDelete'/>" + data-unsaved="<s:text name='mediaFileEdit.unsavedChanges'/>"> + + <p class="media-back"> + <a href="<s:property value='libraryURL'/>"> + <span class="bi bi-arrow-left" aria-hidden="true"></span> + <s:text name="mediaFileEdit.backToLibrary"/></a> + </p> + + <div class="media-details-top"> + + <div class="media-details-preview"> + <s:if test="mediaFile.imageFile"> + <a href="<s:property value='mediaFile.permalink'/>" target="_blank" rel="noopener"> + <img src="<s:property value='mediaFile.permalink'/>" alt="" + data-fallback-icon="<s:property value='typeIcon(mediaFile.contentType)'/>"/> </a> - </div> - </div> - </s:if> - - <%-- ================================================================== --%> - <%-- Title, category, dates and other metadata --%> - - <s:textfield name="bean.name" size="35" maxlength="100" tabindex="1" - label="%{getText('generic.name')}"/> - - <div class="row mb-3"> - <label class="col-form-label col-sm-3"><s:text name="mediaFileEdit.fileInfo"/></label> - - <div class="controls col-sm-9"> - - <s:text name="mediaFileEdit.fileTypeSize"> - <s:param value="bean.contentType"/> - <s:param value="bean.length"/> - </s:text> - - <s:if test="bean.isImage"> - <s:text name="mediaFileEdit.fileDimensions"> - <s:param value="bean.width"/> - <s:param value="bean.height"/> - </s:text> </s:if> + <s:else> + <span class="bi <s:property value='typeIcon(mediaFile.contentType)'/>" aria-hidden="true"></span> + </s:else> + </div> + <div class="media-details-facts"> + <h3 class="media-details-name"><s:property value="mediaFile.name"/></h3> + + <dl class="media-facts"> + <dt><s:text name="mediaFileView.type"/></dt> + <dd><s:property value="formatType(mediaFile.contentType, mediaFile.name)"/> + <span class="text-body-secondary"> (<s:property value="mediaFile.contentType"/>)</span></dd> + <dt><s:text name="mediaFileView.size"/></dt> + <dd><s:property value="formatSize(mediaFile.length)"/></dd> + <s:if test="mediaFile.imageFile && mediaFile.width > 0"> + <dt><s:text name="mediaFileEdit.dimensions"/></dt> + <dd><s:text name="mediaFileEdit.pixels"> + <s:param value="mediaFile.width"/> + <s:param value="mediaFile.height"/> + </s:text></dd> + </s:if> + <dt><s:text name="mediaFileEdit.uploaded"/></dt> + <dd><s:date name="mediaFile.dateUploaded" format="yyyy-MM-dd HH:mm"/></dd> + <dt><s:text name="mediaFileEdit.directory"/></dt> + <dd><s:property value="mediaFile.directory.name"/></dd> + </dl> + + <label class="form-label" for="mediaFileURL"><s:text name="mediaFileEdit.permalink"/></label> + <div class="input-group"> + <input type="text" id="mediaFileURL" class="form-control" readonly + value="<s:property value='mediaFile.permalink'/>"/> + <button type="button" class="btn btn-outline-primary" id="copyURLButton"> + <span class="bi bi-clipboard" aria-hidden="true"></span> + <s:text name="mediaFileEdit.copyURL"/></button> + </div> + <p class="media-copy-status" id="copyStatus" role="status"></p> + + <div class="media-details-actions"> + <a class="btn btn-outline-secondary" href="<s:property value='mediaFile.permalink'/>" + target="_blank" rel="noopener"> + <span class="bi bi-box-arrow-up-right" aria-hidden="true"></span> + <s:text name="mediaFileEdit.openOriginal"/></a> + + <s:form id="createPostForm" action="entryAddWithMediaFile" theme="simple"> + <s:hidden name="salt"/> + <s:hidden name="weblog"/> + <input type="hidden" name="selectedImage" value="<s:property value='mediaFile.id'/>"/> + <button type="submit" class="btn btn-outline-secondary"> + <span class="bi bi-file-earmark-plus" aria-hidden="true"></span> + <s:text name="mediaFileEdit.createEntry"/></button> + </s:form> + + <s:form id="deleteMediaFileForm" action="mediaFileView!delete" theme="simple"> + <s:hidden name="salt"/> + <s:hidden name="weblog"/> + <s:hidden name="mediaFileId"/> + <input type="hidden" name="directoryId" value="<s:property value='mediaFile.directory.id'/>"/> + <button type="submit" class="btn btn-outline-danger"> + <span class="bi bi-trash" aria-hidden="true"></span> + <s:text name="generic.delete"/></button> + </s:form> + </div> </div> </div> - <div class="row mb-3"> - <label class="col-form-label col-sm-3">URL</label> + <h3 class="media-edit-heading"><s:text name="mediaFileEdit.editDetails"/></h3> - <div class="controls col-sm-9"> + <s:form id="mediaFileEditForm" action="mediaFileEdit!save" method="POST" theme="bootstrap" + cssClass="form-vertical media-edit-form"> - <input type="text" id="clip_text" size="57" - value='<s:property value="bean.permalink" />' readonly /> + <s:hidden name="salt"/> + <s:hidden name="weblog"/> + <s:hidden name="mediaFileId"/> + <s:hidden name="returnQuery"/> + <s:hidden name="bean.permalink"/> - <s:url var="linkIconURL" value="/roller-ui/images/clippy.svg"/> - <button class="clipbutton" data-clipboard-target="#clip_text" type="button"> - <img src='<s:property value="%{linkIconURL}" />' alt="Copy to clipboard" style="width:0.9em; height:0.9em"> - </button> + <s:textfield name="bean.name" maxlength="255" label="%{getText('generic.name')}"/> - </div> - </div> + <s:textarea name="bean.description" rows="2" label="%{getText('generic.description')}"/> - <s:textarea name="bean.description" cols="50" rows="2" tabindex="2" - label="%{getText('generic.description')}"/> + <s:textfield name="bean.tagsAsString" maxlength="255" label="%{getText('mediaFileEdit.tags')}"/> - <s:textfield name="bean.tagsAsString" size="30" maxlength="100" tabindex="3" - label="%{getText('mediaFileEdit.tags')}"/> + <s:textfield name="bean.copyrightText" maxlength="1023" label="%{getText('mediaFileEdit.copyright')}"/> - <s:textfield name="bean.copyrightText" size="30" maxlength="100" tabindex="4" - label="%{getText('mediaFileEdit.copyright')}"/> + <s:select name="bean.directoryId" list="allDirectories" listKey="id" listValue="name" + label="%{getText('mediaFileEdit.directory')}"/> - <s:select name="bean.directoryId" list="allDirectories" listKey="id" listValue="name" - tabindex="5" label="%{getText('mediaFileEdit.directory')}"/> + <s:checkbox name="bean.sharedForGallery" label="%{getText('mediaFileEdit.includeGallery')}" + tooltip="%{getText('mediaFileEdit.includeGalleryHelp')}"/> - <s:checkbox name="bean.sharedForGallery" tabindex="6" - label="%{getText('mediaFileEdit.includeGalleryHelp')}"/> + <s:if test="getBooleanProp('mediafile.originalPathEdit.enabled')"> + <details class="media-advanced" <s:if test="bean.originalPath != null && !bean.originalPath.isEmpty()">open</s:if>> + <summary><s:text name="mediaFileEdit.advanced"/></summary> + <s:textfield name="bean.originalPath" id="originalPath" maxlength="255" + label="%{getText('mediaFileEdit.originalPath')}"/> + <p class="form-text"><s:text name="mediaFileEdit.originalPathHelp"/></p> + </details> + </s:if> - <!-- original path from base URL of ctx/resources/ --> - <s:if test="getBooleanProp('mediafile.originalPathEdit.enabled')"> - <div id="originalPathdiv" class="miscControl"> - <s:textfield name="bean.originalPath" id="originalPath" size="30" - maxlength="100" tabindex="3"/> + <div class="media-edit-buttons"> + <s:submit cssClass="btn btn-primary" theme="simple" value="%{getText('generic.save')}"/> + <a class="btn btn-outline-secondary" href="<s:property value='libraryURL'/>"> + <s:text name="generic.cancel"/></a> </div> - </s:if> - - <input type="submit" tabindex="7" class="btn btn-success" - value="<s:text name="generic.save" />" name="submit"/> - <input type="button" tabindex="8" class="btn btn-outline-secondary" - value="<s:text name="generic.cancel" />" onClick="window.parent.onEditCancelled();"/> + </s:form> -</s:form> +</div> +<script src="<s:url value='/roller-ui/scripts/media-library.js'/>"></script> -<script> - $(document).ready(function () { - new ClipboardJS('.clipbutton'); - }); -</script> +</s:if> +<s:else> + <p><a href="<s:property value='libraryURL'/>"><s:text name="mediaFileEdit.backToLibrary"/></a></p> +</s:else> diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEditSuccess.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEditSuccess.jsp deleted file mode 100644 index 249564fc2..000000000 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEditSuccess.jsp +++ /dev/null @@ -1,22 +0,0 @@ -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. The ASF licenses this file to You - under the Apache License, Version 2.0 (the "License"); you may not - use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. For additional information regarding - copyright in this work, please see the NOTICE file in the top level - directory of this distribution. ---%> -<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> - -<script> -parent.onEditSuccess(); -</script> diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFilePager.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFilePager.jsp deleted file mode 100644 index 1b5b12164..000000000 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFilePager.jsp +++ /dev/null @@ -1,83 +0,0 @@ -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. The ASF licenses this file to You - under the Apache License, Version 2.0 (the "License"); you may not - use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. For additional information regarding - copyright in this work, please see the NOTICE file in the top level - directory of this distribution. ---%> -<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> - -<%-- Media file search results pager: the same control as Pager.jsp, but search is a POSTed - form, so each button resubmits #mediaFileSearchForm with bean.pageNum set to its page - (see MediaFileSidebar.jsp). --%> - -<s:if test="pager.pageCount > 1"> - <nav class="roller-pager" aria-label="<s:text name='generic.pagination'/>"> - - <s:if test="pager.pageNum > 0"> - <button type="button" class="btn btn-outline-primary btn-sm media-search-page" - data-page="0"> - <span class="bi bi-chevron-double-left" aria-hidden="true"></span> - <s:text name="generic.first"/></button> - </s:if> - <s:else> - <span class="btn btn-outline-secondary btn-sm disabled" aria-disabled="true"> - <span class="bi bi-chevron-double-left" aria-hidden="true"></span> - <s:text name="generic.first"/></span> - </s:else> - - <s:if test="pager.pageNum > 0"> - <button type="button" class="btn btn-outline-primary btn-sm media-search-page" - data-page="<s:property value='pager.pageNum - 1'/>"> - <span class="bi bi-chevron-left" aria-hidden="true"></span> - <s:text name="generic.newer"/></button> - </s:if> - <s:else> - <span class="btn btn-outline-secondary btn-sm disabled" aria-disabled="true"> - <span class="bi bi-chevron-left" aria-hidden="true"></span> - <s:text name="generic.newer"/></span> - </s:else> - - <span class="roller-pager-page"> - <s:text name="generic.pageNumber"> - <s:param value="pager.pageNumber"/> - <s:param value="pager.pageCount"/> - </s:text> - </span> - - <s:if test="pager.moreItems"> - <button type="button" class="btn btn-outline-primary btn-sm media-search-page" - data-page="<s:property value='pager.pageNum + 1'/>"> - <s:text name="generic.older"/> - <span class="bi bi-chevron-right" aria-hidden="true"></span></button> - </s:if> - <s:else> - <span class="btn btn-outline-secondary btn-sm disabled" aria-disabled="true"> - <s:text name="generic.older"/> - <span class="bi bi-chevron-right" aria-hidden="true"></span></span> - </s:else> - - <s:if test="pager.moreItems"> - <button type="button" class="btn btn-outline-primary btn-sm media-search-page" - data-page="<s:property value='pager.pageCount - 1'/>"> - <s:text name="generic.last"/> - <span class="bi bi-chevron-double-right" aria-hidden="true"></span></button> - </s:if> - <s:else> - <span class="btn btn-outline-secondary btn-sm disabled" aria-disabled="true"> - <s:text name="generic.last"/> - <span class="bi bi-chevron-double-right" aria-hidden="true"></span></span> - </s:else> - - </nav> -</s:if> diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp index cd923fbd1..9a419b381 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp @@ -23,31 +23,35 @@ <div class="media-folders-header"> <h3 id="mediaFoldersHeading"><s:text name="mediaFileView.folders"/></h3> - <button type="button" class="btn btn-outline-primary btn-sm" data-bs-toggle="collapse" - data-bs-target="#newFolderForm" aria-expanded="false" aria-controls="newFolderForm"> - <span class="bi bi-folder-plus" aria-hidden="true"></span> - <s:text name="mediaFileView.newFolder"/> - </button> + <s:if test="actionName == 'mediaFileView'"> + <button type="button" class="btn btn-outline-primary btn-sm" data-bs-toggle="collapse" + data-bs-target="#newFolderForm" aria-expanded="false" aria-controls="newFolderForm"> + <span class="bi bi-folder-plus" aria-hidden="true"></span> + <s:text name="mediaFileView.newFolder"/> + </button> + </s:if> </div> - <div id="newFolderForm" class="collapse media-new-folder"> - <label class="form-label" for="newDirectoryName"><s:text name="mediaFileView.directoryName"/></label> - <div class="input-group input-group-sm"> - <input type="text" id="newDirectoryName" class="form-control" maxlength="25"/> - <button type="button" id="newDirectoryButton" class="btn btn-primary" disabled> - <s:text name="mediaFileView.create"/></button> + <s:if test="actionName == 'mediaFileView'"> + <div id="newFolderForm" class="collapse media-new-folder"> + <label class="form-label" for="newDirectoryName"><s:text name="mediaFileView.directoryName"/></label> + <div class="input-group input-group-sm"> + <input type="text" id="newDirectoryName" class="form-control" maxlength="25"/> + <button type="button" id="newDirectoryButton" class="btn btn-primary" disabled> + <s:text name="mediaFileView.create"/></button> + </div> </div> - </div> + </s:if> <ul class="media-folder-list"> <s:iterator var="folder" value="allDirectories"> - <s:url var="folderURL" action="mediaFileView"> + <s:url var="folderURL" escapeAmp="false" action="mediaFileView"> <s:param name="weblog" value="%{actionWeblog.handle}"/> <s:param name="directoryId" value="%{#folder.id}"/> </s:url> <li> <a href="<s:property value='%{folderURL}'/>" - <s:if test="!pager && #folder.id == currentDirectory.id">class="active" aria-current="page"</s:if>> + <s:if test="actionName == 'mediaFileView' && !(search && bean.allFolders) && #folder.id == currentDirectory.id">class="active" aria-current="page"</s:if>> <span class="bi bi-folder2" aria-hidden="true"></span> <span class="media-folder-name"><s:property value="#folder.name"/></span> </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 aa4284565..37c0cc428 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp @@ -17,17 +17,18 @@ --%> <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> -<s:form id="createPostForm" action='entryAddWithMediaFile'> - <s:hidden name="salt"/> - <input type="hidden" name="weblog" value="<s:property value='actionWeblog.handle' />"/> - <input type="hidden" name="selectedImage" id="selectedImage"/> - <input type="hidden" name="type" id="type"/> -</s:form> +<%-- The media library: a page of files from a folder or a search. The search form is a GET, + so the page state is in the URL; the selection actions POST with that state in hidden + fields and come back to the same page. --%> -<s:url var="mediaFileAddURL" action="mediaFileAdd"> +<s:url var="mediaFileAddURL" escapeAmp="false" action="mediaFileAdd"> <s:param name="weblog" value="%{actionWeblog.handle}"/> <s:param name="directoryName" value="%{directoryName}"/> </s:url> +<s:url var="clearSearchURL" escapeAmp="false" action="mediaFileView"> + <s:param name="weblog" value="%{actionWeblog.handle}"/> + <s:param name="directoryId" value="%{directoryId}"/> +</s:url> <div id="mediaLibrary" class="media-library" data-confirm-delete="<s:text name='mediaFileView.confirmDelete'/>" @@ -38,22 +39,21 @@ <%-- Heading: where we are, and the main action --%> <div class="media-header"> - <div> - <s:if test="pager"> - <h3 class="media-heading"><s:text name="mediaFileView.searchTitle"/></h3> + <h3 class="media-heading"> + <s:if test="search"> + <span class="bi bi-search" aria-hidden="true"></span> + <s:text name="mediaFileView.searchTitle"/> </s:if> <s:else> - <h3 class="media-heading"> - <span class="bi bi-folder2" aria-hidden="true"></span> - <s:property value="currentDirectory.name"/> - </h3> + <span class="bi bi-folder2" aria-hidden="true"></span> + <s:property value="currentDirectory.name"/> </s:else> - </div> + </h3> <div class="media-folder-picker"> <label class="form-label" for="folderPicker"><s:text name="mediaFileView.viewFolder"/></label> <select id="folderPicker" class="form-select"> <s:iterator var="folder" value="allDirectories"> - <s:url var="folderURL" action="mediaFileView"> + <s:url var="folderURL" escapeAmp="false" action="mediaFileView"> <s:param name="weblog" value="%{actionWeblog.handle}"/> <s:param name="directoryId" value="%{#folder.id}"/> </s:url> @@ -68,14 +68,12 @@ </a> </div> -<%-- Search: name and type first; size and tags behind Filters --%> +<%-- Search: name, type and scope first; size and tags behind Filters --%> -<s:form id="mediaFileSearchForm" name="mediaFileSearchForm" action="mediaFileView!search" +<s:form id="mediaFileSearchForm" name="mediaFileSearchForm" action="mediaFileView" method="get" theme="simple" cssClass="media-search" role="search"> - <s:hidden name="salt"/> <s:hidden name="weblog"/> - <%-- set by the result pager buttons; a new search starts at page 0 --%> - <input type="hidden" id="beanPageNum" name="bean.pageNum" value="0"/> + <s:hidden name="directoryId"/> <div class="media-search-row"> <div class="media-search-name"> @@ -87,31 +85,33 @@ <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"> + <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-expanded="false" aria-controls="mediaFilters"> + 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> - <s:submit id="searchButton" cssClass="btn btn-primary" value="%{getText('generic.search')}"/> - <s:if test="pager"> - <s:url var="mediaFileViewURL" action="mediaFileView"> - <s:param name="weblog" value="%{actionWeblog.handle}"/> - </s:url> - <a class="btn btn-outline-secondary" href="<s:property value='%{mediaFileViewURL}'/>"> - <s:text name="mediaFileView.clearSearch"/></a> - </s:if> + <button type="submit" class="btn btn-primary"><s:text name="generic.search"/></button> </div> </div> - <div id="mediaFilters" class="collapse media-filters"> + <div id="mediaFilters" class="collapse media-filters <s:if test='bean.filtersSet'>show</s:if>"> <fieldset class="media-filter-size"> <legend class="form-label"><s:text name="mediaFileView.size"/></legend> <s:select id="sizeFilterTypeCombo" name="bean.sizeFilterType" list="sizeFilterTypes" listKey="key" listValue="value" cssClass="form-select" aria-label="%{getText('mediaFileView.sizeComparison')}"/> - <s:textfield id="beanSize" name="bean.size" maxlength="10" cssClass="form-control" - aria-label="%{getText('mediaFileView.size')}"/> + <input type="number" id="beanSize" name="bean.size" min="0" class="form-control" + value="<s:if test='bean.size > 0'><s:property value='bean.size'/></s:if>" + aria-label="<s:text name='mediaFileView.size'/>"/> <s:select id="beanSizeUnit" name="bean.sizeUnit" list="sizeUnits" listKey="key" listValue="value" cssClass="form-select" aria-label="%{getText('mediaFileView.sizeUnit')}"/> </fieldset> @@ -122,18 +122,36 @@ </div> </s:form> -<s:if test="pager"> - <p class="media-result-summary" role="status"> - <s:if test="pager.items.size() > 0"> - <s:text name="mediaFileView.matchingResults"> - <s:param value="pager.totalCount"/> - </s:text> - </s:if> - <s:else> - <s:text name="mediaFileView.noResults"/> - </s:else> - </p> -</s:if> +<%-- What is shown: criteria, scope and count --%> + +<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> <%-- Files, with the selection toolbar above them --%> @@ -143,8 +161,13 @@ <s:hidden name="directoryId"/> <s:hidden name="newDirectoryName"/> <input type="hidden" name="mediaFileId" 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 && childFiles.size() > 0) || (pager && pager.items.size() > 0)"> + <s:if test="pager.items.size() > 0"> <div class="media-toolbar"> <div class="media-toolbar-group"> @@ -165,38 +188,55 @@ <span class="bi bi-trash" aria-hidden="true"></span> <s:text name="generic.delete"/></button> </div> - <s:if test="!pager"> - <div class="media-toolbar-group ms-auto"> - <label for="sortByMenu"><s:text name="mediaFileView.sortBy"/></label> - <s:select id="sortByMenu" name="sortBy" list="sortOptions" listKey="key" listValue="value" - cssClass="form-select form-select-sm"/> + <div class="media-toolbar-group ms-auto"> + <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> - </s:if> + </div> </div> - <s:if test="pager"> - <s:include value="/WEB-INF/jsps/editor/MediaFilePager.jsp"/> - </s:if> + <s:include value="/WEB-INF/jsps/editor/Pager.jsp"/> <ul class="media-grid" id="mediaGrid"> - <s:if test="pager"> - <s:iterator var="mediaFile" value="pager.items"> - <s:include value="/WEB-INF/jsps/editor/MediaFileCard.jsp"/> - </s:iterator> - </s:if> - <s:else> - <s:iterator var="mediaFile" value="childFiles"> - <s:include value="/WEB-INF/jsps/editor/MediaFileCard.jsp"/> - </s:iterator> - </s:else> + <li class="media-list-header" aria-hidden="true"> + <span></span><span></span> + <span><s:text name="generic.name"/></span> + <span><s:text name="mediaFileView.type"/></span> + <span><s:text name="mediaFileView.size"/></span> + <span><s:text name="mediaFileEdit.uploaded"/></span> + </li> + <s:iterator var="mediaFile" value="pager.items"> + <s:include value="/WEB-INF/jsps/editor/MediaFileCard.jsp"/> + </s:iterator> </ul> - <s:if test="pager"> - <s:include value="/WEB-INF/jsps/editor/MediaFilePager.jsp"/> - </s:if> + <s:include value="/WEB-INF/jsps/editor/Pager.jsp"/> </s:if> - <s:elseif test="!pager"> + <s:elseif test="search"> + <div class="media-empty"> + <span class="bi bi-search" aria-hidden="true"></span> + <p><s:text name="mediaFileView.noResults"/></p> + <a class="btn btn-outline-primary" href="<s:property value='%{clearSearchURL}'/>"> + <s:text name="mediaFileView.clearSearch"/></a> + </div> + </s:elseif> + <s:elseif test="!hasActionErrors()"> <div class="media-empty"> <span class="bi bi-images" aria-hidden="true"></span> <p><s:text name="mediaFileView.noFiles"/></p> @@ -205,7 +245,7 @@ </div> </s:elseif> - <s:if test="currentDirectory.name != 'default' && !pager"> + <s:if test="!search && currentDirectory.name != 'default'"> <div class="media-folder-actions"> <button type="button" class="btn btn-link text-danger" id="deleteFolderButton"> <s:text name="mediaFileView.deleteFolder"/></button> @@ -216,37 +256,7 @@ </div> -<%-- ================================================================================================ --%> - -<%-- view image modal --%> - -<div id="mediafile_edit_lightbox" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="edit-subtitle"> - - <div class="modal-dialog modal-lg"> - - <div class="modal-content"> - - <div class="modal-header"> - <h3 class="modal-title fs-5" id="edit-subtitle"></h3> - <button type="button" class="btn-close" data-bs-dismiss="modal" - aria-label="<s:text name='generic.close'/>"></button> - </div> - - <div class="modal-body"> - <iframe id="mediaFileEditor" title="<s:text name='mediaFileEdit.subtitle'/>" - style="visibility:inherit; width:100%; height:70vh; border:0"></iframe> - </div> - - </div> - </div> - -</div> - -<s:url var="mediaFileEditURL" action="mediaFileEdit"> - <s:param name="weblog" value="%{actionWeblog.handle}" /> -</s:url> <span id="mediaFileUrls" hidden - data-edit-url="<s:property value='%{mediaFileEditURL}'/>" data-delete-selected-url="<s:url action='mediaFileView!deleteSelected'/>" data-move-selected-url="<s:url action='mediaFileView!moveSelected'/>" data-delete-folder-url="<s:url action='mediaFileView!deleteFolder'/>" diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Pager.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Pager.jsp index 728bd8187..29174fa2e 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/Pager.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/Pager.jsp @@ -18,7 +18,7 @@ <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> <%-- First / Newer / Older / Last buttons for pages whose action has a LinkPager named "pager". - MediaFileView.jsp draws the same control with buttons that resubmit its search form. --%> + The previous and next labels come from the pager. --%> <s:if test="pager.prevLink != null || pager.nextLink != null"> <nav class="roller-pager" aria-label="<s:text name='generic.pagination'/>"> @@ -37,12 +37,12 @@ <s:if test="pager.prevLink != null"> <a class="btn btn-outline-primary btn-sm" href="<s:property value='pager.prevLink'/>"> <span class="bi bi-chevron-left" aria-hidden="true"></span> - <s:text name="generic.newer"/></a> + <s:text name="%{pager.prevKey}"/></a> </s:if> <s:else> <span class="btn btn-outline-secondary btn-sm disabled" aria-disabled="true"> <span class="bi bi-chevron-left" aria-hidden="true"></span> - <s:text name="generic.newer"/></span> + <s:text name="%{pager.prevKey}"/></span> </s:else> <span class="roller-pager-page"> @@ -54,12 +54,12 @@ <s:if test="pager.nextLink != null"> <a class="btn btn-outline-primary btn-sm" href="<s:property value='pager.nextLink'/>"> - <s:text name="generic.older"/> + <s:text name="%{pager.nextKey}"/> <span class="bi bi-chevron-right" aria-hidden="true"></span></a> </s:if> <s:else> <span class="btn btn-outline-secondary btn-sm disabled" aria-disabled="true"> - <s:text name="generic.older"/> + <s:text name="%{pager.nextKey}"/> <span class="bi bi-chevron-right" aria-hidden="true"></span></span> </s:else> diff --git a/app/src/main/webapp/WEB-INF/tiles.xml b/app/src/main/webapp/WEB-INF/tiles.xml index 90121f8da..20c5efa93 100644 --- a/app/src/main/webapp/WEB-INF/tiles.xml +++ b/app/src/main/webapp/WEB-INF/tiles.xml @@ -229,9 +229,11 @@ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" /> </definition> - <definition name=".MediaFileEdit" extends=".tiles-popuppage" > + <definition name=".MediaFileEdit" extends=".tiles-mediapage" > <put-attribute name="head" value="/WEB-INF/jsps/tiles/head.jsp" /> <put-attribute name="content" value="/WEB-INF/jsps/editor/MediaFileEdit.jsp" /> + <put-attribute name="sidebar" value="/WEB-INF/jsps/editor/MediaFileSidebar.jsp" /> + <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" /> </definition> <definition name=".MediaFileAddExternalInclude" extends=".tiles-popuppage-only-content" > @@ -260,11 +262,6 @@ <put-attribute name="content" value="/WEB-INF/jsps/editor/MediaFileAddSuccessInclude.jsp" /> </definition> - <definition name=".MediaFileEditSuccess" extends=".tiles-popuppage" > - <put-attribute name="head" value="/WEB-INF/jsps/tiles/head.jsp" /> - <put-attribute name="content" value="/WEB-INF/jsps/editor/MediaFileEditSuccess.jsp" /> - </definition> - <definition name=".MediaFileView" extends=".tiles-mediapage" > <put-attribute name="head" value="/WEB-INF/jsps/tiles/head.jsp" /> <put-attribute name="content" value="/WEB-INF/jsps/editor/MediaFileView.jsp" /> 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 77365142e..863d94927 100644 --- a/app/src/main/webapp/roller-ui/scripts/media-library.js +++ b/app/src/main/webapp/roller-ui/scripts/media-library.js @@ -17,153 +17,222 @@ */ /* - * Media library page (MediaFileView.jsp, MediaFileSidebar.jsp, MediaFileCard.jsp). - * Localized strings and action URLs arrive in data-* attributes; file names are - * only ever written with text APIs. + * Media library (MediaFileView.jsp, MediaFileSidebar.jsp, MediaFileCard.jsp) and + * media file details (MediaFileEdit.jsp). Localized strings and action URLs arrive + * in data-* attributes; file names are only ever written with text APIs. */ $(function () { - var library = $("#mediaLibrary"); - if (!library.length) { - return; - } - var urls = $("#mediaFileUrls"); - var form = document.mediaFileViewForm; function format(message, value) { return message.replace("{0}", value); } - // ----- selection --------------------------------------------------------- + // A preview that fails to load shows the file type icon instead. + document.addEventListener("error", function (e) { + var img = e.target; + if (img.tagName === "IMG" && img.closest(".media-card-preview, .media-details-preview")) { + 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); + } + }, true); - function selected() { - return $(".media-select:checked"); + var library = $("#mediaLibrary"); + if (library.length) { + initLibrary(library); + } + var details = $("#mediaDetails"); + if (details.length) { + initDetails(details); } - function updateSelection() { - var count = selected().length; - $(".media-select").each(function () { - $(this).closest(".media-card").toggleClass("selected", this.checked); + function initLibrary(library) { + var urls = $("#mediaFileUrls"); + var form = document.mediaFileViewForm; + + // ----- selection --------------------------------------------------- + + function selected() { + return $(".media-select:checked"); + } + + function updateSelection() { + var count = selected().length; + $(".media-select").each(function () { + $(this).closest(".media-card").toggleClass("selected", this.checked); + }); + $("#selectedCount").text(count > 0 ? format(library.data("selected-count"), count) : ""); + $("#moveButton, #deleteButton, #moveTargetMenu, #clearSelectionButton").prop("disabled", count === 0); + } + + $(document).on("change", ".media-select", updateSelection); + + $("#selectPageButton").on("click", function () { + $(".media-select").prop("checked", true); + updateSelection(); }); - $("#selectedCount").text(count > 0 ? format(library.data("selected-count"), count) : ""); - $("#moveButton, #deleteButton, #moveTargetMenu, #clearSelectionButton").prop("disabled", count === 0); - } - $(document).on("change", ".media-select", updateSelection); + $("#clearSelectionButton").on("click", function () { + $(".media-select").prop("checked", false); + updateSelection(); + }); - $("#selectPageButton").on("click", function () { - $(".media-select").prop("checked", true); updateSelection(); - }); - $("#clearSelectionButton").on("click", function () { - $(".media-select").prop("checked", false); - updateSelection(); - }); + // ----- actions on the selection and the folder ----------------------- - updateSelection(); + function submitTo(url) { + form.action = url; + form.submit(); + } - // ----- actions on the selection, the folder and the view ----------------- + $("#deleteButton").on("click", function () { + if (confirm(format(library.data("confirm-delete"), selected().length))) { + submitTo(urls.data("delete-selected-url")); + } + }); - function submitTo(url) { - form.action = url; - form.submit(); - } + $("#moveButton").on("click", function () { + if (confirm(library.data("confirm-move"))) { + submitTo(urls.data("move-selected-url")); + } + }); - $("#deleteButton").on("click", function () { - if (confirm(format(library.data("confirm-delete"), selected().length))) { - submitTo(urls.data("delete-selected-url")); - } - }); + $("#deleteFolderButton").on("click", function () { + if (confirm(library.data("confirm-delete-folder"))) { + submitTo(urls.data("delete-folder-url")); + } + }); - $("#moveButton").on("click", function () { - if (confirm(library.data("confirm-move"))) { - submitTo(urls.data("move-selected-url")); - } - }); + // ----- search, sort and folders -------------------------------------- + + var searchForm = $("#mediaFileSearchForm"); + + // leave empty and default criteria out of the URL + searchForm.on("submit", function () { + $(this).find("[name]").add("#sortByMenu").each(function () { + var empty = this.value === "" || this.value === "mediaFileView.any" + || (this.name === "bean.scope" && this.value === "folder") + || (this.name === "bean.sortBy" && this.value === "newest"); + var sizeUnused = /^bean\.size/.test(this.name) && !Number($("#beanSize").val()); + if (empty || sizeUnused) { + this.disabled = true; + } + }); + }); - $("#deleteFolderButton").on("click", function () { - if (confirm(library.data("confirm-delete-folder"))) { - submitTo(urls.data("delete-folder-url")); - } - }); + // fields disabled above stay disabled when the browser restores this page + $(window).on("pageshow", function () { + searchForm.find("[name]").add("#sortByMenu").prop("disabled", false); + }); - $("#sortByMenu").on("change", function () { - form.submit(); - }); + $("#sortByMenu").on("change", function () { + searchForm.trigger("submit"); + }); - // ----- folders ------------------------------------------------------------- + // narrow screens pick the folder from a list in the header + $("#folderPicker").on("change", function () { + window.location.href = this.value; + }); - // narrow screens pick the folder from a list in the header - $("#folderPicker").on("change", function () { - window.location.href = this.value; - }); + // ----- grid or list, remembered in this browser ---------------------- - // ----- new folder (sidebar) ---------------------------------------------- + var grid = $("#mediaGrid"); - var newFolderName = $("#newDirectoryName"); - var newFolderButton = $("#newDirectoryButton"); + function showView(view) { + grid.toggleClass("media-list", view === "list"); + $("[data-media-view]").each(function () { + var on = $(this).data("media-view") === view; + $(this).attr("aria-pressed", String(on)).toggleClass("active", on); + }); + } - newFolderName.on("input", function () { - newFolderButton.prop("disabled", $.trim(newFolderName.val()).length === 0); - }).on("keydown", function (e) { - if (e.key === "Enter" && !newFolderButton.prop("disabled")) { - e.preventDefault(); - newFolderButton.click(); + var savedView = "grid"; + try { + savedView = localStorage.getItem("roller.mediaView") || "grid"; + } catch (e) { + // storage unavailable; use the grid } - }); + showView(savedView); + + $("[data-media-view]").on("click", function () { + var view = $(this).data("media-view"); + showView(view); + try { + localStorage.setItem("roller.mediaView", view); + } catch (e) { + // storage unavailable; the choice lasts for this page only + } + }); - newFolderButton.on("click", function () { - form.newDirectoryName.value = $.trim(newFolderName.val()); - submitTo(urls.data("create-folder-url")); - }); + // ----- new folder (sidebar) ------------------------------------------ - // ----- search result pages ----------------------------------------------- + var newFolderName = $("#newDirectoryName"); + var newFolderButton = $("#newDirectoryButton"); - $(document).on("click", ".media-search-page", function () { - $("#beanPageNum").val($(this).data("page")); - $("#mediaFileSearchForm").submit(); - }); + newFolderName.on("input", function () { + newFolderButton.prop("disabled", $.trim(newFolderName.val()).length === 0); + }).on("keydown", function (e) { + if (e.key === "Enter" && !newFolderButton.prop("disabled")) { + e.preventDefault(); + newFolderButton.click(); + } + }); - // ----- previews ---------------------------------------------------------- + newFolderButton.on("click", function () { + form.newDirectoryName.value = $.trim(newFolderName.val()); + submitTo(urls.data("create-folder-url")); + }); + } - // A thumbnail that fails to load shows the file type icon instead. - document.addEventListener("error", function (e) { - var img = e.target; - if (img.tagName === "IMG" && img.closest(".media-card-preview")) { - var icon = document.createElement("span"); - icon.className = "bi " + (img.getAttribute("data-fallback-icon") || "bi-file-earmark"); - icon.setAttribute("aria-hidden", "true"); - img.replaceWith(icon); - } - }, true); + function initDetails(details) { + + // ----- copy URL ------------------------------------------------------ + + var urlField = $("#mediaFileURL"); + var status = $("#copyStatus"); + + $("#copyURLButton").on("click", function () { + var url = urlField.val(); + function copied() { + status.text(details.data("copied")); + } + function failed() { + urlField.trigger("focus").trigger("select"); + status.text(details.data("copy-failed")); + } + if (navigator.clipboard && window.isSecureContext) { + navigator.clipboard.writeText(url).then(copied, failed); + } else { + failed(); + } + }); - // ----- details dialog ---------------------------------------------------- + // ----- delete ---------------------------------------------------------- - var editor = $("#mediaFileEditor"); - var dialog = $("#mediafile_edit_lightbox"); - var opener = null; + $("#deleteMediaFileForm").on("submit", function (e) { + if (!confirm(details.data("confirm-delete"))) { + e.preventDefault(); + } + }); - $(document).on("click", ".mediafile-edit-target", function () { - opener = this; - $("#edit-subtitle").text($(this).attr("data-mediafile-name")); - editor.attr("src", urls.data("edit-url") + "&mediaFileId=" - + encodeURIComponent($(this).attr("data-mediafile-id"))); - dialog.modal("show"); - }); + // ----- warn before leaving with unsaved edits -------------------------- - dialog.on("hidden.bs.modal", function () { - editor.attr("src", "about:blank"); - if (opener) { - opener.focus(); - } - }); - - // called by MediaFileEdit.jsp and MediaFileEditSuccess.jsp inside the dialog - window.onEditSuccess = function () { - dialog.modal("hide"); - form.submit(); - }; - window.onEditCancelled = function () { - dialog.modal("hide"); - }; + var editForm = $("#mediaFileEditForm"); + var saved = editForm.serialize(); + var submitting = false; + + editForm.on("submit", function () { + submitting = true; + }); + + $(window).on("beforeunload", function (e) { + if (!submitting && editForm.serialize() !== saved) { + e.preventDefault(); + e.originalEvent.returnValue = details.data("unsaved"); + return details.data("unsaved"); + } + }); + } }); diff --git a/app/src/main/webapp/roller-ui/styles/roller.css b/app/src/main/webapp/roller-ui/styles/roller.css index 6e9fce559..21409df17 100644 --- a/app/src/main/webapp/roller-ui/styles/roller.css +++ b/app/src/main/webapp/roller-ui/styles/roller.css @@ -526,6 +526,7 @@ body { text-align: start; font-size: 0.875rem; color: var(--bs-link-color); + text-decoration: none; cursor: pointer; } @@ -560,6 +561,228 @@ 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-toolbar .btn-group { + margin-left: 0.5rem; +} + +.media-list-header { + display: none; +} + +/* List view: one row per file, with name, type, size and upload date columns */ +.media-grid.media-list { + grid-template-columns: minmax(0, 1fr); + gap: 0; +} + +.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; + 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-list-header { + font-size: 0.875rem; + font-weight: 600; + color: var(--bs-secondary-color); +} + +.media-grid.media-list .media-card-body, +.media-grid.media-list .media-card-text, +.media-grid.media-list .media-card-meta { + display: contents; +} + +.media-grid.media-list .media-card-body .form-check-input { + order: 1; + margin-top: 0; +} + +.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); +} + +.media-grid.media-list .media-card-preview .bi { + font-size: 1.5rem; +} + +.media-grid.media-list .media-card-name { + order: 3; + -webkit-line-clamp: 1; +} + +.media-grid.media-list .media-card-type { + order: 4; +} + +.media-grid.media-list .media-card-size { + order: 5; +} + +.media-grid.media-list .media-card-date { + order: 6; + display: block; +} + +.media-grid.media-list .media-card-type, +.media-grid.media-list .media-card-size, +.media-grid.media-list .media-card-date { + font-size: 0.875rem; +} + +@media (max-width: 575.98px) { + .media-grid.media-list .media-list-header, + .media-grid.media-list .media-card { + grid-template-columns: 1.25rem 3rem minmax(0, 1fr) 4.5rem; + } + + .media-grid.media-list .media-list-header span:nth-child(4), + .media-grid.media-list .media-list-header span:nth-child(6), + .media-grid.media-list .media-card-type, + .media-grid.media-list .media-card-date { + display: none; + } +} + +/* media file details (MediaFileEdit.jsp) */ + +.media-back { + margin-bottom: 1rem; +} + +.media-details-top { + display: grid; + grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); + gap: 1.5rem; +} + +.media-details-preview { + display: flex; + align-items: center; + justify-content: center; + min-height: 12rem; + padding: 0.75rem; + border: 1px solid var(--bs-border-color); + border-radius: var(--bs-border-radius); + background-color: var(--bs-tertiary-bg); +} + +.media-details-preview img { + max-width: 100%; + max-height: 24rem; + object-fit: contain; +} + +.media-details-preview .bi { + font-size: 5rem; + color: var(--bs-secondary-color); +} + +.media-details-name { + font-size: 1.25rem; + overflow-wrap: anywhere; +} + +.media-facts { + display: grid; + grid-template-columns: max-content minmax(0, 1fr); + gap: 0.25rem 1rem; + margin: 1rem 0; +} + +.media-facts dt { + font-weight: 600; +} + +.media-facts dd { + margin: 0; + overflow-wrap: anywhere; +} + +.media-copy-status { + min-height: 1.5rem; + margin: 0.25rem 0 0; + font-size: 0.875rem; + color: var(--bs-success-text-emphasis); +} + +.media-details-actions { + display: flex; + flex-wrap: wrap; + gap: 0.5rem; +} + +.media-details-actions form { + margin: 0; +} + +.media-edit-heading { + font-size: 1.1rem; + margin: 2rem 0 1rem; + padding-top: 1rem; + border-top: 1px solid var(--bs-border-color); +} + +/* The bootstrap theme adds no spacing to form-vertical groups */ +.media-edit-form > fieldset > div, +.media-edit-form > fieldset > details { + margin-bottom: 1rem; +} + +.media-advanced summary { + margin-bottom: 0.5rem; + cursor: pointer; +} + +.media-edit-buttons { + display: flex; + flex-wrap: wrap; + gap: 0.5rem; +} + +@media (max-width: 767.98px) { + .media-details-top { + grid-template-columns: minmax(0, 1fr); + } +} + /* Narrow screens (media pages set a device-width viewport): the folder list gives way to the folder picker in the page header */ .media-folder-picker { diff --git a/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java b/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java index 32515d5e2..f7e7648b1 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java @@ -794,6 +794,88 @@ public class MediaFileTest { TestUtils.teardownUser(testUser.getUserName()); } + /** + * Test the folder criterion, case-insensitive name order, newest-first + * order, and that equal sort values page without repeats or gaps. + */ + @Test + public void testSearchMediaFileFolderAndStableOrder() throws Exception { + User testUser = TestUtils.setupUser("mediaFileTestUser11"); + Weblog testWeblog = TestUtils.setupWeblog("mediaFileTestWeblog11", testUser); + try { + MediaFileManager mfMgr = WebloggerFactory.getWeblogger().getMediaFileManager(); + MediaFileDirectory defaultDir = mfMgr.getDefaultMediaFileDirectory(testWeblog); + MediaFileDirectory otherDir = mfMgr.createMediaFileDirectory(testWeblog, "other"); + TestUtils.endSession(true); + + testWeblog = TestUtils.getManagedWebsite(testWeblog); + defaultDir = mfMgr.getMediaFileDirectory(defaultDir.getId()); + otherDir = mfMgr.getMediaFileDirectory(otherDir.getId()); + + // B and c share an upload time, so only the ID orders them by date + long now = System.currentTimeMillis(); + Object[][] files = { + {"B.png", defaultDir, now}, + {"a.png", defaultDir, now - 60000}, + {"c.png", defaultDir, now}, + {"a2.png", otherDir, now - 120000}}; + for (Object[] f : files) { + MediaFile mediaFile = new MediaFile(); + mediaFile.setName((String) f[0]); + mediaFile.setLength(2000); + mediaFile.setDirectory((MediaFileDirectory) f[1]); + mediaFile.setWeblog(testWeblog); + mediaFile.setInputStream(getClass().getResourceAsStream(TEST_IMAGE)); + mediaFile.setContentType("image/png"); + mediaFile.setDateUploaded(new Timestamp((Long) f[2])); + mfMgr.createMediaFile(testWeblog, mediaFile, new RollerMessages()); + ((MediaFileDirectory) f[1]).getMediaFiles().add(mediaFile); + } + TestUtils.endSession(true); + testWeblog = TestUtils.getManagedWebsite(testWeblog); + defaultDir = mfMgr.getMediaFileDirectory(defaultDir.getId()); + + MediaFileFilter inFolder = new MediaFileFilter(); + inFolder.setDirectory(defaultDir); + inFolder.setOrder(MediaFileOrder.NAME); + List<MediaFile> byName = mfMgr.searchMediaFiles(testWeblog, inFolder); + assertEquals(List.of("a.png", "B.png", "c.png"), + byName.stream().map(MediaFile::getName).toList()); + assertEquals(3, mfMgr.getMediaFileCount(testWeblog, inFolder)); + + MediaFileFilter everywhere = new MediaFileFilter(); + everywhere.setName("a"); + assertEquals(2, mfMgr.getMediaFileCount(testWeblog, everywhere)); + everywhere.setName("b"); + assertEquals(1, mfMgr.getMediaFileCount(testWeblog, everywhere), "name match ignores case"); + everywhere.setName(null); + assertEquals(4, mfMgr.getMediaFileCount(testWeblog, everywhere)); + + MediaFileFilter newest = new MediaFileFilter(); + newest.setOrder(MediaFileOrder.DATE_UPLOADED_DESC); + List<MediaFile> all = mfMgr.searchMediaFiles(testWeblog, newest); + assertEquals(4, all.size()); + assertEquals("a.png", all.get(2).getName()); + assertEquals("a2.png", all.get(3).getName()); + + // one file per page gives the same files, in the same order + List<String> paged = new ArrayList<>(); + for (int page = 0; page < 4; page++) { + newest.setStartIndex(page); + newest.setLength(1); + List<MediaFile> one = mfMgr.searchMediaFiles(testWeblog, newest); + assertEquals(1, one.size()); + paged.add(one.get(0).getId()); + } + assertEquals(all.stream().map(MediaFile::getId).toList(), paged); + + TestUtils.endSession(true); + } finally { + TestUtils.teardownWeblog(testWeblog.getId()); + TestUtils.teardownUser(testUser.getUserName()); + } + } + /** * Test media file update */ diff --git a/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileSearchBeanTest.java b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileSearchBeanTest.java new file mode 100644 index 000000000..ba5242d1a --- /dev/null +++ b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileSearchBeanTest.java @@ -0,0 +1,116 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.roller.weblogger.ui.struts2.editor; + +import java.util.Map; + +import org.apache.roller.weblogger.pojos.MediaFileFilter; +import org.apache.roller.weblogger.pojos.MediaFileFilter.MediaFileOrder; +import org.apache.roller.weblogger.pojos.MediaFileFilter.SizeFilterType; +import org.apache.roller.weblogger.pojos.MediaFileType; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class MediaFileSearchBeanTest { + + @Test + void browsingAFolderIsNewestFirstWithNoCriteria() { + MediaFileSearchBean bean = new MediaFileSearchBean(); + bean.setType("mediaFileView.any"); + bean.setName(" "); + assertFalse(bean.isSearch()); + assertTrue(bean.toParams().isEmpty()); + + MediaFileFilter filter = new MediaFileFilter(); + bean.copyTo(filter); + assertEquals(MediaFileOrder.DATE_UPLOADED_DESC, filter.getOrder()); + assertNull(filter.getName()); + assertNull(filter.getType()); + assertEquals(0, filter.getStartIndex()); + assertEquals(MediaFileSearchBean.PAGE_SIZE, filter.getLength()); + } + + @Test + void criteriaSortAndScopeRoundTripAsParameters() { + MediaFileSearchBean bean = new MediaFileSearchBean(); + bean.setName(" logo "); + bean.setType("mediaFileView.image"); + bean.setSize(2); + bean.setSizeFilterType("mediaFileView.gt"); + bean.setSizeUnit("mediaFileView.kb"); + bean.setTags("red blue"); + bean.setScope("all"); + bean.setSortBy("name"); + bean.setPage(3); + assertTrue(bean.isSearch()); + assertTrue(bean.isFiltersSet()); + + Map<String, String> params = bean.toParams(); + assertEquals("logo", params.get("bean.name")); + assertEquals("mediaFileView.image", params.get("bean.type")); + assertEquals("2", params.get("bean.size")); + assertEquals("red blue", params.get("bean.tags")); + assertEquals("all", params.get("bean.scope")); + assertEquals("name", params.get("bean.sortBy")); + assertFalse(params.containsKey("bean.page"), "the pager adds the page"); + + MediaFileFilter filter = new MediaFileFilter(); + bean.copyTo(filter); + assertEquals("logo", filter.getName()); + assertEquals(MediaFileType.IMAGE, filter.getType()); + assertEquals(2048, filter.getSize()); + assertEquals(SizeFilterType.GT, filter.getSizeFilterType()); + assertEquals(java.util.List.of("red", "blue"), filter.getTags()); + assertEquals(MediaFileOrder.NAME, filter.getOrder()); + assertEquals(3 * MediaFileSearchBean.PAGE_SIZE, filter.getStartIndex()); + } + + @Test + void unknownValuesFallBackToDefaults() { + MediaFileSearchBean bean = new MediaFileSearchBean(); + bean.setSortBy("dateUploaded; drop"); + bean.setScope("everything"); + bean.setPage(-4); + assertEquals(MediaFileSearchBean.SORT_NEWEST, bean.getSortBy()); + assertEquals(MediaFileSearchBean.SCOPE_FOLDER, bean.getScope()); + assertEquals(0, bean.getPage()); + } + + @Test + void allFoldersScopeOnlyMattersWhenSearching() { + MediaFileSearchBean bean = new MediaFileSearchBean(); + bean.setScope("all"); + assertFalse(bean.toParams().containsKey("bean.scope")); + } + + @Test + void detailsPageKeepsOnlyAUrlSafeReturnQuery() { + MediaFileEdit edit = new MediaFileEdit(); + edit.setReturnQuery("weblog=roller&directoryId=abc&bean.name=a%20b&bean.page=2"); + assertEquals("weblog=roller&directoryId=abc&bean.name=a%20b&bean.page=2", edit.getReturnQuery()); + + edit.setReturnQuery("weblog=roller\"><script>"); + assertNull(edit.getReturnQuery()); + + edit.setReturnQuery("x=1#//evil.example"); + assertNull(edit.getReturnQuery()); + } +}
