From e516060e5027e3994c81ab1a6b36418306b08d24 Mon Sep 17 00:00:00 2001
From: "David M. Johnson" <snoopdave@apache.org>
Date: Wed, 11 Nov 2026 18:09:44 -0500
Subject: [PATCH 1/3] Auto-hide only the page's action messages, not every
 alert

messages.jsp closed every .alert on the page ten seconds after it loaded.
That removed the error boxes inside the categories dialogs, so opening a
dialog after ten seconds failed, and it also hid alerts other pages show
on purpose, such as the uploads-disabled warning. Limit it to the #messages
and #errors boxes it renders.
---
 app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp
index 6ddafe2a4..1f46e3cc2 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp
@@ -19,8 +19,9 @@
 
 <script>
     $(document).ready(function () {
-        // Remove the alert box after 10 seconds
-        $(".alert").delay(10000).slideUp(200, function() {
+        // Remove the action message boxes below after 10 seconds. Only these: other
+        // alerts on the page, such as error boxes in dialogs, must stay.
+        $("#messages, #errors").delay(10000).slideUp(200, function() {
             $(this).alert('close');
         });
     });

From ad5d71b4ade518b98c4184c270c3eaf2b7cf2773 Mon Sep 17 00:00:00 2001
From: "David M. Johnson" <snoopdave@apache.org>
Date: Wed, 11 Nov 2026 22:22:34 -0500
Subject: [PATCH 2/3] Redesign the blogroll page

Blogrolls are listed beside their links, each with its own URL. Links can
be reordered by drag or keyboard, selected and moved or deleted in bulk,
and added or edited in one dialog with field errors. OPML import is linked
from the page again and opens the imported blogroll.

Fixes: the "switch to blogroll" list was blank, the edit dialog title
always said "Adding", the duplicate-name error showed the URL, link names
with apostrophes were shown and re-saved as HTML entities, and the default
blogroll could be renamed. Move, delete and reorder accept only links in
the blogroll being shown.
---
 CHANGES.md                                    |   10 +
 .../ui/struts2/editor/BookmarkEdit.java       |   11 +-
 .../ui/struts2/editor/Bookmarks.java          |  331 ++---
 .../ui/struts2/editor/BookmarksImport.java    |   13 +-
 .../ui/struts2/editor/FolderEdit.java         |    6 +
 .../resources/ApplicationResources.properties |  170 +--
 .../ApplicationResources_de.properties        |   12 -
 .../ApplicationResources_es.properties        |    9 -
 .../ApplicationResources_fr.properties        |   12 -
 .../ApplicationResources_ja.properties        |   15 -
 .../ApplicationResources_ko.properties        |   12 -
 .../ApplicationResources_ru.properties        |    9 -
 .../ApplicationResources_zh_CN.properties     |   19 -
 app/src/main/resources/struts.xml             |    9 +-
 .../webapp/WEB-INF/jsps/editor/Bookmarks.jsp  | 1110 +++++------------
 .../WEB-INF/jsps/editor/BookmarksImport.jsp   |   47 +-
 .../WEB-INF/jsps/editor/BookmarksSidebar.jsp  |   43 -
 app/src/main/webapp/WEB-INF/tiles.xml         |    4 +-
 .../main/webapp/roller-ui/scripts/blogroll.js |  529 ++++++++
 .../main/webapp/roller-ui/styles/roller.css   |  332 +++++
 .../ui/struts2/editor/BookmarksTest.java      |  256 ++++
 .../ui/struts2/editor/FolderEditSaveTest.java |   22 +
 .../util/StrutsParameterAnnotationTest.java   |    1 -
 23 files changed, 1817 insertions(+), 1165 deletions(-)
 delete mode 100644 app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp
 create mode 100644 app/src/main/webapp/roller-ui/scripts/blogroll.js
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksTest.java

diff --git a/CHANGES.md b/CHANGES.md
index fa53dc883..b56b40803 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -25,6 +25,16 @@
   every AtomPub URI, permission, element and status code, with examples
   that the test suite checks against the code.
 
+- **Redesigned blogroll page.** A weblog's blogrolls are listed beside
+  their links, and each blogroll has its own address.
+  - Drag a link by its handle, or use the arrow keys on the handle, to
+    change the order themes show links in.
+  - Select links to move them to another blogroll or delete them.
+  - Add and edit links in one dialog that starts with the URL, fills in the
+    name from it, and checks each field. OPML import is back on the page.
+  - The default blogroll can't be renamed, since themes find it by its
+    name, and the page works on phones.
+
 ### Bug fixes
 
 - **AtomPub fixes found while running a 7.0.0 snapshot.**
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
index 9dbfec394..395c4c849 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
@@ -26,6 +26,7 @@
 import org.apache.roller.weblogger.business.WebloggerFactory;
 import org.apache.roller.weblogger.pojos.WeblogBookmark;
 import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.HTMLSanitizer;
 import org.apache.roller.weblogger.util.cache.CacheManager;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 import org.apache.struts2.interceptor.validation.SkipValidation;
@@ -131,10 +132,12 @@ public void myValidate() {
             addError("bookmarkForm.notFound");
             return;
         }
-        // if name new or changed, check new name doesn't already exist
-        if ((isAdd() || !getBean().getName().equals(bookmark.getName()))
-             && bookmark.getFolder().hasBookmarkOfName(getBean().getName())) {
-                addError("bookmarkForm.error.duplicateName", getBean().getUrl());
+        // if name new or changed, check new name doesn't already exist; names are
+        // stored sanitized, so compare the sanitized form
+        String name = HTMLSanitizer.conditionallySanitize(getBean().getName());
+        if ((isAdd() || !StringUtils.equals(name, bookmark.getName()))
+             && bookmark.getFolder().hasBookmarkOfName(name)) {
+                addError("bookmarkForm.error.duplicateName", getBean().getName());
         }
     }
 
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
index c13104b9f..705fd4738 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
@@ -20,7 +20,10 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
@@ -31,18 +34,22 @@
 import org.apache.roller.weblogger.pojos.WeblogBookmark;
 import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
 import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.Utilities;
 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;
 
 /**
- * List bookmarks and folders and allow for moving them around and deleting them.
+ * The blogroll page: a weblog's blogrolls (bookmark folders) and the links in
+ * one of them. Links can be reordered, moved to another blogroll and deleted;
+ * a blogroll other than the default one can be deleted.
  */
-// TODO: make this work @AllowedMethods({"execute","delete","deleteFolder","move","view","folderCreated"})
 public class Bookmarks extends UIAction {
 
-    private static Log log = LogFactory.getLog(Bookmarks.class);
+    private static final Log log = LogFactory.getLog(Bookmarks.class);
+
+    /** The blogroll that themes show; it can't be renamed or deleted. */
+    public static final String DEFAULT_FOLDER = "default";
 
     // the id of folder being viewed
     private String folderId = null;
@@ -50,16 +57,16 @@ public class Bookmarks extends UIAction {
     // the folder being viewed
     private WeblogBookmarkFolder folder = null;
 
-    // the list of bookmarks to move or delete
+    // the links to move or delete
     private String[] selectedBookmarks = null;
 
-    // the target folder to move items to
+    // the folder to move links to
     private String targetFolderId = null;
 
-    // a new folder the user wishes to view
-    private String viewFolderId = null;
+    // the links of the folder, in their new order
+    private List<String> bookmarkIds = new ArrayList<>();
 
-    // all folders from the action weblog
+    // all folders of the weblog: default first, then by name
     private List<WeblogBookmarkFolder> allFolders = Collections.emptyList();
 
     public Bookmarks() {
@@ -68,202 +75,222 @@ public Bookmarks() {
         this.pageTitle = "bookmarksForm.rootTitle";
     }
 
+    /**
+     * Loads the requested blogroll. Without one, opens the default blogroll if
+     * it has links, otherwise the first blogroll that has links, so the page
+     * doesn't open on an empty list while the links are elsewhere.
+     */
     @Override
     public void myPrepare() {
         try {
             BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
-            if (!StringUtils.isEmpty(getFolderId())) {
-                setFolder(bmgr.getFolderById(getActionWeblog(), getFolderId()));
-            } else {
-                setFolder(bmgr.getDefaultFolder(getActionWeblog()));
-                if (getFolder() != null) {
-                    setFolderId(getFolder().getId());
-                }
+            List<WeblogBookmarkFolder> folders = new ArrayList<>(bmgr.getAllFolders(getActionWeblog()));
+            folders.sort(Comparator
+                    .comparing((WeblogBookmarkFolder f) -> !DEFAULT_FOLDER.equals(f.getName()))
+                    .thenComparing(f -> StringUtils.defaultString(f.getName()), String.CASE_INSENSITIVE_ORDER));
+            allFolders = folders;
+
+            WeblogBookmarkFolder requested = StringUtils.isEmpty(getFolderId())
+                    ? null : bmgr.getFolderById(getActionWeblog(), getFolderId());
+            if (requested == null) {
+                requested = folders.stream()
+                        .filter(f -> !f.getBookmarks().isEmpty())
+                        .findFirst()
+                        .orElse(folders.isEmpty() ? null : folders.get(0));
             }
+            setFolder(requested);
         } catch (WebloggerException ex) {
             log.error("Error looking up folder", ex);
         }
     }
 
     /**
-     * Present the bookmarks available in the folder specified by the request.
+     * Shows the blogroll.
      */
+    @SkipValidation
     @Override
     public String execute() {
-
-        // build list of folders that the user can navigate to
-        List<WeblogBookmarkFolder> newFolders = new ArrayList<>();
-
-        try {
-            // Build list of all folders, except for current one
-            BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
-            List<WeblogBookmarkFolder> folders = bmgr.getAllFolders(getActionWeblog());
-            for (WeblogBookmarkFolder fd : folders) {
-                if (!fd.getId().equals(getFolderId())) {
-                    newFolders.add(fd);
-                }
-            }
-
-        } catch (WebloggerException ex) {
-            log.error("Error building folders list", ex);
-            addError("Error building folders list");
-        }
-
-        if (!newFolders.isEmpty()) {
-            setAllFolders(newFolders);
-        }
-
         return LIST;
     }
 
     /**
-     * Delete bookmarks.
+     * Deletes the selected links.
      */
     public String delete() {
-
-        BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
-
+        List<WeblogBookmark> links = selectedLinks();
+        if (links == null) {
+            addError("bookmarksForm.error.notFound");
+            return execute();
+        }
         try {
-            WeblogBookmark bookmark;
-            String bookmarks[] = getSelectedBookmarks();
-            if (null != bookmarks && bookmarks.length > 0) {
-                if (log.isDebugEnabled()) {
-                    log.debug("Processing delete of " + bookmarks.length
-                            + " bookmarks.");
-                }
-                for (int j = 0; j < bookmarks.length; j++) {
-                    if (log.isDebugEnabled()) {
-                        log.debug("Deleting bookmark - " + bookmarks[j]);
-                    }
-                    bookmark = bmgr.getBookmark(getActionWeblog(), bookmarks[j]);
-                    if (bookmark != null) {
-                        bmgr.removeBookmark(bookmark);
-                    }
-
-                }
+            BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
+            for (WeblogBookmark link : links) {
+                folder.getBookmarks().remove(link);
+                bmgr.removeBookmark(link);
             }
-
-            // flush changes
             WebloggerFactory.getWeblogger().flush();
-
-            // notify caches
             CacheManager.invalidate(getActionWeblog());
-
+            addMessage(links.size() == 1 ? "bookmarksForm.deletedOne" : "bookmarksForm.deletedMany",
+                    String.valueOf(links.size()));
         } catch (WebloggerException ex) {
-            log.error("Error doing bookmark deletes", ex);
-            addError("Error doing bookmark deletes");
+            log.error("Error deleting links", ex);
+            addError("generic.error.check.logs");
         }
-
         return execute();
     }
 
+    /**
+     * Deletes the blogroll being viewed and its links, then shows the default blogroll.
+     */
     public String deleteFolder() {
-
+        if (folder == null) {
+            addError("folderForm.notFound");
+            return execute();
+        }
+        if (isDefaultFolder()) {
+            addError("bookmarksForm.error.deleteDefault");
+            return execute();
+        }
         try {
             BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
-            WeblogBookmarkFolder fd = bmgr.getFolderById(getActionWeblog(), getFolderId());
-
-            if (fd != null) {
-
-                if ( "default".equals( fd.getName() ) ) {
-                    addError("Cannot delete default bookmark");
-                    return execute();
-                }
-                bmgr.removeFolder(fd);
-
-                // flush changes
-                WebloggerFactory.getWeblogger().flush();
-
-                // notify caches
-                CacheManager.invalidate(getActionWeblog());
-
-                // re-route to default folder
-                setFolder(bmgr.getDefaultFolder(getActionWeblog()));
-                setFolderId(getFolder().getId());
-            }
+            String name = folder.getName();
+            bmgr.removeFolder(folder);
+            WebloggerFactory.getWeblogger().flush();
+            CacheManager.invalidate(getActionWeblog());
+            addMessage("bookmarksForm.folderDeleted", name);
 
+            allFolders = new ArrayList<>(allFolders);
+            allFolders.remove(folder);
+            setFolder(bmgr.getDefaultFolder(getActionWeblog()));
         } catch (WebloggerException ex) {
             log.error("Error deleting folder", ex);
+            addError("generic.error.check.logs");
         }
         return execute();
     }
 
     @SkipValidation
     public String folderCreated() {
-        // action from FolderEdit upon creation of a new folder, to display
-        // a success message prior to showing the new folder.
-        addMessage("folderForm.created");
+        // reached by a redirect from FolderEdit after it creates a folder, and
+        // from BookmarksImport after it imports links into a new one
+        if (folder != null) {
+            addMessage("folderForm.created", folder.getName());
+        }
         return execute();
     }
 
     /**
-     * View the contents of another bookmark folder.
+     * Moves the selected links to the end of another blogroll.
      */
-    public String view() {
-
+    public String move() {
         try {
             BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
-            if (!StringUtils.isEmpty(viewFolderId)) {
-                setFolder(bmgr.getFolderById(getActionWeblog(), viewFolderId));
-                setFolderId(viewFolderId);
+            WeblogBookmarkFolder target = StringUtils.isEmpty(getTargetFolderId())
+                    ? null : bmgr.getFolderById(getActionWeblog(), getTargetFolderId());
+            List<WeblogBookmark> links = selectedLinks();
+            if (target == null || links == null || target.equals(folder)) {
+                addError("bookmarksForm.error.move");
+                return execute();
             }
-        } catch (WebloggerException ex) {
-            log.error("Error looking up folder", ex);
+            for (WeblogBookmark link : links) {
+                folder.getBookmarks().remove(link);
+                target.addBookmark(link);
+                link.setFolder(target);
+                // recalculated by saveBookmark: after the target's last link
+                link.setPriority(null);
+                bmgr.saveBookmark(link);
+            }
+            WebloggerFactory.getWeblogger().flush();
+            CacheManager.invalidate(getActionWeblog());
+            addMessage(links.size() == 1 ? "bookmarksForm.movedOne" : "bookmarksForm.movedMany",
+                    List.of(String.valueOf(links.size()), target.getName()));
+        } catch (WebloggerException e) {
+            log.error("Error moving links", e);
+            addError("bookmarksForm.error.move");
         }
         return execute();
     }
 
     /**
-     * Move bookmarks to a new folder.
+     * Saves a new order for the links of the blogroll. The posted ids must be
+     * exactly the blogroll's links.
      */
-    public String move() {
-
+    public String reorder() {
+        if (folder == null) {
+            addError("folderForm.notFound");
+            return execute();
+        }
+        List<WeblogBookmark> links = folder.getBookmarks();
+        Set<String> ids = new HashSet<>(bookmarkIds);
+        if (ids.size() != bookmarkIds.size() || ids.size() != links.size()
+                || links.stream().anyMatch(link -> !ids.contains(link.getId()))) {
+            addError("bookmarksForm.error.reorder");
+            return execute();
+        }
         try {
             BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
-
-            if (log.isDebugEnabled()) {
-                log.debug("Moving bookmarks to folder - " + getTargetFolderId());
+            for (WeblogBookmark link : links) {
+                link.setPriority(bookmarkIds.indexOf(link.getId()));
+                bmgr.saveBookmark(link);
             }
+            links.sort(Comparator.comparing(WeblogBookmark::getPriority));
+            WebloggerFactory.getWeblogger().flush();
+            CacheManager.invalidate(getActionWeblog());
+            addMessage("bookmarksForm.orderSaved");
+        } catch (WebloggerException ex) {
+            log.error("Error reordering links", ex);
+            addError("generic.error.check.logs");
+        }
+        return execute();
+    }
 
-            // Move bookmarks to new parent folder.
-            WeblogBookmarkFolder newFolder = bmgr.getFolderById(getActionWeblog(), getTargetFolderId());
-            String bookmarks[] = getSelectedBookmarks();
-
-            if (newFolder == null) {
-                addError("bookmarksForm.error.move");
-                return execute();
+    /**
+     * The selected links, or null if any of them is not in the blogroll being viewed.
+     */
+    private List<WeblogBookmark> selectedLinks() {
+        if (folder == null || selectedBookmarks == null || selectedBookmarks.length == 0) {
+            return null;
+        }
+        List<WeblogBookmark> links = new ArrayList<>();
+        for (String id : selectedBookmarks) {
+            WeblogBookmark link = folder.getBookmarks().stream()
+                    .filter(b -> b.getId().equals(id))
+                    .findFirst().orElse(null);
+            if (link == null) {
+                return null;
             }
+            links.add(link);
+        }
+        return links;
+    }
 
-            if (null != bookmarks && bookmarks.length > 0) {
-                List<WeblogBookmark> bookmarksToMove = new ArrayList<>();
-                for (String bookmarkId : bookmarks) {
-                    WeblogBookmark bd = bmgr.getBookmark(getActionWeblog(), bookmarkId);
-                    if (bd == null) {
-                        addError("bookmarksForm.error.move");
-                        return execute();
-                    }
-                    bookmarksToMove.add(bd);
-                }
-                for (WeblogBookmark bd : bookmarksToMove) {
-                    newFolder.addBookmark(bd);
-                    bd.setFolder(newFolder);
-                    bmgr.saveBookmark(bd);
-                    folder.getBookmarks().remove(bd);
-                }
-            }
+    /**
+     * The links of the blogroll being viewed, as a plain list: Struts doesn't
+     * allow the page to call methods on the persistence provider's list.
+     */
+    public List<WeblogBookmark> getLinks() {
+        return folder == null ? Collections.emptyList() : new ArrayList<>(folder.getBookmarks());
+    }
 
-            // flush changes
-            WebloggerFactory.getWeblogger().flush();
+    public int linkCount(WeblogBookmarkFolder f) {
+        return f == null ? 0 : f.getBookmarks().size();
+    }
 
-            // notify caches
-            CacheManager.invalidate(getActionWeblog());
+    /**
+     * A link's name or description as plain text. They are stored sanitized,
+     * so may hold markup and entities; the page shows them as themes do.
+     */
+    public String plainText(String text) {
+        return text == null ? "" : Utilities.unescapeHTML(Utilities.removeHTML(text, false));
+    }
 
-        } catch (WebloggerException e) {
-            log.error("Error doing bookmark move", e);
-            addError("bookmarksForm.error.move");
-        }
+    public boolean isDefaultFolder() {
+        return folder != null && DEFAULT_FOLDER.equals(folder.getName());
+    }
 
-        return execute();
+    /** The blogrolls the selected links can be moved to: all but the one being viewed. */
+    public List<WeblogBookmarkFolder> getMoveTargets() {
+        return allFolders.stream().filter(f -> !f.equals(folder)).toList();
     }
 
     public String getFolderId() {
@@ -293,12 +320,17 @@ public void setTargetFolderId(String targetFolderId) {
         this.targetFolderId = targetFolderId;
     }
 
-    public List<WeblogBookmarkFolder> getAllFolders() {
-        return allFolders;
+    public List<String> getBookmarkIds() {
+        return bookmarkIds;
+    }
+
+    @StrutsParameter
+    public void setBookmarkIds(List<String> bookmarkIds) {
+        this.bookmarkIds = bookmarkIds == null ? new ArrayList<>() : bookmarkIds;
     }
 
-    public void setAllFolders(List<WeblogBookmarkFolder> allFolders) {
-        this.allFolders = allFolders;
+    public List<WeblogBookmarkFolder> getAllFolders() {
+        return allFolders;
     }
 
     public WeblogBookmarkFolder getFolder() {
@@ -307,17 +339,8 @@ public WeblogBookmarkFolder getFolder() {
 
     private void setFolder(WeblogBookmarkFolder folder) {
         this.folder = folder;
-        if ( folder != null ) {
+        if (folder != null) {
             this.folderId = folder.getId();
         }
     }
-
-    public String getViewFolderId() {
-        return viewFolderId;
-    }
-
-    @StrutsParameter
-    public void setViewFolderId(String viewFolderId) {
-        this.viewFolderId = viewFolderId;
-    }
 }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
index 9ae5900a5..58b39de36 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
@@ -30,6 +30,7 @@
 import org.apache.roller.util.RollerConstants;
 import org.apache.roller.weblogger.business.BookmarkManager;
 import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
 import org.apache.roller.weblogger.ui.struts2.util.UIAction;
 import org.apache.roller.weblogger.util.cache.CacheManager;
 import org.apache.struts2.action.UploadedFilesAware;
@@ -49,6 +50,9 @@ public final class BookmarksImport extends UIAction implements UploadedFilesAwar
     private static final long WRITE_THRESHOLD_IN_MB = 4;
     private static final long WRITE_THRESHOLD = WRITE_THRESHOLD_IN_MB * 1024000;
 
+    // the blogroll the links were imported into, for the redirect to it
+    private String folderId = null;
+
     // uploaded opml file, injected by the actionFileUpload interceptor
     private UploadedFile opmlFile = null;
 
@@ -107,8 +111,9 @@ public String save() {
                     // notify caches
                     CacheManager.invalidate(getActionWeblog());
 
-                    // message to user
-                    addMessage("bookmarksImport.imported", folderName);
+                    // the blogroll page opens the new blogroll and says it was imported
+                    WeblogBookmarkFolder imported = bm.getFolder(getActionWeblog(), folderName);
+                    folderId = imported == null ? null : imported.getId();
 
                     // destroy the temporary file created
                     opmlFile.delete();
@@ -139,4 +144,8 @@ public String save() {
         return INPUT;
     }
 
+
+    public String getFolderId() {
+        return folderId;
+    }
 }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
index f67dec1f1..15d897b64 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
@@ -157,6 +157,12 @@ public void myValidate() {
             addError("folderForm.notFound");
             return;
         }
+        // themes find the default blogroll by its name
+        if (!isAdd() && Bookmarks.DEFAULT_FOLDER.equals(folder.getName())
+                && !Bookmarks.DEFAULT_FOLDER.equals(getBean().getName())) {
+            addError("folderForm.error.renameDefault");
+            return;
+        }
         // make sure new name is not a duplicate of an existing folder
         if ( isAdd() || !getBean().getName().equals(folder.getName()) ) {
             if (folder.getWeblog().hasBookmarkFolder(getBean().getName())) {
diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties
index 888f3f87f..5276e526e 100644
--- a/app/src/main/resources/ApplicationResources.properties
+++ b/app/src/main/resources/ApplicationResources.properties
@@ -56,90 +56,101 @@ generic.pagination=Pagination
 generic.chooseDate=Choose date
 generic.clearDate=Clear date
 
-# ------------------------------------------------------------- BookmarkForm.jsp
+# ------------------------------------------------------------- Bookmarks.jsp (link dialog)
 
-bookmarkForm.add.title=Add New Bookmark
-bookmarkForm.add.subtitle=Adding new bookmark in folder:
-bookmarkForm.edit.title=Edit Bookmark
-bookmarkForm.edit.subtitle=Editing bookmark in folder:
+bookmarkForm.add.title=Add Link
+bookmarkForm.edit.title=Edit Link
 bookmarkForm.image=Image URL
-bookmarkForm.rssUrl=Newsfeed URL
-bookmarkForm.url=Bookmark URL
-bookmarkForm.created=Bookmark "{0}" created
-bookmarkForm.updated=Bookmark "{0}" updated
-bookmarkForm.required=Name and Bookmark URL are required.
-bookmarkForm.badUrls=These URLs are invalid:
-
-bookmarkForm.requiredFields=Name and Bookmark URL are required.
+bookmarkForm.imageHelp=Optional. Themes that show link images use this picture.
+bookmarkForm.rssUrl=Feed URL
+bookmarkForm.feedHelp=Optional. The site''s RSS or Atom feed, for themes that list feeds.
+bookmarkForm.url=URL
+bookmarkForm.nameHelp=The link text. For a new link it is filled in from the URL.
+bookmarkForm.advanced=Feed and image
+bookmarkForm.created=Link "{0}" added
+bookmarkForm.updated=Link "{0}" updated
+bookmarkForm.nameRequired=Name is required.
+bookmarkForm.urlRequired=URL is required.
+bookmarkForm.badUrl=Enter a full URL that starts with http:// or https://.
 
 # errors from validation
-Bookmark.error.nameNull=Name is a required field
-Bookmark.error.nameSize=Name cannot be more than 255 characters
-Bookmark.error.descriptionSize=Description cannot be more than 255 characters
-Bookmark.error.urlNull=Bookmark URL is a required field
-Bookmark.error.urlBad=The URL you entered is not valid
-Bookmark.error.imageBad=The image URL you entered is not valid
-Bookmark.error.feedUrlBad=The feed URL you entered is not valid
-bookmarkForm.error.duplicateName=Bookmark with that name already exists in folder
+Bookmark.error.nameNull=Name is required.
+Bookmark.error.nameSize=Name cannot be more than 255 characters.
+Bookmark.error.descriptionSize=Description cannot be more than 255 characters.
+Bookmark.error.urlNull=URL is required.
+Bookmark.error.urlBad=The URL is not valid.
+Bookmark.error.imageBad=The image URL is not valid.
+Bookmark.error.feedUrlBad=The feed URL is not valid.
+bookmarkForm.error.duplicateName=A link named "{0}" is already in this blogroll.
 
 
-# ----------------------------------------------------------- BookmarksForm.jsp
+# ----------------------------------------------------------- Bookmarks.jsp
 
-bookmarksForm.root=root
 bookmarksForm.rootTitle=Blogroll
 
 bookmarksForm.subtitle=Manage blogrolls in weblog <span>{0}</span>
 
-bookmarksForm.rootPrompt=This is your blog''s default blogroll. Most blog themes display these links (previously known as bookmarks) in the sidebar of the blog. You can also define new blogroll, but you will have to edit your theme templates if you wish to display them.
-bookmarksForm.otherPrompt=This is a custom blogroll. If you wish to display these links on your blog you will have to edit your blog theme templates.
+bookmarksForm.rootPrompt=This is your weblog''s default blogroll. Most themes show its links in the sidebar. Drag a link by its handle, or focus the handle and use the arrow keys, to change the order.
+bookmarksForm.otherPrompt=Themes show only the default blogroll unless you edit their templates to include this one. Drag a link by its handle, or focus the handle and use the arrow keys, to change the order.
 
-bookmarksForm.path=Blogroll
-bookmarksForm.blogrollName=Blogroll name
-bookmarksForm.switchTo=Switch to blogroll
-bookmarksForm.deleteFolder=Delete current blogroll
-bookmarksForm.newBlogroll=New blogroll...
+bookmarksForm.folders=Blogrolls
+bookmarksForm.blogrollName=Name
+bookmarksForm.linkCount={0,choice,0#No links|1#1 link|1<{0} links}
+bookmarksForm.defaultNote=Shown by most themes
+bookmarksForm.deleteFolder=Delete blogroll
 
-bookmarksForm.addBookmark=Add blogroll link
+bookmarksForm.addBookmark=Add link
+bookmarksForm.addLink.title=Add link to "{0}"
+bookmarksForm.editLink.title=Edit link
 bookmarksForm.addFolder=New blogroll
-bookmarksForm.delete=Delete selected
-bookmarksForm.delete.confirm=Confirm Selected Link Delete
-bookmarksForm.delete.areYouSure=Are you sure you want to delete the selected blogroll links?
-bookmarksForm.url=URL
-bookmarksForm.feedurl=Newsfeed URL
-bookmarksForm.folder=Blogroll
-bookmarksForm.edit.tip=Click to modify this link
-bookmarksForm.folder.edit.tip=Click to edit blogroll
-bookmarksForm.move=Move selected to
-bookmarksForm.move.confirm=Move selected link?
-bookmarksForm.selectAllLabel=Select all links
-bookmarksForm.selectOneLabel=Select blogroll named {0}
-bookmarksForm.visitLink=Visit
-bookmarksForm.visitLink.tip=Click to visit this site
-
-bookmarksForm.error.move=Error performing move, parent to child moves not allowed
-bookmarkForm.notFound=The requested bookmark was not found
-folderForm.notFound=The requested folder was not found
+bookmarksForm.delete=Delete
+bookmarksForm.deleteOne.title=Delete link "{0}"?
+bookmarksForm.deleteMany.title=Delete {0} links?
+bookmarksForm.delete.areYouSure=This can''t be undone.
+bookmarksForm.deletedOne=Link deleted
+bookmarksForm.deletedMany={0} links deleted
+bookmarksForm.feedurl=Feed
+bookmarksForm.feedOf=Feed of {0}
+bookmarksForm.moveTo=Move to
+bookmarksForm.move=Move
+bookmarksForm.movedOne=Link moved to "{1}"
+bookmarksForm.movedMany={0} links moved to "{1}"
+bookmarksForm.moveHandle=Move {0}
+bookmarksForm.orderSaved=Link order saved
+bookmarksForm.selectAllLabel=Select all
+bookmarksForm.selectedCount={0} selected
+bookmarksForm.selectOneLabel=Select {0}
+bookmarksForm.visitLink.tip=Opens in a new tab
+bookmarksForm.folderDeleted=Blogroll "{0}" deleted
+
+bookmarksForm.error.move=The links could not be moved. Reload the page and try again.
+bookmarksForm.error.notFound=The selected links were not found. Reload the page and try again.
+bookmarksForm.error.reorder=The links changed while you were reordering them. Reload the page and try again.
+bookmarksForm.error.deleteDefault=The default blogroll can''t be deleted.
+bookmarkForm.notFound=The requested link was not found
+folderForm.notFound=The requested blogroll was not found
 categoryForm.notFound=The requested category was not found
-bookmarksForm.importBookmarks=Import Blogroll via OPML
-bookmarksForm.noresults=There are currently no Blogroll links
-
-bookmarksForm.addBlogroll.title=Add New Blogroll
-bookmarksForm.editBlogroll.title=Edit Blogroll
-bookmarksForm.blogroll.requiredFields=You must specify a blogroll name
-
-blogrollDeleteOK.removeBlogroll=Confirm Blogroll Delete
-blogrollDeleteOK.areYouSure=Are you sure you want to delete blogroll and all of its links?
-
-# --------------------------------------------------------- Bookmarks import.jsp
-
-bookmarksImport.title=Import OPML Bookmarks
-bookmarksImport.subtitle=Import bookmarks in to weblog <span>{0}</span> via OPML
-bookmarksImport.prompt=Upload a standard OPML file to your bookmark collection. \
-The bookmarks will be imported into a new bookmark folder with the name \
-imported-[timestamp]. You will then be able to edit them and move them to \
-other bookmark folders if you wish.
-bookmarksImport.imported=Imported OPML bookmarks into folder [{0}]
-bookmarksImport.error=Error importing bookmarks: {0}
+bookmarksForm.importBookmarks=Import OPML
+bookmarksForm.noresults=No links in this blogroll yet.
+
+bookmarksForm.addBlogroll.title=New blogroll
+bookmarksForm.editBlogroll.title=Rename blogroll
+bookmarksForm.blogroll.requiredFields=Name is required.
+
+blogrollDeleteOK.removeBlogroll=Delete blogroll "{0}"?
+blogrollDeleteOK.areYouSure=The blogroll "{0}" and its {1,choice,1#link|1<{1} links} will be deleted. This can''t be undone.
+blogrollDeleteOK.empty=The blogroll "{0}" has no links. This can''t be undone.
+
+# --------------------------------------------------------- BookmarksImport.jsp
+
+bookmarksImport.title=Import OPML
+bookmarksImport.subtitle=Import links into weblog <span>{0}</span>
+bookmarksImport.prompt=Choose an OPML file, such as one exported from a feed reader or another blog. \
+Its links go into a new blogroll named imported- and the date and time. You can then \
+rename it, or move the links to another blogroll.
+bookmarksImport.file=OPML file
+bookmarksImport.fileHelp=An .opml or .xml file, up to 4 MB.
+bookmarksImport.error=Error importing links: {0}
 bookmarksImport.import=Import
 
 # ----------------------------------------------------------------- cacheInfo.jsp
@@ -501,22 +512,21 @@ error.unexpected=Unexpected error. If this error occurs again, please contact th
 errorPage.title=Unexpected Exception
 errorPage.message=Roller has encountered and logged an unexpected exception.
 
-# --------------------------------------------------------------- FolderForm.jsp
-
-folderForm.add.title=Add Folder
-folderForm.add.subtitle=Adding new bookmark folder
+# --------------------------------------------------------------- blogroll dialog
 
-folderForm.edit.title=Edit Folder
-folderForm.edit.subtitle=Editing bookmark folder [{0}]
+folderForm.add.title=New Blogroll
+folderForm.edit.title=Rename Blogroll
 
-folderForm.created=Folder created
-folderForm.updated=Folder name updated
+folderForm.created=Blogroll "{0}" created
+folderForm.updated=Blogroll renamed
+folderForm.updatedNamed=Blogroll renamed to "{0}"
 
-folderForm.error.duplicateName=The folder name {0} is already in use, please choose another name
+folderForm.error.duplicateName=A blogroll named "{0}" already exists.
+folderForm.error.renameDefault=The default blogroll can''t be renamed: themes find it by its name.
 
 # errors from validation
-Folder.error.nameNull=Name is a required field
-Folder.error.nameSize=Name cannot be more than 255 characters
+Folder.error.nameNull=Name is required.
+Folder.error.nameSize=Name cannot be more than 255 characters.
 
 
 # ---------------------------------------------------------------------- Footer
diff --git a/app/src/main/resources/ApplicationResources_de.properties b/app/src/main/resources/ApplicationResources_de.properties
index 35d9ca673..2c0126bd3 100644
--- a/app/src/main/resources/ApplicationResources_de.properties
+++ b/app/src/main/resources/ApplicationResources_de.properties
@@ -100,10 +100,8 @@ WeblogConfig.error.descriptionSize=Die Beschreibung darf nicht l\u00E4nger als 2
 # errors from validation
 WeblogConfig.error.nameNull=Der Name muss eingegeben werden
 WeblogConfig.error.nameSize=Der Name darf nicht l\u00E4nger als 255 Zeichen sein
-bookmarkForm.add.subtitle=Lesezeichen hinzuf\u00FCgen in Ordner [{0}]
 # ------------------------------------------------------------- BookmarkForm.jsp
 bookmarkForm.add.title=Neues Lesezeichen hinzuf\u00FCgen
-bookmarkForm.edit.subtitle=Lesezeichen bearbeiten in Ordner [{0}]
 bookmarkForm.edit.title=Lesezeichen bearbeiten
 bookmarkForm.image=Bild URL
 bookmarkForm.rssUrl=Newsfeed URL
@@ -112,23 +110,15 @@ bookmarkForm.url=Lesezeichen URL
 bookmarksForm.addBookmark=Lesezeichen hinzuf\u00FCgen
 bookmarksForm.addFolder=Ordner hinzuf\u00FCgen
 bookmarksForm.delete=L\u00F6sche Auswahl
-bookmarksForm.delete.confirm=Ausgew\u00E4hlte Lesezeichen l\u00F6schen?
-bookmarksForm.edit.tip=Anklicken um das Lesezeichen zu bearbeiten
 bookmarksForm.error.move=Fehler beim Verschieben, Elternknoten nach Kindknoten zu verschieben ist nicht erlaubt
-bookmarksForm.folder=Ordner
 bookmarksForm.importBookmarks=Lesezeichen via OPML importieren
 bookmarksForm.move=Verschiebe Auswahl
-bookmarksForm.move.confirm=Ausgew\u00E4hlte Lesezeichen verschieben?
-bookmarksForm.path=Ordner
-bookmarksForm.root=root
 bookmarksForm.rootPrompt=Die ist Ihr oberster Lesezeichenordner. Die Lesezeichen, die Sie hier anlegen, werden im Blogrollen Bereich Ihres Blogs erscheinen (vorausgesetzt Sie benutzen eines der Standardthemen). Sie k\u00F6nnen Lesezeichenordner anlegen, aber Sie m\u00FCssen entsprechende Lesezeichenanzeigemacros zu Ihren Weblog Schablonen hinzuf\u00FCgen, wenn Sie die Ordnerinhalte anzeigen wollen.
 bookmarksForm.rootTitle=Blogroll
 bookmarksForm.subtitle=Lesezeichen verwalten in Weblog <span>{0}</span>
-bookmarksForm.visitLink=Besuche
 bookmarksForm.visitLink.tip=Klicken Sie um die Website zu besuchen
 bookmarksImport.error=Fehler beim Importieren von Lesezeichen: {0}
 bookmarksImport.import=Import
-bookmarksImport.imported=OPML Lesezeichen wurden importiert in den Ordner [{0}]
 bookmarksImport.prompt=Laden Sie eine OPML Standarddatei zu Ihrer Lesezeichensammlung. Die Lesezeichen werden in einen neuen Lesezeichenordner mit dem Namen 'imported-[Zeitstempel]'. Danach k\u00F6nnen Sie die Lesezeichen bearbeiten und in andere Ordner verschieben.
 bookmarksImport.subtitle=Lesezeichen wurden via OPML in Weblog <span>{0}</span> importiert
 # ------------------------------------------------------ Bookmarks import.jsp
@@ -346,10 +336,8 @@ error.upload.forbiddenFile=Es k\u00F6nnen nur Dateien hochgeladen werden, die in
 errorPage.message=Roller hat eine unerwartete Ausnahmebedingung festgestellt und aufgezeichnet.
 errorPage.title=Unerwartete Ausnahmebedingung
 #------------------------------------------------------------ Struts Validator
-folderForm.add.subtitle=Neuen Lesezeichenordner hinzuf\u00FCgen
 # --------------------------------------------------------------- FolderForm.jsp
 folderForm.add.title=Ordner hinzuf\u00FCgen
-folderForm.edit.subtitle=Bearbeite Lesezeichenordner [{0}]
 folderForm.edit.title=Ordner bearbeiten
 folderForm.error.duplicateName=Der Ordnername {0} wird bereits verwendet, bitte w\u00E4hlen Sie einen anderen
 # ---------------------------------------------------------------------- Footer
diff --git a/app/src/main/resources/ApplicationResources_es.properties b/app/src/main/resources/ApplicationResources_es.properties
index e8e795526..e80bc0d3f 100644
--- a/app/src/main/resources/ApplicationResources_es.properties
+++ b/app/src/main/resources/ApplicationResources_es.properties
@@ -32,24 +32,17 @@ generic.delete=Eliminar
 
 
 bookmarkForm.add.title=A\u00F1adir nuevo marcador
-bookmarkForm.add.subtitle=A\u00F1adiendo marcador en la carpeta [{0}]
 bookmarkForm.edit.title=Editar marcador
-bookmarkForm.edit.subtitle=Editando marcador en carpeta [{0}]
 bookmarkForm.image=URL de la imagen
 bookmarkForm.rssUrl=URL de la suscripci\u00F3n
 bookmarkForm.url=URL del marcador
-bookmarksForm.root=ra\u00EDz
 bookmarksForm.rootTitle=Blogroll
 bookmarksForm.rootPrompt=Esta es la carpeta de marcadores de nivel superior. Los marcadores que ponga aqu\u00ED aparecer\u00E1n en la secci\u00F3n blogroll de su blog (suponiendo que est\u00E9 usando uno de los temas por defecto). Puede crear carpetas de marcadores aqu\u00ED, pero tendr\u00E1 que a\u00F1adir los correspondientes macros de visualizaci\u00F3n a sus plantillas del weblog si desea mostrar sus contenidos.
 bookmarksForm.subtitle=Administrar marcadores en el weblog <span>{0}</span>
 bookmarksForm.addBookmark=A\u00F1adir marcador
 bookmarksForm.addFolder=A\u00F1adir carpeta de marcador
 bookmarksForm.delete=Borrar seleccionado
-bookmarksForm.folder=Carpeta de marcador
-bookmarksForm.edit.tip=Haga click para editar esta marcador
 bookmarksForm.move=Mover el seleccionado
-bookmarksForm.path=Carpeta de marcador
-bookmarksForm.visitLink=Visitar
 bookmarksForm.visitLink.tip=Haga click para visitar este sitio
 bookmarksForm.error.move=Error al mover, no est\u00E1n permitidos los movimientos de padre a hijo.
 bookmarksImport.title=Importar marcadores OPML
@@ -198,9 +191,7 @@ error.permissionDenied.reason3=Su conexi\u00F3n a la base de datos del servidor
 errorPage.title=Excepci\u00F3n inesperada
 errorPage.message=Roller ha encontrado y registrado una excepci\u00F3n inesperada.
 folderForm.add.title=A\u00F1adir carpeta
-folderForm.add.subtitle=A\u00F1adir nuevo marcador
 folderForm.edit.title=Editar carpeta
-folderForm.edit.subtitle=Editar carpeta de marcadores [{0}]
 inviteMember.title=Invitar a un nuevo miembro
 inviteMember.subtitle=Invitar a un nuevo usuario a que se una a este weblog
 inviteMember.prompt=Invitar a un usuario a unirse a este weblog seleccionando abajo su direcci\u00F3n de correo electr\u00F3nico, eligiendo un permiso para este y haciendo click en el bot\u00F3n Enviar invitaci\u00F3n. Si el usuario no se muestra en la lista de abajo, escriba las primeras letras del nombre de usuario o direcci\u00F3n de correo electr\u00F3nico para encontrar coincidencias.
diff --git a/app/src/main/resources/ApplicationResources_fr.properties b/app/src/main/resources/ApplicationResources_fr.properties
index 8c7f4c362..d75e9ab36 100644
--- a/app/src/main/resources/ApplicationResources_fr.properties
+++ b/app/src/main/resources/ApplicationResources_fr.properties
@@ -33,16 +33,13 @@ generic.delete=Effacer
 # ------------------------------------------------------------- BookmarkForm.jsp
 
 bookmarkForm.add.title=Ajouter un signet
-bookmarkForm.add.subtitle=Ajouter un signet dans le répertoire [{0}]
 bookmarkForm.edit.title=Editer un signet
-bookmarkForm.edit.subtitle=Editer un signet dans le répertoire [{0}]
 bookmarkForm.image=Lien de l'image
 bookmarkForm.rssUrl=Adresse du fil d'information
 bookmarkForm.url=Lien du signet
 
 # ----------------------------------------------------------- BookmarksForm.jsp
 
-bookmarksForm.root=racine
 bookmarksForm.rootTitle=Signets
 
 #FIXME
@@ -58,13 +55,7 @@ bookmarksForm.subtitle=Gérer les signets du blog<span>{0}</span>
 bookmarksForm.addBookmark=Ajouter un signet
 bookmarksForm.addFolder=Ajouter un répertoire de signets
 bookmarksForm.delete=Effacer la sélection
-bookmarksForm.delete.confirm=Effacer les signets sélectionnés ?
-bookmarksForm.folder=Répertoire de signets
-bookmarksForm.edit.tip=Cliquez pour éditer ce signet ou répertoire
 bookmarksForm.move=Déplacer la selection
-bookmarksForm.move.confirm=Déplacer les signets sélectionnés ?
-bookmarksForm.path=Chemin
-bookmarksForm.visitLink=Visiter
 bookmarksForm.visitLink.tip=Cliquez ici pour visiter ce site
 
 bookmarksForm.error.move=Erreur : déplacer un répertoire parent dans un sous-répertoire est interdit
@@ -79,7 +70,6 @@ bookmarksImport.prompt=Importer un fichier au standard OPML dans votre collectio
 Les signets seront importés dans un nouveau répertoire de signets portant le nom \
 imported-[date]. Vous pourrez alors les éditer et les déplacer dans d'autres répertoires \
 si vous le désirez.
-bookmarksImport.imported=Signets OPML importés dans le répertoire [{0}]
 bookmarksImport.error=Une erreur est survenue durant l'importation de signets : {0}
 bookmarksImport.import=Importer
 
@@ -381,10 +371,8 @@ Pour résoudre ce problème, veuillez contacter votre administrateur système.
 # --------------------------------------------------------------- FolderForm.jsp
 
 folderForm.add.title=Ajouter un répertoire
-folderForm.add.subtitle=Ajoute un répertoire de signets dans le répertoire [{0}]
 
 folderForm.edit.title=Editer un répertoire
-folderForm.edit.subtitle=Edite le répertoire de signets dans le répertoire [{0}]
 
 folderForm.error.duplicateName=Le répertoire '{0}' est en cours d'utilisation. \
 Vous devez choisir un autre répertoire.
diff --git a/app/src/main/resources/ApplicationResources_ja.properties b/app/src/main/resources/ApplicationResources_ja.properties
index f6ca6b556..e21310a16 100644
--- a/app/src/main/resources/ApplicationResources_ja.properties
+++ b/app/src/main/resources/ApplicationResources_ja.properties
@@ -32,16 +32,13 @@ generic.delete=\u524A\u9664
 # ------------------------------------------------------------- BookmarkForm.jsp
 
 bookmarkForm.add.title=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u3092\u8FFD\u52A0\u3059\u308B
-bookmarkForm.add.subtitle=\u30D5\u30A9\u30EB\u30C0[{0}]\u306B\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u3092\u8FFD\u52A0\u3059\u308B
 bookmarkForm.edit.title=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u3092\u7DE8\u96C6\u3059\u308B
-bookmarkForm.edit.subtitle=\u30D5\u30A9\u30EB\u30C0[{0}]\u306E\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u3092\u7DE8\u96C6\u3059\u308B
 bookmarkForm.image=\u753B\u50CFURL
 bookmarkForm.rssUrl=\u30CB\u30E5\u30FC\u30B9\u30D5\u30A3\u30FC\u30C9\u306EURL
 bookmarkForm.url=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u306EURL
 
 # ----------------------------------------------------------- BookmarksForm.jsp
 
-bookmarksForm.root=\u30EB\u30FC\u30C8
 bookmarksForm.rootTitle=Blogroll
 bookmarksForm.rootPrompt=\u30E1\u30A4\u30F3\u306E\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u30D5\u30A9\u30EB\u30C0\u3067\u3059\u3002\u3053\u3053\u3067\u8A2D\u5B9A\u3057\u305F\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u306F\u30D6\u30ED\u30B0\u306EBlogroll\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u8868\u793A\u3055\u308C\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30C6\u30FC\u30DE\u3092\u4F7F\u3063\u3066\u3044\u308B\u5834\u5408)\u3002\u8FFD\u52A0\u306E\u30D5\u30A9\u30EB\u30C0\u3092\u4F5C\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u304C\u3001\u305D\u306E\u30D5\u30A9\u30EB\u30C0\u306E\u5185\u5BB9\u3092\u8868\u793A\u3057\u305F\u3044\u5834\u5408\u306F\u5BFE\u5FDC\u3059\u308B\u30DE\u30AF\u30ED\u3092\u30D6\u30ED\u30B0\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306B\u8FFD\u52A0\u3057\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093\u3002
 bookmarksForm.subtitle=<span>{0}</span>\u306E\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u7BA1\u7406
@@ -49,11 +46,7 @@ bookmarksForm.subtitle=<span>{0}</span>\u306E\u30D6\u30C3\u30AF\u30DE\u30FC\u30A
 bookmarksForm.addBookmark=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u8FFD\u52A0
 bookmarksForm.addFolder=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u30D5\u30A9\u30EB\u30C0\u8FFD\u52A0
 bookmarksForm.delete=\u9078\u629E\u3057\u305F\u3082\u306E\u3092\u524A\u9664
-bookmarksForm.folder=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u30D5\u30A9\u30EB\u30C0
-bookmarksForm.edit.tip=\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u3092\u7DE8\u96C6
 bookmarksForm.move=\u9078\u629E\u3057\u305F\u3082\u306E\u3092\u79FB\u52D5
-bookmarksForm.path=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u30D5\u30A9\u30EB\u30C0
-bookmarksForm.visitLink=\u8A2A\u554F
 bookmarksForm.visitLink.tip=\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u8A2A\u554F
 
 bookmarksForm.error.move=\u89AA\u304B\u3089\u5B50\u3078\u306E\u79FB\u52D5\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u306A\u3044\u305F\u3081\u79FB\u52D5\u3067\u304D\u307E\u305B\u3093
@@ -67,7 +60,6 @@ bookmarksImport.prompt=OPML\u5F62\u5F0F\u3067\u8A18\u8FF0\u3055\u308C\u305F\u30D
 \u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u3067\u304D\u307E\u3059\u3002\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u305F\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u306F\u300Cimported-[timestamp]\u300D\
 \u30D5\u30A9\u30EB\u30C0\u3078\u4FDD\u5B58\u3055\u308C\u307E\u3059\u3002\u3053\u308C\u3089\u306F\u65E2\u5B58\u306E\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u3068\u540C\u3058\u3088\u3046\u306B\
 \u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u81EA\u4F53\u306E\u7DE8\u96C6\u3084\u30D5\u30A9\u30EB\u30C0\u79FB\u52D5\u306A\u3069\u306E\u7DE8\u96C6\u3092\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
-bookmarksImport.imported=OPML\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u3092\u30D5\u30A9\u30EB\u30C0[{0}]\u3078\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u307E\u3057\u305F
 bookmarksImport.error=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF{0}\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u30A8\u30E9\u30FC
 
 # ----------------------------------------------------------------- cacheInfo.jsp
@@ -311,9 +303,7 @@ errorPage.message=Roller\u304C\u4F8B\u5916\u3092\u8A18\u9332\u3057\u307E\u3057\u
 # --------------------------------------------------------------- FolderForm.jsp
 
 folderForm.add.title=\u30D5\u30A9\u30EB\u30C0\u8FFD\u52A0
-folderForm.add.subtitle=\u65B0\u3057\u3044\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u30D5\u30A9\u30EB\u30C0\u3092\u8FFD\u52A0\u3057\u307E\u3059
 folderForm.edit.title=\u30D5\u30A9\u30EB\u30C0\u7DE8\u96C6
-folderForm.edit.subtitle=\u30D5\u30A9\u30EB\u30C0[{0}]\u3092\u7DE8\u96C6\u3057\u307E\u3059
 
 # ------------------------------------------------------ index / setup page
 
@@ -937,7 +927,6 @@ comment.validator.bannedwordslistMessage=\u30B3\u30E1\u30F3\u30C8\u306B\u30D6\u3
 comment.validator.excessSizeMessage=\u30B3\u30E1\u30F3\u30C8\u304C{0}\u6587\u5B57\u3092\u8D85\u3048\u3066\u3044\u307E\u3059
 comment.validator.excessLinksMessage=\u30B3\u30E1\u30F3\u30C8\u306B{0}\u500B\u4EE5\u4E0A\u306E\u30EA\u30F3\u30AF\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
 Entry.error.textNull=\u672C\u6587\u306F\u5FC5\u9808\u9805\u76EE\u3067\u3059
-bookmarksForm.delete.confirm=\u9078\u629E\u3057\u305F\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u3092\u524A\u9664\u3057\u307E\u3059\u304B\uFF1F
 commentManagement.bulkDeletePrompt2=\u3053\u308C\u3089\u3059\u3079\u3066\u3092\u524A\u9664\u3057\u307E\u3059\u304B\uFF1F
 CreateWeblog.error.descriptionSize=\u8A73\u7D30\u306F255\u6587\u5B57\u4EE5\u5185\u3067\u306A\u3051\u308C\u3070\u3044\u3051\u307E\u305B\u3093
 Template.error.descriptionSize=\u8A73\u7D30\u306F255\u6587\u5B57\u4EE5\u5185\u3067\u306A\u3051\u308C\u3070\u3044\u3051\u307E\u305B\u3093
@@ -971,7 +960,6 @@ loginPage.loginOpenID=\u30ED\u30B0\u30A4\u30F3
 configForm.pageMaxEntries=\u30DA\u30FC\u30B8\u3042\u305F\u308A\u306E\u6700\u5927\u8868\u793A\u30A8\u30F3\u30C8\u30EA\u6570
 yourWebsites.userCount=\u30E1\u30F3\u30D0\u30FC
 commentServlet.email.thereAreSystemMessages=Roller\u30B7\u30B9\u30C6\u30E0\u30E1\u30C3\u30BB\u30FC\u30B8
-bookmarksForm.move.confirm=\u9078\u629E\u3057\u305F\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u3092\u79FB\u52D5\u3057\u307E\u3059\u304B\uFF1F
 Bookmark.error.nameSize=\u540D\u524D\u306F255\u6587\u5B57\u4EE5\u5185\u3067\u306A\u3051\u308C\u3070\u3044\u3051\u307E\u305B\u3093
 CreateWeblog.error.nameSize=\u540D\u524D\u306F255\u6587\u5B57\u4EE5\u5185\u3067\u306A\u3051\u308C\u3070\u3044\u3051\u307E\u305B\u3093
 WeblogConfig.error.nameSize=\u540D\u524D\u306F255\u6587\u5B57\u4EE5\u5185\u3067\u306A\u3051\u308C\u3070\u3044\u3051\u307E\u305B\u3093
@@ -1170,7 +1158,6 @@ userRegister.success.ready=\u30D5\u30A9\u30FC\u30E0\u306F\u554F\u984C\u306A\u304
 pageForm.tip=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u7DE8\u96C6\u3057\u3066\u3001\u751F\u6210\u3055\u308C\u308B\u30DA\u30FC\u30B8\u3092\u5909\u66F4\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3067\u4F7F\u7528\u3059\u308B\u3053\u3068\u306E\u3067\u304D\u308B\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u304A\u3088\u3073\u30B3\u30FC\u30C9\u306B\u3064\u3044\u3066\u306FRoller\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30FB\u30AC\u30A4\u30C9\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u3053\u308C\u306F\u4E0A\u7D1A\u30E6\u30FC\u30B6\u30FC\u306E\u305F\u3081\u306E\u3082\u306E\u3067\u3042\u308A\u3001\u3082\u3057\u3042\u306A\u305F\u304CHTML\u306B\u8A73\u3057\u304F\u306A\u3044\u5834\u5408\u306F\u305D\u306E\u307E\u307E\u306B\u3057\u3066\u304A\u3044\u305F\u65B9\u304C\u826F\u3044\u3067\u3057\u3087\u3046\u3002
 planetGroupSubs.column.feedUrl=\u30D5\u30A3\u30FC\u30C9URL
 mediaFileSuccess.createPost=\u65B0\u3057\u304F\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u4F7F\u3063\u3066\u65B0\u3057\u3044\u30A8\u30F3\u30C8\u30EA\u3092\u4F5C\u6210\u3059\u308B
-bookmarkForm.requiredFields={0}\u3068{1}\u306F\u5FC5\u9808\u3067\u3059\u3002
 planetGroupSubs.column.title=\u30BF\u30A4\u30C8\u30EB
 bookmarksForm.deleteFolder.confirm=\u30D5\u30A9\u30EB\u30C0\u3068\u3001\u30D5\u30A9\u30EB\u30C0\u306B\u542B\u307E\u308C\u308B\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u3092\u524A\u9664\u3057\u3066\u3088\u308D\u3057\u3044\u3067\u3059\u304B?
 planetSubscription.error=\u30CB\u30E5\u30FC\u30B9\u30D5\u30A3\u30FC\u30C9URL\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
@@ -1189,7 +1176,6 @@ pingTarget.malformedUrl=URL\u304C\u4E0D\u6B63\u306A\u5F62\u5F0F\u3067\u3059\u300
 mediaFileView.filesTagged=\u30BF\u30B0\u304C <b>{0}</b> \u306E\u30D5\u30A1\u30A4\u30EB
 weblogEdit.hasComments=<a href\="{0}">\u30B3\u30E1\u30F3\u30C8 [{1}]</a>
 categoryDeleteOK.title=\u30AB\u30C6\u30B4\u30EA\u306E\u524A\u9664
-bookmarksForm.url=URL
 mediaFile.move.success=\u30E1\u30C7\u30A3\u30A2\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u6B63\u5E38\u306B\u79FB\u52D5\u3055\u308C\u307E\u3057\u305F\u3002
 mediaFileView.noResults=\u6761\u4EF6\u306B\u5408\u81F4\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u306F\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u4ED6\u306E\u6761\u4EF6\u3092\u8A66\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 planetGroups.error.title=\u30BF\u30A4\u30C8\u30EB\u306F\u5FC5\u9808\u9805\u76EE\u3067\u3059
@@ -1380,7 +1366,6 @@ pingTarget.created=Ping\u30BF\u30FC\u30B2\u30C3\u30C8 "{0}" \u304C\u8FFD\u52A0\u
 themeEditor.yourCustomStylesheet=<em style\="color\:red">\u30AB\u30B9\u30BF\u30E0</em>\u30FB\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u30FB\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002
 tabbedmenu.weblog.pingSetup=Pings
 mediaFileAdd.copyright=\u8457\u4F5C\u6A29\u8868\u793A
-bookmarksForm.folder.edit.tip=\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u3092\u7DE8\u96C6
 installer.aboutTheException=\u4EE5\u4E0A\u306E\u60C5\u5831\u3067\u554F\u984C\u304C\u7279\u5B9A\u3067\u304D\u306A\u3044\u5834\u5408\u3001\u3082\u3046\u5C11\u3057\u8A73\u7D30\u306A\u60C5\u5831\u306F\u3053\u3061\u3089\u3067\u3059\u3002\u6839\u672C\u306E\u539F\u56E0\u306F\u3001\u3053\u306E\u30BF\u30A4\u30D7\u306E\u4F8B\u5916\u3067\u3059
 mediaFileEdit.tags=\u30BF\u30B0\uFF08\u30B9\u30DA\u30FC\u30B9\u3067\u5206\u5272\uFF09
 macro.weblog.noEntriesForCategory=\u6307\u5B9A\u3055\u308C\u305F\u30AB\u30C6\u30B4\u30EA\u306B\u306F\u30A8\u30F3\u30C8\u30EA\u30FC\u304C\u3042\u308A\u307E\u305B\u3093
diff --git a/app/src/main/resources/ApplicationResources_ko.properties b/app/src/main/resources/ApplicationResources_ko.properties
index 3adb9a1a4..06f66c561 100644
--- a/app/src/main/resources/ApplicationResources_ko.properties
+++ b/app/src/main/resources/ApplicationResources_ko.properties
@@ -32,10 +32,8 @@ generic.delete=\uc0ad\uc81c
 # ------------------------------------------------------------- BookmarkForm.jsp
 
 bookmarkForm.add.title=\uc0c8 \ubd81\ub9c8\ud06c \ucd94\uac00
-bookmarkForm.add.subtitle=[{0}] \ud3f4\ub354\uc5d0 \uc0c8 \ubd81\ub9c8\ud06c \ucd94\uac00
 
 bookmarkForm.edit.title=\ubd81\ub9c8\ud06c \ud3b8\uc9d1
-bookmarkForm.edit.subtitle=[{0}] \ud3f4\ub354\uc758 \ubd81\ub9c8\ud06c \ud3b8\uc9d1
 
 bookmarkForm.image=\uc774\ubbf8\uc9c0 URL
 bookmarkForm.rssUrl=\ub274\uc2a4 \ud53c\ub4dc URL
@@ -53,7 +51,6 @@ Bookmark.error.feedUrlBad=\uc785\ub825\ud558\uc2e0 \ud53c\ub4dc URL\uc774 \uc720
 
 # ----------------------------------------------------------- BookmarksForm.jsp
 
-bookmarksForm.root=\ub8e8\ud2b8
 bookmarksForm.rootTitle=\ubd81\ub9c8\ud06c
 
 bookmarksForm.rootPrompt=\
@@ -68,13 +65,7 @@ bookmarksForm.subtitle=\uc6f9\ub85c\uadf8 <span>{0}</span> \ub0b4\uc758 \ubd81\u
 bookmarksForm.addBookmark=\ubd81\ub9c8\ud06c \ucd94\uac00
 bookmarksForm.addFolder=\ubd81\ub9c8\ud06c \ud3f4\ub354 \ucd94\uac00
 bookmarksForm.delete=\uc120\ud0dd \ud56d\ubaa9 \uc0ad\uc81c
-bookmarksForm.delete.confirm=\uc120\ud0dd\ub41c \ubd81\ub9c8\ud06c\ub4e4\uc744 \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?
-bookmarksForm.folder=\ubd81\ub9c8\ud06c \ud3f4\ub354
-bookmarksForm.edit.tip=\uc774 \ud3f4\ub354 \ub610\ub294 \ubd81\ub9c8\ud06c\ub97c \ud3b8\uc9d1\ud558\uc2dc\ub824\uba74 \ud074\ub9ad\ud558\uc2ed\uc2dc\uc624.
 bookmarksForm.move=\uc120\ud0dd \ud56d\ubaa9 \uc774\ub3d9
-bookmarksForm.move.confirm=\uc120\ud0dd\ub41c \ubd81\ub9c8\ud06c\ub4e4\uc744 \uc774\ub3d9\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?
-bookmarksForm.path=\uacbd\ub85c
-bookmarksForm.visitLink=\ubc29\ubb38
 bookmarksForm.visitLink.tip=\uc774 \uc0ac\uc774\ud2b8\ub97c \ubc29\ubb38\ud558\uc2dc\ub824\uba74 \ud074\ub9ad\ud558\uc2ed\uc2dc\uc624.
 
 bookmarksForm.error.move=\uc774\ub3d9 \uc911 \uc624\ub958\uac00 \ubc1c\uc0dd\ud558\uc600\uc2b5\ub2c8\ub2e4. \ubd80\ubaa8 \ud3f4\ub354\ub294 \uc790\uc2dd \ud3f4\ub354\ub85c \uc774\ub3d9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
@@ -87,7 +78,6 @@ bookmarksImport.subtitle=OPML\uc744 \ud1b5\ud574 \uc6f9\ub85c\uadf8 <span>{0}</s
 bookmarksImport.prompt=\ud45c\uc900 OPML \ud30c\uc77c\uc744 \uadc0\ud558\uc758 \ubd81\ud30c\ud06c \uceec\ub809\uc158\uc73c\ub85c \uc5c5\ub85c\ub4dc\ud558\uc2ed\uc2dc\uc624. \
 \ubd81\ub9c8\ud06c\ub4e4\uc774 imported-[\uc2dc\uac04\ud45c\uc2dc] \ub77c\ub294 \ud3f4\ub354 \uc774\ub984\uc73c\ub85c \uac00\uc838\uc62c \uc218 \uc788\uc2b5\ub2c8\ub2e4. \
 \ud544\uc694\ud55c \uacbd\uc6b0 \ud3b8\uc9d1\ud558\uac70\ub098 \ub2e4\ub978 \ubd81\ub9c8\ud06c \ud3f4\ub354\ub85c \uc774\ub3d9\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
-bookmarksImport.imported=[{0}] \ud3f4\ub354\ub85c \uac00\uc838\uc628 OPML \ubd81\ub9c8\ud06c\ub4e4
 bookmarksImport.error=\ubd81\ub9c8\ud06c \uac00\uc838\uc624\uae30 \uc624\ub958: {0}
 bookmarksImport.import=\uac00\uc838\uc624\uae30
 
@@ -399,10 +389,8 @@ error.permissionDenied.reason3=\ube14\ub85c\uadf8 \uc11c\ubc84\uc758 \ub370\uc77
 # --------------------------------------------------------------- FolderForm.jsp
 
 folderForm.add.title=\ud3f4\ub354 \ucd94\uac00
-folderForm.add.subtitle=\ud3f4\ub354 [{0}]\uc5d0 \uc0c8 \ubd81\ub9c8\ud06c \ud3f4\ub354 \ucd94\uac00
 
 folderForm.edit.title=\ud3f4\ub354 \ud3b8\uc9d1
-folderForm.edit.subtitle=\ud3f4\ub354 [{0}]\uc5d0 \ubd81\ub9c8\ud06c \ud3f4\ub354 \ud3b8\uc9d1
 
 folderForm.error.duplicateName=\ud3f4\ub354\uba85, {0}\uc774(\uac00) \uc774\ubbf8 \uc0ac\uc6a9\uc911\uc785\ub2c8\ub2e4. \ub2e4\ub978 \uc774\ub984\uc744 \uc120\ud0dd\ud558\uc2ed\uc2dc\uc624.
 
diff --git a/app/src/main/resources/ApplicationResources_ru.properties b/app/src/main/resources/ApplicationResources_ru.properties
index 78aa084ca..b6c92664b 100644
--- a/app/src/main/resources/ApplicationResources_ru.properties
+++ b/app/src/main/resources/ApplicationResources_ru.properties
@@ -39,10 +39,8 @@ generic.delete=\u0423\u0434\u0430\u043B\u0438\u0442\u044C
 # ------------------------------------------------------------- BookmarkForm.jsp
 
 bookmarkForm.add.title=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0441\u0441\u044B\u043B\u043A\u0443
-bookmarkForm.add.subtitle=\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0441\u0441\u044B\u043B\u043A\u0438 \u0432 \u043F\u0430\u043F\u043A\u0443 [{0}]
 
 bookmarkForm.edit.title=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0441\u0441\u044B\u043B\u043A\u0443
-bookmarkForm.edit.subtitle=\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0435 \u0441\u0441\u044B\u043B\u043A\u0438 \u0432 \u043F\u0430\u043F\u043A\u0435 [{0}]
 
 bookmarkForm.image=URL \u041A\u0430\u0440\u0442\u0438\u043D\u043A\u0438
 bookmarkForm.rssUrl=URL \u041D\u043E\u0432\u043E\u0441\u0442\u0435\u0439
@@ -50,7 +48,6 @@ bookmarkForm.url=URL \u0421\u0441\u044B\u043B\u043A\u0438
 
 # ----------------------------------------------------------- BookmarksForm.jsp
 
-bookmarksForm.root=root
 bookmarksForm.rootTitle=\u0421\u0441\u044B\u043B\u043A\u0438
 
 bookmarksForm.rootPrompt=\
@@ -64,11 +61,7 @@ bookmarksForm.subtitle=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0
 bookmarksForm.addBookmark=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0441\u0441\u044B\u043B\u043A\u0443
 bookmarksForm.addFolder=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043F\u0430\u043F\u043A\u0443 \u0441\u0441\u044B\u043B\u043E\u043A
 bookmarksForm.delete=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u043E\u0435
-bookmarksForm.folder=\u041F\u0430\u043F\u043A\u0430 \u0421\u0441\u044B\u043B\u043E\u043A
-bookmarksForm.edit.tip=\u041D\u0430\u0436\u043C\u0438\u0442\u0435 \u0447\u0442\u043E\u0431\u044B \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C
 bookmarksForm.move=\u041F\u0435\u0440\u0435\u043C\u0435\u0441\u0442\u0438\u0442\u044C \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u043E\u0435
-bookmarksForm.path=\u041F\u0430\u043F\u043A\u0430 \u0421\u0441\u044B\u043B\u043E\u043A
-bookmarksForm.visitLink=\u041F\u043E\u0441\u0435\u0442\u0438\u0442\u044C
 bookmarksForm.visitLink.tip=\u041D\u0430\u0436\u043C\u0438\u0442\u0435 \u0447\u0442\u043E\u0431\u044B \u043F\u0435\u0440\u0435\u0439\u0442\u0438
 
 bookmarksForm.error.move=\u041E\u0448\u0438\u0431\u043A\u0430 \u043F\u0435\u0440\u0435\u043C\u0435\u0449\u0435\u043D\u0438\u044F, parent to child moves not allowed
@@ -260,9 +253,7 @@ errorPage.message=Roller \u0432\u0441\u0442\u0440\u0435\u0442\u0438\u043B \u0438
 # --------------------------------------------------------------- FolderForm.jsp
 
 folderForm.add.title=\u0421\u043E\u0437\u0434\u0430\u0439\u0442\u0435 \u043D\u043E\u0432\u0443\u044E \u043F\u0430\u043F\u043A\u0443
-folderForm.add.subtitle=\u0421\u043E\u0437\u0434\u0430\u0439\u0442\u0435 \u043D\u043E\u0432\u0443\u044E \u043F\u0430\u043F\u043A\u0443 \u0437\u0430\u043A\u043B\u0430\u0434\u043E\u043A
 folderForm.edit.title=\u041F\u0435\u0440\u0435\u0438\u043C\u0435\u043D\u0443\u0439\u0442\u0435 \u043F\u0430\u043F\u043A\u0443
-folderForm.edit.subtitle=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043F\u0430\u043F\u043A\u0438 \u0437\u0430\u043A\u043B\u0430\u0434\u043E\u043A [{0}]
 
 # ----------------------------------------------------------------- Invite member
 
diff --git a/app/src/main/resources/ApplicationResources_zh_CN.properties b/app/src/main/resources/ApplicationResources_zh_CN.properties
index 03792b4a7..e3047046d 100644
--- a/app/src/main/resources/ApplicationResources_zh_CN.properties
+++ b/app/src/main/resources/ApplicationResources_zh_CN.properties
@@ -47,18 +47,13 @@ generic.poweredBy=Powered by Apache Roller
 # ------------------------------------------------------------- BookmarkForm.jsp
 
 bookmarkForm.add.title=\u6DFB\u52A0\u65B0\u4E66\u7B7E
-bookmarkForm.add.subtitle=\u5728\u6587\u4EF6\u5939 [{0}] \u4E2D\u6DFB\u52A0\u65B0\u7684\u4E66\u7B7E
 bookmarkForm.edit.title=\u7F16\u8F91\u4E66\u7B7E
-bookmarkForm.edit.subtitle=\u6B63\u5728\u7F16\u8F91\u6587\u4EF6\u5939 [{0}] \u4E2D\u7684\u4E66\u7B7E
 bookmarkForm.image=\u56FE\u50CFURL
 bookmarkForm.rssUrl=\u65B0\u95FB\u6E90URL
 bookmarkForm.url=\u4E66\u7B7EURL
 bookmarkForm.created=\u4E66\u7B7E\u5DF2\u521B\u5EFA
 bookmarkForm.updated=\u4E66\u7B7E "{0}" \u5DF2\u66F4\u65B0
-bookmarkForm.required=\u8981\u6C42\u8F93\u5165\u540D\u5B57\u548C\u4E66\u7B7EURL\u3002
-bookmarkForm.badUrls=\u8FD9\u4E9BURL\u662F\u65E0\u6548\u7684:
 
-bookmarkForm.requiredFields=\u8981\u6C42\u8F93\u5165\u540D\u5B57\u548C\u4E66\u7B7EURL\u3002
 
 # errors from validation
 Bookmark.error.nameNull=\u540D\u5B57\u4E0D\u80FD\u4E3A\u7A7A
@@ -73,7 +68,6 @@ bookmarkForm.error.duplicateName=\u5DF2\u5B58\u5728\u540C\u540D\u7684\u4E66\u7B7
 
 # ----------------------------------------------------------- BookmarksForm.jsp
 
-bookmarksForm.root=\u6839
 bookmarksForm.rootTitle=\u6536\u85CF
 
 bookmarksForm.subtitle=\u7BA1\u7406 <span>{0}</span> \u535A\u5BA2\u4E2D\u7684\u4E66\u7B7E
@@ -81,27 +75,17 @@ bookmarksForm.subtitle=\u7BA1\u7406 <span>{0}</span> \u535A\u5BA2\u4E2D\u7684\u4
 bookmarksForm.rootPrompt=\u8FD9\u662F\u4F60\u7684\u4E3B\u4E66\u7B7E\u5939\u3002\u8FD9\u91CC\u4FDD\u7559\u7684\u4E66\u7B7E\u4F1A\u5728\u535A\u5BA2\u7684\u6536\u85CF\u680F\u4E2D\u663E\u793A\uFF08\u8FD9\u91CC\u5047\u8BBE\u4F60\u4F7F\u7528\u9ED8\u8BA4\u4E3B\u9898\uFF09\u3002\u4F60\u8FD8\u53EF\u4EE5\u5EFA\u7ACB\u65B0\u7684\u4E66\u7B7E\u5939\uFF0C\u4F46\u662F\u5982\u679C\u4F60\u9700\u8981\u663E\u793A\u65B0\u4E66\u7B7E\u5939\u7684\u5185\u5BB9\uFF0C\u5C31\u9700\u8981\u5728\u4F60\u7684\u535A\u5BA2\u6A21\u677F\u4E2D\u5F15\u7528\u76F8\u5E94\u7684\u5B8F\u6765\u4F7F\u7528\u5B83\u3002
 bookmarksForm.otherPrompt=\u8FD9\u662F\u4E00\u4E2A\u81EA\u5B9A\u4E49\u535A\u5BA2\u7FA4\u3002\u5982\u679C\u4F60\u60F3\u8981\u5728\u4F60\u7684\u535A\u5BA2\u4E0A\u663E\u793A\u8FD9\u4E9B\u94FE\u63A5\u5219\u5FC5\u987B\u7F16\u8F91\u4F60\u7684\u535A\u5BA2\u4E3B\u9898\u6A21\u677F\u3002
 
-bookmarksForm.path=\u4E66\u7B7E\u5939
 bookmarksForm.blogrollName=\u535A\u5BA2\u7FA4\u540D\u79F0
-bookmarksForm.switchTo=\u5207\u6362\u5230\u535A\u5BA2\u7FA4
 bookmarksForm.deleteFolder=\u5220\u9664\u4E66\u7B7E\u5939
-bookmarksForm.newBlogroll=\u65B0\u5EFA\u535A\u5BA2\u7FA4...
 
 bookmarksForm.addBookmark=\u6DFB\u52A0\u4E66\u7B7E
 bookmarksForm.addFolder=\u65B0\u5EFA\u4E66\u7B7E\u5939
 bookmarksForm.delete=\u5220\u9664\u9009\u4E2D\u7684
-bookmarksForm.delete.confirm=\u786E\u5B9A\u8981\u5220\u9664\u9009\u4E2D\u7684\u4E66\u7B7E\u5417\uFF1F
 bookmarksForm.delete.areYouSure=\u4F60\u786E\u5B9A\u8981\u5220\u9664\u9009\u4E2D\u7684\u535A\u5BA2\u7FA4\u94FE\u63A5\u5417\uFF1F
-bookmarksForm.url=URL
 bookmarksForm.feedurl=\u65B0\u95FB\u6E90URL
-bookmarksForm.folder=\u4E66\u7B7E\u5939
-bookmarksForm.edit.tip=\u70B9\u51FB\u4EE5\u7F16\u8F91\u6B64\u4E66\u7B7E
-bookmarksForm.folder.edit.tip=\u70B9\u51FB\u4EE5\u7F16\u8F91\u6B64\u4E66\u7B7E\u5939
 bookmarksForm.move=\u79FB\u52A8\u81F3
-bookmarksForm.move.confirm=\u786E\u5B9A\u8981\u79FB\u52A8\u9009\u4E2D\u7684\u4E66\u7B7E\u5417\uFF1F
 bookmarksForm.selectAllLabel=\u9009\u62E9\u6240\u6709\u4E66\u7B7E
 bookmarksForm.selectOneLabel=\u9009\u62E9\u4E66\u7B7E {0}
-bookmarksForm.visitLink=\u8BBF\u95EE
 bookmarksForm.visitLink.tip=\u70B9\u51FB\u4EE5\u8BBF\u95EE\u6B64\u7AD9\u70B9
 
 bookmarksForm.error.move=\u79FB\u52A8\u9519\u8BEF\uFF0C\u4E0D\u5141\u8BB8\u5C06\u7236\u6587\u4EF6\u5939\u79FB\u52A8\u5230\u5B83\u7684\u5B50\u6587\u4EF6\u5939\u4E2D
@@ -123,7 +107,6 @@ bookmarksImport.prompt=\u4E0A\u4F20\u6807\u51C6OPML\u683C\u5F0F\u7684\u4E66\u7B7
 
 
 
-bookmarksImport.imported=\u5BFC\u5165OPML\u683C\u5F0F\u4E66\u7B7E\u5230\u4E66\u7B7E\u5939 [{0}]
 bookmarksImport.error=\u5BFC\u5165\u4E66\u7B7E\u9519\u8BEF: {0}
 bookmarksImport.import=\u5BFC\u5165
 
@@ -485,10 +468,8 @@ errorPage.message=\u7CFB\u7EDF\u5DF2\u53D1\u751F\u5E76\u8BB0\u5F55\u4E86\u4E00\u
 # --------------------------------------------------------------- FolderForm.jsp
 
 folderForm.add.title=\u6DFB\u52A0\u4E66\u7B7E\u5939
-folderForm.add.subtitle=\u6DFB\u52A0\u65B0\u7684\u4E66\u7B7E\u5939
 
 folderForm.edit.title=\u7F16\u8F91\u4E66\u7B7E\u5939
-folderForm.edit.subtitle=\u6B63\u5728\u7F16\u8F91\u4E66\u7B7E\u5939 [{0}]
 
 folderForm.created=\u5DF2\u521B\u5EFA\u6587\u4EF6\u5939
 folderForm.updated=\u5DF2\u66F4\u65B0\u6587\u4EF6\u5939\u540D\u79F0
diff --git a/app/src/main/resources/struts.xml b/app/src/main/resources/struts.xml
index a688e2114..3f16dc41b 100644
--- a/app/src/main/resources/struts.xml
+++ b/app/src/main/resources/struts.xml
@@ -509,7 +509,7 @@
         <action name="bookmarks"
                 class="org.apache.roller.weblogger.ui.struts2.editor.Bookmarks">
             <result name="list" type="tiles">.Bookmarks</result>
-            <allowed-methods>delete,deleteFolder,execute,folderCreated,move,view</allowed-methods>
+            <allowed-methods>delete,deleteFolder,execute,folderCreated,move,reorder</allowed-methods>
         </action>
 
         <action name="bookmarkAdd"
@@ -540,7 +540,12 @@
         <action name="bookmarksImport"
                 class="org.apache.roller.weblogger.ui.struts2.editor.BookmarksImport">
             <result name="input" type="tiles">.BookmarksImport</result>
-            <result name="success" type="chain">bookmarks</result>
+            <!-- redirect, so the blogroll page opens the new blogroll at its own URL -->
+            <result name="success" type="redirectAction">
+                <param name="actionName">bookmarks!folderCreated</param>
+                <param name="weblog">${weblog}</param>
+                <param name="folderId">${folderId}</param>
+            </result>
             <allowed-methods>execute,save</allowed-methods>
         </action>
 
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
index a2182d0f2..744a4868c 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
@@ -17,838 +17,406 @@
 --%>
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 
+<%-- Blogroll: the weblog's blogrolls (bookmark folders) on the left, or in a strip above on a
+     phone, and the links of one of them. Links are dragged (or moved with the arrow keys on their
+     handle) to reorder; selected links can be moved or deleted. Dialogs post with AJAX and reload
+     the page, which then shows a short confirmation. Text the script needs is in data-* attributes. --%>
+
+<s:url var="importURL" action="bookmarksImport">
+    <s:param name="weblog" value="%{actionWeblog.handle}"/>
+</s:url>
+
+<div id="blogrollPage" class="blogroll-page"
+     data-folder-id="<s:property value='folderId'/>"
+     data-folder-name="<s:property value='folder.name'/>"
+     data-folder-url="<s:url action='bookmarks' escapeAmp='false'><s:param name='weblog' value='%{actionWeblog.handle}'/></s:url>"
+     data-msg-link-added="<s:text escapeHtml="true" name='bookmarkForm.created'/>"
+     data-msg-link-saved="<s:text escapeHtml="true" name='bookmarkForm.updated'/>"
+     data-msg-folder-added="<s:text escapeHtml="true" name='folderForm.created'/>"
+     data-msg-folder-renamed="<s:text escapeHtml="true" name='folderForm.updatedNamed'/>"
+     data-msg-folder-deleted="<s:text escapeHtml="true" name='bookmarksForm.folderDeleted'/>"
+     data-msg-deleted-one="<s:text escapeHtml="true" name='bookmarksForm.deletedOne'/>"
+     data-msg-deleted-many="<s:text escapeHtml="true" name='bookmarksForm.deletedMany'/>"
+     data-msg-moved-one="<s:text escapeHtml="true" name='bookmarksForm.movedOne'/>"
+     data-msg-moved-many="<s:text escapeHtml="true" name='bookmarksForm.movedMany'/>"
+     data-msg-order-saved="<s:text escapeHtml="true" name='bookmarksForm.orderSaved'/>"
+     data-msg-error="<s:text escapeHtml="true" name='generic.error.check.logs'/>"
+     data-msg-name-required="<s:text escapeHtml="true" name='bookmarkForm.nameRequired'/>"
+     data-msg-url-required="<s:text escapeHtml="true" name='bookmarkForm.urlRequired'/>"
+     data-msg-bad-url="<s:text escapeHtml="true" name='bookmarkForm.badUrl'/>"
+     data-msg-folder-name-required="<s:text escapeHtml="true" name='bookmarksForm.blogroll.requiredFields'/>"
+     data-msg-selected="<s:text escapeHtml="true" name='bookmarksForm.selectedCount'/>"
+     data-title-add-link="<s:text escapeHtml="true" name='bookmarksForm.addLink.title'/>"
+     data-title-edit-link="<s:text escapeHtml="true" name='bookmarksForm.editLink.title'/>"
+     data-title-add-folder="<s:text escapeHtml="true" name='bookmarksForm.addBlogroll.title'/>"
+     data-title-rename-folder="<s:text escapeHtml="true" name='bookmarksForm.editBlogroll.title'/>"
+     data-title-delete-one="<s:text escapeHtml="true" name='bookmarksForm.deleteOne.title'/>"
+     data-title-delete-many="<s:text escapeHtml="true" name='bookmarksForm.deleteMany.title'/>">
+
+<div class="blogroll-header">
+    <p class="subtitle mb-0">
+        <s:text name="bookmarksForm.subtitle">
+            <s:param value="weblog"/>
+        </s:text>
+    </p>
+    <div class="blogroll-header-actions">
+        <a class="btn btn-outline-secondary" href="<s:property value='%{importURL}'/>">
+            <span class="bi bi-upload" aria-hidden="true"></span>
+            <s:text escapeHtml="true" name="bookmarksForm.importBookmarks"/>
+        </a>
+        <button type="button" id="addFolderButton" class="btn btn-outline-primary">
+            <span class="bi bi-folder-plus" aria-hidden="true"></span>
+            <s:text escapeHtml="true" name="bookmarksForm.addFolder"/>
+        </button>
+    </div>
+</div>
 
-<%--
-Blogroll link management
-
-We used to call them Bookmarks and Folders, now we call them Blogroll links and Blogrolls.
---%>
-
-<%-- ================================================================================================ --%>
-
-<%-- Main blogroll/folder management interface, a checkbox-table with some buttons  --%>
-
-<p class="subtitle"><s:text name="bookmarksForm.subtitle"> <s:param value="weblog"/> </s:text></p>
-
-<s:if test="folder.name == 'default'">
-    <p class="pagetip"><s:text name="bookmarksForm.rootPrompt"/></p>
-</s:if>
-<s:else>
-    <p class="pagetip"><s:text name="bookmarksForm.otherPrompt"/></p>
-</s:else>
-
-
-<%-- table of blogroll links with selection checkboxes, wrapped in a form --%>
-
-<s:form action="bookmarks!delete" theme="bootstrap" cssClass="form-horizontal">
-    <s:hidden name="salt"/>
-    <s:hidden name="weblog"/>
-    <s:hidden name="folderId"/>
-
-    <%-- for default blogroll, show page "tip" and read-only folder name --%>
-
-    <s:if test="folder.name == 'default'">
-
-        <div class="row mb-3">
-            <label class="col-sm-3 col-form-label" for="bookmarks_folder_name">
-                <s:text name="bookmarksForm.blogrollName"/>
-            </label>
-            <div class="col-sm-9 controls">
-                <div class="form-control"><s:property value="folder.name"/></div>
+<div class="blogroll-layout">
+
+    <%-- the blogrolls; a GET link each, so a blogroll can be reloaded, bookmarked and reached with Back --%>
+    <nav class="blogroll-nav" aria-label="<s:text escapeHtml="true" name='bookmarksForm.folders'/>">
+        <ul class="blogroll-folders">
+            <s:iterator var="f" value="allFolders">
+                <s:url var="folderURL" action="bookmarks" escapeAmp="false">
+                    <s:param name="weblog" value="%{actionWeblog.handle}"/>
+                    <s:param name="folderId" value="%{#f.id}"/>
+                </s:url>
+                <li>
+                    <a href="<s:property value='%{folderURL}'/>"
+                       class="blogroll-folder<s:if test='#f.id == folderId'> active</s:if>"
+                       <s:if test="#f.id == folderId">aria-current="page"</s:if>>
+                        <span class="blogroll-folder-name">
+                            <s:if test="#f.name == 'default'"><span class="bi bi-star" aria-hidden="true"></span></s:if>
+                            <s:property value="#f.name"/>
+                        </span>
+                        <span class="blogroll-folder-count"><s:property value="linkCount(#f)"/></span>
+                    </a>
+                </li>
+            </s:iterator>
+        </ul>
+    </nav>
+
+    <section class="blogroll-main" aria-labelledby="blogrollTitle">
+
+        <div class="blogroll-main-header">
+            <div class="blogroll-title-block">
+                <h3 id="blogrollTitle" class="blogroll-title"><s:property value="folder.name"/></h3>
+                <span class="blogroll-meta">
+                    <s:text escapeHtml="true" name="bookmarksForm.linkCount"><s:param value="links.size()"/></s:text>
+                    <s:if test="defaultFolder">
+                        &middot; <s:text escapeHtml="true" name="bookmarksForm.defaultNote"/>
+                    </s:if>
+                </span>
             </div>
-        </div>
-
-    </s:if>
-
-    <s:if test="folder.name != 'default'">
-
-        <%-- Blogroll / Folder Name --%>
-
-        <%-- for other blogrolls, show textarea so user can rename it --%>
-        <%-- don't use Struts tags here so button can be on same line as text input --%>
-
-        <div class="row mb-3">
-            <label class="col-sm-3 col-form-label" for="bookmarks_folder_name">
-                <s:text name="bookmarksForm.blogrollName"/>
-            </label>
-            <div class="col-sm-9 controls">
-                <div style="display:flex; gap:1em;">
-                    <input type="text" name="folder.name" style="flex:1;"
-                           value="<s:property value='folder.name'/>" id="bookmarks_folder_name" class="form-control"
-                           onchange="nameChanged()"
-                           onkeyup="nameChanged()"/>
-                    <button type="button" id="rename_button" class="btn btn-success"
-                            onclick="renameFolder(); return false;"
-                            onsubmit="return false;">
-                        <s:text name="generic.rename"/>
+            <div class="blogroll-main-actions">
+                <button type="button" id="addLinkButton" class="btn btn-primary">
+                    <span class="bi bi-plus-lg" aria-hidden="true"></span>
+                    <s:text escapeHtml="true" name="bookmarksForm.addBookmark"/>
+                </button>
+                <s:if test="!defaultFolder">
+                    <button type="button" id="renameFolderButton" class="btn btn-outline-secondary">
+                        <span class="bi bi-pencil" aria-hidden="true"></span>
+                        <s:text escapeHtml="true" name="generic.rename"/>
                     </button>
-                    <button type="button" id="rename_cancel" class="btn btn-outline-secondary"
-                            onclick="cancelRenameFolder(); return false;"
-                            onsubmit="return false;">
-                        <s:text name="generic.cancel"/>
+                    <button type="button" id="deleteFolderButton" class="btn btn-outline-danger">
+                        <span class="bi bi-trash" aria-hidden="true"></span>
+                        <s:text escapeHtml="true" name="bookmarksForm.deleteFolder"/>
                     </button>
-                </div>
+                </s:if>
             </div>
         </div>
 
-    </s:if>
+        <p class="pagetip" id="blogrollTip">
+            <s:if test="defaultFolder"><s:text escapeHtml="true" name="bookmarksForm.rootPrompt"/></s:if>
+            <s:else><s:text escapeHtml="true" name="bookmarksForm.otherPrompt"/></s:else>
+        </p>
 
-    <%-- allow user to select the bookmark folder to view --%>
+        <%-- carries the salt for the reorder post; the link ids are added by the script --%>
+        <s:form id="linksReorderForm" action="bookmarks!reorder" theme="simple">
+            <s:hidden name="salt"/>
+            <s:hidden name="weblog"/>
+            <s:hidden name="folderId"/>
+        </s:form>
 
-    <div class="form-group ">
-        <label class="col-sm-3 control-label" for="bookmarks_viewFolderId">
-            <s:text name="bookmarksForm.switchTo"/>
-        </label>
-        <div class="col-sm-9 controls">
-            <s:select name="viewFolderId" list="allFolders" listKey="id" listValue="name" emptyOption="true"
-                      theme="simple" cssClass="form-control" onchange="viewChanged()"/>
-        </div>
-    </div>
+        <s:if test="!links.isEmpty()">
 
-    <table class="rollertable table table-striped">
-
-        <tr class="rHeaderTr">
-            <th width="5%">
-                <input name="control" type="checkbox"
-                       onclick="toggleFunctionAll(this.checked); selectionChanged()"
-                       title="<s:text name="bookmarksForm.selectAllLabel"/>"/>
-            </th>
-            <th class="rollertable" width="25%"><s:text name="generic.name"/></th>
-            <th class="rollertable" width="70%"><s:text name="bookmarksForm.url"/></th>
-            <th class="rollertable" width="5%"><s:text name="generic.edit"/></th>
-        </tr>
-
-        <s:if test="folder.bookmarks.size > 0">
-
-            <%-- Bookmarks --%>
-            <s:iterator var="bookmark" value="folder.bookmarks" status="rowstatus">
-                <tr class="rollertable_odd">
-
-                    <td class="rollertable center" style="vertical-align:middle">
-                        <input type="checkbox" name="selectedBookmarks" onchange="selectionChanged()"
-                               title="<s:text name="bookmarksForm.selectOneLabel"><s:param value="#bookmark.name"/></s:text>"
-                               value="<s:property value="#bookmark.id"/>"/>
-                    </td>
-
-                    <td>
-                        <str:truncateNicely lower="40" upper="50">
-                            <s:property value="#bookmark.name"/>
-                        </str:truncateNicely>
-                    </td>
-
-                    <td>
-                        <s:if test="#bookmark.url != null">
-                            <a href="<s:property value="#bookmark.url" />" target="_blank">
-                                <str:truncateNicely lower="70" upper="90">
-                                    <s:property value="#bookmark.url"/>
-                                </str:truncateNicely>
-                                <span class="bi bi-play-circle"></span>
+            <%-- move and delete the selected links; the ids are added by the script --%>
+            <s:form id="linksMoveForm" action="bookmarks!move" theme="simple" cssClass="blogroll-bulkbar">
+                <s:hidden name="salt"/>
+                <s:hidden name="weblog"/>
+                <s:hidden name="folderId"/>
+                <div class="form-check mb-0">
+                    <input type="checkbox" class="form-check-input" id="selectAllLinks">
+                    <label class="form-check-label" for="selectAllLinks" id="selectedCount"><s:text escapeHtml="true" name="bookmarksForm.selectAllLabel"/></label>
+                </div>
+                <div class="blogroll-bulk-actions">
+                    <s:if test="!moveTargets.isEmpty()">
+                        <div class="input-group input-group-sm blogroll-move">
+                            <label class="input-group-text" for="linksMoveForm_targetFolderId"><s:text escapeHtml="true" name="bookmarksForm.moveTo"/></label>
+                            <s:select name="targetFolderId" id="linksMoveForm_targetFolderId" list="moveTargets"
+                                      listKey="id" listValue="name" cssClass="form-select" disabled="true"/>
+                            <button type="button" id="moveLinksButton" class="btn btn-outline-secondary" disabled>
+                                <s:text escapeHtml="true" name="bookmarksForm.move"/>
+                            </button>
+                        </div>
+                    </s:if>
+                    <button type="button" id="deleteLinksButton" class="btn btn-sm btn-outline-danger" disabled>
+                        <span class="bi bi-trash" aria-hidden="true"></span>
+                        <s:text escapeHtml="true" name="bookmarksForm.delete"/>
+                    </button>
+                </div>
+            </s:form>
+
+            <ul id="linkList" class="link-list" aria-describedby="blogrollTip">
+                <s:iterator var="bookmark" value="links">
+                    <li class="link-row"
+                        data-link-id="<s:property value='#bookmark.id'/>"
+                        data-link-name="<s:property value='plainText(#bookmark.name)'/>"
+                        data-link-url="<s:property value='#bookmark.url'/>"
+                        data-link-feed="<s:property value='#bookmark.feedUrl'/>"
+                        data-link-desc="<s:property value='plainText(#bookmark.description)'/>"
+                        data-link-image="<s:property value='#bookmark.image'/>">
+
+                        <input type="checkbox" class="form-check-input link-select" value="<s:property value='#bookmark.id'/>"
+                               aria-label="<s:text escapeHtml="true" name='bookmarksForm.selectOneLabel'><s:param value='plainText(#bookmark.name)'/></s:text>">
+
+                        <button type="button" class="link-handle"
+                                aria-label="<s:text escapeHtml="true" name='bookmarksForm.moveHandle'><s:param value='plainText(#bookmark.name)'/></s:text>">
+                            <span class="bi bi-grip-vertical" aria-hidden="true"></span>
+                        </button>
+
+                        <s:if test="#bookmark.image != null && #bookmark.image != ''">
+                            <img class="link-image" src="<s:property value='#bookmark.image'/>" alt="" loading="lazy">
+                        </s:if>
+                        <s:else>
+                            <span class="link-image link-image-none" aria-hidden="true"><span class="bi bi-link-45deg"></span></span>
+                        </s:else>
+
+                        <div class="link-main">
+                            <a href="#" class="link-name link-edit"><s:property value="plainText(#bookmark.name)"/></a>
+                            <a class="link-url" href="<s:property value='#bookmark.url'/>" target="_blank" rel="noopener noreferrer"
+                               title="<s:text escapeHtml="true" name='bookmarksForm.visitLink.tip'/>"><s:property value="#bookmark.url"/><span
+                               class="bi bi-box-arrow-up-right" aria-hidden="true"></span></a>
+                            <s:if test="#bookmark.description != null && #bookmark.description != ''">
+                                <span class="link-desc"><s:property value="plainText(#bookmark.description)"/></span>
+                            </s:if>
+                        </div>
+
+                        <%-- OPML import sets a link's feed to its own URL when the file names none --%>
+                        <s:if test="#bookmark.feedUrl != null && #bookmark.feedUrl != '' && #bookmark.feedUrl != #bookmark.url">
+                            <a class="link-feed" href="<s:property value='#bookmark.feedUrl'/>" target="_blank" rel="noopener noreferrer"
+                               title="<s:text escapeHtml="true" name='bookmarksForm.feedurl'/>"
+                               aria-label="<s:text escapeHtml="true" name='bookmarksForm.feedOf'><s:param value='plainText(#bookmark.name)'/></s:text>">
+                                <span class="bi bi-rss" aria-hidden="true"></span>
                             </a>
                         </s:if>
 
-                    </td>
-
-                    <td align="center">
-
-                        <a href="#" class="bookmark-edit-link"
-                           data-bookmark-id="<s:property value="#bookmark.id"/>"
-                           data-bookmark-name="<s:property value="#bookmark.name"/>"
-                           data-bookmark-url="<s:property value="#bookmark.url"/>"
-                           data-bookmark-feed-url="<s:property value="#bookmark.feedUrl"/>"
-                           data-bookmark-description="<s:property value="#bookmark.description"/>"
-                           data-bookmark-image="<s:property value="#bookmark.image"/>">
-                            <span class="bi bi-pencil-square"></span>
-                        </a>
-
-                    </td>
-
-                </tr>
-
-            </s:iterator>
-
+                        <div class="link-actions">
+                            <button type="button" class="btn btn-sm btn-outline-secondary link-edit">
+                                <span class="bi bi-pencil" aria-hidden="true"></span>
+                                <s:text escapeHtml="true" name="generic.edit"/>
+                            </button>
+                            <button type="button" class="btn btn-sm btn-outline-danger link-delete">
+                                <span class="bi bi-trash" aria-hidden="true"></span>
+                                <s:text escapeHtml="true" name="generic.delete"/>
+                            </button>
+                        </div>
+                    </li>
+                </s:iterator>
+            </ul>
         </s:if>
 
         <s:else>
-            <tr>
-                <td style="vertical-align:middle; padding-top: 1em;" colspan="7">
-                    <s:text name="bookmarksForm.noresults"/>
-                </td>
-            </tr>
+            <div class="blogroll-empty">
+                <span class="bi bi-link-45deg" aria-hidden="true"></span>
+                <p><s:text escapeHtml="true" name="bookmarksForm.noresults"/></p>
+                <div class="blogroll-empty-actions">
+                    <button type="button" class="btn btn-primary" id="emptyAddLinkButton">
+                        <span class="bi bi-plus-lg" aria-hidden="true"></span>
+                        <s:text escapeHtml="true" name="bookmarksForm.addBookmark"/>
+                    </button>
+                    <a class="btn btn-outline-secondary" href="<s:property value='%{importURL}'/>">
+                        <span class="bi bi-upload" aria-hidden="true"></span>
+                        <s:text escapeHtml="true" name="bookmarksForm.importBookmarks"/>
+                    </a>
+                </div>
+            </div>
         </s:else>
+    </section>
+</div>
 
-    </table>
-
-    <%-- Add new blogroll link --%>
-    <button type="button" class="btn btn-success" onclick="addBookmark();return false;"
-            style="float:left; margin-right: 2em">
-        <s:text name="bookmarksForm.addBookmark"/>
-    </button>
-
-    <s:if test="!allFolders.isEmpty && folder.bookmarks.size > 0">
-        <%-- Move-selected button --%>
-        <s:submit id="move_selected" value="%{getText('bookmarksForm.move')}" theme="simple"
-                  cssClass="btn btn-warning" cssStyle="float:left; margin-right: 0.5em"
-                  action="bookmarks!move" onclick="onMoveToFolder();return false;"/>
-        <%-- Move-to combo-box --%>
-        <s:select name="targetFolderId" theme="simple"
-                  cssClass="form-select" cssStyle="float:left; width:auto; margin-right: 2em"
-                  list="allFolders" listKey="id" listValue="name"/>
-    </s:if>
-
-    <s:if test="folder.bookmarks.size > 0">
-        <%-- Delete-selected button --%>
-        <input id="delete_selected" value="<s:text name="bookmarksForm.delete"/>" type="button"
-               class="btn btn-danger" style="float:left;"
-               onclick="confirmDeleteSelected();return false;"/>
-    </s:if>
-
-    <s:if test="folder.name != 'default'">
-        <%-- Delete the whole blogroll --%>
-        <s:submit value="%{getText('bookmarksForm.deleteFolder')}" theme="simple"
-                  cssClass="btn btn-danger" cssStyle="float:right; clear:left; margin-top:2em"
-                  action="bookmarks!deleteFolder"
-                  onclick="confirmDeleteFolder();return false;"/>
-
-    </s:if>
-
-</s:form>
-
-
-<%-- -------------------------------------------------------- --%>
-
-<%-- JavaScript for Main blogroll/folder management interface --%>
-
-<script>
-
-    var originalName;
-    var renameButton;
-    var renameCancel;
-    var deleteSelectedButton;
-    var moveSelectedButton;
-    var viewSelector;
-    var moveToSelector;
-
-    $(document).ready(function () {
-
-        originalName = $("#bookmarks_folder_name:first").val();
-
-        if (!originalName) {
-            originalName = 'default';
-        }
-
-        renameButton = $("#rename_button:first");
-        renameCancel = $("#rename_cancel:first");
-        deleteSelectedButton = $("#delete_selected:first");
-        moveSelectedButton = $("#move_selected:first");
-        viewSelector = $("#bookmarks_viewFolderId:first");
-        moveToSelector = $("#bookmarks_targetFolderId:first");
-
-        nameChanged();
-        selectionChanged();
-
-        // add the "New Blogroll" option to blogroll selectors
-        viewSelector.append(new Option('<s:text name="bookmarksForm.newBlogroll"/>', "new_blogroll"));
-    });
-
-
-    function selectionChanged() {
-        var checked = false;
-        var selected = $("[name=selectedBookmarks]");
-        for (var i in selected) {
-            if (selected[i].checked) {
-                checked = true;
-                break;
-            }
-        }
-        if (checked) {
-            deleteSelectedButton.attr("disabled", false);
-            deleteSelectedButton.addClass("btn-danger");
-
-            moveSelectedButton.attr("disabled", false);
-            moveSelectedButton.addClass("btn-warning");
-
-            moveToSelector.attr("disabled", false);
-
-        } else {
-            deleteSelectedButton.attr("disabled", true);
-            deleteSelectedButton.removeClass("btn-danger");
-
-            moveSelectedButton.attr("disabled", true);
-            moveSelectedButton.removeClass("btn-warning");
-
-            moveToSelector.attr("disabled", true);
-        }
-    }
-
-    function nameChanged() {
-        var newName = $("#bookmarks_folder_name:first").val();
-        if (newName && newName !== originalName && newName.trim().length > 0) {
-            renameButton.attr("disabled", false);
-            renameButton.addClass("btn-success");
-
-            renameCancel.attr("disabled", false);
-
-        } else {
-            renameButton.attr("disabled", true);
-            renameButton.removeClass("btn-success");
-
-            renameCancel.attr("disabled", true);
-        }
-    }
-
-    function renameFolder() {
-
-        var newName = $("#bookmarks_folder_name:first").val();
-        $("#folderEditForm_bean_name").val(newName);
-
-        var folderId = $("#bookmarks_folderId").val();
-        $("#folderEditForm_bean_id").val(folderId);
-
-        // post blogroll via AJAX
-        var folderEditForm = $("#folderEditForm")[0];
-        $.ajax({
-            method: 'post',
-            url: folderEditForm.attributes["action"].value,
-            data: $("#folderEditForm").serialize(),
-            context: document.body
-
-        }).done(function (data, status, response) {
-
-            refreshSalt(data);
-
-            var errors = actionErrors(data);
-            if (errors.length > 0) {
-                alert(errors.join("\n"));
-
-            } else {
-                originalName = newName;
-                nameChanged();
-            }
-
-        }).fail(function (data) {
-            alert('<s:text name="generic.error.check.logs" />');
-        });
-    }
-
-    function cancelRenameFolder(event) {
-        $("#bookmarks_folder_name:first").val(originalName);
-        nameChanged();
-    }
-
-    function confirmDeleteSelected() {
-        $('#delete-links-modal').modal('show');
-    }
-
-    function deleteSelected() {
-        document.bookmarks[0].submit();
-    }
-
-    function confirmDeleteFolder() {
-        $('#boomarks_delete_folder_folderId').val($('#bookmarks_folderId:first').val());
-        $('#deleteBlogrollName').text($('#deleteBlogrollName').data('folder-name'));
-        $('#delete-blogroll-modal').modal('show');
-    }
-
-    function onMoveToFolder() {
-        var bookmarksForm = $("#bookmarks")[0];
-        bookmarksForm.action = "bookmarks!move.rol";
-        bookmarksForm.submit();
-    }
-
-    function viewChanged() {
-
-        var bookmarksForm = $("#bookmarks")[0];
-        var folderEditForm = $("#folderEditForm")[0];
-
-        if ("new_blogroll" === bookmarksForm.viewFolderId.value) {
-            newBlogroll();
-
-        } else {
-            // user changed the blogroll/folder, post to "view" action to get new page
-            bookmarksForm.action = "bookmarks!view.rol";
-            bookmarksForm.submit();
-        }
-    }
-
-    function newBlogroll() {
-
-        // user selected New Blogroll option, show the add/edit blogroll modal
-        $('#blogroll-edit-title').html('<s:text name="bookmarksForm.addBlogroll.title" />');
-
-        folderEditForm.action = "folderAdd!save.rol";
-        folderEditForm.actionName.value = "folderAdd";
-
-        // disable save button until valid name is entered
-
-        $('#addedit-bookmarkfolder-modal').modal('show');
-
-        onBlogrollFormChanged();
-    }
-
-</script>
-
-
-<%-- ================================================================================================ --%>
-
-<%-- add/edit blogroll / folder form --%>
+<div id="blogrollStatus" class="visually-hidden" role="status" aria-live="polite"></div>
 
-<div id="addedit-bookmarkfolder-modal" class="modal fade addedit-bookmarkfolder-modal" tabindex="-1" role="dialog">
+<div class="toast-container position-fixed bottom-0 end-0 p-3">
+    <div id="blogrollToast" class="toast align-items-center text-bg-success border-0" role="status" aria-atomic="true">
+        <div class="d-flex">
+            <div class="toast-body"></div>
+            <button type="button" class="btn-close btn-close-white me-2 m-auto" data-bs-dismiss="toast"
+                    aria-label="<s:text escapeHtml="true" name='generic.close'/>"></button>
+        </div>
+    </div>
+</div>
 
-    <div class="modal-dialog modal-lg">
+<%-- add/edit link dialog --%>
 
+<div id="link-edit-modal" class="modal fade" tabindex="-1" aria-labelledby="link-edit-title" aria-hidden="true">
+    <div class="modal-dialog">
         <div class="modal-content">
-
             <div class="modal-header">
-                <h3 id="blogroll-edit-title"></h3>
+                <h3 class="modal-title fs-5" id="link-edit-title"></h3>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="<s:text escapeHtml="true" name='generic.close'/>"></button>
             </div>
-
             <div class="modal-body">
-                <s:form action="folderEdit" id="folderEditForm" theme="bootstrap" cssClass="form-horizontal">
+                <div id="linkEditErrors" class="alert alert-danger d-none" role="alert"></div>
+                <s:form action="bookmarkEdit!save" id="linkEditForm" theme="simple" novalidate="novalidate">
                     <s:hidden name="salt"/>
-                    <s:hidden name="actionName"/>
                     <s:hidden name="weblog"/>
-                    <s:hidden name="bean.id"/>
-
-                    <%-- action needed here because we are using AJAX to post this form --%>
-                    <s:hidden name="action:folderEdit!save" value="save"/>
-
-                    <s:textfield name="bean.name" label="%{getText('generic.name')}" maxlength="255"
-                                 onchange="onBlogrollFormChanged()"
-                                 onkeyup="onBlogrollFormChanged()"
-                    />
+                    <s:hidden name="folderId"/>
+                    <s:hidden name="bean.id" id="linkEditForm_bean_id"/>
+
+                    <div class="mb-3">
+                        <label class="form-label" for="linkEditForm_bean_url"><s:text escapeHtml="true" name="bookmarkForm.url"/></label>
+                        <s:textfield name="bean.url" id="linkEditForm_bean_url" value="" maxlength="255" type="url"
+                                     cssClass="form-control" required="required" placeholder="https://"
+                                     aria-describedby="linkUrlFeedback"/>
+                        <div id="linkUrlFeedback" class="invalid-feedback"></div>
+                    </div>
+
+                    <div class="mb-3">
+                        <label class="form-label" for="linkEditForm_bean_name"><s:text escapeHtml="true" name="generic.name"/></label>
+                        <s:textfield name="bean.name" id="linkEditForm_bean_name" value="" maxlength="255"
+                                     cssClass="form-control" required="required"
+                                     aria-describedby="linkNameFeedback linkNameHelp"/>
+                        <div id="linkNameFeedback" class="invalid-feedback"></div>
+                        <div id="linkNameHelp" class="form-text"><s:text escapeHtml="true" name="bookmarkForm.nameHelp"/></div>
+                    </div>
+
+                    <div class="mb-3">
+                        <label class="form-label" for="linkEditForm_bean_description"><s:text escapeHtml="true" name="generic.description"/></label>
+                        <s:textfield name="bean.description" id="linkEditForm_bean_description" value="" maxlength="255"
+                                     cssClass="form-control"/>
+                    </div>
+
+                    <details id="linkAdvanced" class="link-advanced">
+                        <summary><s:text escapeHtml="true" name="bookmarkForm.advanced"/></summary>
+                        <div class="mt-3 mb-3">
+                            <label class="form-label" for="linkEditForm_bean_feedUrl"><s:text escapeHtml="true" name="bookmarkForm.rssUrl"/></label>
+                            <s:textfield name="bean.feedUrl" id="linkEditForm_bean_feedUrl" value="" maxlength="255" type="url"
+                                         cssClass="form-control" aria-describedby="linkFeedHelp linkFeedFeedback"/>
+                            <div id="linkFeedFeedback" class="invalid-feedback"></div>
+                            <div id="linkFeedHelp" class="form-text"><s:text escapeHtml="true" name="bookmarkForm.feedHelp"/></div>
+                        </div>
+                        <div class="mb-1">
+                            <label class="form-label" for="linkEditForm_bean_image"><s:text escapeHtml="true" name="bookmarkForm.image"/></label>
+                            <s:textfield name="bean.image" id="linkEditForm_bean_image" value="" maxlength="255" type="url"
+                                         cssClass="form-control" aria-describedby="linkImageHelp linkImageFeedback"/>
+                            <div id="linkImageFeedback" class="invalid-feedback"></div>
+                            <div id="linkImageHelp" class="form-text"><s:text escapeHtml="true" name="bookmarkForm.imageHelp"/></div>
+                            <img id="linkImagePreview" class="link-image-preview d-none" alt="">
+                        </div>
+                    </details>
                 </s:form>
-            </div> <!-- modal-body-->
-
+            </div>
             <div class="modal-footer">
-                <p id="feedback-area-blogroll-edit"></p>
-                <button id="save_blogroll" onclick="submitEditedBlogroll()" class="btn btn-primary">
-                    <s:text name="generic.save"/>
-                </button>
-                <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">
-                    <s:text name="generic.cancel"/>
-                </button>
+                <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal"><s:text escapeHtml="true" name="generic.cancel"/></button>
+                <button type="button" id="linkSaveButton" class="btn btn-primary"><s:text escapeHtml="true" name="generic.save"/></button>
             </div>
-
-        </div> <!-- modal-content-->
-
-    </div> <!-- modal-dialog -->
-
+        </div>
+    </div>
 </div>
 
-<script>
-
-    <%-- JavaScript for add/edit blogroll modal --%>
-
-    function onBlogrollFormChanged() {
-
-        var saveBlogrollButton = $('#save_blogroll:first');
-
-        var name = $('#folderEditForm_bean_name:first').val().trim();
-
-        if (name.length > 0) {
-            saveBlogrollButton.attr("disabled", false);
-            console.log("Button enabled!");
-
-        } else {
-            saveBlogrollButton.attr("disabled", true);
-            console.log("Button disabled!");
-        }
-
-    }
-
-
-    function submitEditedBlogroll() {
-
-        var folderEditForm = $('#folderEditForm')[0];
-
-        var feedbackAreaBlogrollEdit = $("#feedback-area-blogroll-edit");
-
-        // if name is empty reject and show error message
-        if ($("#folderEditForm_bean_name").val().trim() === "") {
-            feedbackAreaBlogrollEdit.html('<s:text name="bookmarksForm.blogroll.requiredFields" />');
-            feedbackAreaBlogrollEdit.css("color", "red");
-            return;
-        }
-
-        // post blogroll via AJAX
-        $.ajax({
-            method: 'post',
-            url: folderEditForm.attributes["action"].value,
-            data: $("#folderEditForm").serialize(),
-            context: document.body
-
-        }).done(function (data, status, response) {
-
-            refreshSalt(data);
-
-            var errors = actionErrors(data);
-            if (errors.length > 0) {
-                feedbackAreaBlogrollEdit.css("color", "red");
-                feedbackAreaBlogrollEdit.text(errors.join(" "));
-
-            } else {
-                feedbackAreaBlogrollEdit.css("color", "green");
-                feedbackAreaBlogrollEdit.html('<s:text name="generic.success" />');
-                $('#blogroll-edit-modal').modal("hide");
-
-                // kludge get folderId from response header send back by Struts action
-                var newFolderId = response.getResponseHeader('folderId');
-                viewSelector.append(new Option('', newFolderId));
-                $("#bookmarks_viewFolderId").val(newFolderId);
-
-                var bookmarksForm = $("#bookmarks")[0];
-                bookmarksForm.action = "bookmarks!view.rol";
-                bookmarksForm.submit();
-            }
-
-        }).fail(function (data) {
-            feedbackAreaBlogrollEdit.html('<s:text name="generic.error.check.logs" />');
-            feedbackAreaBlogrollEdit.css("color", "red");
-        });
-    }
-
-</script>
-
-
-<%-- ========================================================================================== --%>
-
-<%-- delete blogroll confirmation modal --%>
-
-<div id="delete-links-modal" class="modal fade delete-links-modal" tabindex="-1" role="dialog">
-
-    <div class="modal-dialog modal-lg">
+<%-- add/rename blogroll dialog --%>
 
+<div id="folder-edit-modal" class="modal fade" tabindex="-1" aria-labelledby="folder-edit-title" aria-hidden="true">
+    <div class="modal-dialog">
         <div class="modal-content">
-
             <div class="modal-header">
-                <h3>
-                    <s:text name="bookmarksForm.delete.confirm"/>
-                </h3>
+                <h3 class="modal-title fs-5" id="folder-edit-title"></h3>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="<s:text escapeHtml="true" name='generic.close'/>"></button>
+            </div>
+            <div class="modal-body">
+                <div id="folderEditErrors" class="alert alert-danger d-none" role="alert"></div>
+                <s:form action="folderEdit!save" id="folderEditForm" theme="simple" novalidate="novalidate">
+                    <s:hidden name="salt"/>
+                    <s:hidden name="weblog"/>
+                    <s:hidden name="bean.id" id="folderEditForm_bean_id" value=""/>
+                    <label class="form-label" for="folderEditForm_bean_name"><s:text escapeHtml="true" name="bookmarksForm.blogrollName"/></label>
+                    <s:textfield name="bean.name" id="folderEditForm_bean_name" value="" maxlength="255"
+                                 cssClass="form-control" required="required" aria-describedby="folderNameFeedback"/>
+                    <div id="folderNameFeedback" class="invalid-feedback"></div>
+                </s:form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal"><s:text escapeHtml="true" name="generic.cancel"/></button>
+                <button type="button" id="folderSaveButton" class="btn btn-primary"><s:text escapeHtml="true" name="generic.save"/></button>
             </div>
-
-            <s:form theme="bootstrap" cssClass="form-horizontal">
-                <div class="modal-body">
-                    <s:text name="bookmarksForm.delete.areYouSure" />
-                </div>
-
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-outline-secondary" value="%{getText('generic.yes')}" onclick="deleteSelected()">
-                        <s:text name="generic.yes"/>
-                    </button>
-                    &nbsp;
-                    <button type="button" class="btn btn-outline-secondary btn-primary" data-bs-dismiss="modal">
-                        <s:text name="generic.no"/>
-                    </button>
-                </div>
-            </s:form>
-
         </div>
     </div>
 </div>
 
+<%-- delete links dialog --%>
 
-<%-- ========================================================================================== --%>
-
-<%-- delete blogroll confirmation modal --%>
-
-<div id="delete-blogroll-modal" class="modal fade delete-blogroll-modal" tabindex="-1" role="dialog">
-
-    <div class="modal-dialog modal-lg">
-
+<div id="delete-links-modal" class="modal fade" tabindex="-1" aria-labelledby="delete-links-title" aria-hidden="true">
+    <div class="modal-dialog">
         <div class="modal-content">
-
             <div class="modal-header">
-                <h3>
-                    <s:text name="blogrollDeleteOK.removeBlogroll"/>:
-                    <span id="blogroll-name"></span>
-                </h3>
+                <h3 class="modal-title fs-5" id="delete-links-title"></h3>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="<s:text escapeHtml="true" name='generic.close'/>"></button>
+            </div>
+            <div class="modal-body">
+                <div id="deleteLinksErrors" class="alert alert-danger d-none" role="alert"></div>
+                <s:form id="linksDeleteForm" action="bookmarks!delete" theme="simple">
+                    <s:hidden name="salt"/>
+                    <s:hidden name="weblog"/>
+                    <s:hidden name="folderId"/>
+                </s:form>
+                <p class="mb-0"><s:text escapeHtml="true" name="bookmarksForm.delete.areYouSure"/></p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal"><s:text escapeHtml="true" name="generic.cancel"/></button>
+                <button type="button" id="deleteLinksConfirm" class="btn btn-danger"><s:text escapeHtml="true" name="generic.delete"/></button>
             </div>
-
-            <s:form id="boomarks_delete_folder" action="bookmarks!deleteFolder" theme="bootstrap"
-                    cssClass="form-horizontal">
-                <s:hidden name="salt"/>
-                <s:hidden name="weblog"/>
-                <s:hidden name="folderId"/>
-
-                <div class="modal-body">
-                    <s:text name="blogrollDeleteOK.areYouSure" />
-                    <span id="deleteBlogrollName"
-                          data-folder-name="<s:property value="%{folder.name}"/>"></span>?
-                </div>
-
-                <div class="modal-footer">
-                    <s:submit theme="simple" cssClass="btn btn-outline-secondary" value="%{getText('generic.yes')}"/>&nbsp;
-                    <button type="button" class="btn btn-outline-secondary btn-primary" data-bs-dismiss="modal">
-                        <s:text name="generic.no"/>
-                    </button>
-                </div>
-
-            </s:form>
-
         </div>
     </div>
 </div>
 
+<%-- delete blogroll dialog --%>
 
-<%-- ================================================================================================ --%>
-
-<%-- add/edit link form: a modal --%>
-
-<div id="addedit-bookmark-modal" class="modal fade addedit-bookmark-modal" tabindex="-1" role="dialog">
-
-    <div class="modal-dialog modal-lg">
-
+<s:if test="!defaultFolder">
+<div id="delete-folder-modal" class="modal fade" tabindex="-1" aria-labelledby="delete-folder-title" aria-hidden="true">
+    <div class="modal-dialog">
         <div class="modal-content">
-
             <div class="modal-header">
-
-                <%-- Titling, processing actions different between add and edit --%>
-                <s:if test="actionName == 'bookmarkEdit'">
-                    <s:set var="subtitleKey">bookmarkForm.edit.subtitle</s:set>
-                    <s:set var="mainAction">bookmarkEdit</s:set>
-                </s:if>
-                <s:else>
-                    <s:set var="subtitleKey">bookmarkForm.add.subtitle</s:set>
-                    <s:set var="mainAction">bookmarkAdd</s:set>
-                </s:else>
-
-                <h3>
-                    <s:text name="%{#subtitleKey}"> </s:text> <span id="subtitle_folder_name"></span>
+                <h3 class="modal-title fs-5" id="delete-folder-title">
+                    <s:text escapeHtml="true" name="blogrollDeleteOK.removeBlogroll"><s:param value="folder.name"/></s:text>
                 </h3>
-
-                <div id="bookmark_required_fields" role="alert" class="alert">
-                    <s:text name="bookmarkForm.requiredFields"/>
-                </div>
-
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="<s:text escapeHtml="true" name='generic.close'/>"></button>
             </div>
-            <%-- modal header --%>
-
             <div class="modal-body">
-
-                <s:form action="bookmarkEdit" theme="bootstrap" cssClass="form-horizontal">
+                <div id="deleteFolderErrors" class="alert alert-danger d-none" role="alert"></div>
+                <s:form id="folderDeleteForm" action="bookmarks!deleteFolder" theme="simple">
                     <s:hidden name="salt"/>
                     <s:hidden name="weblog"/>
-                    <%--
-                        Edit action uses folderId for redirection back to proper bookmarks folder on cancel
-                        (as configured in struts.xml); add action also, plus to know which folder to put new
-                        bookmark in.
-                    --%>
                     <s:hidden name="folderId"/>
-                    <s:hidden name="bean.id"/>
-
-                    <s:textfield name="bean.name" maxlength="255"
-                                 onchange="onBookmarkFormChanged()"
-                                 onkeyup="onBookmarkFormChanged()"
-                                 label="%{getText('generic.name')}"/>
-
-                    <s:textfield name="bean.url" maxlength="255"
-                                 onchange="onBookmarkFormChanged()"
-                                 onkeyup="onBookmarkFormChanged()"
-                                 label="%{getText('bookmarkForm.url')}"/>
-
-                    <s:textfield name="bean.feedUrl" maxlength="255"
-                                 onchange="onBookmarkFormChanged()"
-                                 onkeyup="onBookmarkFormChanged()"
-                                 label="%{getText('bookmarkForm.rssUrl')}"/>
-
-                    <s:textfield name="bean.description" maxlength="255"
-                                 onchange="onBookmarkFormChanged()"
-                                 onkeyup="onBookmarkFormChanged()"
-                                 label="%{getText('generic.description')}"/>
-
-                    <s:textfield name="bean.image" maxlength="255"
-                                 onchange="onBookmarkFormChanged()"
-                                 onkeyup="onBookmarkFormChanged()"
-                                 label="%{getText('bookmarkForm.image')}"/>
                 </s:form>
-
+                <p class="mb-0">
+                    <s:if test="!links.isEmpty()">
+                        <s:text escapeHtml="true" name="blogrollDeleteOK.areYouSure"><s:param value="folder.name"/><s:param value="links.size()"/></s:text>
+                    </s:if>
+                    <s:else>
+                        <s:text escapeHtml="true" name="blogrollDeleteOK.empty"><s:param value="folder.name"/></s:text>
+                    </s:else>
+                </p>
             </div>
-
-            <div class="modal-body">
-                <div class="modal-footer">
-                    <p id="feedback-area-edit"></p>
-                    <button type="button" id="save_bookmark" onclick="saveBookmark()" class="btn btn-primary">
-                        <s:text name="generic.save"/>
-                    </button>
-                    <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">
-                        <s:text name="generic.cancel"/>
-                    </button>
-                </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal"><s:text escapeHtml="true" name="generic.cancel"/></button>
+                <button type="button" id="deleteFolderConfirm" class="btn btn-danger"><s:text escapeHtml="true" name="bookmarksForm.deleteFolder"/></button>
             </div>
-
-
         </div>
-        <%-- modal content --%>
-
     </div>
-    <%-- modal dialog --%>
-
-</div> <%-- modal --%>
-
-
-<%-- ---------------------------------------------------- --%>
-
-<%-- JavaScript for add/edit link modal --%>
-
-<script>
-
-    function addBookmark() {
-
-        var saveBookmarkButton = $('#save_bookmark:first');
-        saveBookmarkButton.attr("disabled", true);
-
-        var elem = $('#bookmark_required_fields:first');
-        elem.html('<s:text name="bookmarkForm.requiredFields" />');
-        elem.removeClass("alert-success");
-        elem.removeClass("alert-danger");
-        elem.addClass("alert-info");
-
-        $('#bookmarkEdit_bean_name:first').val('');
-        $('#bookmarkEdit_bean_url:first').val('');
-        $('#bookmarkEdit_bean_image:first').val('');
-        $('#bookmarkEdit_bean_feedUrl:first').val('');
-
-        $('#subtitle_folder_name:first').text(originalName);
-
-        $('#addedit-bookmark-modal').modal('show');
-    }
-
-
-    // Values come from data-* attributes and are bound via delegated listeners.
-    $(document).on('click', '.bookmark-edit-link', function (event) {
-        event.preventDefault();
-        editBookmark($(this).attr('data-bookmark-id'),
-                $(this).attr('data-bookmark-name'),
-                $(this).attr('data-bookmark-url'),
-                $(this).attr('data-bookmark-feed-url'),
-                $(this).attr('data-bookmark-description'),
-                $(this).attr('data-bookmark-image'));
-    });
-
-    function editBookmark(id, name, url, feedUrl, description, image) {
-
-        var saveBookmarkButton = $('#save_bookmark:first');
-        saveBookmarkButton.attr("disabled", true);
-
-        var elem = $('#bookmark_required_fields:first');
-        elem.html('<s:text name="bookmarkForm.requiredFields" />');
-        elem.removeClass("alert-success");
-        elem.removeClass("alert-danger");
-        elem.addClass("alert-info");
-
-        $('#bookmarkEdit_bean_id:first').val(id);
-        $('#bookmark_folderId').val(id);
-        $('#bookmarkEdit_bean_name:first').val(name);
-        $('#bookmarkEdit_bean_url:first').val(url);
-        $('#bookmarkEdit_bean_feedUrl:first').val(feedUrl);
-        $('#bookmarkEdit_bean_description:first').val(description);
-        $('#bookmarkEdit_bean_image:first').val(image);
-
-        $('#subtitle_folder_name:first').text(originalName);
-
-        $('#addedit-bookmark-modal').modal('show');
-    }
-
-
-    function onBookmarkFormChanged() {
-
-        var saveBookmarkButton = $('#save_bookmark:first');
-
-        var name = $('#bookmarkEdit_bean_name:first').val().trim();
-        var url = $('#bookmarkEdit_bean_url:first').val().trim();
-        var image = $('#bookmarkEdit_bean_image:first').val().trim();
-        var feedUrl = $('#bookmarkEdit_bean_feedUrl:first').val().trim();
-
-        var badUrls = [];
-
-        if (url.length > 0) {
-            if (!isValidUrl(url)) {
-                badUrls.push("Bookmark URL")
-            }
-        }
-
-        if (image.length > 0) {
-            if (!isValidUrl(image)) {
-                badUrls.push("Image URL")
-            }
-        }
-
-        if (feedUrl.length > 0) {
-            if (!isValidUrl(feedUrl)) {
-                badUrls.push("Newsfeed URL")
-            }
-        }
-
-        var elem = $('#bookmark_required_fields:first');
-        var message = '';
+</div>
+</s:if>
 
-        if (name.length > 0 && url.length > 0 && badUrls.length === 0) {
-            saveBookmarkButton.attr("disabled", false);
+</div>
 
-            message = '<s:text name="generic.looksGood" />';
-            elem.removeClass("alert-info");
-            elem.removeClass("alert-danger");
-            elem.addClass("alert-success");
-            elem.text(message);
-
-        } else {
-            saveBookmarkButton.attr("disabled", true);
-
-            if (name.length === 0 || url.length === 0) {
-                message = '<s:text name="bookmarkForm.required" />';
-            }
-            if (badUrls.length > 0) {
-                message = '<s:text name="bookmarkForm.badUrls" />';
-                var sep = " ";
-                for (i in badUrls) {
-                    message = message + sep + badUrls[i];
-                    sep = ", ";
-                }
-            }
-            elem.removeClass("alert-info");
-            elem.removeClass("alert-success");
-            elem.addClass("alert-danger");
-            elem.text(message);
-        }
-    }
-
-
-    function saveBookmark() {
-
-        var feedbackAreaEdit = $("#feedback-area-edit");
-
-        // post bookmark via AJAX
-        $.ajax({
-            method: 'post',
-            url: "bookmarkEdit!save.rol",
-            data: $("#bookmarkEdit").serialize(),
-            context: document.body
-
-        }).done(function (data) {
-
-            refreshSalt(data);
-
-            var errors = actionErrors(data);
-            if (errors.length > 0) {
-                feedbackAreaEdit.css("color", "red");
-                feedbackAreaEdit.text(errors.join(" "));
-
-            } else {
-                feedbackAreaEdit.css("color", "green");
-                feedbackAreaEdit.html('<s:text name="generic.success" />');
-                $('#addedit-bookmark-modal').modal("hide");
-
-                // cause page to be reloaded so that edit appears
-                // and make sure we end up on the right folder
-                bookmarksForm = $("#bookmarks")[0];
-                bookmarksForm.viewFolderId.value = bookmarksForm.folderId.value;
-                viewChanged();
-            }
-
-        }).fail(function (data) {
-            feedbackAreaEdit.html('<s:text name="generic.error.check.logs" />');
-            feedbackAreaEdit.css("color", "red");
-        });
-    }
-
-</script>
+<script src="<s:url value='/roller-ui/scripts/blogroll.js'/>"></script>
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp
index e053034eb..377974b3f 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp
@@ -17,24 +17,33 @@
 --%>
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 
-<p class="subtitle">
-    <s:text name="bookmarksImport.subtitle" >
-        <s:param value="actionWeblog.handle" />
-    </s:text>
-</p>
+<%-- Import an OPML file into a new blogroll; on success the blogroll page opens it. --%>
 
-<p class="pagetip">
-    <s:text name="bookmarksImport.prompt" />
-</p>     
+<s:url var="blogrollURL" action="bookmarks">
+    <s:param name="weblog" value="%{actionWeblog.handle}"/>
+</s:url>
 
-<s:form action="bookmarksImport!save" method="POST" enctype="multipart/form-data">
-	<s:hidden name="salt" />
-    <s:hidden name="weblog" />
-    <s:file name="opmlFile" />
-    <br />
-    <br />
-    <div class="mb-3">
-        <s:submit theme="simple" cssClass="btn btn-primary" value="%{getText('bookmarksImport.import')}" />
-        <s:submit theme="simple" cssClass="btn btn-outline-secondary" value="%{getText('generic.cancel')}" action="bookmarks" />
-    </div>
-</s:form>
+<div class="blogroll-import">
+    <p class="subtitle">
+        <s:text name="bookmarksImport.subtitle">
+            <s:param value="actionWeblog.handle"/>
+        </s:text>
+    </p>
+
+    <p class="pagetip"><s:text escapeHtml="true" name="bookmarksImport.prompt"/></p>
+
+    <s:form action="bookmarksImport!save" method="POST" enctype="multipart/form-data" theme="simple">
+        <s:hidden name="salt"/>
+        <s:hidden name="weblog"/>
+        <div class="mb-3">
+            <label class="form-label" for="opmlFile"><s:text escapeHtml="true" name="bookmarksImport.file"/></label>
+            <input type="file" class="form-control" id="opmlFile" name="opmlFile" required
+                   accept=".opml,.xml,text/xml,text/x-opml,application/xml" aria-describedby="opmlFileHelp">
+            <div id="opmlFileHelp" class="form-text"><s:text escapeHtml="true" name="bookmarksImport.fileHelp"/></div>
+        </div>
+        <div class="d-flex gap-2">
+            <s:submit theme="simple" cssClass="btn btn-primary" value="%{getText('bookmarksImport.import')}"/>
+            <a class="btn btn-outline-secondary" href="<s:property value='%{blogrollURL}'/>"><s:text escapeHtml="true" name="generic.cancel"/></a>
+        </div>
+    </s:form>
+</div>
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp
deleted file mode 100644
index 29db953fd..000000000
--- a/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp
+++ /dev/null
@@ -1,43 +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" %>
-
-<h3><s:text name="mainPage.actions"/></h3>
-<hr size="1" noshade="noshade"/>
-
-<p>
-    <%-- Add Blogroll --%>
-
-    <a href="#" onclick="newBlogroll()">
-        <span class="bi bi-plus-lg"></span>
-        <s:text name="bookmarksForm.addFolder"/>
-    </a>
-</p>
-
-<%-- Import bookmarks
-<p>
-    <s:url var="importBookmarks" action="bookmarksImport">
-        <s:param name="weblog" value="%{actionWeblog.handle}"/>
-    </s:url>
-    <s:a href="%{importBookmarks}">
-        <span class="bi bi-plus-lg"></span>
-        <s:text name="bookmarksForm.importBookmarks"/>
-    </s:a>
-</p>
---%>
-
diff --git a/app/src/main/webapp/WEB-INF/tiles.xml b/app/src/main/webapp/WEB-INF/tiles.xml
index 113d48ece..8d8612784 100644
--- a/app/src/main/webapp/WEB-INF/tiles.xml
+++ b/app/src/main/webapp/WEB-INF/tiles.xml
@@ -313,12 +313,14 @@
 
     <definition name=".Bookmarks" extends=".tiles-tabbedpage" >
         <put-attribute name="content" value="/WEB-INF/jsps/editor/Bookmarks.jsp" />
-        <put-attribute name="sidebar" value="/WEB-INF/jsps/editor/BookmarksSidebar.jsp" />
+        <!-- laid out for narrow screens, like the media pages -->
+        <put-attribute name="viewport" value="/WEB-INF/jsps/tiles/viewport.jsp" />
         <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
     </definition>
 
     <definition name=".BookmarksImport" extends=".tiles-tabbedpage" >
         <put-attribute name="content" value="/WEB-INF/jsps/editor/BookmarksImport.jsp" />
+        <put-attribute name="viewport" value="/WEB-INF/jsps/tiles/viewport.jsp" />
         <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
     </definition>
 
diff --git a/app/src/main/webapp/roller-ui/scripts/blogroll.js b/app/src/main/webapp/roller-ui/scripts/blogroll.js
new file mode 100644
index 000000000..80b0651b3
--- /dev/null
+++ b/app/src/main/webapp/roller-ui/scripts/blogroll.js
@@ -0,0 +1,529 @@
+/*
+* 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.
+*/
+
+/*
+ * Blogroll page (Bookmarks.jsp): add, edit and delete dialogs for links and
+ * blogrolls that post with AJAX, moving selected links to another blogroll,
+ * and drag (or arrow-key) reordering. After a change the page reloads and
+ * shows a short confirmation, carried across the reload in sessionStorage.
+ */
+(function ($) {
+    "use strict";
+
+    var page = document.getElementById("blogrollPage");
+    if (!page) {
+        return;
+    }
+
+    var FLASH_KEY = "roller.blogroll.flash";
+    var list = document.getElementById("linkList");
+
+    function text(name) {
+        return page.dataset[name] || "";
+    }
+
+    // messages come from resource bundles, which write parameters as {0}, {1}
+    function format(message) {
+        var args = Array.prototype.slice.call(arguments, 1);
+        return message.replace(/\{(\d)\}/g, function (match, i) {
+            return args[i] !== undefined ? args[i] : match;
+        });
+    }
+
+    function byId(id) {
+        return document.getElementById(id);
+    }
+
+    // --- confirmation after a change -------------------------------------
+
+    function showToast(message, isError) {
+        var toast = byId("blogrollToast");
+        toast.querySelector(".toast-body").textContent = message;
+        toast.classList.toggle("text-bg-success", !isError);
+        toast.classList.toggle("text-bg-danger", !!isError);
+        bootstrap.Toast.getOrCreateInstance(toast).show();
+    }
+
+    // reloads the page, or opens another blogroll, then shows the message and
+    // highlights the links named, by id or by name
+    function reloadWith(message, highlight, folderId) {
+        try {
+            sessionStorage.setItem(FLASH_KEY, JSON.stringify({ message: message, highlight: highlight || [] }));
+        } catch (e) {
+            // storage unavailable: reload without the confirmation
+        }
+        location.href = text("folderUrl") + "&folderId=" + encodeURIComponent(folderId || text("folderId"));
+    }
+
+    function showFlash() {
+        var flash = null;
+        try {
+            flash = JSON.parse(sessionStorage.getItem(FLASH_KEY));
+            sessionStorage.removeItem(FLASH_KEY);
+        } catch (e) {
+            return;
+        }
+        if (!flash) {
+            return;
+        }
+        showToast(flash.message);
+        if (list) {
+            list.querySelectorAll(".link-row").forEach(function (row) {
+                if (flash.highlight.indexOf(row.dataset.linkId) >= 0
+                        || flash.highlight.indexOf(row.dataset.linkName) >= 0) {
+                    row.classList.add("link-row-changed");
+                    row.scrollIntoView({ block: "nearest" });
+                }
+            });
+        }
+    }
+
+    // --- posting -----------------------------------------------------------
+
+    function post(form, extra) {
+        var data = $(form).serialize() + (extra || "");
+        return $.ajax({ method: "post", url: form.action, data: data }).done(function (html) {
+            refreshSalt(html);
+        });
+    }
+
+    function showErrors(box, errors) {
+        box.textContent = errors.join(" ");
+        box.classList.toggle("d-none", errors.length === 0);
+    }
+
+    // posts a dialog's form; errors from the server go in the dialog
+    function submit(form, extra, button, errorBox, onSuccess) {
+        button.disabled = true;
+        post(form, extra).done(function (html) {
+            var errors = actionErrors(html);
+            if (errors.length > 0) {
+                showErrors(errorBox, errors);
+                button.disabled = false;
+            } else {
+                onSuccess(html);
+            }
+        }).fail(function () {
+            showErrors(errorBox, [text("msgError")]);
+            button.disabled = false;
+        });
+    }
+
+    function setInvalid(field, feedbackId, message) {
+        field.classList.toggle("is-invalid", !!message);
+        byId(feedbackId).textContent = message || "";
+    }
+
+    // "" for an empty field, null for one that isn't an http(s) URL
+    function httpUrl(field) {
+        var value = field.value.trim();
+        if (!value) {
+            return "";
+        }
+        try {
+            var url = new URL(value);
+            return url.protocol === "http:" || url.protocol === "https:" ? url.href : null;
+        } catch (e) {
+            return null;
+        }
+    }
+
+    // --- add and edit a link ----------------------------------------------
+
+    var linkModal = new bootstrap.Modal(byId("link-edit-modal"));
+    var linkForm = byId("linkEditForm");
+    var linkUrl = byId("linkEditForm_bean_url");
+    var linkName = byId("linkEditForm_bean_name");
+    var linkDesc = byId("linkEditForm_bean_description");
+    var linkFeed = byId("linkEditForm_bean_feedUrl");
+    var linkImage = byId("linkEditForm_bean_image");
+    var linkPreview = byId("linkImagePreview");
+    var linkSave = byId("linkSaveButton");
+    var linkErrors = byId("linkEditErrors");
+    var nameTouched = false;
+    var touched = {};
+
+    // shows a field's error only once the user has typed in it, or on save
+    function validateLink(all) {
+        var url = httpUrl(linkUrl);
+        var feed = httpUrl(linkFeed);
+        var image = httpUrl(linkImage);
+        var nameOk = linkName.value.trim() !== "";
+        var show = function (field) {
+            return all || touched[field.id];
+        };
+        setInvalid(linkUrl, "linkUrlFeedback", !show(linkUrl) ? "" :
+            url === "" ? text("msgUrlRequired") : url === null ? text("msgBadUrl") : "");
+        setInvalid(linkName, "linkNameFeedback", show(linkName) && !nameOk ? text("msgNameRequired") : "");
+        setInvalid(linkFeed, "linkFeedFeedback", feed === null ? text("msgBadUrl") : "");
+        setInvalid(linkImage, "linkImageFeedback", image === null ? text("msgBadUrl") : "");
+        linkPreview.classList.toggle("d-none", !image);
+        if (image && linkPreview.getAttribute("src") !== image) {
+            linkPreview.setAttribute("src", image);
+        }
+        var ok = nameOk && url !== "" && url !== null && feed !== null && image !== null;
+        linkSave.disabled = !ok;
+        return ok;
+    }
+
+    // a new link's name starts as the site's host name, until the user types one
+    function suggestName() {
+        if (nameTouched || linkForm.dataset.adding !== "true") {
+            return;
+        }
+        var url = httpUrl(linkUrl);
+        linkName.value = url ? new URL(url).hostname.replace(/^www\./, "") : "";
+    }
+
+    function openLinkEditor(row) {
+        var adding = !row;
+        var data = adding ? {} : row.dataset;
+        byId("link-edit-title").textContent = format(adding ? text("titleAddLink") : text("titleEditLink"), text("folderName"));
+        linkForm.dataset.adding = adding ? "true" : "false";
+        linkForm.action = linkForm.action.replace(/bookmark(Add|Edit)!save/, adding ? "bookmarkAdd!save" : "bookmarkEdit!save");
+        byId("linkEditForm_bean_id").value = adding ? "" : data.linkId;
+        linkUrl.value = data.linkUrl || "";
+        linkName.value = data.linkName || "";
+        linkDesc.value = data.linkDesc || "";
+        linkFeed.value = data.linkFeed || "";
+        linkImage.value = data.linkImage || "";
+        byId("linkAdvanced").open = !!(data.linkFeed || data.linkImage);
+        nameTouched = !adding;
+        touched = {};
+        showErrors(linkErrors, []);
+        linkPreview.classList.add("d-none");
+        linkPreview.removeAttribute("src");
+        validateLink(false);
+        linkModal.show();
+    }
+
+    function saveLink() {
+        if (!validateLink(true)) {
+            return;
+        }
+        var adding = linkForm.dataset.adding === "true";
+        var name = linkName.value.trim();
+        submit(linkForm, "", linkSave, linkErrors, function () {
+            reloadWith(format(adding ? text("msgLinkAdded") : text("msgLinkSaved"), name), [name]);
+        });
+    }
+
+    [linkUrl, linkName, linkFeed, linkImage].forEach(function (field) {
+        field.addEventListener("input", function () {
+            touched[field.id] = true;
+            if (field === linkName) {
+                nameTouched = true;
+            }
+            if (field === linkUrl) {
+                suggestName();
+            }
+            validateLink(false);
+        });
+    });
+    linkPreview.addEventListener("error", function () {
+        linkPreview.classList.add("d-none");
+    });
+    linkSave.addEventListener("click", saveLink);
+    linkForm.addEventListener("submit", function (event) {
+        event.preventDefault();
+    });
+    linkForm.addEventListener("keydown", function (event) {
+        if (event.key === "Enter" && event.target.matches("input")) {
+            event.preventDefault();
+            saveLink();
+        }
+    });
+    byId("link-edit-modal").addEventListener("shown.bs.modal", function () {
+        (linkForm.dataset.adding === "true" ? linkUrl : linkName).focus();
+    });
+    ["addLinkButton", "emptyAddLinkButton"].forEach(function (id) {
+        var button = byId(id);
+        if (button) {
+            button.addEventListener("click", function () {
+                openLinkEditor(null);
+            });
+        }
+    });
+
+    // --- add and rename a blogroll ------------------------------------------
+
+    var folderModal = new bootstrap.Modal(byId("folder-edit-modal"));
+    var folderForm = byId("folderEditForm");
+    var folderName = byId("folderEditForm_bean_name");
+    var folderSave = byId("folderSaveButton");
+    var folderErrors = byId("folderEditErrors");
+
+    function validateFolder(show) {
+        var ok = folderName.value.trim() !== "";
+        setInvalid(folderName, "folderNameFeedback", show && !ok ? text("msgFolderNameRequired") : "");
+        folderSave.disabled = !ok;
+        return ok;
+    }
+
+    function openFolderEditor(renaming) {
+        byId("folder-edit-title").textContent = renaming ? text("titleRenameFolder") : text("titleAddFolder");
+        folderForm.dataset.adding = renaming ? "false" : "true";
+        folderForm.action = folderForm.action.replace(/folder(Add|Edit)!save/, renaming ? "folderEdit!save" : "folderAdd!save");
+        byId("folderEditForm_bean_id").value = renaming ? text("folderId") : "";
+        folderName.value = renaming ? text("folderName") : "";
+        showErrors(folderErrors, []);
+        validateFolder(false);
+        folderModal.show();
+    }
+
+    function saveFolder() {
+        if (!validateFolder(true)) {
+            return;
+        }
+        var adding = folderForm.dataset.adding === "true";
+        var name = folderName.value.trim();
+        submit(folderForm, "", folderSave, folderErrors, function (html) {
+            // a new blogroll is opened: its id is in the page the save returns
+            var created = new DOMParser().parseFromString(html, "text/html").getElementById("blogrollPage");
+            var folderId = adding && created ? created.dataset.folderId : null;
+            reloadWith(format(adding ? text("msgFolderAdded") : text("msgFolderRenamed"), name), [], folderId);
+        });
+    }
+
+    folderName.addEventListener("input", function () {
+        validateFolder(true);
+    });
+    folderSave.addEventListener("click", saveFolder);
+    folderForm.addEventListener("submit", function (event) {
+        event.preventDefault();
+        saveFolder();
+    });
+    byId("folder-edit-modal").addEventListener("shown.bs.modal", function () {
+        folderName.focus();
+        folderName.select();
+    });
+    byId("addFolderButton").addEventListener("click", function () {
+        openFolderEditor(false);
+    });
+    if (byId("renameFolderButton")) {
+        byId("renameFolderButton").addEventListener("click", function () {
+            openFolderEditor(true);
+        });
+    }
+
+    // --- delete a blogroll ---------------------------------------------------
+
+    if (byId("delete-folder-modal")) {
+        var folderDeleteModal = new bootstrap.Modal(byId("delete-folder-modal"));
+        byId("deleteFolderButton").addEventListener("click", function () {
+            showErrors(byId("deleteFolderErrors"), []);
+            folderDeleteModal.show();
+        });
+        byId("deleteFolderConfirm").addEventListener("click", function () {
+            var name = text("folderName");
+            submit(byId("folderDeleteForm"), "", this, byId("deleteFolderErrors"), function () {
+                // the default blogroll opens: no folder id
+                reloadWith(format(text("msgFolderDeleted"), name), [], "");
+            });
+        });
+    }
+
+    // the rest works on the links, when there are any
+    if (!list) {
+        showFlash();
+        return;
+    }
+
+    // --- selecting, moving and deleting links -----------------------------------
+
+    var selectAll = byId("selectAllLinks");
+    var selectedCount = byId("selectedCount");
+    var selectAllLabel = selectedCount.textContent;
+    var moveSelect = byId("linksMoveForm_targetFolderId");
+    var moveButton = byId("moveLinksButton");
+    var deleteButton = byId("deleteLinksButton");
+    var deleteModal = new bootstrap.Modal(byId("delete-links-modal"));
+    var deleteConfirm = byId("deleteLinksConfirm");
+    var toDelete = [];
+
+    function boxes() {
+        return Array.prototype.slice.call(list.querySelectorAll(".link-select"));
+    }
+
+    function selectedIds() {
+        return boxes().filter(function (box) {
+            return box.checked;
+        }).map(function (box) {
+            return box.value;
+        });
+    }
+
+    function idsParam(ids) {
+        return ids.map(function (id) {
+            return "&selectedBookmarks=" + encodeURIComponent(id);
+        }).join("");
+    }
+
+    function namesOf(ids) {
+        return boxes().filter(function (box) {
+            return ids.indexOf(box.value) >= 0;
+        }).map(function (box) {
+            return box.closest(".link-row").dataset.linkName;
+        });
+    }
+
+    function selectionChanged() {
+        var ids = selectedIds();
+        var all = boxes().length;
+        selectAll.checked = ids.length === all;
+        selectAll.indeterminate = ids.length > 0 && ids.length < all;
+        selectedCount.textContent = ids.length ? format(text("msgSelected"), ids.length) : selectAllLabel;
+        deleteButton.disabled = ids.length === 0;
+        if (moveSelect) {
+            moveSelect.disabled = ids.length === 0;
+            moveButton.disabled = ids.length === 0;
+        }
+        boxes().forEach(function (box) {
+            box.closest(".link-row").classList.toggle("link-row-selected", box.checked);
+        });
+    }
+
+    selectAll.addEventListener("change", function () {
+        boxes().forEach(function (box) {
+            box.checked = selectAll.checked;
+        });
+        selectionChanged();
+    });
+    list.addEventListener("change", function (event) {
+        if (event.target.matches(".link-select")) {
+            selectionChanged();
+        }
+    });
+
+    function openDelete(ids) {
+        toDelete = ids;
+        var names = namesOf(ids);
+        byId("delete-links-title").textContent = ids.length === 1
+            ? format(text("titleDeleteOne"), names[0])
+            : format(text("titleDeleteMany"), ids.length);
+        showErrors(byId("deleteLinksErrors"), []);
+        deleteConfirm.disabled = false;
+        deleteModal.show();
+    }
+
+    deleteButton.addEventListener("click", function () {
+        openDelete(selectedIds());
+    });
+    deleteConfirm.addEventListener("click", function () {
+        submit(byId("linksDeleteForm"), idsParam(toDelete), deleteConfirm, byId("deleteLinksErrors"), function () {
+            reloadWith(format(toDelete.length === 1 ? text("msgDeletedOne") : text("msgDeletedMany"), toDelete.length));
+        });
+    });
+
+    if (moveButton) {
+        moveButton.addEventListener("click", function () {
+            var ids = selectedIds();
+            var target = moveSelect.options[moveSelect.selectedIndex];
+            moveButton.disabled = true;
+            post(byId("linksMoveForm"), idsParam(ids)).done(function (html) {
+                var errors = actionErrors(html);
+                if (errors.length > 0) {
+                    showToast(errors.join(" "), true);
+                    moveButton.disabled = false;
+                } else {
+                    // open the target blogroll, with the moved links highlighted
+                    reloadWith(format(ids.length === 1 ? text("msgMovedOne") : text("msgMovedMany"), ids.length, target.text),
+                            ids, target.value);
+                }
+            }).fail(function () {
+                showToast(text("msgError"), true);
+                moveButton.disabled = false;
+            });
+        });
+    }
+
+    // --- row actions -----------------------------------------------------------
+
+    list.addEventListener("click", function (event) {
+        var edit = event.target.closest(".link-edit");
+        var remove = event.target.closest(".link-delete");
+        if (edit) {
+            event.preventDefault();
+            openLinkEditor(edit.closest(".link-row"));
+        } else if (remove) {
+            openDelete([remove.closest(".link-row").dataset.linkId]);
+        }
+    });
+
+    // --- reordering ------------------------------------------------------------
+
+    var saveTimer = null;
+
+    function saveOrder() {
+        var ids = Array.prototype.map.call(list.querySelectorAll(".link-row"), function (row) {
+            return "&bookmarkIds=" + encodeURIComponent(row.dataset.linkId);
+        }).join("");
+        post(byId("linksReorderForm"), ids).done(function (html) {
+            var errors = actionErrors(html);
+            if (errors.length > 0) {
+                showToast(errors.join(" "), true);
+            } else {
+                byId("blogrollStatus").textContent = text("msgOrderSaved");
+                showToast(text("msgOrderSaved"));
+            }
+        }).fail(function () {
+            showToast(text("msgError"), true);
+        });
+    }
+
+    // keyboard moves can come quickly, one after another; save once they stop
+    function saveOrderSoon() {
+        clearTimeout(saveTimer);
+        saveTimer = setTimeout(saveOrder, 600);
+    }
+
+    if ($.fn.sortable && list.children.length > 1) {
+        $(list).sortable({
+            handle: ".link-handle",
+            // the default also cancels drags that start on a button, and the handle is one
+            cancel: "input, textarea, select, option",
+            axis: "y",
+            containment: "parent",
+            tolerance: "pointer",
+            update: saveOrder
+        });
+    }
+
+    list.addEventListener("keydown", function (event) {
+        var handle = event.target.closest(".link-handle");
+        if (!handle || (event.key !== "ArrowUp" && event.key !== "ArrowDown")) {
+            return;
+        }
+        event.preventDefault();
+        var row = handle.closest(".link-row");
+        var sibling = event.key === "ArrowUp" ? row.previousElementSibling : row.nextElementSibling;
+        if (!sibling) {
+            return;
+        }
+        if (event.key === "ArrowUp") {
+            list.insertBefore(row, sibling);
+        } else {
+            list.insertBefore(sibling, row);
+        }
+        handle.focus();
+        saveOrderSoon();
+    });
+
+    selectionChanged();
+    showFlash();
+}(jQuery));
diff --git a/app/src/main/webapp/roller-ui/styles/roller.css b/app/src/main/webapp/roller-ui/styles/roller.css
index 2b6ba76e8..34677bd64 100644
--- a/app/src/main/webapp/roller-ui/styles/roller.css
+++ b/app/src/main/webapp/roller-ui/styles/roller.css
@@ -1192,3 +1192,335 @@ form fieldset {
 nav.navbar {
     margin-bottom: 20px;
 }
+
+/* blogroll (Bookmarks.jsp, blogroll.js) */
+
+.blogroll-header {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    justify-content: space-between;
+    gap: 0.5rem;
+    margin-bottom: 1rem;
+}
+
+.blogroll-header-actions,
+.blogroll-main-actions,
+.blogroll-empty-actions {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 0.5rem;
+}
+
+.blogroll-layout {
+    display: grid;
+    grid-template-columns: minmax(10rem, 14rem) minmax(0, 1fr);
+    gap: 1.5rem;
+    align-items: start;
+}
+
+.blogroll-folders {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+
+.blogroll-folder {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 0.5rem;
+    padding: 0.5rem 0.75rem;
+    border-radius: var(--bs-border-radius);
+    color: var(--bs-body-color);
+    text-decoration: none;
+}
+
+.blogroll-folder:hover,
+.blogroll-folder:focus-visible {
+    background-color: var(--bs-tertiary-bg);
+}
+
+.blogroll-folder.active {
+    background-color: var(--bs-primary-bg-subtle);
+    color: var(--bs-primary-text-emphasis);
+    font-weight: 600;
+}
+
+.blogroll-folder-name {
+    min-width: 0;
+    overflow-wrap: anywhere;
+}
+
+.blogroll-folder-name .bi {
+    margin-right: 0.25rem;
+}
+
+.blogroll-folder-count {
+    flex: none;
+    font-size: 0.8125rem;
+    color: var(--bs-secondary-color);
+}
+
+.blogroll-main-header {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: flex-start;
+    justify-content: space-between;
+    gap: 0.5rem;
+}
+
+.blogroll-title {
+    font-size: 1.375rem;
+    margin: 0;
+    overflow-wrap: anywhere;
+}
+
+.blogroll-meta {
+    font-size: 0.875rem;
+    color: var(--bs-secondary-color);
+}
+
+.blogroll-main .pagetip {
+    margin: 0.75rem 0;
+}
+
+.blogroll-bulkbar {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    justify-content: space-between;
+    gap: 0.5rem;
+    padding: 0.5rem 0.25rem;
+    border-top: 1px solid var(--bs-border-color);
+}
+
+.blogroll-bulk-actions {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 0.5rem;
+}
+
+.blogroll-move {
+    width: auto;
+    flex-wrap: nowrap;
+}
+
+.blogroll-move .form-select {
+    max-width: 12rem;
+}
+
+.link-list {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    border-top: 1px solid var(--bs-border-color);
+}
+
+.link-row {
+    display: flex;
+    align-items: center;
+    gap: 0.75rem;
+    padding: 0.6rem 0.25rem;
+    border-bottom: 1px solid var(--bs-border-color);
+    background-color: var(--bs-body-bg);
+}
+
+.link-row.ui-sortable-helper {
+    box-shadow: var(--bs-box-shadow);
+    border: 1px solid var(--bs-border-color);
+}
+
+.link-row.ui-sortable-placeholder {
+    visibility: visible !important;
+    background-color: var(--bs-tertiary-bg);
+}
+
+.link-row-selected {
+    background-color: var(--bs-primary-bg-subtle);
+}
+
+.link-row-changed {
+    background-color: var(--bs-success-bg-subtle);
+    transition: background-color 2s ease-out;
+}
+
+.link-select {
+    flex: none;
+    margin: 0;
+}
+
+.link-handle {
+    flex: none;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 2rem;
+    height: 2.75rem;
+    padding: 0;
+    border: 0;
+    border-radius: var(--bs-border-radius);
+    background: none;
+    color: var(--bs-secondary-color);
+    cursor: grab;
+    touch-action: none;
+}
+
+.link-handle:hover,
+.link-handle:focus-visible {
+    background-color: var(--bs-tertiary-bg);
+    color: var(--bs-body-color);
+}
+
+.link-image {
+    flex: none;
+    width: 2rem;
+    height: 2rem;
+    object-fit: cover;
+    border-radius: var(--bs-border-radius-sm);
+}
+
+.link-image-none {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    background-color: var(--bs-tertiary-bg);
+    color: var(--bs-secondary-color);
+    font-size: 1.25rem;
+}
+
+.link-main {
+    flex: 1 1 auto;
+    min-width: 0;
+    display: flex;
+    flex-direction: column;
+}
+
+.link-name {
+    font-weight: 600;
+    text-decoration: none;
+    overflow-wrap: anywhere;
+}
+
+.link-name:hover,
+.link-name:focus-visible {
+    text-decoration: underline;
+}
+
+.link-url {
+    font-size: 0.875rem;
+    color: var(--bs-secondary-color);
+    text-decoration: none;
+    overflow-wrap: anywhere;
+}
+
+.link-url:hover,
+.link-url:focus-visible {
+    text-decoration: underline;
+}
+
+.link-url .bi {
+    margin-left: 0.25rem;
+    font-size: 0.75rem;
+}
+
+.link-desc {
+    font-size: 0.875rem;
+    overflow-wrap: anywhere;
+}
+
+.link-feed {
+    flex: none;
+    color: #e67e22;
+    padding: 0.25rem;
+}
+
+.link-actions {
+    flex: none;
+    display: flex;
+    gap: 0.5rem;
+}
+
+.link-advanced summary {
+    cursor: pointer;
+    color: var(--bs-link-color);
+}
+
+.link-image-preview {
+    display: block;
+    max-width: 8rem;
+    max-height: 8rem;
+    margin-top: 0.5rem;
+    border-radius: var(--bs-border-radius);
+    border: 1px solid var(--bs-border-color);
+}
+
+.blogroll-empty {
+    text-align: center;
+    padding: 3rem 1rem;
+    color: var(--bs-secondary-color);
+    border-top: 1px solid var(--bs-border-color);
+}
+
+.blogroll-empty > .bi {
+    font-size: 3rem;
+}
+
+.blogroll-empty-actions {
+    justify-content: center;
+}
+
+.blogroll-import {
+    max-width: 40rem;
+}
+
+@media (max-width: 767.98px) {
+    /* the blogrolls become a strip of tabs above the links */
+    .blogroll-layout {
+        grid-template-columns: minmax(0, 1fr);
+        gap: 1rem;
+    }
+
+    .blogroll-folders {
+        display: flex;
+        gap: 0.25rem;
+        overflow-x: auto;
+        padding-bottom: 0.25rem;
+        border-bottom: 1px solid var(--bs-border-color);
+    }
+
+    .blogroll-folder {
+        white-space: nowrap;
+        min-height: 2.75rem;
+    }
+
+    .blogroll-folder-name {
+        overflow-wrap: normal;
+    }
+}
+
+@media (max-width: 575.98px) {
+    /* the name beside the handle, buttons on a line of their own */
+    .link-row {
+        flex-wrap: wrap;
+        gap: 0.25rem 0.5rem;
+    }
+
+    .link-main {
+        flex: 1 1 0;
+    }
+
+    .link-actions {
+        flex-basis: 100%;
+        justify-content: flex-end;
+    }
+
+    .link-actions .btn {
+        min-height: 2.75rem;
+    }
+
+    .blogroll-move .form-select {
+        max-width: 9rem;
+    }
+}
diff --git a/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksTest.java b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksTest.java
new file mode 100644
index 000000000..8c636f7ba
--- /dev/null
+++ b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksTest.java
@@ -0,0 +1,256 @@
+/*
+ * 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
+ *
+ *     https://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.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.roller.weblogger.business.BookmarkManager;
+import org.apache.roller.weblogger.business.Weblogger;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogBookmark;
+import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
+import org.apache.roller.weblogger.util.cache.CacheManager;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.MockedStatic;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * The blogroll page opens a blogroll that has links, reorders and moves links
+ * within the weblog's blogrolls, and keeps the default blogroll.
+ */
+class BookmarksTest {
+
+    private MockedStatic<WebloggerFactory> factory;
+    private MockedStatic<CacheManager> cache;
+    private Weblogger weblogger;
+    private BookmarkManager bookmarks;
+    private Weblog weblog;
+    private WeblogBookmarkFolder defaultFolder;
+    private WeblogBookmarkFolder friends;
+    private WeblogBookmarkFolder apache;
+    private WeblogBookmark roller;
+    private WeblogBookmark asf;
+    private WeblogBookmark tomcat;
+
+    @BeforeEach
+    void setUp() throws Exception {
+        bookmarks = mock(BookmarkManager.class);
+        weblogger = mock(Weblogger.class);
+        when(weblogger.getBookmarkManager()).thenReturn(bookmarks);
+        factory = mockStatic(WebloggerFactory.class);
+        factory.when(WebloggerFactory::getWeblogger).thenReturn(weblogger);
+        cache = mockStatic(CacheManager.class);
+
+        weblog = mock(Weblog.class);
+        defaultFolder = folder("f-default", "default");
+        friends = folder("f-friends", "Friends");
+        apache = folder("f-apache", "Apache");
+        roller = link(apache, "b-roller", "Roller", 0);
+        asf = link(apache, "b-asf", "ASF", 1);
+        tomcat = link(apache, "b-tomcat", "Tomcat", 2);
+        // in the order the database returns them
+        when(bookmarks.getAllFolders(weblog)).thenReturn(Arrays.asList(friends, apache, defaultFolder));
+        when(bookmarks.getDefaultFolder(weblog)).thenReturn(defaultFolder);
+    }
+
+    @AfterEach
+    void tearDown() {
+        cache.close();
+        factory.close();
+    }
+
+    private WeblogBookmarkFolder folder(String id, String name) throws Exception {
+        WeblogBookmarkFolder folder = new WeblogBookmarkFolder();
+        folder.setId(id);
+        folder.setName(name);
+        folder.setWeblog(weblog);
+        when(bookmarks.getFolderById(weblog, id)).thenReturn(folder);
+        return folder;
+    }
+
+    private WeblogBookmark link(WeblogBookmarkFolder folder, String id, String name, int priority) {
+        WeblogBookmark link = new WeblogBookmark();
+        link.setId(id);
+        link.setName(name);
+        link.setUrl("https://example.com/" + id);
+        link.setPriority(priority);
+        folder.addBookmark(link);
+        return link;
+    }
+
+    private Bookmarks action(String folderId) {
+        Bookmarks action = spy(new Bookmarks());
+        doAnswer(call -> call.getArgument(0)).when(action).getText(anyString());
+        doAnswer(call -> call.getArgument(0)).when(action).getText(anyString(), anyList());
+        doAnswer(call -> call.getArgument(0)).when(action).getText(anyString(), anyString(), anyString());
+        action.setActionWeblog(weblog);
+        action.setFolderId(folderId);
+        action.myPrepare();
+        return action;
+    }
+
+    @Test
+    void listsTheDefaultBlogrollFirst() {
+        Bookmarks action = action(null);
+
+        assertEquals(List.of(defaultFolder, apache, friends), action.getAllFolders());
+    }
+
+    @Test
+    void opensTheFirstBlogrollWithLinksWhenTheDefaultOneIsEmpty() {
+        Bookmarks action = action(null);
+
+        assertEquals(apache, action.getFolder());
+        assertEquals("f-apache", action.getFolderId());
+    }
+
+    @Test
+    void opensTheDefaultBlogrollWhenItHasLinks() {
+        link(defaultFolder, "b-home", "Home", 0);
+
+        assertEquals(defaultFolder, action(null).getFolder());
+    }
+
+    @Test
+    void movesToAnyBlogrollButTheOneShown() {
+        assertEquals(List.of(defaultFolder, friends), action("f-apache").getMoveTargets());
+    }
+
+    @Test
+    void savesNewOrder() throws Exception {
+        Bookmarks action = action("f-apache");
+        action.setBookmarkIds(List.of("b-tomcat", "b-roller", "b-asf"));
+
+        action.reorder();
+
+        assertFalse(action.hasActionErrors());
+        assertEquals(0, tomcat.getPriority());
+        assertEquals(1, roller.getPriority());
+        assertEquals(2, asf.getPriority());
+        assertEquals(List.of(tomcat, roller, asf), apache.getBookmarks());
+        verify(weblogger).flush();
+    }
+
+    @Test
+    void rejectsAnOrderThatLeavesOutALink() throws Exception {
+        Bookmarks action = action("f-apache");
+        action.setBookmarkIds(List.of("b-tomcat", "b-roller"));
+
+        action.reorder();
+
+        assertTrue(action.hasActionErrors());
+        assertEquals(2, tomcat.getPriority());
+        verify(bookmarks, never()).saveBookmark(any());
+    }
+
+    @Test
+    void movesLinksToTheEndOfAnotherBlogroll() throws Exception {
+        WeblogBookmark existing = link(friends, "b-alice", "Alice", 4);
+        doAnswer(call -> {
+            WeblogBookmark saved = call.getArgument(0);
+            if (saved.getPriority() == null) {
+                saved.calculatePriority();
+            }
+            return null;
+        }).when(bookmarks).saveBookmark(any());
+        Bookmarks action = action("f-apache");
+        action.setSelectedBookmarks(new String[] {"b-roller"});
+        action.setTargetFolderId("f-friends");
+
+        action.move();
+
+        assertFalse(action.hasActionErrors());
+        assertEquals(List.of(existing, roller), friends.getBookmarks());
+        assertEquals(friends, roller.getFolder());
+        assertEquals(5, roller.getPriority());
+        assertEquals(List.of(asf, tomcat), apache.getBookmarks());
+    }
+
+    @Test
+    void refusesToMoveALinkFromAnotherBlogroll() throws Exception {
+        WeblogBookmark alice = link(friends, "b-alice", "Alice", 0);
+        Bookmarks action = action("f-apache");
+        action.setSelectedBookmarks(new String[] {"b-alice"});
+        action.setTargetFolderId("f-default");
+
+        action.move();
+
+        assertTrue(action.hasActionErrors());
+        assertEquals(friends, alice.getFolder());
+        verify(bookmarks, never()).saveBookmark(any());
+    }
+
+    @Test
+    void deletesOnlyLinksOfTheBlogrollShown() throws Exception {
+        Bookmarks action = action("f-apache");
+        action.setSelectedBookmarks(new String[] {"b-asf", "b-elsewhere"});
+
+        action.delete();
+
+        assertTrue(action.hasActionErrors());
+        verify(bookmarks, never()).removeBookmark(any());
+
+        action.clearErrorsAndMessages();
+        action.setSelectedBookmarks(new String[] {"b-asf"});
+        action.delete();
+
+        assertFalse(action.hasActionErrors());
+        verify(bookmarks).removeBookmark(asf);
+        assertEquals(List.of(roller, tomcat), apache.getBookmarks());
+    }
+
+    @Test
+    void keepsTheDefaultBlogroll() throws Exception {
+        link(defaultFolder, "b-home", "Home", 0);
+        Bookmarks action = action("f-default");
+
+        action.deleteFolder();
+
+        assertTrue(action.hasActionErrors());
+        verify(bookmarks, never()).removeFolder(any());
+    }
+
+    @Test
+    void deletesAnotherBlogrollAndShowsTheDefaultOne() throws Exception {
+        Bookmarks action = action("f-friends");
+
+        action.deleteFolder();
+
+        assertFalse(action.hasActionErrors());
+        verify(bookmarks).removeFolder(friends);
+        assertEquals(defaultFolder, action.getFolder());
+        assertFalse(action.getAllFolders().contains(friends));
+    }
+}
diff --git a/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEditSaveTest.java b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEditSaveTest.java
index 6aa154996..e2f477658 100644
--- a/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEditSaveTest.java
+++ b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEditSaveTest.java
@@ -31,12 +31,14 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -102,6 +104,26 @@ void addingAFolderSendsTheNewId() throws Exception {
         verify(response).addHeader("folderId", "new-folder");
     }
 
+    @Test
+    void theDefaultFolderCannotBeRenamed() throws Exception {
+        WeblogBookmarkFolder folder = new WeblogBookmarkFolder();
+        folder.setId("folder-default");
+        folder.setName("default");
+        folder.setWeblog(weblog);
+        when(bookmarks.getFolderById(weblog, "folder-default")).thenReturn(folder);
+
+        FolderEdit action = action("folderEdit");
+        action.getBean().setId("folder-default");
+        action.myPrepare();
+        action.getBean().setName("Links");
+
+        assertEquals(FolderEdit.INPUT, action.save());
+        assertTrue(action.hasActionErrors());
+        // themes find the default blogroll by its name
+        assertEquals("default", folder.getName());
+        verify(bookmarks, never()).saveFolder(any());
+    }
+
     private FolderEdit action(String actionName) {
         FolderEdit action = spy(new FolderEdit());
         doAnswer(call -> call.getArgument(0)).when(action).getText(anyString());
diff --git a/app/src/test/java/org/apache/roller/weblogger/ui/struts2/util/StrutsParameterAnnotationTest.java b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/util/StrutsParameterAnnotationTest.java
index 72b5a65bf..5bfa26290 100644
--- a/app/src/test/java/org/apache/roller/weblogger/ui/struts2/util/StrutsParameterAnnotationTest.java
+++ b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/util/StrutsParameterAnnotationTest.java
@@ -64,7 +64,6 @@ public class StrutsParameterAnnotationTest {
     private static final Set<String> NOT_BOUND = Set.of(
             // set from the static <param> of the action mapping in struts.xml
             "PingTargetEdit.actionName",
-            "FolderEdit.actionName",
             // no such property; the hidden fields are leftovers in the JSPs
             "Categories.categoryId",
             "WeblogConfig.defaultPlugins");

From 6b8adb3b80d2f046fba2d061afe7b5adb4a04848 Mon Sep 17 00:00:00 2001
From: "David M. Johnson" <snoopdave@apache.org>
Date: Thu, 12 Nov 2026 19:04:51 -0500
Subject: [PATCH 3/3] Send one blogroll order save at a time, and reorder on
 touch screens

- Send one order save at a time and refresh the salt when a post fails.
- Show up and down buttons on touch screens, where the handle can't be
  dragged.
---
 .../resources/ApplicationResources.properties |  6 +-
 .../webapp/WEB-INF/jsps/editor/Bookmarks.jsp  | 14 ++++-
 .../main/webapp/roller-ui/scripts/blogroll.js | 56 +++++++++++++++----
 .../main/webapp/roller-ui/styles/roller.css   | 23 ++++++++
 4 files changed, 86 insertions(+), 13 deletions(-)

diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties
index bb793b65c..155589471 100644
--- a/app/src/main/resources/ApplicationResources.properties
+++ b/app/src/main/resources/ApplicationResources.properties
@@ -90,8 +90,8 @@ bookmarksForm.rootTitle=Blogroll
 
 bookmarksForm.subtitle=Manage blogrolls in weblog <span>{0}</span>
 
-bookmarksForm.rootPrompt=This is your weblog''s default blogroll. Most themes show its links in the sidebar. Drag a link by its handle, or focus the handle and use the arrow keys, to change the order.
-bookmarksForm.otherPrompt=Themes show only the default blogroll unless you edit their templates to include this one. Drag a link by its handle, or focus the handle and use the arrow keys, to change the order.
+bookmarksForm.rootPrompt=This is your weblog''s default blogroll. Most themes show its links in the sidebar. Drag a link by its handle, or focus the handle and use the arrow keys, or on a touch screen use the up and down buttons, to change the order.
+bookmarksForm.otherPrompt=Themes show only the default blogroll unless you edit their templates to include this one. Drag a link by its handle, or focus the handle and use the arrow keys, or on a touch screen use the up and down buttons, to change the order.
 
 bookmarksForm.folders=Blogrolls
 bookmarksForm.blogrollName=Name
@@ -116,6 +116,8 @@ bookmarksForm.move=Move
 bookmarksForm.movedOne=Link moved to "{1}"
 bookmarksForm.movedMany={0} links moved to "{1}"
 bookmarksForm.moveHandle=Move {0}
+bookmarksForm.moveUp=Move {0} up
+bookmarksForm.moveDown=Move {0} down
 bookmarksForm.orderSaved=Link order saved
 bookmarksForm.selectAllLabel=Select all
 bookmarksForm.selectedCount={0} selected
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
index 744a4868c..182dcb231 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
@@ -18,7 +18,7 @@
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 
 <%-- Blogroll: the weblog's blogrolls (bookmark folders) on the left, or in a strip above on a
-     phone, and the links of one of them. Links are dragged (or moved with the arrow keys on their
+     phone, and the links of one of them. Links are dragged (or moved with the arrow keys or touch-screen buttons on their
      handle) to reorder; selected links can be moved or deleted. Dialogs post with AJAX and reload
      the page, which then shows a short confirmation. Text the script needs is in data-* attributes. --%>
 
@@ -185,6 +185,18 @@
                             <span class="bi bi-grip-vertical" aria-hidden="true"></span>
                         </button>
 
+                        <%-- shown instead of the handle on touch screens, where it cannot be dragged --%>
+                        <span class="link-move">
+                            <button type="button" class="btn btn-sm btn-outline-secondary link-move-up"
+                                    aria-label="<s:text escapeHtml="true" name='bookmarksForm.moveUp'><s:param value='plainText(#bookmark.name)'/></s:text>">
+                                <span class="bi bi-chevron-up" aria-hidden="true"></span>
+                            </button>
+                            <button type="button" class="btn btn-sm btn-outline-secondary link-move-down"
+                                    aria-label="<s:text escapeHtml="true" name='bookmarksForm.moveDown'><s:param value='plainText(#bookmark.name)'/></s:text>">
+                                <span class="bi bi-chevron-down" aria-hidden="true"></span>
+                            </button>
+                        </span>
+
                         <s:if test="#bookmark.image != null && #bookmark.image != ''">
                             <img class="link-image" src="<s:property value='#bookmark.image'/>" alt="" loading="lazy">
                         </s:if>
diff --git a/app/src/main/webapp/roller-ui/scripts/blogroll.js b/app/src/main/webapp/roller-ui/scripts/blogroll.js
index 80b0651b3..853c2fce3 100644
--- a/app/src/main/webapp/roller-ui/scripts/blogroll.js
+++ b/app/src/main/webapp/roller-ui/scripts/blogroll.js
@@ -99,6 +99,11 @@
         var data = $(form).serialize() + (extra || "");
         return $.ajax({ method: "post", url: form.action, data: data }).done(function (html) {
             refreshSalt(html);
+        }).fail(function (xhr) {
+            // the salt just sent is spent whether or not the post worked
+            if (xhr && xhr.responseText) {
+                refreshSalt(xhr.responseText);
+            }
         });
     }
 
@@ -468,8 +473,18 @@
     // --- reordering ------------------------------------------------------------
 
     var saveTimer = null;
+    var saving = false;
+    var saveAgain = false;
 
+    // Each post spends the page's salt and returns a new one, so only one save
+    // can be in flight. A change made meanwhile is sent afterwards, from the
+    // list as it is then.
     function saveOrder() {
+        if (saving) {
+            saveAgain = true;
+            return;
+        }
+        saving = true;
         var ids = Array.prototype.map.call(list.querySelectorAll(".link-row"), function (row) {
             return "&bookmarkIds=" + encodeURIComponent(row.dataset.linkId);
         }).join("");
@@ -483,6 +498,12 @@
             }
         }).fail(function () {
             showToast(text("msgError"), true);
+        }).always(function () {
+            saving = false;
+            if (saveAgain) {
+                saveAgain = false;
+                saveOrder();
+            }
         });
     }
 
@@ -504,24 +525,39 @@
         });
     }
 
+    // one step up or down; the arrow keys on the handle and the buttons shown
+    // on touch screens (where the handle cannot be dragged) both use it
+    function moveRow(row, up) {
+        var sibling = up ? row.previousElementSibling : row.nextElementSibling;
+        if (!sibling) {
+            return false;
+        }
+        if (up) {
+            list.insertBefore(row, sibling);
+        } else {
+            list.insertBefore(sibling, row);
+        }
+        saveOrderSoon();
+        return true;
+    }
+
     list.addEventListener("keydown", function (event) {
         var handle = event.target.closest(".link-handle");
         if (!handle || (event.key !== "ArrowUp" && event.key !== "ArrowDown")) {
             return;
         }
         event.preventDefault();
-        var row = handle.closest(".link-row");
-        var sibling = event.key === "ArrowUp" ? row.previousElementSibling : row.nextElementSibling;
-        if (!sibling) {
-            return;
+        if (moveRow(handle.closest(".link-row"), event.key === "ArrowUp")) {
+            handle.focus();
         }
-        if (event.key === "ArrowUp") {
-            list.insertBefore(row, sibling);
-        } else {
-            list.insertBefore(sibling, row);
+    });
+
+    list.addEventListener("click", function (event) {
+        var button = event.target.closest(".link-move-up, .link-move-down");
+        if (button) {
+            moveRow(button.closest(".link-row"), button.classList.contains("link-move-up"));
+            button.focus();
         }
-        handle.focus();
-        saveOrderSoon();
     });
 
     selectionChanged();
diff --git a/app/src/main/webapp/roller-ui/styles/roller.css b/app/src/main/webapp/roller-ui/styles/roller.css
index 34677bd64..877b9b0a2 100644
--- a/app/src/main/webapp/roller-ui/styles/roller.css
+++ b/app/src/main/webapp/roller-ui/styles/roller.css
@@ -1367,6 +1367,29 @@ nav.navbar {
     touch-action: none;
 }
 
+.link-move {
+    display: none;
+    flex: none;
+    flex-direction: column;
+    gap: 0.125rem;
+}
+
+.link-move .btn {
+    line-height: 1;
+    padding: 0.2rem 0.5rem;
+}
+
+/* a finger cannot drag the handle (jQuery UI sortable has no touch support), so use buttons */
+@media (pointer: coarse) {
+    .link-handle {
+        display: none;
+    }
+
+    .link-move {
+        display: flex;
+    }
+}
+
 .link-handle:hover,
 .link-handle:focus-visible {
     background-color: var(--bs-tertiary-bg);