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 72b0061c039e99bffc81d833b21c2c9933ef86de Author: David M. Johnson <[email protected]> AuthorDate: Sun Oct 25 13:24:40 2026 -0400 Media library: new layout, equal cards, folder sidebar; report partial uploads The media pages get their own tiles layout: the folder list replaces the Powered-by card in the sidebar, and a viewport meta tag lets the page reflow on phones, where a folder picker replaces the list. Files show as equal cards in a CSS grid. Long names wrap in two lines, and each card shows type, size and a selection checkbox with an accessible label. Search, the selection toolbar (select page, clear, move, delete) and the Upload button now sit above the files. Uploading several files no longer hides the ones that were saved when another fails: the success page lists the failures with their names and reasons. The unused Name field and the broken Cancel, Upload more and No enclosure controls are fixed. --- .../weblogger/ui/struts2/editor/MediaFileAdd.java | 142 ++++-- .../weblogger/ui/struts2/editor/MediaFileBase.java | 485 +++++++++--------- .../ui/struts2/editor/MediaFileDisplay.java | 118 +++++ .../main/resources/ApplicationResources.properties | 24 +- .../webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp | 64 +-- .../WEB-INF/jsps/editor/MediaFileAddSuccess.jsp | 31 +- .../webapp/WEB-INF/jsps/editor/MediaFileCard.jsp | 56 +++ .../WEB-INF/jsps/editor/MediaFileSidebar.jsp | 165 ++---- .../webapp/WEB-INF/jsps/editor/MediaFileView.jsp | 556 +++++++-------------- .../webapp/WEB-INF/jsps/tiles/brandingCard.jsp | 35 ++ .../main/webapp/WEB-INF/jsps/tiles/contextLine.jsp | 32 ++ .../webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp | 16 +- .../main/webapp/WEB-INF/jsps/tiles/viewport.jsp | 18 + app/src/main/webapp/WEB-INF/tiles.xml | 16 +- .../main/webapp/roller-ui/scripts/media-library.js | 169 +++++++ app/src/main/webapp/roller-ui/styles/roller.css | 305 ++++++++++- .../ui/struts2/editor/MediaFileDisplayTest.java | 65 +++ 17 files changed, 1440 insertions(+), 857 deletions(-) diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java index 6651cfc64..07854b652 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java @@ -21,10 +21,12 @@ import java.io.File; import java.io.FileInputStream; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Iterator; import java.util.List; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.weblogger.WebloggerException; @@ -63,6 +65,9 @@ public class MediaFileAdd extends MediaFileBase implements UploadedFilesAware { private List<MediaFile> newFiles = new ArrayList<>(); + // the outcome for each file in the upload, in the order they were sent + private final List<UploadResult> uploadResults = new ArrayList<>(); + private String directoryName = null; public MediaFileAdd() { @@ -144,12 +149,10 @@ public class MediaFileAdd extends MediaFileBase implements UploadedFilesAware { MediaFileManager manager = WebloggerFactory.getWeblogger().getMediaFileManager(); - RollerMessages errors = new RollerMessages(); - List<MediaFile> uploaded = new ArrayList<>(); - if (uploadedFiles != null && !uploadedFiles.isEmpty()) { - // loop over uploaded files and try saving them + // loop over uploaded files and try saving each one; a file that + // fails does not stop the others for (UploadedFile upload : uploadedFiles) { // skip null files @@ -159,25 +162,27 @@ public class MediaFileAdd extends MediaFileBase implements UploadedFilesAware { continue; } + String fileName = upload.getOriginalName(); + int terminated = fileName.indexOf('\000'); + if (terminated != -1) { + // disallow sneaky null terminated strings + fileName = fileName.substring(0, terminated).trim(); + } + + // make sure fileName is valid + if (fileName.indexOf('/') != -1 + || fileName.indexOf('\\') != -1 + || fileName.contains("..")) { + failed(fileName, getText("uploadFiles.error.badPath", + Collections.singletonList(fileName))); + continue; + } + + RollerMessages errors = new RollerMessages(); try { MediaFile mediaFile = new MediaFile(); bean.copyTo(mediaFile); - String fileName = upload.getOriginalName(); - int terminated = fileName.indexOf('\000'); - if (terminated != -1) { - // disallow sneaky null terminated strings - fileName = fileName.substring(0, terminated).trim(); - } - - // make sure fileName is valid - if (fileName.indexOf('/') != -1 - || fileName.indexOf('\\') != -1 - || fileName.contains("..")) { - addError("uploadFiles.error.badPath", fileName); - continue; - } - mediaFile.setName(fileName); mediaFile.setDirectory(getDirectory()); mediaFile.setWeblog(getActionWeblog()); @@ -191,6 +196,7 @@ public class MediaFileAdd extends MediaFileBase implements UploadedFilesAware { if (!WebloggerFactory.getWeblogger().getFileContentManager().canSave( getActionWeblog(), fileName, declaredType, uploadFile.length(), errors)) { + failed(fileName, messageText(errors)); continue; } mediaFile.setContentType(MediaTypePolicy.storedTypeFor( @@ -198,6 +204,10 @@ public class MediaFileAdd extends MediaFileBase implements UploadedFilesAware { RollerContext.getServletContext()::getMimeType)); manager.createMediaFile(getActionWeblog(), mediaFile, errors); + if (errors.getErrorCount() > 0) { + failed(fileName, messageText(errors)); + continue; + } WebloggerFactory.getWeblogger().flush(); if (mediaFile.isImageFile()) { @@ -205,38 +215,51 @@ public class MediaFileAdd extends MediaFileBase implements UploadedFilesAware { } else { newFiles.add(mediaFile); } - - uploaded.add(mediaFile); + uploadResults.add(UploadResult.uploaded(mediaFile)); } catch (Exception e) { - log.error("Error uploading media file", e); - addError("mediaFileAdd.errorUploading", bean.getName()); + log.error("Error uploading media file " + fileName, e); + failed(fileName, getText("mediaFileAdd.errorUploading", + Collections.singletonList(fileName))); } } - for (Iterator<RollerMessage> it = errors.getErrors(); it.hasNext();) { - RollerMessage msg = it.next(); - addError(msg.getKey(), Arrays.asList(msg.getArgs())); - } - - if (!uploaded.isEmpty() && !this.errorsExist()) { - addMessage("uploadFiles.uploadedFiles"); - for (MediaFile upload : uploaded) { - addMessage("uploadFiles.uploadedFile", - upload.getPermalink()); - } - - } else { + if (newImages.isEmpty() && newFiles.isEmpty()) { + // nothing was saved; the errors are on the upload form return INPUT; } + // Files that were saved are listed on the success page, with + // any that failed, so a partial upload is never hidden. this.pageTitle = "mediaFileAddSuccess.title"; return SUCCESS; + + } else { + addError("error.upload.file"); } } return INPUT; } + /** + * Record a file that was not saved, and report it as an action error that + * names the file. The reason is message text with escaped arguments. + */ + private void failed(String fileName, String reason) { + uploadResults.add(UploadResult.failed(fileName, reason)); + addActionError(StringEscapeUtils.escapeHtml4(fileName) + ": " + reason); + } + + private String messageText(RollerMessages messages) { + List<String> texts = new ArrayList<>(); + for (Iterator<RollerMessage> it = messages.getErrors(); it.hasNext();) { + RollerMessage msg = it.next(); + texts.add(msg.getArgs() == null ? getText(msg.getKey()) + : getText(msg.getKey(), Arrays.asList(msg.getArgs()))); + } + return String.join(" ", texts); + } + /** * Validates media file to be added. */ @@ -299,6 +322,14 @@ public class MediaFileAdd extends MediaFileBase implements UploadedFilesAware { this.newFiles = newFiles; } + public List<UploadResult> getUploadResults() { + return uploadResults; + } + + public int getFailedCount() { + return (int) uploadResults.stream().filter(r -> !r.isUploaded()).count(); + } + /** * @return the directoryName */ @@ -314,4 +345,43 @@ public class MediaFileAdd extends MediaFileBase implements UploadedFilesAware { public void setDirectoryName(String directoryName) { this.directoryName = directoryName; } + + /** What happened to one file in an upload. */ + public static final class UploadResult { + private final String fileName; + private final MediaFile mediaFile; + private final String error; + + private UploadResult(String fileName, MediaFile mediaFile, String error) { + this.fileName = fileName; + this.mediaFile = mediaFile; + this.error = error; + } + + static UploadResult uploaded(MediaFile mediaFile) { + return new UploadResult(mediaFile.getName(), mediaFile, null); + } + + static UploadResult failed(String fileName, String error) { + return new UploadResult(fileName, null, error); + } + + public String getFileName() { + return fileName; + } + + /** The saved file, or null if it failed. */ + public MediaFile getMediaFile() { + return mediaFile; + } + + /** Why the file failed, as escaped message HTML; null if it was saved. */ + public String getError() { + return error; + } + + public boolean isUploaded() { + return mediaFile != null; + } + } } diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java index 7feecc7be..582b372b0 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java @@ -1,66 +1,66 @@ -/* - * 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.ui.struts2.editor; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.roller.weblogger.WebloggerException; -import org.apache.roller.weblogger.business.MediaFileManager; -import org.apache.roller.weblogger.business.WebloggerFactory; -import org.apache.roller.weblogger.pojos.MediaFile; -import org.apache.roller.weblogger.pojos.MediaFileDirectory; -import org.apache.roller.weblogger.pojos.MediaFileDirectoryComparator; -import org.apache.roller.weblogger.pojos.MediaFileDirectoryComparator.DirectoryComparatorType; -import org.apache.roller.weblogger.pojos.WeblogPermission; -import org.apache.roller.weblogger.ui.struts2.util.UIAction; -import org.apache.struts2.interceptor.parameter.StrutsParameter; - -/** - * Base class for all actions related to media files. - * - */ -@SuppressWarnings("serial") -public class MediaFileBase extends UIAction { - - private static Log log = LogFactory.getLog(MediaFileBase.class); - private String[] selectedMediaFiles; - private String[] selectedMediaFileDirectories; - private String selectedDirectory; - private String mediaFileId; - private List<MediaFileDirectory> allDirectories; - private boolean overlayMode; - - @Override - public List<String> requiredWeblogPermissionActions() { - return Collections.singletonList(WeblogPermission.POST); - } - - /** - * Deletes media file - */ - protected void doDeleteMediaFile() { - - try { - log.debug("Processing delete of file id - " + this.mediaFileId); +/* + * 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.ui.struts2.editor; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.roller.weblogger.WebloggerException; +import org.apache.roller.weblogger.business.MediaFileManager; +import org.apache.roller.weblogger.business.WebloggerFactory; +import org.apache.roller.weblogger.pojos.MediaFile; +import org.apache.roller.weblogger.pojos.MediaFileDirectory; +import org.apache.roller.weblogger.pojos.MediaFileDirectoryComparator; +import org.apache.roller.weblogger.pojos.MediaFileDirectoryComparator.DirectoryComparatorType; +import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.ui.struts2.util.UIAction; +import org.apache.struts2.interceptor.parameter.StrutsParameter; + +/** + * Base class for all actions related to media files. + * + */ +@SuppressWarnings("serial") +public class MediaFileBase extends UIAction { + + private static Log log = LogFactory.getLog(MediaFileBase.class); + private String[] selectedMediaFiles; + private String[] selectedMediaFileDirectories; + private String selectedDirectory; + private String mediaFileId; + private List<MediaFileDirectory> allDirectories; + private boolean overlayMode; + + @Override + public List<String> requiredWeblogPermissionActions() { + return Collections.singletonList(WeblogPermission.POST); + } + + /** + * Deletes media file + */ + protected void doDeleteMediaFile() { + + try { + log.debug("Processing delete of file id - " + this.mediaFileId); MediaFileManager manager = WebloggerFactory.getWeblogger() .getMediaFileManager(); MediaFile mediaFile = manager.getMediaFile(getActionWeblog(), this.mediaFileId); @@ -69,24 +69,24 @@ public class MediaFileBase extends UIAction { return; } manager.removeMediaFile(getActionWeblog(), mediaFile); - // flush changes - WebloggerFactory.getWeblogger().flush(); - WebloggerFactory.getWeblogger().release(); - addMessage("mediaFile.delete.success"); - } catch (WebloggerException e) { - log.error("Error deleting media file", e); - addError("mediaFile.delete.error", this.mediaFileId); - } - } - - /** - * Shares media file for public gallery - */ - protected void doIncludeMediaFileInGallery() { - - try { - log.debug("Processing include-in-gallery of file id - " - + this.mediaFileId); + // flush changes + WebloggerFactory.getWeblogger().flush(); + WebloggerFactory.getWeblogger().release(); + addMessage("mediaFile.delete.success"); + } catch (WebloggerException e) { + log.error("Error deleting media file", e); + addError("mediaFile.delete.error", this.mediaFileId); + } + } + + /** + * Shares media file for public gallery + */ + protected void doIncludeMediaFileInGallery() { + + try { + log.debug("Processing include-in-gallery of file id - " + + this.mediaFileId); MediaFileManager manager = WebloggerFactory.getWeblogger() .getMediaFileManager(); MediaFile mediaFile = manager.getMediaFile(getActionWeblog(), this.mediaFileId); @@ -95,66 +95,66 @@ public class MediaFileBase extends UIAction { return; } mediaFile.setSharedForGallery(true); - manager.updateMediaFile(getActionWeblog(), mediaFile); - // flush changes - WebloggerFactory.getWeblogger().flush(); - addMessage("mediaFile.includeInGallery.success"); - } catch (WebloggerException e) { - log.error("Error including media file in gallery", e); - addError("mediaFile.includeInGallery.error", this.mediaFileId); - } - } - - /** - * Delete selected media files. - */ - protected void doDeleteSelected() { - String[] fileIds = getSelectedMediaFiles(); - String[] dirIds = getSelectedMediaFileDirectories(); - try { - MediaFileManager manager = WebloggerFactory.getWeblogger() - .getMediaFileManager(); - - if (fileIds != null && fileIds.length > 0) { - log.debug("Processing delete of " + fileIds.length - + " media files."); - for (String fileId : fileIds) { - log.debug("Deleting media file - " + fileId); - MediaFile mediaFile = manager.getMediaFile(getActionWeblog(), fileId); - if (mediaFile != null) { - manager.removeMediaFile(getActionWeblog(), mediaFile); - } - } - } - - WebloggerFactory.getWeblogger().getWeblogManager() - .saveWeblog(this.getActionWeblog()); - - // flush changes - WebloggerFactory.getWeblogger().flush(); - WebloggerFactory.getWeblogger().release(); - addMessage("mediaFile.delete.success"); - - } catch (WebloggerException e) { - log.error("Error deleting selected media files", e); - addError("mediaFile.delete.error"); - } - } - - /** - * Move selected media files to a directory. - */ - void doMoveSelected() { - String[] fileIds = getSelectedMediaFiles(); - String[] dirIds = getSelectedMediaFileDirectories(); - try { - int movedFiles = 0; - MediaFileManager manager = WebloggerFactory.getWeblogger() - .getMediaFileManager(); - - if (fileIds != null && fileIds.length > 0) { - log.debug("Processing move of " + fileIds.length - + " media files."); + manager.updateMediaFile(getActionWeblog(), mediaFile); + // flush changes + WebloggerFactory.getWeblogger().flush(); + addMessage("mediaFile.includeInGallery.success"); + } catch (WebloggerException e) { + log.error("Error including media file in gallery", e); + addError("mediaFile.includeInGallery.error", this.mediaFileId); + } + } + + /** + * Delete selected media files. + */ + protected void doDeleteSelected() { + String[] fileIds = getSelectedMediaFiles(); + String[] dirIds = getSelectedMediaFileDirectories(); + try { + MediaFileManager manager = WebloggerFactory.getWeblogger() + .getMediaFileManager(); + + if (fileIds != null && fileIds.length > 0) { + log.debug("Processing delete of " + fileIds.length + + " media files."); + for (String fileId : fileIds) { + log.debug("Deleting media file - " + fileId); + MediaFile mediaFile = manager.getMediaFile(getActionWeblog(), fileId); + if (mediaFile != null) { + manager.removeMediaFile(getActionWeblog(), mediaFile); + } + } + } + + WebloggerFactory.getWeblogger().getWeblogManager() + .saveWeblog(this.getActionWeblog()); + + // flush changes + WebloggerFactory.getWeblogger().flush(); + WebloggerFactory.getWeblogger().release(); + addMessage("mediaFile.delete.success"); + + } catch (WebloggerException e) { + log.error("Error deleting selected media files", e); + addError("mediaFile.delete.error"); + } + } + + /** + * Move selected media files to a directory. + */ + void doMoveSelected() { + String[] fileIds = getSelectedMediaFiles(); + String[] dirIds = getSelectedMediaFileDirectories(); + try { + int movedFiles = 0; + MediaFileManager manager = WebloggerFactory.getWeblogger() + .getMediaFileManager(); + + if (fileIds != null && fileIds.length > 0) { + log.debug("Processing move of " + fileIds.length + + " media files."); MediaFileDirectory targetDirectory = manager .getMediaFileDirectory(getActionWeblog(), this.selectedDirectory); if (targetDirectory == null) { @@ -177,97 +177,112 @@ public class MediaFileBase extends UIAction { manager.moveMediaFile(mediaFile, targetDirectory); movedFiles++; } - } - } - - // flush changes - WebloggerFactory.getWeblogger().flush(); - WebloggerFactory.getWeblogger().release(); - if (movedFiles > 0) { - addMessage("mediaFile.move.success"); - } - - } catch (WebloggerException e) { - log.error("Error moving selected media files", e); - addError("mediaFile.move.errors"); - } - } - - /** - * Refresh the list of directories. - */ - void refreshAllDirectories() { - try { - MediaFileManager mgr = WebloggerFactory.getWeblogger().getMediaFileManager(); - - List<MediaFileDirectory> directories = mgr.getMediaFileDirectories(getActionWeblog()); - List<MediaFileDirectory> sortedDirList = new ArrayList<>(directories); - sortedDirList.sort(new MediaFileDirectoryComparator(DirectoryComparatorType.NAME)); - - setAllDirectories(sortedDirList); - - } catch (WebloggerException ex) { - log.error("Error looking up media file directories", ex); - } - } - - public String[] getSelectedMediaFiles() { - return selectedMediaFiles; - } - - @StrutsParameter - public void setSelectedMediaFiles(String[] selectedMediaFiles) { - this.selectedMediaFiles = selectedMediaFiles; - } - - public String getSelectedDirectory() { - return selectedDirectory; - } - - @StrutsParameter - public void setSelectedDirectory(String selectedDirectory) { - this.selectedDirectory = selectedDirectory; - } - - public List<MediaFileDirectory> getAllDirectories() { - return allDirectories; - } - - public void setAllDirectories(List<MediaFileDirectory> allDirectories) { - this.allDirectories = allDirectories; - } - - public String getMediaFileId() { - return mediaFileId; - } - - @StrutsParameter - public void setMediaFileId(String mediaFileId) { - this.mediaFileId = mediaFileId; - } - - public boolean isOverlayMode() { - return overlayMode; - - } - - public void setOverlayMode(boolean mode) { - this.overlayMode = mode; - } - - /** - * @return the selectedMediaFileDirectories - */ - public String[] getSelectedMediaFileDirectories() { - return selectedMediaFileDirectories; - } - - /** - * @param selectedMediaFileDirectories - * the selectedMediaFileDirectories to set - */ - public void setSelectedMediaFileDirectories( - String[] selectedMediaFileDirectories) { - this.selectedMediaFileDirectories = selectedMediaFileDirectories; - } -} + } + } + + // flush changes + WebloggerFactory.getWeblogger().flush(); + WebloggerFactory.getWeblogger().release(); + if (movedFiles > 0) { + addMessage("mediaFile.move.success"); + } + + } catch (WebloggerException e) { + log.error("Error moving selected media files", e); + addError("mediaFile.move.errors"); + } + } + + /** + * Refresh the list of directories. + */ + void refreshAllDirectories() { + try { + MediaFileManager mgr = WebloggerFactory.getWeblogger().getMediaFileManager(); + + List<MediaFileDirectory> directories = mgr.getMediaFileDirectories(getActionWeblog()); + List<MediaFileDirectory> sortedDirList = new ArrayList<>(directories); + sortedDirList.sort(new MediaFileDirectoryComparator(DirectoryComparatorType.NAME)); + + setAllDirectories(sortedDirList); + + } catch (WebloggerException ex) { + log.error("Error looking up media file directories", ex); + } + } + + /** Size for display, see {@link MediaFileDisplay#formatSize(long)}. */ + public String formatSize(long bytes) { + return MediaFileDisplay.formatSize(bytes); + } + + /** File type for display, see {@link MediaFileDisplay#formatType(String, String)}. */ + public String formatType(String contentType, String fileName) { + return MediaFileDisplay.formatType(contentType, fileName); + } + + /** Icon class for a file without a thumbnail. */ + public String typeIcon(String contentType) { + return MediaFileDisplay.typeIcon(contentType); + } + + public String[] getSelectedMediaFiles() { + return selectedMediaFiles; + } + + @StrutsParameter + public void setSelectedMediaFiles(String[] selectedMediaFiles) { + this.selectedMediaFiles = selectedMediaFiles; + } + + public String getSelectedDirectory() { + return selectedDirectory; + } + + @StrutsParameter + public void setSelectedDirectory(String selectedDirectory) { + this.selectedDirectory = selectedDirectory; + } + + public List<MediaFileDirectory> getAllDirectories() { + return allDirectories; + } + + public void setAllDirectories(List<MediaFileDirectory> allDirectories) { + this.allDirectories = allDirectories; + } + + public String getMediaFileId() { + return mediaFileId; + } + + @StrutsParameter + public void setMediaFileId(String mediaFileId) { + this.mediaFileId = mediaFileId; + } + + public boolean isOverlayMode() { + return overlayMode; + + } + + public void setOverlayMode(boolean mode) { + this.overlayMode = mode; + } + + /** + * @return the selectedMediaFileDirectories + */ + public String[] getSelectedMediaFileDirectories() { + return selectedMediaFileDirectories; + } + + /** + * @param selectedMediaFileDirectories + * the selectedMediaFileDirectories to set + */ + public void setSelectedMediaFileDirectories( + String[] selectedMediaFileDirectories) { + this.selectedMediaFileDirectories = selectedMediaFileDirectories; + } +} diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileDisplay.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileDisplay.java new file mode 100644 index 000000000..d9bb7069c --- /dev/null +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileDisplay.java @@ -0,0 +1,118 @@ +/* + * 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.ui.struts2.editor; + +import java.util.Locale; + +import org.apache.commons.lang3.StringUtils; + +/** + * Short, human-readable labels for media files, shared by the media library + * and the editor's media chooser. + */ +public final class MediaFileDisplay { + + private static final String[] UNITS = {"KB", "MB", "GB", "TB"}; + + private MediaFileDisplay() { + } + + /** + * Size for display: "512 bytes", "1.5 KB", "23 MB". One decimal below 10 + * of a unit, none above. + */ + public static String formatSize(long bytes) { + if (bytes < 1024) { + return bytes == 1 ? "1 byte" : bytes + " bytes"; + } + double value = bytes; + int unit = -1; + do { + value /= 1024; + unit++; + } while (value >= 1024 && unit < UNITS.length - 1); + String number = value < 10 + ? String.format(Locale.ROOT, "%.1f", value).replace(".0", "") + : String.format(Locale.ROOT, "%.0f", value); + return number + " " + UNITS[unit]; + } + + /** + * File type for display, from a content type: "image/png" is "PNG", + * "image/svg+xml" is "SVG", "application/x-zip-compressed" is "ZIP-COMPRESSED". + */ + public static String formatType(String contentType) { + if (StringUtils.isBlank(contentType)) { + return ""; + } + String type = contentType.trim().toLowerCase(Locale.ROOT); + int semicolon = type.indexOf(';'); + if (semicolon != -1) { + type = type.substring(0, semicolon).trim(); + } + String subtype = type.substring(type.indexOf('/') + 1); + int plus = subtype.indexOf('+'); + if (plus > 0) { + subtype = subtype.substring(0, plus); + } + subtype = StringUtils.removeStart(subtype, "x-"); + subtype = StringUtils.removeStart(subtype, "vnd."); + if ("jpeg".equals(subtype) || "pjpeg".equals(subtype)) { + subtype = "jpg"; + } else if ("mpeg".equals(subtype) && type.startsWith("audio/")) { + subtype = "mp3"; + } + return subtype.toUpperCase(Locale.ROOT); + } + + /** + * File type for display. When the content type says nothing useful + * (missing, or application/octet-stream), the file name extension is used. + */ + public static String formatType(String contentType, String fileName) { + String label = formatType(contentType); + if ((label.isEmpty() || "OCTET-STREAM".equals(label)) && fileName != null) { + int dot = fileName.lastIndexOf('.'); + if (dot > 0 && dot < fileName.length() - 1) { + return fileName.substring(dot + 1).toUpperCase(Locale.ROOT); + } + } + return label; + } + + /** Bootstrap Icons class for a file that has no thumbnail. */ + public static String typeIcon(String contentType) { + String type = StringUtils.defaultString(contentType).toLowerCase(Locale.ROOT); + if (type.startsWith("image/")) { + return "bi-file-earmark-image"; + } else if (type.startsWith("audio/")) { + return "bi-file-earmark-music"; + } else if (type.startsWith("video/")) { + return "bi-file-earmark-play"; + } else if (type.equals("application/pdf")) { + return "bi-file-earmark-pdf"; + } else if (type.contains("zip") || type.contains("compressed") + || type.contains("tar") || type.contains("gzip")) { + return "bi-file-earmark-zip"; + } else if (type.startsWith("text/")) { + return "bi-file-earmark-text"; + } + return "bi-file-earmark"; + } +} diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties index 8aa834400..ec86bbad9 100644 --- a/app/src/main/resources/ApplicationResources.properties +++ b/app/src/main/resources/ApplicationResources.properties @@ -36,6 +36,8 @@ generic.save=Save generic.rename=Rename generic.edit=Edit generic.delete=Delete +generic.close=Close +generic.search=Search generic.tagline=Tagline generic.error.check.logs=System error - check logs for more information. generic.changes.saved=Changes saved @@ -771,7 +773,7 @@ mediaFileImageChooser.pageTip=Select an image and it will be included as a thumb # -- Media File Add mediaFileAdd.title=Add new media file -mediaFileAdd.pageTip=Use this page to upload up to five new media files. The name, description, tags and other properties will be applied to all files uploaded. +mediaFileAdd.pageTip=Use this page to upload up to five new media files. Each file keeps its own name. The description, tags and other properties are applied to all files uploaded. mediaFileAdd.fileLocation=Choose media files to upload mediaFileAdd.tags=Tags (space separated) mediaFileAdd.copyright=Copyright statement @@ -785,6 +787,8 @@ mediaFileAdd.errorUploading=Error uploading file {0} mediaFileAddSuccess.title=Media File Upload Complete mediaFileSuccess.subtitle=Your upload was successful +mediaFileSuccess.partial=Some files were not uploaded. The files listed further down were saved; these were not: +mediaFileSuccess.viewLibrary=Go to the media library mediaFileSuccess.pageTip=If you wish, you can now create a new weblog post including images or files you just uploaded. mediaFileSuccess.name=Name: @@ -802,7 +806,7 @@ mediaFileSuccess.selectEnclosure=You can select one file to be included in the n mediaFileSuccess.noEnclosure=No enclosure mediaFileSuccess.createPost=Create new weblog post -mediaFileSuccess.uploadMore=Upload more... +mediaFileSuccess.uploadMore=Upload more files # -- Media File Edit @@ -877,6 +881,22 @@ mediaFileView.filesTagged=Files with tags <b>{0}</b> mediaFileView.noFiles=No files in this folder. mediaFileView.folderName=Folder mediaFileView.reset=Reset +mediaFileView.upload=Upload files +mediaFileView.folders=Folders +mediaFileView.newFolder=New folder +mediaFileView.nameStartsWith=Name starts with +mediaFileView.filters=Filters +mediaFileView.clearSearch=Clear search +mediaFileView.sizeComparison=Size comparison +mediaFileView.sizeUnit=Size unit +mediaFileView.selectPage=Select this page +mediaFileView.clearSelection=Clear selection +mediaFileView.selectedCount={0} selected on this page +mediaFileView.moveTo=Folder to move the selected files to +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} #--- Media File Sidebar 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 8c84b5b96..f3b6e519b 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp @@ -27,8 +27,6 @@ <s:hidden name="weblog"/> <s:hidden name="directoryName"/> - <s:textfield name="bean.name" maxlength="255" label="%{getText('generic.name')}"/> - <s:textarea name="bean.description" rows="3" label="%{getText('generic.description')}"/> <s:textarea name="bean.copyrightText" rows="3" label="%{getText('mediaFileAdd.copyright')}"/> @@ -61,8 +59,12 @@ <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:submit cssClass="btn btn-outline-secondary" theme="simple" - value="%{getText('generic.cancel')}" action="mediaFileAdd!cancel"/> + <s:url var="mediaFileViewURL" action="mediaFileView"> + <s:param name="weblog" value="%{actionWeblog.handle}"/> + <s:param name="directoryName" value="%{directoryName}"/> + </s:url> + <a class="btn btn-outline-secondary" href="<s:property value='%{mediaFileViewURL}'/>"> + <s:text name="generic.cancel"/></a> </div> </div> @@ -73,54 +75,16 @@ <script> + // Upload is enabled once a file is chosen. Each file keeps its own name. $(document).ready(function () { - + var uploadButton = $("#uploadButton"); + uploadButton.attr("disabled", true); $("input[type='file']").change(function () { - - var name = ''; - var count = 0; - var fileControls = $("input[type='file']"); - - for (var i = 0; i < fileControls.length; i++) { - if (jQuery.trim(fileControls.get(i).value).length > 0) { - count++; - name = fileControls.get(i).value; - } - } - - var entryBean = $("#entry_bean_name"); - if (count === 1) { - entryBean.get(0).disabled = false; - entryBean.get(0).value = getFileName(name); - - } else if (count > 1) { - entryBean.css("font-style", "italic"); - entryBean.css("color", "grey"); - entryBean.get(0).value = "<s:text name="mediaFileAdd.multipleNames" />"; - entryBean.get(0).disabled = true; - } - - if (count > 0) { - $("#uploadButton:first").attr("disabled", false) - } + var chosen = $("input[type='file']").filter(function () { + return this.value.length > 0; + }).length; + uploadButton.attr("disabled", chosen === 0); }); - - $("#uploadButton:first").attr("disabled", true) }); - function getFileName(fullName) { - var backslashIndex = fullName.lastIndexOf('/'); - var fwdslashIndex = fullName.lastIndexOf('\\'); - var fileName; - if (backslashIndex >= 0) { - fileName = fullName.substring(backslashIndex + 1); - } else if (fwdslashIndex >= 0) { - fileName = fullName.substring(fwdslashIndex + 1); - } - else { - fileName = fullName; - } - return fileName; - } - -</script> \ No newline at end of file +</script> 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 edd3b1a8c..af5a01f97 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp @@ -18,7 +18,24 @@ <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> -<p class="subtitle"><s:text name="mediaFileSuccess.subtitle"/></p> +<s:if test="failedCount == 0"> + <p class="subtitle"><s:text name="mediaFileSuccess.subtitle"/></p> +</s:if> +<s:else> + <p class="subtitle"><s:text name="mediaFileSuccess.partial"/></p> + <ul class="media-upload-failed"> + <s:iterator var="result" value="uploadResults"> + <s:if test="!#result.uploaded"> + <li> + <span class="bi bi-x-circle text-danger" aria-hidden="true"></span> + <strong><s:property value="#result.fileName"/></strong>: + <%-- error is message text whose arguments UIAction.getText() already escaped --%> + <s:property value="#result.error" escapeHtml="false"/> + </li> + </s:if> + </s:iterator> + </ul> +</s:else> <p class="pagetip"><s:text name="mediaFileSuccess.pageTip"/></p> <s:form id="entry" theme="bootstrap" cssClass="form-horizontal"> @@ -136,7 +153,7 @@ <div class="row"> <div class="col-md-1"> - <input type="radio" name="enclosure" + <input type="radio" name="enclosure" class="enclosure-choice" data-enclosure-url="" data-enclosure-type="" data-enclosure-length="" /> </div> @@ -167,13 +184,11 @@ <s:submit theme="simple" cssClass="btn btn-success" id="submit" value="%{getText('mediaFileSuccess.createPost')}" action="entryAddWithMediaFile"/> - <button class="btn btn-outline-secondary" onclick='window.load("<s:property value='%{mediaFileAddURL}'/>")'> - <s:text name="mediaFileSuccess.uploadMore"/> - </button> + <a class="btn btn-outline-secondary" href="<s:property value='%{mediaFileAddURL}'/>"> + <s:text name="mediaFileSuccess.uploadMore"/></a> - <button class="btn btn-outline-secondary" onclick='window.load("<s:property value='%{mediaFileViewURL}'/>")'> - <s:text name="generic.cancel"/> - </button> + <a class="btn btn-outline-secondary" href="<s:property value='%{mediaFileViewURL}'/>"> + <s:text name="mediaFileSuccess.viewLibrary"/></a> </div> </s:form> diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileCard.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileCard.jsp new file mode 100644 index 000000000..028db2ed6 --- /dev/null +++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileCard.jsp @@ -0,0 +1,56 @@ +<%-- + 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" %> + +<%-- 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. --%> + +<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>"> + <s:if test="#mediaFile.imageFile"> + <img src="<s:property value='#mediaFile.thumbnailURL'/>" alt="" loading="lazy" + data-fallback-icon="<s:property value='typeIcon(#mediaFile.contentType)'/>"/> + </s:if> + <s:else> + <span class="bi <s:property value='typeIcon(#mediaFile.contentType)'/>" aria-hidden="true"></span> + </s:else> + </button> + + <div class="media-card-body"> + <input type="checkbox" class="form-check-input media-select" name="selectedMediaFiles" + id="select-<s:property value='#mediaFile.id'/>" + value="<s:property value='#mediaFile.id'/>" + aria-label="<s:text name='mediaFileView.selectFile' escapeHtml='true'><s:param value='#mediaFile.name'/></s:text>"/> + <div class="media-card-text"> + <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> + <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> + <span class="media-card-date"><s:date name="#mediaFile.dateUploaded" format="yyyy-MM-dd"/></span> + </span> + </div> + </div> + +</li> 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 82c40c0d6..cd923fbd1 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp @@ -17,143 +17,42 @@ --%> <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> -<div class="sidebarFade"> - <div class="menu-tr"> - <div class="menu-tl"> - <div class="sidebarInner"> +<%-- Media library sidebar: the weblog's folders. Roller folders are flat, so this is a plain list. --%> - <h3><s:text name="mediaFileSidebar.actions"/></h3> +<nav class="media-folders" aria-labelledby="mediaFoldersHeading"> - <div style="clear:right"> - <span class="bi bi-image"></span> - <s:url var="mediaFileAddURL" action="mediaFileAdd"> - <s:param name="weblog" value="%{actionWeblog.handle}"/> - <s:param name="directoryName" value="%{directoryName}"/> - </s:url> - <a href='<s:property escapeHtml="false" value="%{mediaFileAddURL}" />' - <s:if test="actionName.equals('mediaFileAdd')"> style='font-weight:bold;'</s:if> > - <s:text name="mediaFileSidebar.add"/> - </a> - </div> - - <s:if test="!pager"> - <%-- Only show Create New Directory control when NOT showing search results --%> - - <div style="clear:right; margin-top: 1em"> - - <span class="bi bi-folder2-open"></span> - <s:text name="mediaFileView.addDirectory"/> <br /> - - <label for="newDirectoryName"> - <s:text name="mediaFileView.directoryName"/> - </label> - <input type="text" id="newDirectoryName" name="newDirectoryName" size="8" maxlength="25"/> - - <input type="button" id="newDirectoryButton" class="btn btn-primary" style="clear:left" - value='<s:text name="mediaFileView.create" />' onclick="onCreateDirectory()"/> - - </div> - </s:if> - - <hr size="1" noshade="noshade"/> - - <h3><s:text name="mediaFileView.search"/></h3> - - <s:form id="mediaFileSearchForm" name="mediaFileSearchForm" - action="mediaFileView!search" theme="bootstrap" cssClass="form-vertical"> - <s:hidden name="salt"/> - <s:hidden name="weblog"/> - <input type="hidden" name="mediaFileId" value=""/> - <%-- set by the result pager buttons; a new search starts at page 0 --%> - <input type="hidden" id="beanPageNum" name="bean.pageNum" value="0"/> - - <s:textfield id="beanName" name="bean.name" size="20" maxlength="255" - label="%{getText('generic.name')}"/> - - <s:select id="beanType" name="bean.type" - list="fileTypes" listKey="key" listValue="value" - label="%{getText('mediaFileView.type')}"/> - - <s:select name="bean.sizeFilterType" id="sizeFilterTypeCombo" - list="sizeFilterTypes" listKey="key" listValue="value" - label="%{getText('mediaFileView.size')}"/> - - <s:textfield id="beanSize" name="bean.size" size="3" maxlength="10"/> - - <s:select name="bean.sizeUnit" list="sizeUnits" listKey="key" listValue="value"/> - - <s:textfield id="beanTags" name="bean.tags" size="20" maxlength="50" - label="%{getText('mediaFileView.tags')}"/> - - <s:submit id="searchButton" theme="simple" cssClass="btn btn-primary" - value="%{getText('mediaFileView.search')}" cssStyle="margin:5px 0;"/> - - <s:if test="pager"> - <input id="resetButton" style="margin:5px 0;" type="button" class="btn btn-outline-secondary" - name="reset" value='<s:text name="mediaFileView.reset" />'/> - </s:if> - - </s:form> + <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> + </div> - </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> </div> </div> -</div> - - -<script> - - function onCreateDirectory() { - document.mediaFileViewForm.newDirectoryName.value = $("#newDirectoryName").get(0).value; - document.mediaFileViewForm.action = '<s:url action="mediaFileView!createNewDirectory" />'; - document.mediaFileViewForm.submit(); - } - - $("#newDirectoryButton").ready(function () { - $("#newDirectoryName").bind("keyup", maintainDirectoryButtonState); - $("#newDirectoryButton").attr("disabled", true); - }); - function maintainDirectoryButtonState(e) { - if (jQuery.trim($("#newDirectoryName").get(0).value).length === 0) { - $("#newDirectoryButton").attr("disabled", true); - } else { - $("#newDirectoryButton").attr("disabled", false); - } - } - - // result pager buttons (MediaFilePager.jsp) resubmit this search for their page - $(document).on("click", ".media-search-page", function () { - $("#beanPageNum").val($(this).data("page")); - $("#mediaFileSearchForm").submit(); - }); - - $("#searchButton").ready(function () { - - maintainSearchButtonState(); - $("input").bind("keyup", maintainSearchButtonState); - $("select").bind("change", maintainSearchButtonState); - - $("#resetButton").bind("click", function () { - <s:url var="mediaFileViewURL" action="mediaFileView"> - <s:param name="weblog" value="%{actionWeblog.handle}" /> + <ul class="media-folder-list"> + <s:iterator var="folder" value="allDirectories"> + <s:url var="folderURL" action="mediaFileView"> + <s:param name="weblog" value="%{actionWeblog.handle}"/> + <s:param name="directoryId" value="%{#folder.id}"/> </s:url> - window.location = '<s:property value="%{mediaFileViewURL}" />'; - }); - }); - - function maintainSearchButtonState(e) { - var beanSize = $("#beanSize").get(0).value; - var beanType = $("#beanType").get(0).value; - - if (jQuery.trim($("#beanName").get(0).value).length === 0 - && jQuery.trim($("#beanTags").get(0).value).length === 0 - && (jQuery.trim(beanSize).length === 0 || beanSize === 0) - && (beanType.length === 0 || beanType === "mediaFileView.any")) { - $("#searchButton").attr("disabled", true); - } else { - $("#searchButton").attr("disabled", false); - } - } - -</script> + <li> + <a href="<s:property value='%{folderURL}'/>" + <s:if test="!pager && #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> + </li> + </s:iterator> + </ul> + +</nav> 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 574c13804..aa4284565 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp @@ -24,426 +24,232 @@ <input type="hidden" name="type" id="type"/> </s:form> +<s:url var="mediaFileAddURL" action="mediaFileAdd"> + <s:param name="weblog" value="%{actionWeblog.handle}"/> + <s:param name="directoryName" value="%{directoryName}"/> +</s:url> -<%-- ********************************************************************* --%> +<div id="mediaLibrary" class="media-library" + data-confirm-delete="<s:text name='mediaFileView.confirmDelete'/>" + data-confirm-move="<s:text name='mediaFile.move.confirm'/>" + data-confirm-delete-folder="<s:text name='mediaFile.deleteFolder.confirm'/>" + data-selected-count="<s:text name='mediaFileView.selectedCount'/>"> -<%-- Subtitle and folder path --%> +<%-- Heading: where we are, and the main action --%> -<s:if test='currentDirectory.name.equals("default")'> - - <p class="subtitle"> - <s:text name="mediaFileView.subtitle"> - <s:param value="weblog"/> - </s:text> - </p> - <p class="pagetip"> - <s:text name="mediaFileView.rootPageTip"/> - </p> - -</s:if> +<div class="media-header"> + <div> + <s:if test="pager"> + <h3 class="media-heading"><s:text name="mediaFileView.searchTitle"/></h3> + </s:if> + <s:else> + <h3 class="media-heading"> + <span class="bi bi-folder2" aria-hidden="true"></span> + <s:property value="currentDirectory.name"/> + </h3> + </s:else> + </div> + <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:param name="weblog" value="%{actionWeblog.handle}"/> + <s:param name="directoryId" value="%{#folder.id}"/> + </s:url> + <option value="<s:property value='%{folderURL}'/>" + <s:if test="#folder.id == currentDirectory.id">selected</s:if>><s:property value="#folder.name"/></option> + </s:iterator> + </select> + </div> + <a class="btn btn-primary" href="<s:property value='%{mediaFileAddURL}'/>"> + <span class="bi bi-upload" aria-hidden="true"></span> + <s:text name="mediaFileView.upload"/> + </a> +</div> -<s:elseif test='pager'> +<%-- Search: name and type first; size and tags behind Filters --%> - <p class="subtitle"> - <s:text name="mediaFileView.searchTitle"/> - </p> - <p class="pagetip"> +<s:form id="mediaFileSearchForm" name="mediaFileSearchForm" action="mediaFileView!search" + 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"/> + + <div class="media-search-row"> + <div class="media-search-name"> + <label class="form-label" for="beanName"><s:text name="mediaFileView.nameStartsWith"/></label> + <s:textfield id="beanName" name="bean.name" maxlength="255" cssClass="form-control"/> + </div> + <div class="media-search-type"> + <label class="form-label" for="beanType"><s:text name="mediaFileView.type"/></label> + <s:select id="beanType" name="bean.type" list="fileTypes" listKey="key" listValue="value" + cssClass="form-select"/> + </div> + <div class="media-search-buttons"> + <button type="button" class="btn btn-outline-secondary" data-bs-toggle="collapse" + data-bs-target="#mediaFilters" aria-expanded="false" aria-controls="mediaFilters"> + <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> + </div> + </div> - <%-- display summary of the search results and terms --%> + <div id="mediaFilters" class="collapse media-filters"> + <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')}"/> + <s:select id="beanSizeUnit" name="bean.sizeUnit" list="sizeUnits" listKey="key" listValue="value" + cssClass="form-select" aria-label="%{getText('mediaFileView.sizeUnit')}"/> + </fieldset> + <div class="media-filter-tags"> + <label class="form-label" for="beanTags"><s:text name="mediaFileView.tags"/></label> + <s:textfield id="beanTags" name="bean.tags" maxlength="50" cssClass="form-control"/> + </div> + </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:text name="mediaFileView.matchingResults"> + <s:param value="pager.totalCount"/> + </s:text> </s:if> <s:else> <s:text name="mediaFileView.noResults"/> </s:else> - <s:text name="mediaFileView.searchInfo"/> - - <ul> - <s:if test="!bean.name.isEmpty()"> - <li> - <s:text name="mediaFileView.filesNamed"> - <s:param value="bean.name"/> - </s:text> - </li> - </s:if> - <s:if test="bean.size > 0"> - <li> - <s:text name="mediaFileView.filesOfSize"> - <s:param value='bean.sizeFilterTypeLabel'/> - <s:param value='bean.size'/> - <s:param value='bean.sizeUnitLabel'/> - </s:text> - </li> - </s:if> - <s:if test="!bean.type.isEmpty()"> - <li> - <s:text name="mediaFileView.filesOfType"> - <s:param value='bean.typeLabel'/> - </s:text> - </li> - </s:if> - <s:if test="!bean.tags.isEmpty()"> - <li> - <s:text name="mediaFileView.filesTagged"> - <s:param value="bean.tags"/> - </s:text> - </li> - </s:if> - </ul> - - <s:include value="/WEB-INF/jsps/editor/MediaFilePager.jsp"/> - -</s:elseif> - -<s:else> - - <p class="subtitle"> - <s:text name="mediaFileView.folderName"/>: <s:property value="%{currentDirectory.name}"/> - </p> - <p class="pagetip"> - <s:text name="mediaFileView.dirPageTip"/> </p> +</s:if> -</s:else> - - -<s:if test="childFiles || (pager && pager.items.size() > 0)"> - - <s:form id="mediaFileViewForm" name="mediaFileViewForm" action="mediaFileView" theme="bootstrap"> - <s:hidden name="salt"/> - <s:hidden name="weblog"/> - <s:hidden name="directoryId"/> - <s:hidden name="newDirectoryName"/> - <input type="hidden" name="mediaFileId" value=""/> - - <div class="image-controls"> - - <s:if test="!allDirectories.isEmpty"> - <%-- Folder to View combo-box --%> - <span><s:text name="mediaFileView.viewFolder"/>:</span> - <s:select id="viewDirectoryMenu" name="viewDirectoryId" - list="allDirectories" listKey="id" listValue="name" onchange="onView()"/> - </s:if> - - <span><s:text name="mediaFileView.sortBy"/>:</span> - <s:select id="sortByMenu" name="sortBy" list="sortOptions" listKey="key" listValue="value" - onchange="document.mediaFileViewForm.submit();"/> - - </div> - - - <%-- ***************************************************************** --%> - - <%-- Media file folder contents --%> - - <script> - function highlight(el, flag) { - if (flag) { - $(el).addClass("highlight"); - } else { - $(el).removeClass("highlight"); - } - } - </script> - - <div id="imageGrid" class="card"> - <div class="card-body"> - - <ul> - - <s:if test="!pager"> - - <%-- ----------------------------------------------------- --%> - - <%-- NOT SEARCH RESULTS --%> - - <s:if test="childFiles.size() ==0"> - <s:text name="mediaFileView.noFiles"/> - </s:if> - - <%-- List media files --%> - - <s:iterator var="mediaFile" value="childFiles"> - - <li class="align-images" - onmouseover="highlight(this, true)" onmouseout="highlight(this, false)"> - - <div class="mediaObject mediafile-edit-target" - data-mediafile-id="<s:property value="#mediaFile.id"/>" - data-mediafile-name="<s:property value="#mediaFile.name"/>"> - - <s:if test="#mediaFile.imageFile"> - <img border="0" src="<s:property value='%{#mediaFile.thumbnailURL}' />" - width="<s:property value='#mediaFile.thumbnailWidth' />" - height="<s:property value='#mediaFile.thumbnailHeight' />" - title="<s:property value='#mediaFile.name' />" - alt="<s:property value='#mediaFile.name' />" - /> - </s:if> - - <s:else> - <s:url var="mediaFileURL" value="/images/page.png"/> - <img border="0" src="<s:property value='%{mediaFileURL}' />" - style="padding:40px 50px;" - alt="<s:property value='#mediaFile.name'/>" - /> - </s:else> - - </div> - - <div class="mediaObjectInfo"> - - <input type="checkbox" - name="selectedMediaFiles" - value="<s:property value="#mediaFile.id"/>"/> - <input type="hidden" id="mediafileidentity" - value="<s:property value='#mediaFile.id'/>"/> - - <str:truncateNicely lower="47" upper="47"> - <s:property value="#mediaFile.name"/> - </str:truncateNicely> - - </div> - - </li> - - </s:iterator> - - </s:if> - - <s:else> - - <%-- ----------------------------------------------------- --%> - - <%-- SEARCH RESULTS --%> - - <s:iterator var="mediaFile" value="pager.items"> - - <li class="align-images" - onmouseover="highlight(this, true)" onmouseout="highlight(this, false)"> - - <div class="mediaObject mediafile-edit-target" - data-mediafile-id="<s:property value="#mediaFile.id"/>" - data-mediafile-name="<s:property value="#mediaFile.name"/>"> - - <s:if test="#mediaFile.imageFile"> - <img border="0" src="<s:property value='%{#mediaFile.thumbnailURL}' />" - width="<s:property value='#mediaFile.thumbnailWidth'/>" - height="<s:property value='#mediaFile.thumbnailHeight'/>" - title="<s:property value='#mediaFile.name' />" - alt="<s:property value='#mediaFile.name'/>"/> - </s:if> - - <s:else> - <s:url var="mediaFileURL" value="/images/page.png"/> - <img border="0" src="<s:property value='%{mediaFileURL}' />" - style="padding:40px 50px;" alt="<s:property value='#mediaFile.name'/>"/> - </s:else> - - </div> - - <div class="mediaObjectInfo"> - - <input type="checkbox" - name="selectedMediaFiles" - value="<s:property value="#mediaFile.id"/>"/> - <input type="hidden" id="mediafileidentity" - value="<s:property value='#mediaFile.id'/>"> - - <str:truncateNicely lower="40" upper="50"> - <s:property value="#mediaFile.name"/> - </str:truncateNicely> - - <span class="button" id="addbutton-<s:property value='#mediaFile.id' />"> - <img id="addbutton-img<s:property value='#mediaFile.id' />" - src="<s:url value="/images/add.png"/>"/> - </span> - - </div> - - </li> - - </s:iterator> - - </s:else> - - </ul> +<%-- Files, with the selection toolbar above them --%> +<s:form id="mediaFileViewForm" name="mediaFileViewForm" action="mediaFileView" theme="simple"> + <s:hidden name="salt"/> + <s:hidden name="weblog"/> + <s:hidden name="directoryId"/> + <s:hidden name="newDirectoryName"/> + <input type="hidden" name="mediaFileId" value=""/> + + <s:if test="(!pager && childFiles.size() > 0) || (pager && pager.items.size() > 0)"> + + <div class="media-toolbar"> + <div class="media-toolbar-group"> + <button type="button" class="btn btn-outline-secondary btn-sm" id="selectPageButton"> + <s:text name="mediaFileView.selectPage"/></button> + <button type="button" class="btn btn-outline-secondary btn-sm" id="clearSelectionButton" disabled> + <s:text name="mediaFileView.clearSelection"/></button> + <span class="media-selected-count" id="selectedCount" aria-live="polite"></span> </div> + <div class="media-toolbar-group"> + <label class="visually-hidden" for="moveTargetMenu"><s:text name="mediaFileView.moveTo"/></label> + <s:select id="moveTargetMenu" name="selectedDirectory" list="allDirectories" listKey="id" + listValue="name" cssClass="form-select form-select-sm" disabled="true"/> + <button type="button" class="btn btn-outline-primary btn-sm" id="moveButton" disabled> + <span class="bi bi-folder-symlink" aria-hidden="true"></span> + <s:text name="mediaFileView.move"/></button> + <button type="button" class="btn btn-outline-danger btn-sm" id="deleteButton" disabled> + <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> + </s:if> </div> - <div style="clear:left;"></div> - <s:if test="pager"> <s:include value="/WEB-INF/jsps/editor/MediaFilePager.jsp"/> </s:if> - <s:if test="(!pager && childFiles.size() > 0) || (pager && pager.items.size() > 0) || (currentDirectory.name != 'default' && !pager)"> - - <div class="image-controls"> - - <s:if test="(!pager && childFiles.size() > 0) || (pager && pager.items.size() > 0)"> - <input id="toggleButton" type="button" class="btn btn-outline-secondary" style="display: inline" - value='<s:text name="generic.toggle" />' onclick="onToggle()"/> - - <input id="deleteButton" type="button" class="btn btn-danger" style="display: inline" - value='<s:text name="mediaFileView.deleteSelected" />' onclick="onDeleteSelected()"/> - - <input id="moveButton" type="button" class="btn btn-primary" style="display: inline" - value='<s:text name="mediaFileView.moveSelected" />' onclick="onMoveSelected()"/> - </s:if> - - <s:select id="moveTargetMenu" name="selectedDirectory" cssStyle="display: inline; width: 15em" - list="allDirectories" listKey="id" listValue="name"/> - - <s:if test="currentDirectory.name != 'default' && !pager"> - <input id="deleteFolderButton" type="button" class="btn btn-outline-secondary" style="display: inline" - value='<s:text name="mediaFileView.deleteFolder" />' onclick="onDeleteFolder()"/> - </s:if> - - </div> + <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> + </ul> + <s:if test="pager"> + <s:include value="/WEB-INF/jsps/editor/MediaFilePager.jsp"/> </s:if> - </s:form> + </s:if> + <s:elseif test="!pager"> + <div class="media-empty"> + <span class="bi bi-images" aria-hidden="true"></span> + <p><s:text name="mediaFileView.noFiles"/></p> + <a class="btn btn-primary" href="<s:property value='%{mediaFileAddURL}'/>"> + <s:text name="mediaFileView.upload"/></a> + </div> + </s:elseif> -</s:if> + <s:if test="currentDirectory.name != 'default' && !pager"> + <div class="media-folder-actions"> + <button type="button" class="btn btn-link text-danger" id="deleteFolderButton"> + <s:text name="mediaFileView.deleteFolder"/></button> + </div> + </s:if> + +</s:form> +</div> <%-- ================================================================================================ --%> <%-- view image modal --%> -<div id="mediafile_edit_lightbox" class="modal fade" tabindex="-1" role="dialog"> +<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="subtitle"> - <s:text name="mediaFileEdit.subtitle"/><b><span id="edit-subtitle"></span></b> - </h3> + <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" - style="visibility:inherit" - height="700" <%-- pixels, sigh, this is suboptimal--%> - width="100%" - frameborder="no" - scrolling="auto"> - </iframe> + <iframe id="mediaFileEditor" title="<s:text name='mediaFileEdit.subtitle'/>" + style="visibility:inherit; width:100%; height:70vh; border:0"></iframe> </div> - <div class="modal-footer"></div> - </div> </div> </div> - -<script> - toggleState = 'Off'; - - function onClickEdit(mediaFileId, mediaFileName) { - <s:url var="mediaFileEditURL" action="mediaFileEdit"> - <s:param name="weblog" value="%{actionWeblog.handle}" /> - </s:url> - $('#edit-subtitle').text(mediaFileName); - $('#mediaFileEditor').attr('src', '<s:property value="%{mediaFileEditURL}" />' + '&mediaFileId=' + mediaFileId); - $('#mediafile_edit_lightbox').modal('show'); - } - - // Values come from data-* attributes and are bound via delegated listeners. - $(document).on('click', '.mediafile-edit-target', function () { - onClickEdit($(this).attr('data-mediafile-id'), - $(this).attr('data-mediafile-name')); - }); - - function onEditSuccess() { - onEditCancelled(); - document.mediaFileViewForm.submit(); - } - - function onEditCancelled() { - $('#mediafile_edit_lightbox').modal('hide'); - $("#mediaFileEditor").attr('src', 'about:blank'); - } - - function onSelectDirectory(id) { - window.location = "<s:url action="mediaFileView" />?directoryId=" - + id + "&weblog=" + '<s:property value="actionWeblog.handle" />'; - } - - function onToggle() { - if (toggleState === 'Off') { - toggleState = 'On'; - toggleFunction(true, 'selectedMediaFiles'); - $("#deleteButton").attr('disabled', false); - $("#moveButton").attr('disabled', false); - $("#moveTargetMenu").attr('disabled', false); - } else { - toggleState = 'Off'; - toggleFunction(false, 'selectedMediaFiles'); - $("#deleteButton").attr('disabled', true); - $("#moveButton").attr('disabled', true); - $("#moveTargetMenu").attr('disabled', true); - } - } - - function onDeleteSelected() { - if (confirm("<s:text name='mediaFile.delete.confirm' />")) { - document.mediaFileViewForm.action = '<s:url action="mediaFileView!deleteSelected" />'; - document.mediaFileViewForm.submit(); - } - } - - function onDeleteFolder() { - if (confirm("<s:text name='mediaFile.deleteFolder.confirm' />")) { - document.mediaFileViewForm.action = '<s:url action="mediaFileView!deleteFolder" />'; - document.mediaFileViewForm.submit(); - } - } - - function onMoveSelected() { - if (confirm("<s:text name='mediaFile.move.confirm' />")) { - document.mediaFileViewForm.action = '<s:url action="mediaFileView!moveSelected" />'; - document.mediaFileViewForm.submit(); - } - } - - function onView() { - document.mediaFileViewForm.action = "<s:url action='mediaFileView!view' />"; - document.mediaFileViewForm.submit(); - } - - <%-- code to toggle buttons on/off as media file/directory selections change --%> - - $(document).ready(function () { - $("#deleteButton").attr('disabled', true); - $("#moveButton").attr('disabled', true); - $("#moveTargetMenu").attr('disabled', true); - - $("input[type=checkbox]").change(function () { - var count = 0; - $("input[type=checkbox]").each(function (index, element) { - if (element.checked) count++; - }); - if (count === 0) { - $("#deleteButton").attr('disabled', true); - $("#moveButton").attr('disabled', true); - $("#moveTargetMenu").attr('disabled', true); - } else { - $("#deleteButton").attr('disabled', false); - $("#moveButton").attr('disabled', false); - $("#moveTargetMenu").attr('disabled', false); - } - }); - }); - -</script> \ No newline at end of file +<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'/>" + data-create-folder-url="<s:url action='mediaFileView!createNewDirectory'/>"></span> + +<script src="<s:url value='/roller-ui/scripts/media-library.js'/>"></script> diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/brandingCard.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/brandingCard.jsp new file mode 100644 index 000000000..952a5c7fc --- /dev/null +++ b/app/src/main/webapp/WEB-INF/jsps/tiles/brandingCard.jsp @@ -0,0 +1,35 @@ +<%-- + 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" %> + +<%-- The "Powered by" card at the top of the tabbed page sidebar --%> + +<div class="card"> + <div class="card-body" style="text-align: center"> + + <img src='<s:url value="/roller-ui/images/feather.svg" />' + alt="ASF feat" height="100" align="center"/> + <h4><s:text name="generic.poweredBy" /></h4> + + <s:if test="authenticatedUser != null || actionWeblog != null"> + <%-- an attribute of the page definition is not visible from here, so include the tile --%> + <s:include value="/WEB-INF/jsps/tiles/userStatus.jsp"/> + </s:if> + + </div> +</div> diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/contextLine.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/contextLine.jsp new file mode 100644 index 000000000..d9a431fe8 --- /dev/null +++ b/app/src/main/webapp/WEB-INF/jsps/tiles/contextLine.jsp @@ -0,0 +1,32 @@ +<%-- + 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 pages use the sidebar for folders, so they show the user and weblog in one line + instead of the "Powered by" card --%> + +<p class="roller-context-line"> + <s:if test="authenticatedUser != null"> + <a href="<s:url action="menu" namespace="/roller-ui" />"><s:property value="authenticatedUser.userName"/></a> + </s:if> + <s:if test="authenticatedUser != null && actionWeblog != null"><span aria-hidden="true"> · </span></s:if> + <s:if test="actionWeblog != null"> + <s:text name="mainPage.currentWebsite" />: + <a href='<s:property value="actionWeblog.absoluteURL" />'><s:property value="actionWeblog.handle" /></a> + </s:if> +</p> diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp index 8946a26f4..8433deaa7 100644 --- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp @@ -22,6 +22,7 @@ <head> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <tiles:insertAttribute name="viewport"/> <link rel="icon" href="<%= request.getContextPath() %>/favicon.svg" type="image/x-icon"> <title><s:property value="getProp('site.shortName')"/>: <s:property value="pageTitle"/></title> <tiles:insertAttribute name="head"/> @@ -41,22 +42,9 @@ <div class="col-md-3 roller-column-left"> - <div class="card"> - <div class="card-body" style="text-align: center"> - - <img src='<s:url value="/roller-ui/images/feather.svg" />' - alt="ASF feat" height="100" align="center"/> - <h4><s:text name="generic.poweredBy" /></h4> - - <s:if test="authenticatedUser != null || actionWeblog != null"> - <tiles:insertAttribute name="userStatus"/> - </s:if> - - </div> - </div> + <tiles:insertAttribute name="branding"/> <c:if test="${sidebar != '/WEB-INF/jsps/tiles/empty.jsp'}"> - <s:property value="sidebar"/> <div class="card"> <div class="card-body"> diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/viewport.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/viewport.jsp new file mode 100644 index 000000000..f0a2cb33a --- /dev/null +++ b/app/src/main/webapp/WEB-INF/jsps/tiles/viewport.jsp @@ -0,0 +1,18 @@ +<%-- + 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. +--%> +<meta name="viewport" content="width=device-width, initial-scale=1"> diff --git a/app/src/main/webapp/WEB-INF/tiles.xml b/app/src/main/webapp/WEB-INF/tiles.xml index 4538650f7..90121f8da 100644 --- a/app/src/main/webapp/WEB-INF/tiles.xml +++ b/app/src/main/webapp/WEB-INF/tiles.xml @@ -34,6 +34,8 @@ <definition name=".tiles-tabbedpage" template="/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp"> <put-attribute name="banner" value="/WEB-INF/jsps/tiles/bannerStatus.jsp" /> <put-attribute name="userStatus" value="/WEB-INF/jsps/tiles/userStatus.jsp" /> + <put-attribute name="branding" value="/WEB-INF/jsps/tiles/brandingCard.jsp" /> + <put-attribute name="viewport" value="/WEB-INF/jsps/tiles/empty.jsp" /> <put-attribute name="head" value="/WEB-INF/jsps/tiles/head.jsp" /> <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" /> <put-attribute name="menu" value="/WEB-INF/jsps/tiles/empty.jsp" /> @@ -44,6 +46,14 @@ <put-attribute name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" /> </definition> + <!-- media pages: the sidebar holds folders, so a one-line user/weblog context + replaces the "Powered by" card --> + <definition name=".tiles-mediapage" extends=".tiles-tabbedpage"> + <put-attribute name="branding" value="/WEB-INF/jsps/tiles/contextLine.jsp" /> + <!-- media pages are laid out for narrow screens; other tabbed pages are not yet --> + <put-attribute name="viewport" value="/WEB-INF/jsps/tiles/viewport.jsp" /> + </definition> + <definition name=".tiles-simplepage" template="/WEB-INF/jsps/tiles/tiles-simplepage.jsp"> <put-attribute name="banner" value="/WEB-INF/jsps/tiles/bannerStatus.jsp" /> <put-attribute name="head" value="/WEB-INF/jsps/tiles/head.jsp" /> @@ -212,7 +222,7 @@ </definition> <!-- weblog editor pages (and associates) --> - <definition name=".MediaFileAdd" extends=".tiles-tabbedpage" > + <definition name=".MediaFileAdd" extends=".tiles-mediapage" > <put-attribute name="head" value="/WEB-INF/jsps/tiles/head.jsp" /> <put-attribute name="content" value="/WEB-INF/jsps/editor/MediaFileAdd.jsp" /> <put-attribute name="sidebar" value="/WEB-INF/jsps/tiles/empty.jsp" /> @@ -255,14 +265,14 @@ <put-attribute name="content" value="/WEB-INF/jsps/editor/MediaFileEditSuccess.jsp" /> </definition> - <definition name=".MediaFileView" extends=".tiles-tabbedpage" > + <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" /> <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=".MediaFileAddSuccess" extends=".tiles-tabbedpage" > + <definition name=".MediaFileAddSuccess" extends=".tiles-mediapage" > <put-attribute name="head" value="/WEB-INF/jsps/tiles/head.jsp" /> <put-attribute name="content" value="/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp" /> <put-attribute name="sidebar" value="/WEB-INF/jsps/tiles/empty.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 new file mode 100644 index 000000000..77365142e --- /dev/null +++ b/app/src/main/webapp/roller-ui/scripts/media-library.js @@ -0,0 +1,169 @@ +/* +* 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. +*/ + +/* + * 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. + */ +$(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 --------------------------------------------------------- + + 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(); + }); + + $("#clearSelectionButton").on("click", function () { + $(".media-select").prop("checked", false); + updateSelection(); + }); + + updateSelection(); + + // ----- actions on the selection, the folder and the view ----------------- + + function submitTo(url) { + form.action = url; + form.submit(); + } + + $("#deleteButton").on("click", function () { + if (confirm(format(library.data("confirm-delete"), selected().length))) { + submitTo(urls.data("delete-selected-url")); + } + }); + + $("#moveButton").on("click", function () { + if (confirm(library.data("confirm-move"))) { + submitTo(urls.data("move-selected-url")); + } + }); + + $("#deleteFolderButton").on("click", function () { + if (confirm(library.data("confirm-delete-folder"))) { + submitTo(urls.data("delete-folder-url")); + } + }); + + $("#sortByMenu").on("change", function () { + form.submit(); + }); + + // ----- folders ------------------------------------------------------------- + + // narrow screens pick the folder from a list in the header + $("#folderPicker").on("change", function () { + window.location.href = this.value; + }); + + // ----- new folder (sidebar) ---------------------------------------------- + + var newFolderName = $("#newDirectoryName"); + var newFolderButton = $("#newDirectoryButton"); + + 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(); + } + }); + + newFolderButton.on("click", function () { + form.newDirectoryName.value = $.trim(newFolderName.val()); + submitTo(urls.data("create-folder-url")); + }); + + // ----- search result pages ----------------------------------------------- + + $(document).on("click", ".media-search-page", function () { + $("#beanPageNum").val($(this).data("page")); + $("#mediaFileSearchForm").submit(); + }); + + // ----- previews ---------------------------------------------------------- + + // 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); + + // ----- details dialog ---------------------------------------------------- + + var editor = $("#mediaFileEditor"); + var dialog = $("#mediafile_edit_lightbox"); + var opener = null; + + $(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"); + }); + + 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"); + }; +}); diff --git a/app/src/main/webapp/roller-ui/styles/roller.css b/app/src/main/webapp/roller-ui/styles/roller.css index 8e4bde61d..6e9fce559 100644 --- a/app/src/main/webapp/roller-ui/styles/roller.css +++ b/app/src/main/webapp/roller-ui/styles/roller.css @@ -284,7 +284,310 @@ body { text-align: center; } -/* media files */ +/* media library (MediaFileView.jsp, MediaFileSidebar.jsp, MediaFileCard.jsp) */ + +.roller-context-line { + font-size: 0.875rem; + color: var(--bs-secondary-color); + margin: 0 0 1rem; + overflow-wrap: anywhere; +} + +.media-folders-header, +.media-header { + display: flex; + flex-wrap: wrap; + align-items: center; + justify-content: space-between; + gap: 0.5rem; +} + +.media-folders-header h3 { + font-size: 1.1rem; + margin: 0; +} + +.media-new-folder { + margin-top: 0.75rem; +} + +.media-folder-list { + list-style: none; + padding: 0; + margin: 0.75rem 0 0; +} + +.media-folder-list a { + display: flex; + align-items: center; + gap: 0.5rem; + padding: 0.35rem 0.5rem; + border-radius: var(--bs-border-radius); + text-decoration: none; + color: var(--bs-body-color); +} + +.media-folder-list a:hover, +.media-folder-list a:focus-visible { + background-color: var(--bs-tertiary-bg); +} + +.media-folder-list a.active { + background-color: var(--bs-primary-bg-subtle); + color: var(--bs-primary-text-emphasis); + font-weight: 600; +} + +.media-folder-name { + overflow-wrap: anywhere; +} + +.media-heading { + font-size: 1.25rem; + margin: 0; + overflow-wrap: anywhere; +} + +.media-search { + margin: 1rem 0; +} + +.media-search-row { + display: flex; + flex-wrap: wrap; + align-items: flex-end; + gap: 0.75rem; +} + +.media-search-name { + flex: 1 1 14rem; +} + +.media-search-type { + flex: 0 1 10rem; +} + +.media-search-buttons { + display: flex; + flex-wrap: wrap; + gap: 0.5rem; +} + +.media-filters { + margin-top: 0.75rem; +} + +.media-filters.show, +.media-filters.collapsing { + display: flex; + flex-wrap: wrap; + gap: 0.75rem; +} + +.media-filter-size { + display: flex; + flex-wrap: wrap; + align-items: flex-end; + gap: 0.5rem; +} + +.media-filter-size legend { + width: 100%; + float: none; + font-size: 1rem; + margin-bottom: 0.5rem; +} + +.media-filter-size .form-select { + width: auto; +} + +.media-filter-size .form-control { + width: 7rem; +} + +.media-filter-tags { + flex: 1 1 14rem; +} + +.media-result-summary { + color: var(--bs-secondary-color); +} + +.media-toolbar { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 0.5rem 1rem; + padding: 0.5rem 0; + border-bottom: 1px solid var(--bs-border-color); + background-color: var(--bs-body-bg); + position: sticky; + top: 0; + z-index: 2; +} + +.media-toolbar-group { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 0.5rem; +} + +.media-toolbar .form-select { + width: auto; + max-width: 12rem; +} + +.media-selected-count { + font-size: 0.875rem; + color: var(--bs-secondary-color); +} + +/* Equal cards whatever the thumbnail shape; the preview keeps the whole image */ +.media-grid { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(8.5rem, 1fr)); + gap: 1rem; + list-style: none; + padding: 0; + margin: 1rem 0; +} + +.media-card { + display: flex; + flex-direction: column; + min-width: 0; + border: 1px solid var(--bs-border-color); + border-radius: var(--bs-border-radius); + background-color: var(--bs-body-bg); +} + +.media-card.selected { + outline: 2px solid var(--bs-primary); + outline-offset: -1px; +} + +.media-card-preview { + display: flex; + align-items: center; + justify-content: center; + aspect-ratio: 4 / 3; + width: 100%; + padding: 0.5rem; + border: 0; + border-bottom: 1px solid var(--bs-border-color); + border-radius: var(--bs-border-radius) var(--bs-border-radius) 0 0; + /* a tinted frame keeps white and transparent images visible */ + background-color: var(--bs-tertiary-bg); + cursor: pointer; +} + +.media-card-preview img { + max-width: 100%; + max-height: 100%; + object-fit: contain; +} + +.media-card-preview .bi { + font-size: 3rem; + color: var(--bs-secondary-color); +} + +.media-card-body { + display: flex; + align-items: flex-start; + gap: 0.5rem; + padding: 0.5rem; + min-width: 0; +} + +.media-card-body .form-check-input { + flex: none; + margin-top: 0.2rem; +} + +.media-card-text { + display: flex; + flex-direction: column; + min-width: 0; +} + +/* Long names wrap within two lines; the full name is on the details page */ +.media-card-name { + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; + overflow-wrap: anywhere; + padding: 0; + border: 0; + background: none; + text-align: start; + font-size: 0.875rem; + color: var(--bs-link-color); + cursor: pointer; +} + +.media-card-name:hover { + text-decoration: underline; +} + +.media-card-meta { + display: flex; + flex-wrap: wrap; + gap: 0 0.5rem; + font-size: 0.75rem; + color: var(--bs-secondary-color); +} + +.media-card-date { + display: none; +} + +.media-empty { + text-align: center; + padding: 3rem 1rem; + color: var(--bs-secondary-color); +} + +.media-empty .bi { + font-size: 3rem; +} + +.media-folder-actions { + margin-top: 1rem; + text-align: end; +} + +/* 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 { + display: none; +} + +@media (max-width: 767.98px) { + .roller-column-left, + .roller-column-right { + padding-left: 0.75rem; + padding-right: 0.75rem; + } + + .roller-column-left .card:has(.media-folders) { + display: none; + } + + .media-folder-picker { + display: block; + flex: 1 1 100%; + } + + .media-header .media-heading { + display: none; + } +} + +/* media files: legacy rules, still used by the editor's media chooser */ .align-images { display:inline; diff --git a/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileDisplayTest.java b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileDisplayTest.java new file mode 100644 index 000000000..1d1a015b9 --- /dev/null +++ b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileDisplayTest.java @@ -0,0 +1,65 @@ +/* + * 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 org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class MediaFileDisplayTest { + + @Test + void formatsSizesInReadableUnits() { + assertEquals("0 bytes", MediaFileDisplay.formatSize(0)); + assertEquals("1 byte", MediaFileDisplay.formatSize(1)); + assertEquals("1023 bytes", MediaFileDisplay.formatSize(1023)); + assertEquals("1 KB", MediaFileDisplay.formatSize(1024)); + assertEquals("1.5 KB", MediaFileDisplay.formatSize(1536)); + assertEquals("10 KB", MediaFileDisplay.formatSize(10 * 1024)); + assertEquals("200 KB", MediaFileDisplay.formatSize(200 * 1024 + 300)); + assertEquals("2.3 MB", MediaFileDisplay.formatSize((long) (2.3 * 1024 * 1024))); + assertEquals("5 GB", MediaFileDisplay.formatSize(5L * 1024 * 1024 * 1024)); + } + + @Test + void formatsContentTypesAsShortLabels() { + assertEquals("PNG", MediaFileDisplay.formatType("image/png")); + assertEquals("JPG", MediaFileDisplay.formatType("image/jpeg")); + assertEquals("SVG", MediaFileDisplay.formatType("image/svg+xml")); + assertEquals("PDF", MediaFileDisplay.formatType("application/pdf")); + assertEquals("MP3", MediaFileDisplay.formatType("audio/mpeg")); + assertEquals("MPEG", MediaFileDisplay.formatType("video/mpeg")); + assertEquals("ZIP-COMPRESSED", MediaFileDisplay.formatType("application/x-zip-compressed")); + assertEquals("HTML", MediaFileDisplay.formatType("text/html; charset=UTF-8")); + assertEquals("", MediaFileDisplay.formatType(null)); + assertEquals("WMV", MediaFileDisplay.formatType("application/octet-stream", "talk.wmv")); + assertEquals("OCTET-STREAM", MediaFileDisplay.formatType("application/octet-stream", "README")); + assertEquals("PNG", MediaFileDisplay.formatType("image/png", "logo.gif")); + } + + @Test + void picksAnIconForEachKindOfFile() { + assertEquals("bi-file-earmark-image", MediaFileDisplay.typeIcon("image/png")); + assertEquals("bi-file-earmark-music", MediaFileDisplay.typeIcon("audio/mpeg")); + assertEquals("bi-file-earmark-play", MediaFileDisplay.typeIcon("video/mp4")); + assertEquals("bi-file-earmark-pdf", MediaFileDisplay.typeIcon("application/pdf")); + assertEquals("bi-file-earmark-zip", MediaFileDisplay.typeIcon("application/zip")); + assertEquals("bi-file-earmark-text", MediaFileDisplay.typeIcon("text/plain")); + assertEquals("bi-file-earmark", MediaFileDisplay.typeIcon("application/octet-stream")); + assertEquals("bi-file-earmark", MediaFileDisplay.typeIcon(null)); + } +}
