From 83cfd6be6cbbcffbaa90d1cf5bf706c82c2f07ba Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Mon, 1 Feb 2021 21:29:16 +0100 Subject: [PATCH] Some layout improvments Former-commit-id: 48dc4713420f8118412b23700a1ce4b8a20a9a28 --- .../DocumentFolderController.java | 17 +- .../ui/cms/contentsections-list.xhtml | 2 +- .../ui/contentsection/contentsection.xhtml | 25 ++- .../documentfolder-not-found.xhtml | 6 +- .../documentfolder/documentfolder.xhtml | 160 ++++++++++-------- .../org/librecms/CmsAdminMessages.properties | 7 +- .../librecms/CmsAdminMessages_de.properties | 7 +- 7 files changed, 148 insertions(+), 76 deletions(-) diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderController.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderController.java index 69caa92de..46ba9464b 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderController.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderController.java @@ -114,7 +114,22 @@ public class DocumentFolderController { private PermissionChecker permissionChecker; @GET - @Path("/{folderPath:(/.+)?}") + @Path("/") + @AuthorizationRequired + @Transactional(Transactional.TxType.REQUIRED) + public String listItems( + @PathParam("sectionIdentifier") final String sectionIdentifier, + @QueryParam("filterTerm") @DefaultValue("") final String filterTerm, + @QueryParam("firstResult") @DefaultValue("0") final int firstResult, + @QueryParam("maxResults") @DefaultValue("20") final int maxResults + ) { + return listItems( + sectionIdentifier, "", filterTerm, firstResult, maxResults + ); + } + + @GET + @Path("/{folderPath:(.+)?}") @AuthorizationRequired @Transactional(Transactional.TxType.REQUIRED) public String listItems( diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/cms/contentsections-list.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/cms/contentsections-list.xhtml index 9540eb474..e3ec5c71b 100644 --- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/cms/contentsections-list.xhtml +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/cms/contentsections-list.xhtml @@ -96,7 +96,7 @@ var="section"> - + #{section.label} diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/contentsection.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/contentsection.xhtml index 56fd4f705..20a8ceb9e 100644 --- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/contentsection.xhtml +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/contentsection.xhtml @@ -27,9 +27,30 @@ diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/documentfolder-not-found.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/documentfolder-not-found.xhtml index f37d25796..22f911fa4 100644 --- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/documentfolder-not-found.xhtml +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/documentfolder-not-found.xhtml @@ -7,17 +7,17 @@ - +
  • - #{CmsAdminMessages['contentsection.documentfolder.title']} + #{CmsAdminMessages['contentsection.documentfolders.title']}
    • - #{CmsAdminMessages.getMessage("contentsections.documentfolder.not_found", [contentSection, folderPath])} + #{CmsAdminMessages.getMessage("contentsections.documentfolders.not_found", [contentSection, folderPath])}
    diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/documentfolder.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/documentfolder.xhtml index f4f0042b8..a9fce8df7 100644 --- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/documentfolder.xhtml +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/documentfolder.xhtml @@ -8,18 +8,18 @@ - +
  • - #{CmsAdminMessages['contentsection.documentfolder.title']} + #{CmsAdminMessages['contentsection.documentfolders.title']}
  • - - #{CmsAdminMessages['contentsection.documentfolder.title']} + + #{CmsAdminMessages['contentsection.documentfolders.title']}
    • @@ -34,7 +34,7 @@
  • - #{breadcrumb.pathToken} + #{breadcrumb.pathToken}
    • @@ -47,67 +47,93 @@

    #{CmsAdminMessages.getMessage("contentsection.documentfolder.heading", [ContentSectionModel.sectionName])}

    - +
    +
    +
    + +
    + +
    +
    + +
    +
    + +
    + +
    @@ -176,7 +202,7 @@ - #{row.name} + #{row.name} #{row.name} diff --git a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties index 0f46f73a8..c23720707 100644 --- a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties +++ b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties @@ -24,7 +24,7 @@ contentsections.edit_dialog.close=Cancel contentsections.edit_dialog.name.label=Name contentsections.edit_dialog.save=Rename content section contentsections.edit_dialog.name.help=The name of the content section. Can only contain the letters a to z, the numbers 0-9, the hyphen and the underscore. -contentsection.documentfolder.title=Documents +contentsection.documentfolders.title=Documents contentsection.documentfolder.heading=Content Section {0} Documents Folder contentsection.documentfolder.headers.name.label=Name contentsection.documentfolder.headers.languages.label=Languages @@ -51,3 +51,8 @@ contentsection.documentfolder.filter.label=Filter documents contentsection.documentfolder.filter.submit=Apply filter contentsections.documentfolder.not_found=Not folder with path {1} found in content section {0}. contentsection.not_found.title=Content Section not found +contentsection.documentfolders.searchbox.label=Search in document folders +contentsection.documentfolders.searchbox.submit=Search +contentsection.assetsfolders.title=Media & Data +contentsection.categories.title=Categories & Page Trees +contentsection.categories.configuration=Configuration diff --git a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties index 8cbf90af5..99581e4b7 100644 --- a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties +++ b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties @@ -24,7 +24,7 @@ contentsections.edit_dialog.close=Abbrechen contentsections.edit_dialog.name.label=Name contentsections.edit_dialog.save=Content Section umbenennen contentsections.edit_dialog.name.help=Der Name der Content Section. Darf nur die Zeichen a bis z, 0-9, the Bindestrich und den Unterstrich enthalten. -contentsection.documentfolder.title=Dokumente +contentsection.documentfolders.title=Dokumente contentsection.documentfolder.heading=Content Section {0} Dokumenten-Ordner contentsection.documentfolder.headers.name.label=Name contentsection.documentfolder.headers.languages.label=Sprachen @@ -51,3 +51,8 @@ contentsection.documentfolder.filter.label=Dokumente filtern contentsection.documentfolder.filter.submit=Filter anwenden contentsections.documentfolder.not_found=Es wurde kein Ordner mit dem Pfad {1} in der Content Section {0} gefunden. contentsection.not_found.title=Content Section nicht gefunden +contentsection.documentfolders.searchbox.label=In Dokument-Ordnern suchen +contentsection.documentfolders.searchbox.submit=Suchen +contentsection.assetsfolders.title=Media & Data +contentsection.categories.title=Kategorien & Seitenb\u00e4ume +contentsection.categories.configuration=Konfiguration