This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a commit to branch categories-page-rework in repository https://gitbox.apache.org/repos/asf/roller.git
commit e16e04cf0bbb0756a472902ab11ae9b851d795af Author: David M. Johnson <[email protected]> AuthorDate: Wed Nov 11 17:40:25 2026 -0500 Redesign the categories page - Categories are one list in display order. Drag a category by its handle, or use the arrow keys on the handle, to reorder them; the order is saved through a new categories!reorder action and is the order themes show. - Each category shows how many entries it has (any status), linked to the entries page filtered by that category. The counts come from one grouped query, which also decides whether a delete must move entries. - Add and edit share one dialog with field-level validation and an image preview; the Save button is disabled while a field is invalid. - Deleting a category that has entries, or that blogging clients post to, asks where to move them; the delete button stays disabled until a target is chosen. - Add replaces the sidebar link with a button in the page; the page is laid out for phones, and a toast confirms each change after the reload. - Removes the unused categories!move action, CategoriesSidebar.jsp and the strings only they used, and escapes every message the page puts in an HTML attribute. --- CHANGES.md | 8 + .../weblogger/business/WeblogEntryManager.java | 9 + .../business/jpa/JPAWeblogEntryManagerImpl.java | 20 + .../weblogger/ui/struts2/editor/Categories.java | 142 +++++-- .../main/resources/ApplicationResources.properties | 42 +- .../resources/ApplicationResources_de.properties | 7 - .../resources/ApplicationResources_es.properties | 6 - .../resources/ApplicationResources_fr.properties | 9 - .../resources/ApplicationResources_ja.properties | 9 - .../resources/ApplicationResources_ko.properties | 8 - .../resources/ApplicationResources_ru.properties | 8 - .../ApplicationResources_zh_CN.properties | 8 - app/src/main/resources/struts.xml | 2 +- .../main/webapp/WEB-INF/jsps/editor/Categories.jsp | 450 ++++++++------------- .../WEB-INF/jsps/editor/CategoriesSidebar.jsp | 55 --- app/src/main/webapp/WEB-INF/tiles.xml | 3 +- .../main/webapp/roller-ui/scripts/categories.js | 331 +++++++++++++++ app/src/main/webapp/roller-ui/styles/roller.css | 146 +++++++ .../weblogger/business/WeblogCategoryCRUDTest.java | 25 ++ .../ui/struts2/editor/CategoriesTest.java | 150 +++++++ .../util/StrutsParameterAnnotationTest.java | 3 +- .../java/org/apache/roller/playwright/BaseIT.java | 12 +- 22 files changed, 992 insertions(+), 461 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index fa53dc883..9a1a9b502 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,6 +13,14 @@ - A details page for each file, with a preview, its facts, a copy-URL button and the edit form. The description is used as the image's alt text. +- **Redesigned categories page.** Categories are one list you can reorder. + - Drag a category by its handle, or use the arrow keys on the handle, to + change the order themes show categories in. + - Each category shows how many entries it has, linked to those entries. + - Add and edit in one dialog with field-level checks and an image preview. + Deleting a category that has entries asks where to move them. + - The page works on phones, and a short message confirms each change. + - **AtomPub can manage templates and categories.** New collections in each weblog's workspace, documented in the user guide: - Templates (standard and mobile versions) for weblog administrators, diff --git a/app/src/main/java/org/apache/roller/weblogger/business/WeblogEntryManager.java b/app/src/main/java/org/apache/roller/weblogger/business/WeblogEntryManager.java index f841193e7..4f4ee6966 100644 --- a/app/src/main/java/org/apache/roller/weblogger/business/WeblogEntryManager.java +++ b/app/src/main/java/org/apache/roller/weblogger/business/WeblogEntryManager.java @@ -281,6 +281,15 @@ public interface WeblogEntryManager { */ boolean isWeblogCategoryInUse(WeblogCategory data) throws WebloggerException; + + /** + * Count the entries in each of a weblog's categories, in any status. + * + * @return entry counts keyed by category id; categories with no entries + * are not in the map + */ + Map<String, Long> getWeblogCategoryEntryCounts(Weblog weblog) + throws WebloggerException; /** diff --git a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java index 93a478a9e..d13c8e1ac 100644 --- a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java +++ b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java @@ -652,6 +652,26 @@ public class JPAWeblogEntryManagerImpl implements WeblogEntryManager { int entryCount = q.getResultList().size(); return entryCount > 0; } + + /** + * @inheritDoc + */ + @Override + public Map<String, Long> getWeblogCategoryEntryCounts(Weblog weblog) + throws WebloggerException { + if (weblog == null) { + throw new WebloggerException("weblog is null"); + } + TypedQuery<Object[]> q = strategy.getDynamicQuery( + "SELECT e.category.id, COUNT(e) FROM WeblogEntry e WHERE e.website = ?1 " + + "GROUP BY e.category.id", Object[].class); + q.setParameter(1, weblog); + Map<String, Long> counts = new HashMap<>(); + for (Object[] row : q.getResultList()) { + counts.put((String) row[0], ((Number) row[1]).longValue()); + } + return counts; + } /** * @inheritDoc diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java index 1716d1aad..6aad16df9 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java @@ -18,8 +18,13 @@ package org.apache.roller.weblogger.ui.struts2.editor; +import java.util.ArrayList; import java.util.Collections; +import java.util.HashSet; import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.weblogger.WebloggerException; @@ -28,52 +33,113 @@ import org.apache.roller.weblogger.business.WeblogEntryManager; import org.apache.roller.weblogger.pojos.WeblogCategory; import org.apache.roller.weblogger.pojos.WeblogPermission; import org.apache.roller.weblogger.ui.struts2.util.UIAction; -import org.apache.struts2.convention.annotation.AllowedMethods; +import org.apache.roller.weblogger.util.cache.CacheManager; +import org.apache.struts2.interceptor.parameter.StrutsParameter; /** - * Manage weblog categories. + * Manage weblog categories: list them with their entry counts, and change + * their order. Adding, editing and removing are done by CategoryEdit and + * CategoryRemove. */ -// TODO: make this work @AllowedMethods({"execute","move"}) public class Categories extends UIAction { - private static Log log = LogFactory.getLog(Categories.class); + private static final Log log = LogFactory.getLog(Categories.class); + + // all categories from the action weblog, in display order + private List<WeblogCategory> allCategories = Collections.emptyList(); + + // number of entries in each category, by category id + private Map<String, Long> entryCounts = Collections.emptyMap(); - // all categories from the action weblog - private List<WeblogCategory> allCategories; + // category ids in their new order, posted by reorder + private List<String> categoryIds = new ArrayList<>(); - public Categories() { - this.actionName = "categories"; - this.desiredMenu = "editor"; - this.pageTitle = "categoriesForm.rootTitle"; - } + public Categories() { + this.actionName = "categories"; + this.desiredMenu = "editor"; + this.pageTitle = "categoriesForm.rootTitle"; + } - @Override - public List<String> requiredWeblogPermissionActions() { - return Collections.singletonList(WeblogPermission.POST); - } + @Override + public List<String> requiredWeblogPermissionActions() { + return Collections.singletonList(WeblogPermission.POST); + } - @Override - public String execute() { - try { + @Override + public String execute() { + try { WeblogEntryManager wmgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); - allCategories = wmgr.getWeblogCategories(getActionWeblog()); - } catch (WebloggerException ex) { - log.error("Error building categories list", ex); - addError("Error building categories list"); - } - - return LIST; - } - - public String move() { - return execute(); - } - - public List<WeblogCategory> getAllCategories() { - return allCategories; - } - - public void setAllCategories(List<WeblogCategory> allCategories) { - this.allCategories = allCategories; - } + allCategories = wmgr.getWeblogCategories(getActionWeblog()); + entryCounts = wmgr.getWeblogCategoryEntryCounts(getActionWeblog()); + } catch (WebloggerException ex) { + log.error("Error building categories list", ex); + addError("generic.error.check.logs"); + } + return LIST; + } + + /** + * Save a new display order. The posted ids must name every category of + * the weblog exactly once. + */ + public String reorder() { + try { + WeblogEntryManager wmgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); + List<WeblogCategory> current = wmgr.getWeblogCategories(getActionWeblog()); + + Set<String> currentIds = new HashSet<>(); + for (WeblogCategory category : current) { + currentIds.add(category.getId()); + } + if (categoryIds.size() != current.size() + || !currentIds.equals(new HashSet<>(categoryIds))) { + addError("categoriesForm.error.reorder"); + return execute(); + } + + for (int position = 0; position < categoryIds.size(); position++) { + WeblogCategory category = wmgr.getWeblogCategory(getActionWeblog(), categoryIds.get(position)); + if (category.getPosition() != position) { + category.setPosition(position); + wmgr.saveWeblogCategory(category); + } + } + WebloggerFactory.getWeblogger().flush(); + CacheManager.invalidate(getActionWeblog()); + addMessage("categoriesForm.orderSaved"); + } catch (WebloggerException ex) { + log.error("Error saving category order", ex); + addError("generic.error.check.logs"); + } + return execute(); + } + + public List<WeblogCategory> getAllCategories() { + return allCategories; + } + + /** Number of entries in the category, in any status. */ + public long getEntryCount(String categoryId) { + Long count = entryCounts.get(categoryId); + return count == null ? 0 : count; + } + + /** + * True if removing the category means moving something to another one: + * its entries, or its role as the blogging clients' default category. + */ + public boolean isInUse(String categoryId) { + WeblogCategory clientDefault = getActionWeblog().getBloggerCategory(); + return getEntryCount(categoryId) > 0 + || (clientDefault != null && categoryId.equals(clientDefault.getId())); + } + + public List<String> getCategoryIds() { + return categoryIds; + } + + @StrutsParameter + public void setCategoryIds(List<String> categoryIds) { + this.categoryIds = categoryIds == null ? new ArrayList<>() : categoryIds; + } } diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties index 888f3f87f..2891e0111 100644 --- a/app/src/main/resources/ApplicationResources.properties +++ b/app/src/main/resources/ApplicationResources.properties @@ -165,7 +165,7 @@ categoryForm.edit.subtitle=Editing category categoryForm.add.title=Add Category categoryForm.add.subtitle=Adding category categoryForm.image=Image URL -categoryForm.created=Category created +categoryForm.created=Category "{0}" added categoryForm.changesSaved=Category "{0}" updated categoryForm.error.duplicateName=Category name already in use categoryForm.removed=Category "{0}" deleted @@ -183,32 +183,34 @@ categoriesForm.noresults=There are currently no categories # ----------------------------------------------------------- CategoriesForm.jsp categoriesForm.subtitle=Manage categories in weblog <span>{0}</span> -categoriesForm.root=root categoriesForm.rootTitle=Categories -categoriesForm.rootPrompt=\ -These are your top-level weblog categories. Roller requires at least one \ -category to be defined. \ -Categories are used to organize your weblog entries and your readers can \ -choose to subscribe to separate feeds for each of your categories. +categoriesForm.rootPrompt=Categories organize your entries, and readers can \ +follow a feed for each one. Drag a category by its handle, or focus the handle \ +and use the arrow keys, to change the order your theme shows them in. \ +A weblog needs at least one category. +categoriesForm.entryCount={0,choice,0#No entries|1#1 entry|1<{0,number,integer} entries} +categoriesForm.viewEntries=View the entries in {0} +categoriesForm.moveHandle=Move {0} +categoriesForm.orderSaved=Category order saved +categoriesForm.error.reorder=The categories changed while you were reordering them. \ +Reload the page and try again. +categoriesForm.lastCategory=A weblog needs at least one category. +categoryForm.imageHelp=Optional. Themes that show category images use this picture. categoriesForm.addCategory=Add Category -categoriesForm.move=Move -categoriesForm.move.confirm=Move selected categories? -categoriesForm.remove=Remove -categoriesForm.imageUrl=Image URL categoryForm.badURL=Image URL is invalid # --------------------------------------------------------- CategoryDeleteOK.jsp categoryDeleteOK.title=Delete Category -categoryDeleteOK.removeCategory=Delete Weblog Category -categoryDeleteOK.warningCatInUse=WARNING: This category is in use! -categoryDeleteOK.youMustMoveEntries=You must move the weblog entries in the \ -category to another category, use the combo-box to select which category \ -should receive the entries.</p> -categoryDeleteOK.moveToWhere=Move the contents to another category: -categoryDeleteOK.noEntriesInCat=There are no weblog entries in this category, \ -OK to delete. -categoryDeleteOK.areYouSure=Are you sure you want to delete this weblog category? +categoryDeleteOK.heading=Delete category "{0}"? +categoryDeleteOK.delete=Delete category +categoryDeleteOK.chooseCategory=Choose a category +categoryDeleteOK.entriesInCategory={0,choice,1#1 entry is|1<{0,number,integer} entries are} in this category. \ +Choose a category to move them to. +categoryDeleteOK.warningCatInUse=Blogging clients use this category as their default. \ +Choose a category to use instead. +categoryDeleteOK.moveToWhere=Move to +categoryDeleteOK.noEntriesInCat=No entries are in this category. # ----------------------------------------------------------------- comments.jsp diff --git a/app/src/main/resources/ApplicationResources_de.properties b/app/src/main/resources/ApplicationResources_de.properties index 35d9ca673..90d3eab50 100644 --- a/app/src/main/resources/ApplicationResources_de.properties +++ b/app/src/main/resources/ApplicationResources_de.properties @@ -145,21 +145,14 @@ calendar.prev=Voriger calendar.summary=Blog Archiv Kalender calendar.today=Heute categoriesForm.addCategory=Kategorie hinzuf\u00FCgen -categoriesForm.move=Verschieben -categoriesForm.move.confirm=Ausgew\u00E4hlte Kategorien verschieben? # ---------------------------------------------------------- CategoriesForm.jsp -categoriesForm.remove=L\u00F6schen -categoriesForm.root=root categoriesForm.rootPrompt=Dies sind Ihre Kategorien auf der obersten Ebene. Sie k\u00F6nnen diese Kategorien verwenden um Ihre Weblogeintr\u00E4ge zu organisieren und Ihre Leser k\u00F6nnen zwischen unterschiedlichen Newsfeeds f\u00FCr Ihre Kategorien w\u00E4hlen. categoriesForm.rootTitle=Kategorien categoriesForm.subtitle=Kategorien in Weblog <span>{0}</span> verwalten -categoryDeleteOK.areYouSure=Sind Sie sicher, dass Sie diese Kategorie l\u00F6schen wollen? categoryDeleteOK.moveToWhere=Verschiebe die Inhalte in eine andere Kategorie: categoryDeleteOK.noEntriesInCat=Es gibt keine Weblogeintr\u00E4ge in dieser Kategorie. Klicken Sie auf 'Ok' um die Kategorie zu l\u00F6schen # ------------------------------------------------------- CategoryDeleteOK.jsp -categoryDeleteOK.removeCategory=L\u00F6sche Kategorie categoryDeleteOK.warningCatInUse=WARNUNG: Diese Kategorie wird benutzt! -categoryDeleteOK.youMustMoveEntries=Sie m\u00FCssen die Eintr\u00E4ge in der Kategorie in eine andere Kategorie verschieben, w\u00E4hlen Sie dazu in der Auswahlliste die Zielkategorie, welche die Eintr\u00E4ge erhalten soll.</p> categoryForm.add.title=Kategorie hinzuf\u00FCgen categoryForm.edit.subtitle=Kategorie bearbeiten # ------------------------------------------------------------- CategoryForm.jsp diff --git a/app/src/main/resources/ApplicationResources_es.properties b/app/src/main/resources/ApplicationResources_es.properties index e8e795526..604cb3458 100644 --- a/app/src/main/resources/ApplicationResources_es.properties +++ b/app/src/main/resources/ApplicationResources_es.properties @@ -64,18 +64,12 @@ categoryForm.add.title=A\u00F1adir categor\u00EDa categoryForm.add.subtitle=A\u00F1adiendo categor\u00EDa categoryForm.image=imagen categoriesForm.subtitle=Administrar categor\u00EDas en weblog <span>{0}</span> -categoriesForm.root=ra\u00EDz categoriesForm.rootTitle=Categor\u00EDas categoriesForm.rootPrompt=Estas son sus categor\u00EDas weblog de nivel superior. Puede usar categor\u00EDas para organizar sus entradas de weblog y sus lectores pueden elegir suscribirse cada una de sus categor\u00EDas. categoriesForm.addCategory=A\u00F1adir categor\u00EDa -categoriesForm.move=Mover -categoriesForm.remove=Eliminar -categoryDeleteOK.removeCategory=Eliminar categor\u00EDa del weblog categoryDeleteOK.warningCatInUse=ALERTA\: \u00A1La categor\u00EDa est\u00E1 en uso\! -categoryDeleteOK.youMustMoveEntries=Debe mover las entradas del weblog de una categor\u00EDa a otra, use el combo-box para seleccionar qu\u00E9 categor\u00EDa debe recibir las entradas. </p> categoryDeleteOK.moveToWhere=Mover los contenidos a otra categor\u00EDa\: categoryDeleteOK.noEntriesInCat=No hay entradas del weblog en esta categor\u00EDa, OK para eliminar. -categoryDeleteOK.areYouSure=\u00BFEst\u00E1 seguro de que desea eliminar esta categor\u00EDa del weblog? comments.title=Comentario comments.header=Enviar un comentario comments.email=Correo electr\u00F3nico\: diff --git a/app/src/main/resources/ApplicationResources_fr.properties b/app/src/main/resources/ApplicationResources_fr.properties index 8c7f4c362..380c522e8 100644 --- a/app/src/main/resources/ApplicationResources_fr.properties +++ b/app/src/main/resources/ApplicationResources_fr.properties @@ -109,7 +109,6 @@ categoryForm.error.duplicateName=Il existe déjà une catégorie nommée '{0}'. # ----------------------------------------------------------- CategoriesForm.jsp categoriesForm.subtitle=Gérer les catégories du blog <span>{0}</span> -categoriesForm.root=Racine categoriesForm.rootTitle=Catégories categoriesForm.rootPrompt=\ Vous trouverez ci-dessous la liste de vos catégories de plus haut niveau. \ @@ -119,20 +118,12 @@ Vous pouvez aussi définir des sous-catégories, cependant la plupart des macros affichent seulement les catégories de plus haut niveau. Il vous faudra modifier votre modèle \ si vous désirer afficher les sous-catégories. categoriesForm.addCategory=Ajouter une catégorie -categoriesForm.move=Déplacer -categoriesForm.move.confirm=Déplacer les catégories sélectionnées ? -categoriesForm.remove=Effacer # --------------------------------------------------------- catégorieDeleteOK.jsp -categoryDeleteOK.removeCategory=Effacer une catégorie categoryDeleteOK.warningCatInUse=ATTENTION: Cette catégorie est en cours d'utilisation ! -categoryDeleteOK.youMustMoveEntries=Vous devez déplacer les entrées de votre blog appartenant à \ -cette catégorie dans une autre catégorie. Sélectionnez quelle catégorie recevra ces entrées dans la \ -boite de sélection.</p> categoryDeleteOK.moveToWhere=Déplacer le contenu dans une autre catégorie : categoryDeleteOK.noEntriesInCat=Il n'y a pas d'entrée dans cette catégorie. -categoryDeleteOK.areYouSure=Etes vous certain de vouloir effacer cette catégorie ? # ----------------------------------------------------------------- comments.jsp diff --git a/app/src/main/resources/ApplicationResources_ja.properties b/app/src/main/resources/ApplicationResources_ja.properties index f6ca6b556..dae9f68d7 100644 --- a/app/src/main/resources/ApplicationResources_ja.properties +++ b/app/src/main/resources/ApplicationResources_ja.properties @@ -96,23 +96,15 @@ categoryForm.image=\u753B\u50CF # ----------------------------------------------------------- CategoriesForm.jsp categoriesForm.subtitle=<span>{0}</span>\u306E\u30AB\u30C6\u30B4\u30EA\u3092\u7BA1\u7406\u3057\u307E\u3059 -categoriesForm.root=\u30EB\u30FC\u30C8 categoriesForm.rootTitle=\u30AB\u30C6\u30B4\u30EA categoriesForm.rootPrompt=\u30AB\u30C6\u30B4\u30EA\u306E\u6700\u4E0A\u4F4D\u3067\u3059\u3002\u6700\u4F4E\u3067\u3082\u4E00\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u304C\u5FC5\u8981\u3067\u3059\u3002\u30AB\u30C6\u30B4\u30EA\u306F\u30D6\u30ED\u30B0\u30A8\u30F3\u30C8\u30EA\u3092\u5206\u985E\u3059\u308B\u305F\u3081\u306B\u4F7F\u308F\u308C\u3001\u30D6\u30ED\u30B0\u306E\u8AAD\u8005\u306F\u30AB\u30C6\u30B4\u30EA\u6BCE\u306B\u5206\u304B\u308C\u305F\u30CB\u30E5\u30FC\u30B9\u30D5\u30A3\u30FC\u30C9\u30 [...] categoriesForm.addCategory=\u30AB\u30C6\u30B4\u30EA\u306E\u8FFD\u52A0 -categoriesForm.move=\u79FB\u52D5 -categoriesForm.move.confirm=\u9078\u629E\u3057\u305F\u30AB\u30C6\u30B4\u30EA\u3092\u79FB\u52D5\u3057\u307E\u3059\u304B\uFF1F -categoriesForm.remove=\u524A\u9664 # --------------------------------------------------------- CategoryDeleteOK.jsp -categoryDeleteOK.removeCategory=\u30AB\u30C6\u30B4\u30EA\u3092\u524A\u9664\u3057\u307E\u3059 categoryDeleteOK.warningCatInUse=<strong>\u8B66\u544A\uFF1A</strong>\u3053\u306E\u30AB\u30C6\u30B4\u30EA\u306F\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u3002 -categoryDeleteOK.youMustMoveEntries=\u3053\u306E\u30AB\u30C6\u30B4\u30EA\u3092\u524A\u9664\u3059\u308B\u306B\u3042\u305F\u308A\u3001\ -<u>\u5C5E\u3059\u308B\u30A8\u30F3\u30C8\u30EA\u5168\u3066\u3092\u4EE5\u4E0B\u3067\u6307\u5B9A\u3059\u308B\u4ED6\u306E\u30AB\u30C6\u30B4\u30EA\u3078\u79FB\u52D5\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059</u>\u3002</p> categoryDeleteOK.moveToWhere=\u79FB\u52D5\u5148\u30AB\u30C6\u30B4\u30EA categoryDeleteOK.noEntriesInCat=\u3053\u306E\u30AB\u30C6\u30B4\u30EA\u306B\u6240\u5C5E\u3059\u308B\u30A8\u30F3\u30C8\u30EA\u306F\u3042\u308A\u307E\u305B\u3093\u3002 -categoryDeleteOK.areYouSure=\u3053\u306E\u30AB\u30C6\u30B4\u30EA\u3092\u524A\u9664\u3057\u307E\u3059\u304B\uFF1F # ----------------------------------------------------------------- comments.jsp @@ -1309,7 +1301,6 @@ commonPingTargets.error.disabling=Ping\u30BF\u30FC\u30B2\u30C3\u30C8\u306E\u7121 stylesheetEdit.revert=\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u3092\u5FA9\u5143 weblogEdit.submitForReview=\u30EC\u30D3\u30E5\u30FC\u4F9D\u983C\u3092\u9001\u4FE1 mediaFileView.filesOfType=\u30BF\u30A4\u30D7\u304C <b>{0}</b> \u306E\u30D5\u30A1\u30A4\u30EB -categoriesForm.imageUrl=\u753B\u50CF\u306EURL userAdmin.tip.openIdUrl=Open ID\u8B58\u5225\u5B50(URL\u5F62\u5F0F)\u3002 macro.weblog.searchalert=\u691C\u7D22\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002 tabbedmenu.weblog.mediaFiles=\u30E1\u30C7\u30A3\u30A2\u30FB\u30D5\u30A1\u30A4\u30EB diff --git a/app/src/main/resources/ApplicationResources_ko.properties b/app/src/main/resources/ApplicationResources_ko.properties index 3adb9a1a4..adf8b1338 100644 --- a/app/src/main/resources/ApplicationResources_ko.properties +++ b/app/src/main/resources/ApplicationResources_ko.properties @@ -127,7 +127,6 @@ Category.error.imageBad=\uc785\ub825\ud558\uc2e0 \uc774\ubbf8\uc9c0 URL\uc740 \u # ----------------------------------------------------------- CategoriesForm.jsp categoriesForm.subtitle=\uc6f9\ub85c\uadf8 <span>{0}</span> \ub0b4\uc758 \uce74\ud14c\uace0\ub9ac \uad00\ub9ac -categoriesForm.root=\ub8e8\ud2b8 categoriesForm.rootTitle=\uce74\ud14c\uace0\ub9ac categoriesForm.rootPrompt=\ \ucd5c\uc0c1\uc704 \uc218\uc900\uc758 \uc6f9\ub85c\uadf8 \uce74\ud14c\uace0\ub9ac\ub4e4\uc785\ub2c8\ub2e4. \ @@ -136,20 +135,13 @@ categoriesForm.rootPrompt=\ \ub610\ud55c \ud558\uc704-\uce74\ud14c\uace0\ub9ac\ub97c \uc815\uc758\ud560 \uc218\ub3c4 \uc788\uc2b5\ub2c8\ub2e4. \ud558\uc9c0\ub9cc, \ub9ce\uc740 \uc2dc\uc2a4\ud15c \ub9e4\ud06c\ub85c\ub4e4\uc740 \ \uc624\uc9c1 \ucd5c\uc0c1\uc704 \uc218\uc900\uc758 \uce74\ud14c\uace0\ub9ac\ub4e4\ub9cc\uc744 \ud45c\uc2dc\ud569\ub2c8\ub2e4. categoriesForm.addCategory=\uce74\ud14c\uace0\ub9ac \ucd94\uac00 -categoriesForm.move=\uc774\ub3d9 -categoriesForm.move.confirm=\uc120\ud0dd\ub41c \uce74\ud14c\uace0\ub9ac\ub4e4\uc744 \uc774\ub3d9\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? -categoriesForm.remove=\uc0ad\uc81c # --------------------------------------------------------- CategoryDeleteOK.jsp -categoryDeleteOK.removeCategory=\uc6f9\ub85c\uadf8 \uce74\ud14c\uace0\ub9ac \uc0ad\uc81c categoryDeleteOK.warningCatInUse=\uacbd\uace0: \uc774 \uce74\ud14c\uace0\ub9ac\ub294 \uc0ac\uc6a9 \uc911\uc778 \uce74\ud14c\uace0\ub9ac\uc785\ub2c8\ub2e4! -categoryDeleteOK.youMustMoveEntries=\uc6f9\ub85c\uadf8 \uae30\uc0ac\ub4e4\uc744 \ub2e4\ub978 \uce74\ud14c\uace0\ub9ac\ub85c \uc774\ub3d9\ud574\uc57c \ud569\ub2c8\ub2e4. \ -\ucf64\ubcf4\ubc15\uc2a4\ub97c \uc0ac\uc6a9\ud558\uc5ec \uae30\uc0ac\ub4e4\uc744 \uc774\ub3d9\ud560 \uce74\ud14c\uace0\ub9ac\ub97c \uc120\ud0dd\ud558\uc2ed\uc2dc\uc624.</p> categoryDeleteOK.moveToWhere=\ucee8\ud150\ud2b8\ub4e4\uc744 \ub2e4\ub978 \uce74\ud14c\uace0\ub9ac\ub85c \uc774\ub3d9\ud558\uc2ed\uc2dc\uc624.: categoryDeleteOK.noEntriesInCat=\uc774 \uce74\ud14c\uace0\ub9ac\uc5d0 \uc6f9\ub85c\uadf8 \uae30\uc0ac\ub4e4\uc774 \uc5c6\uc2b5\ub2c8\ub2e4. \ \uc0ad\uc81c\ud558\uc2dc\ub824\uba74 OK\ub97c \uc120\ud0dd\ud558\uc2ed\uc2dc\uc624. -categoryDeleteOK.areYouSure=\uc774 \uc6f9\ub85c\uadf8 \uce74\ud14c\uace0\ub9ac\ub97c \uc815\ub9d0 \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? # ----------------------------------------------------------------- comments.jsp diff --git a/app/src/main/resources/ApplicationResources_ru.properties b/app/src/main/resources/ApplicationResources_ru.properties index 78aa084ca..26fe4e334 100644 --- a/app/src/main/resources/ApplicationResources_ru.properties +++ b/app/src/main/resources/ApplicationResources_ru.properties @@ -99,26 +99,18 @@ categoryForm.image=\u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0430 # ----------------------------------------------------------- CategoriesForm.jsp categoriesForm.subtitle=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u044F\u043C\u0438 \u0432 \u0434\u043D\u0435\u0432\u043D\u0438\u043A\u0435 <span>{0}</span> -categoriesForm.root=root categoriesForm.rootTitle=\u041A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u0438 categoriesForm.rootPrompt=\u042D\u0442\u043E \u0433\u043B\u0430\u0432\u043D\u0430\u044F \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u044F \u0434\u043D\u0435\u0432\u043D\u0438\u043A\u0430. \ \u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u0438 \u0447\u0442\u043E\u0431\u044B \u0443\u043F\u043E\u0440\u044F\u0434\u043E\u0447\u0438\u0442\u044C \u0437\u0430\u043F\u0438\u0441\u0438, \u0438 \u0412\u0430\u0448\u0438 \u0447\u0438\u0442\u0430\u0442\u0435\u043B\u0438 \u043C\u043E\u0433\u0443\u0442 \ \u043F\u043E\u0434\u043F\u0438\u0441\u0430\u0442\u044C\u0441\u044F \u043D\u0430 \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u0443\u044E \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u044E \u0412\u0430\u0448\u0435\u0433\u043E \u0434\u043D\u0435\u0432\u043D\u0438\u043A\u0430. categoriesForm.addCategory=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u044E -categoriesForm.move=\u041F\u0435\u0440\u0435\u043C\u0435\u0441\u0442\u0438\u0442\u044C -categoriesForm.remove=\u0423\u0434\u0430\u043B\u0438\u0442\u044C # --------------------------------------------------------- CategoryDeleteOK.jsp -categoryDeleteOK.removeCategory=\u0423\u0434\u0430\u043B\u0435\u043D\u0438\u0435 \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u0438 categoryDeleteOK.warningCatInUse=\u0412\u041D\u0418\u041C\u0410\u041D\u0418\u0415: \u041A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u044F \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F! -categoryDeleteOK.youMustMoveEntries=\u0412\u044B \u0434\u043E\u043B\u0436\u043D\u044B \u043F\u0435\u0440\u0435\u043C\u0435\u0441\u0442\u0438\u0442\u044C \u0437\u0430\u043F\u0438\u0441\u0438 \u0432 \u0434\u0440\u0443\u0433\u0443\u044E \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u044E \ -, \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 combo-box \u0434\u043B\u044F \u0432\u044B\u0431\u043E\u0440\u0430 \ -\u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u0438, \u0432 \u043A\u043E\u0442\u043E\u0440\u0443\u044E \u043F\u0435\u0440\u0435\u043C\u0435\u0441\u0442\u0438\u0442\u044C \u0437\u0430\u043F\u0438\u0441\u0438.</p> categoryDeleteOK.moveToWhere=\u041F\u0435\u0440\u0435\u043C\u0435\u0441\u0442\u0438\u0442\u044C \u0432 \u0434\u0440\u0443\u0433\u0443\u044E \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u044E: categoryDeleteOK.noEntriesInCat=\u0412 \u044D\u0442\u043E\u0439 \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u0438 \u043D\u0435\u0442 \u0437\u0430\u043F\u0438\u0441\u0435\u0439, \ \u041C\u043E\u0436\u043D\u043E \u0443\u0434\u0430\u043B\u044F\u0442\u044C. -categoryDeleteOK.areYouSure=\u0412\u044B \u0443\u0432\u0435\u0440\u0435\u043D\u044B \u0447\u0442\u043E \u0445\u043E\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u044E? # ----------------------------------------------------------------- comments.jsp diff --git a/app/src/main/resources/ApplicationResources_zh_CN.properties b/app/src/main/resources/ApplicationResources_zh_CN.properties index 03792b4a7..37844548c 100644 --- a/app/src/main/resources/ApplicationResources_zh_CN.properties +++ b/app/src/main/resources/ApplicationResources_zh_CN.properties @@ -167,7 +167,6 @@ categoriesForm.noresults=\u76EE\u524D\u6CA1\u6709\u5206\u7C7B # ----------------------------------------------------------- CategoriesForm.jsp categoriesForm.subtitle=\u7BA1\u7406\u535A\u5BA2 <span>{0}</span> \u7684\u5206\u7C7B -categoriesForm.root=\u6839 categoriesForm.rootTitle=\u5206\u7C7B categoriesForm.rootPrompt=\u8FD9\u91CC\u662F\u4F60\u7684\u9876\u7EA7\u5206\u7C7B\uFF0C\u535A\u5BA2\u81F3\u5C11\u8981\u6709\u4E00\u4E2A\u5206\u7C7B\u3002\u5206\u7C7B\u662F\u7528\u6765\u7EC4\u7EC7\u4F60\u7684\u6587\u7AE0\uFF0C\u4F60\u7684\u8BFB\u8005\u4E5F\u53EF\u4EE5\u901A\u8FC7\u9009\u62E9\u67D0\u4E00\u4E2A\u5206\u7C7B\u6765\u8BA2\u9605\u4ED6\u611F\u5174\u8DA3\u7684\u4E13\u9898\u3002 @@ -175,24 +174,17 @@ categoriesForm.rootPrompt=\u8FD9\u91CC\u662F\u4F60\u7684\u9876\u7EA7\u5206\u7C7B categoriesForm.addCategory=\u6DFB\u52A0\u5206\u7C7B -categoriesForm.move=\u79FB\u52A8 -categoriesForm.move.confirm=\u786E\u5B9A\u8981\u79FB\u52A8\u9009\u4E2D\u7684\u5206\u7C7B\u5417\uFF1F -categoriesForm.remove=\u79FB\u9664 -categoriesForm.imageUrl=Image URL categoryForm.badURL=Image URL is invalid # --------------------------------------------------------- CategoryDeleteOK.jsp categoryDeleteOK.title=Delete Category -categoryDeleteOK.removeCategory=\u6210\u529F\u79FB\u9664\u535A\u5BA2\u5206\u7C7B categoryDeleteOK.warningCatInUse=\u8B66\u544A\uFF1A\u6B64\u5206\u7C7B\u4ECD\u7136\u5728\u4F7F\u7528\uFF01 -categoryDeleteOK.youMustMoveEntries=\u4F60\u5FC5\u987B\u5148\u628A\u6B64\u5206\u7C7B\u4E2D\u7684\u6587\u7AE0\u8F6C\u79FB\u5230\u53E6\u4E00\u4E2A\u5206\u7C7B\uFF0C\u7528\u9009\u62E9\u6846\u6765\u9009\u4E2D\u8981\u63A5\u6536\u8FD9\u4E9B\u6587\u7AE0\u7684\u5206\u7C7B\u3002</p> categoryDeleteOK.moveToWhere=\u628A\u8FD9\u4E9B\u5185\u5BB9\u8F6C\u79FB\u5230\u53E6\u4E00\u4E2A\u5206\u7C7B: categoryDeleteOK.noEntriesInCat=\u6B64\u5206\u7C7B\u4E2D\u5DF2\u7ECF\u6CA1\u6709\u6587\u7AE0\u4E86\uFF0C\u53EF\u4EE5\u5B89\u5168\u5220\u9664\u3002 -categoryDeleteOK.areYouSure=\u4F60\u786E\u5B9A\u8981\u5220\u9664\u8FD9\u4E2A\u6587\u7AE0\u5206\u7C7B\u5417\uFF1F # ----------------------------------------------------------------- comments.jsp diff --git a/app/src/main/resources/struts.xml b/app/src/main/resources/struts.xml index a688e2114..addfdc54a 100644 --- a/app/src/main/resources/struts.xml +++ b/app/src/main/resources/struts.xml @@ -454,7 +454,7 @@ <action name="categories" class="org.apache.roller.weblogger.ui.struts2.editor.Categories"> <result name="list" type="tiles">.Categories</result> - <allowed-methods>execute,move</allowed-methods> + <allowed-methods>execute,reorder</allowed-methods> </action> <action name="categoryAdd" diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp index 45848f2c6..e5d0c81b6 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp @@ -17,319 +17,205 @@ --%> <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> -<p class="subtitle"> - <s:text name="categoriesForm.subtitle"> - <s:param value="weblog"/> - </s:text> -</p> -<p class="pagetip"> - <s:text name="categoriesForm.rootPrompt"/> -</p> +<%-- Categories: one list in display order. Rows are dragged (or moved with the arrow keys on + their handle) to reorder; Add, Edit and Delete open dialogs that post with AJAX and reload + the page, which then shows a short confirmation. Text the script needs is in data-* attributes. --%> + +<div id="categoriesPage" class="categories-page" + data-msg-added="<s:text escapeHtml="true" name='categoryForm.created'/>" + data-msg-saved="<s:text escapeHtml="true" name='categoryForm.changesSaved'/>" + data-msg-removed="<s:text escapeHtml="true" name='categoryForm.removed'/>" + data-msg-order-saved="<s:text escapeHtml="true" name='categoriesForm.orderSaved'/>" + data-msg-error="<s:text escapeHtml="true" name='generic.error.check.logs'/>" + data-msg-name-required="<s:text escapeHtml="true" name='categoryForm.requiredFields'/>" + data-msg-bad-url="<s:text escapeHtml="true" name='categoryForm.badURL'/>" + data-title-add="<s:text escapeHtml="true" name='categoryForm.add.title'/>" + data-title-edit="<s:text escapeHtml="true" name='categoryForm.edit.title'/>" + data-title-delete="<s:text escapeHtml="true" name='categoryDeleteOK.heading'/>"> + +<div class="categories-header"> + <p class="subtitle mb-0"> + <s:text name="categoriesForm.subtitle"> + <s:param value="weblog"/> + </s:text> + </p> + <button type="button" id="addCategoryButton" class="btn btn-primary"> + <span class="bi bi-plus-lg" aria-hidden="true"></span> + <s:text escapeHtml="true" name="categoriesForm.addCategory"/> + </button> +</div> + +<p class="pagetip" id="categoriesTip"><s:text escapeHtml="true" name="categoriesForm.rootPrompt"/></p> -<%-- Form is a table of categories each with checkbox --%> -<s:form action="categories!move"> +<%-- carries the salt for the reorder post; the category ids are added by the script --%> +<s:form id="categoriesReorderForm" action="categories!reorder" theme="simple"> <s:hidden name="salt"/> <s:hidden name="weblog"/> - <s:hidden name="categoryId"/> - - <table class="rollertable table table-striped" width="100%"> - - <tr class="rollertable"> - <th width="30%"><s:text name="generic.name"/></th> - <th width="50%"><s:text name="generic.description"/></th> - <th width="10%"><s:text name="generic.edit"/></th> - <th width="10%"><s:text name="categoriesForm.remove"/></th> - </tr> - - <s:if test="AllCategories != null && !AllCategories.isEmpty"> - - <s:iterator var="category" value="AllCategories" status="rowstatus"> - <tr> - <td><s:property value="#category.name"/></td> - - <td><s:property value="#category.description"/></td> - - <td align="center"> - - <s:set var="categoryId" value="#category.id" /> - <s:set var="categoryName" value="#category.name" /> - <s:set var="categoryDesc" value="#category.description" /> - <s:set var="categoryImage" value="#category.image" /> - <a href="#" class="category-edit-link" - data-category-id="<s:property value="categoryId" />" - data-category-name="<s:property value="categoryName"/>" - data-category-desc="<s:property value="categoryDesc"/>" - data-category-image="<s:property value="categoryImage"/>"> - <span class="bi bi-pencil-square"></span> - </a> - - </td> - - <td class="rollertable" align="center"> - <s:if test="AllCategories.size() > 1"> - - <s:set var="categoryId" value="#category.id" /> - <s:set var="categoryName" value="#category.name" /> - <s:set var="categoryInUse" value="#category.inUse.toString()" /> - <a href="#" class="category-delete-link" - data-category-id="<s:property value="categoryId" />" - data-category-name="<s:property value="categoryName" />" - data-category-in-use="<s:property value="categoryInUse"/>"> - <span class="bi bi-trash"></span> - </a> - - </s:if> - </td> - - </tr> - </s:iterator> - - </s:if> - - <s:else> - <tr> - <td style="vertical-align:middle" colspan="6"><s:text name="categoriesForm.noresults"/></td> - </tr> - </s:else> - - </table> - </s:form> +<s:if test="allCategories.isEmpty()"> + <p class="categories-empty"><s:text escapeHtml="true" name="categoriesForm.noresults"/></p> +</s:if> + +<ul id="categoryList" class="category-list" aria-describedby="categoriesTip"> + <s:iterator var="category" value="allCategories"> + <s:url var="entriesURL" escapeAmp="false" action="entries"> + <s:param name="weblog" value="%{actionWeblog.handle}"/> + <s:param name="bean.categoryName" value="%{#category.name}"/> + </s:url> + <li class="category-row" + data-category-id="<s:property value='#category.id'/>" + data-category-name="<s:property value='#category.name'/>" + data-category-desc="<s:property value='#category.description'/>" + data-category-image="<s:property value='#category.image'/>" + data-in-use="<s:property value='isInUse(#category.id)'/>" + data-delete-text="<s:if test='getEntryCount(#category.id) > 0'><s:text escapeHtml="true" name='categoryDeleteOK.entriesInCategory'><s:param value='getEntryCount(#category.id)'/></s:text></s:if><s:elseif test='isInUse(#category.id)'><s:text escapeHtml="true" name='categoryDeleteOK.warningCatInUse'/></s:elseif><s:else><s:text escapeHtml="true" name='categoryDeleteOK.noEntriesInCat'/></s:else>"> + + <button type="button" class="category-handle" + aria-label="<s:text escapeHtml="true" name='categoriesForm.moveHandle'><s:param value='#category.name'/></s:text>"> + <span class="bi bi-grip-vertical" aria-hidden="true"></span> + </button> + + <s:if test="#category.image != null && #category.image != ''"> + <img class="category-image" src="<s:property value='#category.image'/>" alt="" loading="lazy"> + </s:if> + + <div class="category-main"> + <a href="#" class="category-name category-edit-link"><s:property value="#category.name"/></a> + <s:if test="#category.description != null && #category.description != ''"> + <span class="category-desc"><s:property value="#category.description"/></span> + </s:if> + </div> -<%-- ============================================================= --%> -<%-- add/edit category modal --%> - -<div id="category-edit-modal" class="modal fade category-edit-modal" tabindex="-1" role="dialog"> + <s:if test="getEntryCount(#category.id) > 0"> + <a class="category-count" href="<s:property value='%{entriesURL}'/>" + title="<s:text escapeHtml="true" name='categoriesForm.viewEntries'><s:param value='#category.name'/></s:text>"> + <s:text escapeHtml="true" name="categoriesForm.entryCount"><s:param value="getEntryCount(#category.id)"/></s:text> + </a> + </s:if> + <s:else> + <span class="category-count"><s:text escapeHtml="true" name="categoriesForm.entryCount"><s:param value="0"/></s:text></span> + </s:else> + + <div class="category-actions"> + <button type="button" class="btn btn-sm btn-outline-secondary category-edit-link"> + <span class="bi bi-pencil" aria-hidden="true"></span> + <s:text escapeHtml="true" name="generic.edit"/> + </button> + <s:if test="allCategories.size() > 1"> + <button type="button" class="btn btn-sm btn-outline-danger category-delete-link"> + <span class="bi bi-trash" aria-hidden="true"></span> + <s:text escapeHtml="true" name="generic.delete"/> + </button> + </s:if> + <s:else> + <%-- a disabled button gets no hover events, so the wrapper carries the tooltip --%> + <span class="d-inline-block" tabindex="0" title="<s:text escapeHtml="true" name='categoriesForm.lastCategory'/>"> + <button type="button" class="btn btn-sm btn-outline-danger" disabled> + <span class="bi bi-trash" aria-hidden="true"></span> + <s:text escapeHtml="true" name="generic.delete"/> + </button> + </span> + </s:else> + </div> + </li> + </s:iterator> +</ul> + +<div id="categoryStatus" class="visually-hidden" role="status" aria-live="polite"></div> + +<div class="toast-container position-fixed bottom-0 end-0 p-3"> + <div id="categoryToast" 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 dialog --%> +<div id="category-edit-modal" class="modal fade" tabindex="-1" aria-labelledby="category-edit-title" aria-hidden="true"> + <div class="modal-dialog"> <div class="modal-content"> - <div class="modal-header"> - <h3 id="category-edit-title"></h3> + <h3 class="modal-title fs-5" id="category-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="categoryEdit" id="categoryEditForm" theme="bootstrap" cssClass="form-horizontal"> + <div id="categoryEditErrors" class="alert alert-danger d-none" role="alert"></div> + <s:form action="categoryEdit!save" id="categoryEditForm" theme="simple" novalidate="novalidate"> <s:hidden name="salt"/> <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:categoryEdit!save" value="save"/> - - <s:textfield name="bean.name" label="%{getText('generic.name')}" maxlength="255" - onchange="validateCategory()" onkeyup="validateCategory()" /> + <s:hidden name="bean.id" id="categoryEditForm_bean_id"/> + + <div class="mb-3"> + <label class="form-label" for="categoryEditForm_bean_name"><s:text escapeHtml="true" name="generic.name"/></label> + <s:textfield name="bean.name" id="categoryEditForm_bean_name" value="" maxlength="255" + cssClass="form-control" required="required" + aria-describedby="categoryNameFeedback"/> + <div id="categoryNameFeedback" class="invalid-feedback"></div> + </div> - <s:textfield name="bean.description" label="%{getText('generic.description')}"/> + <div class="mb-3"> + <label class="form-label" for="categoryEditForm_bean_description"><s:text escapeHtml="true" name="generic.description"/></label> + <s:textfield name="bean.description" id="categoryEditForm_bean_description" value="" + maxlength="255" cssClass="form-control"/> + </div> - <s:textfield name="bean.image" label="%{getText('categoryForm.image')}" - onchange="validateCategory()" onkeyup="validateCategory()" /> + <div class="mb-1"> + <label class="form-label" for="categoryEditForm_bean_image"><s:text escapeHtml="true" name="categoryForm.image"/></label> + <s:textfield name="bean.image" id="categoryEditForm_bean_image" value="" maxlength="255" + cssClass="form-control" type="url" + aria-describedby="categoryImageHelp categoryImageFeedback"/> + <div id="categoryImageFeedback" class="invalid-feedback"></div> + <div id="categoryImageHelp" class="form-text"><s:text escapeHtml="true" name="categoryForm.imageHelp"/></div> + <img id="categoryImagePreview" class="category-image-preview d-none" alt=""> + </div> </s:form> </div> - <div class="modal-footer"> - <p id="feedback-area-edit"></p> - <button onclick="submitEditedCategory()" 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="categorySaveButton" class="btn btn-primary"><s:text escapeHtml="true" name="generic.save"/></button> </div> - </div> </div> </div> -<script> - - var feedbackAreaEdit = $("#feedback-area-edit"); - - function showCategoryEditModal( id, name, desc, image ) { - feedbackAreaEdit.html(""); - $('#category-edit-title').html('<s:text name="categoryForm.edit.title" />'); - - $('#categoryEditForm_bean_id').val(id); - $('#categoryEditForm_bean_name').val(name); - $('#categoryEditForm_bean_description').val(desc); - $('#categoryEditForm_bean_image').val(image); - - $('#category-edit-modal').modal('show'); - - } - - function validateCategory() { - - var saveCategoryButton = $('#categoryEditForm:first'); - - var categoryName = $("#categoryEditForm_bean_name").val(); - var imageURL = $("#categoryEditForm_bean_image").val(); - - if (!categoryName || categoryName.trim() === '') { - saveCategoryButton.attr("disabled", true); - feedbackAreaEdit.html('<s:text name="categoryForm.requiredFields" />'); - feedbackAreaEdit.css("color", "red"); - return; - } - - if (imageURL && imageURL.trim() !== '') { - if (!isValidUrl(imageURL)) { - saveCategoryButton.attr("disabled", true); - feedbackAreaEdit.html('<s:text name="categoryForm.badURL" />'); - feedbackAreaEdit.css("color", "red"); - return; - } - } - - feedbackAreaEdit.html(''); - saveCategoryButton.attr("disabled", false); - } - - function submitEditedCategory() { - - // if name is empty reject and show error message - if ($("#categoryEditForm_bean_name").val().trim() === "") { - feedbackAreaEdit.html('<s:text name="categoryForm.requiredFields" />'); - feedbackAreaEdit.css("color", "red"); - return; - } - - // post category via AJAX - $.ajax({ - method: 'post', - url: "categoryEdit!save.rol", - data: $("#categoryEditForm").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" />'); - $('#category-edit-modal').modal("hide"); - location.reload(true); - } - - }).fail(function (data) { - feedbackAreaEdit.html('<s:text name="generic.error.check.logs" />'); - feedbackAreaEdit.css("color", "red"); - }); - } - -</script> - - -<%-- ============================================================= --%> -<%-- delete confirmation modal --%> - -<div id="delete-category-modal" class="modal fade delete-category-modal" tabindex="-1" role="dialog"> - - <div class="modal-dialog modal-lg"> +<%-- delete dialog --%> +<div id="delete-category-modal" class="modal fade" tabindex="-1" aria-labelledby="category-delete-title" aria-hidden="true"> + <div class="modal-dialog"> <div class="modal-content"> - <div class="modal-header"> - <h3> - <s:text name="categoryDeleteOK.removeCategory"/>: - <span id="category-name"></span> - </h3> + <h3 class="modal-title fs-5" id="category-delete-title"></h3> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="<s:text escapeHtml="true" name='generic.close'/>"></button> </div> - - <s:form action="categoryRemove!remove" theme="bootstrap" cssClass="form-horizontal"> - <s:hidden name="salt"/> - <s:hidden name="weblog"/> - <s:hidden name="removeId"/> - - <div class="modal-body"> - - <div id="category-in-use" style="display:none"> - <p> - <s:text name="categoryDeleteOK.warningCatInUse"/> - <s:text name="categoryDeleteOK.youMustMoveEntries"/> - </p> - <s:text name="categoryDeleteOK.moveToWhere"/> - <s:select name="targetCategoryId" list="allCategories" listKey="id" listValue="name"/> - </div> - - <div id="category-empty" style="display:none"> - <p><s:text name="categoryDeleteOK.noEntriesInCat"/></p> + <div class="modal-body"> + <div id="categoryDeleteErrors" class="alert alert-danger d-none" role="alert"></div> + <s:form action="categoryRemove!remove" id="categoryRemoveForm" theme="simple"> + <s:hidden name="salt"/> + <s:hidden name="weblog"/> + <s:hidden name="removeId" id="categoryRemove_removeId"/> + <p id="categoryDeleteText"></p> + <div id="categoryMoveTarget" class="mb-2"> + <label class="form-label" for="categoryRemove_targetCategoryId"><s:text escapeHtml="true" name="categoryDeleteOK.moveToWhere"/></label> + <%-- options are filled in by the script, without the category being deleted --%> + <s:select name="targetCategoryId" id="categoryRemove_targetCategoryId" list="{}" + headerKey="" headerValue="%{getText('categoryDeleteOK.chooseCategory')}" + cssClass="form-select"/> </div> - - <p> <strong><s:text name="categoryDeleteOK.areYouSure"/></strong> </p> - </div> - - <div class="modal-footer"> - <s:submit theme="simple" cssClass="btn btn-danger" value="%{getText('generic.yes')}"/> - <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal"> - <s:text name="generic.no" /> - </button> - </div> - - </s:form> - + </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="categoryDeleteButton" class="btn btn-danger"><s:text escapeHtml="true" name="categoryDeleteOK.delete"/></button> + </div> </div> </div> </div> -<script> - - function showCategoryDeleteModal( id, name, inUse ) { - $('#categoryRemove_removeId').val(id); - $('#categoryEdit_bean_name').val(name); - $('#category-name').text(name); - if ( inUse ) { - $('#category-in-use').css('display','block'); - $('#category-empty').css('display', 'none'); - } else { - $('#category-in-use').css('display', 'none'); - $('#category-empty').css('display', 'block'); - } - populateCategorySelect(id); - $('#delete-category-modal').modal('show'); - } - - function populateCategorySelect(removeId) { - // Category names are author-supplied. They are rendered into data - // attributes below and read back as text here, so no name is ever - // parsed as JavaScript. - const allCategories = $('.category-delete-link').map(function () { - return { - id: $(this).attr('data-category-id'), - name: $(this).attr('data-category-name') - }; - }).get(); - - const select = $('#categoryRemove_targetCategoryId'); - select.empty(); - allCategories.forEach(function(category) { - if (category.id !== removeId) { - select.append(new Option(category.name, category.id)); - } - }); - } - - // Values come from data-* attributes and are bound via delegated listeners. - $(document).on('click', '.category-edit-link', function (event) { - event.preventDefault(); - showCategoryEditModal($(this).attr('data-category-id'), - $(this).attr('data-category-name'), - $(this).attr('data-category-desc'), - $(this).attr('data-category-image')); - }); - - $(document).on('click', '.category-delete-link', function (event) { - event.preventDefault(); - showCategoryDeleteModal($(this).attr('data-category-id'), - $(this).attr('data-category-name'), - $(this).attr('data-category-in-use') === 'true'); - }); +</div> -</script> +<script src="<s:url value='/roller-ui/scripts/categories.js'/>"></script> diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp deleted file mode 100644 index b8f683968..000000000 --- a/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp +++ /dev/null @@ -1,55 +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> - <s:set var="categoryId" value="#bean.id"/> - <s:set var="categoryName" value="#post.name"/> - <s:set var="categoryDesc" value="#post.description"/> - <s:set var="categoryImage" value="#post.image"/> - - <a href="#" onclick="showCategoryAddModal()"> - <span class="bi bi-plus-lg"></span> - <s:text name="categoriesForm.addCategory"/> - </a> -</p> - -<script> - - var feedbackArea = $("#feedback-area"); - - function showCategoryAddModal() { - - feedbackAreaEdit.html(""); - $('#category-edit-title').html('<s:text name="categoryForm.add.title" />'); - - $('#categoryEditForm_bean_id').val(""); - $('#categoryEditForm_bean_name').val(""); - $('#categoryEditForm_bean_description').val(""); - $('#categoryEditForm_bean_image').val(""); - - validateCategory(); - - $('#category-edit-modal').modal('show'); - } - -</script> - diff --git a/app/src/main/webapp/WEB-INF/tiles.xml b/app/src/main/webapp/WEB-INF/tiles.xml index 113d48ece..6e75551cb 100644 --- a/app/src/main/webapp/WEB-INF/tiles.xml +++ b/app/src/main/webapp/WEB-INF/tiles.xml @@ -297,7 +297,8 @@ <definition name=".Categories" extends=".tiles-tabbedpage" > <put-attribute name="content" value="/WEB-INF/jsps/editor/Categories.jsp" /> - <put-attribute name="sidebar" value="/WEB-INF/jsps/editor/CategoriesSidebar.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> diff --git a/app/src/main/webapp/roller-ui/scripts/categories.js b/app/src/main/webapp/roller-ui/scripts/categories.js new file mode 100644 index 000000000..8115dbba8 --- /dev/null +++ b/app/src/main/webapp/roller-ui/scripts/categories.js @@ -0,0 +1,331 @@ +/* +* 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. +*/ + +/* + * Categories page (Categories.jsp): add, edit and delete dialogs that post with + * AJAX, 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("categoriesPage"); + if (!page) { + return; + } + + var FLASH_KEY = "roller.categories.flash"; + var list = document.getElementById("categoryList"); + var editModal = new bootstrap.Modal(document.getElementById("category-edit-modal")); + var deleteModal = new bootstrap.Modal(document.getElementById("delete-category-modal")); + var editForm = document.getElementById("categoryEditForm"); + var removeForm = document.getElementById("categoryRemoveForm"); + var nameField = document.getElementById("categoryEditForm_bean_name"); + var descField = document.getElementById("categoryEditForm_bean_description"); + var imageField = document.getElementById("categoryEditForm_bean_image"); + var imagePreview = document.getElementById("categoryImagePreview"); + var saveButton = document.getElementById("categorySaveButton"); + var deleteButton = document.getElementById("categoryDeleteButton"); + var targetSelect = document.getElementById("categoryRemove_targetCategoryId"); + + function text(name) { + return page.dataset[name] || ""; + } + + // messages come from resource bundles, which write a parameter as {0} + function format(message, value) { + return message.replace("{0}", value); + } + + function rowOf(element) { + return element.closest(".category-row"); + } + + // --- confirmation after a change ------------------------------------- + + function showToast(message, isError) { + var toast = document.getElementById("categoryToast"); + 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(); + } + + function reloadWith(message, categoryName) { + try { + sessionStorage.setItem(FLASH_KEY, JSON.stringify({ message: message, name: categoryName })); + } catch (e) { + // storage unavailable: reload without the confirmation + } + location.reload(); + } + + 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); + list.querySelectorAll(".category-row").forEach(function (row) { + if (flash.name && row.dataset.categoryName === flash.name) { + row.classList.add("category-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); + } + + // --- add and edit -------------------------------------------------------- + + function setInvalid(field, feedbackId, message) { + field.classList.toggle("is-invalid", !!message); + document.getElementById(feedbackId).textContent = message || ""; + } + + function imageUrl() { + var value = imageField.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; + } + } + + function validate() { + var nameOk = nameField.value.trim() !== ""; + var image = imageUrl(); + setInvalid(nameField, "categoryNameFeedback", nameOk ? "" : text("msgNameRequired")); + setInvalid(imageField, "categoryImageFeedback", image === null ? text("msgBadUrl") : ""); + imagePreview.classList.toggle("d-none", !image); + if (image && imagePreview.getAttribute("src") !== image) { + imagePreview.setAttribute("src", image); + } + saveButton.disabled = !nameOk || image === null; + return !saveButton.disabled; + } + + function openEditor(row) { + var adding = !row; + document.getElementById("category-edit-title").textContent = adding ? text("titleAdd") : text("titleEdit"); + document.getElementById("categoryEditForm_bean_id").value = adding ? "" : row.dataset.categoryId; + nameField.value = adding ? "" : row.dataset.categoryName; + descField.value = adding ? "" : row.dataset.categoryDesc; + imageField.value = adding ? "" : row.dataset.categoryImage; + showErrors(document.getElementById("categoryEditErrors"), []); + setInvalid(nameField, "categoryNameFeedback", ""); + setInvalid(imageField, "categoryImageFeedback", ""); + imagePreview.classList.add("d-none"); + imagePreview.removeAttribute("src"); + saveButton.disabled = adding; + if (!adding) { + validate(); + } + editModal.show(); + } + + function saveCategory() { + if (!validate()) { + return; + } + var adding = document.getElementById("categoryEditForm_bean_id").value === ""; + var name = nameField.value.trim(); + saveButton.disabled = true; + post(editForm).done(function (html) { + var errors = actionErrors(html); + if (errors.length > 0) { + showErrors(document.getElementById("categoryEditErrors"), errors); + saveButton.disabled = false; + } else { + reloadWith(format(adding ? text("msgAdded") : text("msgSaved"), name), name); + } + }).fail(function () { + showErrors(document.getElementById("categoryEditErrors"), [text("msgError")]); + saveButton.disabled = false; + }); + } + + nameField.addEventListener("input", validate); + imageField.addEventListener("input", validate); + imagePreview.addEventListener("error", function () { + imagePreview.classList.add("d-none"); + }); + saveButton.addEventListener("click", saveCategory); + // Enter in a field saves; the form has no submit button and is never posted directly + editForm.addEventListener("submit", function (event) { + event.preventDefault(); + }); + editForm.addEventListener("keydown", function (event) { + if (event.key === "Enter" && event.target.matches("input")) { + event.preventDefault(); + saveCategory(); + } + }); + document.getElementById("addCategoryButton").addEventListener("click", function () { + openEditor(null); + }); + document.getElementById("category-edit-modal").addEventListener("shown.bs.modal", function () { + nameField.focus(); + }); + + // --- delete ---------------------------------------------------------------- + + function openDelete(row) { + var id = row.dataset.categoryId; + var inUse = row.dataset.inUse === "true"; + document.getElementById("category-delete-title").textContent = format(text("titleDelete"), row.dataset.categoryName); + document.getElementById("categoryRemove_removeId").value = id; + document.getElementById("categoryDeleteText").textContent = row.dataset.deleteText; + showErrors(document.getElementById("categoryDeleteErrors"), []); + + // the other categories, in display order, after the "choose" option + while (targetSelect.options.length > 1) { + targetSelect.remove(1); + } + list.querySelectorAll(".category-row").forEach(function (other) { + if (other.dataset.categoryId !== id) { + targetSelect.add(new Option(other.dataset.categoryName, other.dataset.categoryId)); + } + }); + targetSelect.value = ""; + + // a category nothing uses needs no target; a disabled select is not posted + document.getElementById("categoryMoveTarget").classList.toggle("d-none", !inUse); + targetSelect.disabled = !inUse; + deleteButton.disabled = inUse; + deleteButton.dataset.categoryName = row.dataset.categoryName; + deleteModal.show(); + } + + targetSelect.addEventListener("change", function () { + deleteButton.disabled = targetSelect.value === ""; + }); + + deleteButton.addEventListener("click", function () { + var name = deleteButton.dataset.categoryName; + deleteButton.disabled = true; + post(removeForm).done(function (html) { + var errors = actionErrors(html); + if (errors.length > 0) { + showErrors(document.getElementById("categoryDeleteErrors"), errors); + deleteButton.disabled = false; + } else { + reloadWith(format(text("msgRemoved"), name), null); + } + }).fail(function () { + showErrors(document.getElementById("categoryDeleteErrors"), [text("msgError")]); + deleteButton.disabled = false; + }); + }); + + // --- row actions ----------------------------------------------------------- + + list.addEventListener("click", function (event) { + var edit = event.target.closest(".category-edit-link"); + var remove = event.target.closest(".category-delete-link"); + if (edit) { + event.preventDefault(); + openEditor(rowOf(edit)); + } else if (remove) { + openDelete(rowOf(remove)); + } + }); + + // --- reordering ------------------------------------------------------------ + + var saveTimer = null; + + function saveOrder() { + var ids = Array.prototype.map.call(list.querySelectorAll(".category-row"), function (row) { + return "&categoryIds=" + encodeURIComponent(row.dataset.categoryId); + }).join(""); + post(document.getElementById("categoriesReorderForm"), ids).done(function (html) { + var errors = actionErrors(html); + if (errors.length > 0) { + showToast(errors.join(" "), true); + } else { + document.getElementById("categoryStatus").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: ".category-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(".category-handle"); + if (!handle || (event.key !== "ArrowUp" && event.key !== "ArrowDown")) { + return; + } + event.preventDefault(); + var row = rowOf(handle); + 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(); + }); + + 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..48a1a6bc3 100644 --- a/app/src/main/webapp/roller-ui/styles/roller.css +++ b/app/src/main/webapp/roller-ui/styles/roller.css @@ -284,6 +284,152 @@ body { text-align: center; } +/* categories (Categories.jsp, categories.js) */ + +.categories-header { + display: flex; + flex-wrap: wrap; + align-items: center; + justify-content: space-between; + gap: 0.5rem; + margin-bottom: 0.5rem; +} + +.category-list { + list-style: none; + padding: 0; + margin: 1rem 0 0; + border-top: 1px solid var(--bs-border-color); +} + +.category-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); +} + +.category-row.ui-sortable-helper { + box-shadow: var(--bs-box-shadow); + border: 1px solid var(--bs-border-color); +} + +.category-row.ui-sortable-placeholder { + visibility: visible !important; + background-color: var(--bs-tertiary-bg); +} + +.category-row-changed { + background-color: var(--bs-success-bg-subtle); + transition: background-color 2s ease-out; +} + +.category-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; +} + +.category-handle:hover, +.category-handle:focus-visible { + background-color: var(--bs-tertiary-bg); + color: var(--bs-body-color); +} + +.category-image { + flex: none; + width: 2rem; + height: 2rem; + object-fit: cover; + border-radius: var(--bs-border-radius-sm); +} + +.category-main { + flex: 1 1 auto; + min-width: 0; + display: flex; + flex-direction: column; +} + +.category-name { + font-weight: 600; + text-decoration: none; + overflow-wrap: anywhere; +} + +.category-name:hover, +.category-name:focus-visible { + text-decoration: underline; +} + +.category-desc { + font-size: 0.875rem; + color: var(--bs-secondary-color); + overflow-wrap: anywhere; +} + +.category-count { + flex: none; + font-size: 0.875rem; + color: var(--bs-secondary-color); + white-space: nowrap; +} + +.category-actions { + flex: none; + display: flex; + gap: 0.5rem; +} + +.category-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); +} + +@media (max-width: 575.98px) { + /* name and description on one line, count and buttons under them */ + .category-row { + flex-wrap: wrap; + row-gap: 0.25rem; + } + + .category-main { + flex-basis: calc(100% - 3rem); + } + + .category-row:has(.category-image) .category-main { + flex-basis: calc(100% - 5.75rem); + } + + .category-count { + margin-left: 2.75rem; + } + + .category-actions { + margin-left: auto; + } + + .category-actions .btn { + min-height: 2.75rem; + } +} + /* media library (MediaFileView.jsp, MediaFileSidebar.jsp, MediaFileCard.jsp) */ .media-folders-header, diff --git a/app/src/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java b/app/src/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java index d48fc2c8b..0fc6e4923 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java @@ -24,6 +24,8 @@ import org.apache.roller.weblogger.TestUtils; import org.apache.roller.weblogger.pojos.User; import org.apache.roller.weblogger.pojos.Weblog; import org.apache.roller.weblogger.pojos.WeblogCategory; +import org.apache.roller.weblogger.pojos.WeblogEntry; +import java.util.Map; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -200,4 +202,27 @@ public class WeblogCategoryCRUDTest { log.info("END"); } + + /** + * Entry counts per category include entries in any status and leave out + * categories with no entries. + */ + @Test + public void testCategoryEntryCounts() throws Exception { + + WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); + testWeblog = TestUtils.getManagedWebsite(testWeblog); + testUser = TestUtils.getManagedUser(testUser); + + WeblogCategory busy = TestUtils.setupWeblogCategory(testWeblog, "Busy"); + WeblogCategory empty = TestUtils.setupWeblogCategory(testWeblog, "Empty"); + TestUtils.setupWeblogEntry("count-1", busy, WeblogEntry.PubStatus.PUBLISHED, testWeblog, testUser); + TestUtils.setupWeblogEntry("count-2", busy, WeblogEntry.PubStatus.DRAFT, testWeblog, testUser); + TestUtils.endSession(true); + + testWeblog = TestUtils.getManagedWebsite(testWeblog); + Map<String, Long> counts = mgr.getWeblogCategoryEntryCounts(testWeblog); + assertEquals(Long.valueOf(2), counts.get(busy.getId())); + assertFalse(counts.containsKey(empty.getId())); + } } diff --git a/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/CategoriesTest.java b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/CategoriesTest.java new file mode 100644 index 000000000..cdb981a3a --- /dev/null +++ b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/CategoriesTest.java @@ -0,0 +1,150 @@ +/* + * 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.Arrays; +import java.util.List; +import java.util.Map; + +import org.apache.roller.weblogger.business.WeblogEntryManager; +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.WeblogCategory; +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 categories page saves a new display order and reports entry counts. + */ +class CategoriesTest { + + private MockedStatic<WebloggerFactory> factory; + private MockedStatic<CacheManager> cache; + private Weblogger weblogger; + private WeblogEntryManager entries; + private Weblog weblog; + private WeblogCategory java; + private WeblogCategory roller; + private WeblogCategory general; + private Categories action; + + @BeforeEach + void setUp() throws Exception { + entries = mock(WeblogEntryManager.class); + weblogger = mock(Weblogger.class); + when(weblogger.getWeblogEntryManager()).thenReturn(entries); + factory = mockStatic(WebloggerFactory.class); + factory.when(WebloggerFactory::getWeblogger).thenReturn(weblogger); + cache = mockStatic(CacheManager.class); + + weblog = mock(Weblog.class); + java = category("c-java", "Java", 0); + roller = category("c-roller", "Roller", 1); + general = category("c-general", "General", 2); + when(entries.getWeblogCategories(weblog)).thenReturn(Arrays.asList(java, roller, general)); + when(entries.getWeblogCategoryEntryCounts(weblog)).thenReturn(Map.of("c-java", 17L)); + + action = spy(new Categories()); + doAnswer(call -> call.getArgument(0)).when(action).getText(anyString()); + doAnswer(call -> call.getArgument(0)).when(action).getText(anyString(), anyList()); + action.setActionWeblog(weblog); + } + + @AfterEach + void tearDown() { + cache.close(); + factory.close(); + } + + private WeblogCategory category(String id, String name, int position) throws Exception { + WeblogCategory category = new WeblogCategory(); + category.setId(id); + category.setName(name); + category.setPosition(position); + when(entries.getWeblogCategory(weblog, id)).thenReturn(category); + return category; + } + + @Test + void savesNewOrder() throws Exception { + action.setCategoryIds(List.of("c-general", "c-java", "c-roller")); + + action.reorder(); + + assertFalse(action.hasActionErrors()); + assertEquals(0, general.getPosition()); + assertEquals(1, java.getPosition()); + assertEquals(2, roller.getPosition()); + verify(entries).saveWeblogCategory(general); + verify(weblogger).flush(); + } + + @Test + void rejectsAnOrderThatLeavesOutACategory() throws Exception { + action.setCategoryIds(List.of("c-general", "c-java")); + + action.reorder(); + + assertTrue(action.hasActionErrors()); + assertEquals(2, general.getPosition()); + verify(entries, never()).saveWeblogCategory(any()); + verify(weblogger, never()).flush(); + } + + @Test + void rejectsAnOrderWithAnotherWeblogsCategory() throws Exception { + action.setCategoryIds(List.of("c-general", "c-java", "c-elsewhere")); + + action.reorder(); + + assertTrue(action.hasActionErrors()); + verify(entries, never()).saveWeblogCategory(any()); + } + + @Test + void reportsEntryCountsAndUse() { + when(weblog.getBloggerCategory()).thenReturn(general); + + action.execute(); + + assertEquals(17, action.getEntryCount("c-java")); + assertEquals(0, action.getEntryCount("c-roller")); + assertTrue(action.isInUse("c-java")); + assertFalse(action.isInUse("c-roller")); + // blogging clients post to it, so removing it needs a replacement + assertTrue(action.isInUse("c-general")); + } +} 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..f3d5d2995 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 @@ -65,8 +65,7 @@ public class StrutsParameterAnnotationTest { // 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", + // no such property; the hidden field is a leftover in the JSP "WeblogConfig.defaultPlugins"); /** diff --git a/it-playwright/src/test/java/org/apache/roller/playwright/BaseIT.java b/it-playwright/src/test/java/org/apache/roller/playwright/BaseIT.java index 692cce341..49f9e1e4c 100644 --- a/it-playwright/src/test/java/org/apache/roller/playwright/BaseIT.java +++ b/it-playwright/src/test/java/org/apache/roller/playwright/BaseIT.java @@ -280,11 +280,11 @@ abstract class BaseIT { } // authoring dialogs (Bootstrap modals) - private static final String CATEGORY_ADD_LINK = "a[onclick*='showCategoryAddModal']"; + private static final String CATEGORY_ADD_BUTTON = "#addCategoryButton"; private static final String CATEGORY_DIALOG = "#category-edit-modal"; private static final String CATEGORY_NAME_FIELD = "#categoryEditForm_bean_name"; - private static final String CATEGORY_SAVE_BUTTON = CATEGORY_DIALOG + " .modal-footer .btn-primary"; - private static final String CATEGORY_TABLE = "table.rollertable"; + private static final String CATEGORY_SAVE_BUTTON = "#categorySaveButton"; + private static final String CATEGORY_LIST = "#categoryList"; private static final String ENTRY_DELETE_LINK = ".entry-delete-link"; private static final String ENTRY_DELETE_DIALOG = "#delete-entry-modal"; private static final String ENTRY_DELETE_NO = ENTRY_DELETE_DIALOG + " .modal-footer button[data-bs-dismiss='modal']"; @@ -296,17 +296,15 @@ abstract class BaseIT { /** Adds a category through the Add Category dialog on the categories page. */ protected void addCategoryThroughDialog(String weblogHandle, String name) { goTo("roller-ui/authoring/categories.rol?weblog=" + weblogHandle); - page.locator(CATEGORY_ADD_LINK).first().click(); + page.locator(CATEGORY_ADD_BUTTON).click(); assertThat(page.locator(CATEGORY_DIALOG)).isVisible(); page.locator(CATEGORY_NAME_FIELD).fill(name); - // the dialog validates on keyup, which fill() does not fire - page.locator(CATEGORY_NAME_FIELD).press("End"); page.locator(CATEGORY_SAVE_BUTTON).click(); // a successful save closes the dialog and reloads the list assertThat(page.locator(CATEGORY_DIALOG)).isHidden(); - assertThat(page.locator(CATEGORY_TABLE)).containsText(name); + assertThat(page.locator(CATEGORY_LIST)).containsText(name); } /** Opens the delete dialog for an entry on the entries page and cancels it. */
