From 38ecc4df1878d859046a0f125716049e61788478 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 11 Jan 2021 20:30:25 +0100
Subject: [PATCH] Some work on the content sections admin app

Former-commit-id: 6fee82e83bce1e996ce6b921fec99feba0051884
---
 .../main/java/org/librecms/CmsConstants.java  |  1 +
 .../ui/ContentSectionsController.java         | 42 +++++++++++++---
 .../content-sections/content-sections.xhtml   | 48 +++++++++++++++++--
 .../librecms/ui/content-sections/list.xhtml   | 26 ++++++++++
 .../librecms/ui/content-sections/pages.xhtml  | 27 +++++++++++
 .../librecms/ui/content-sections/search.xhtml | 27 +++++++++++
 .../org/librecms/CmsAdminMessages.properties  |  6 +++
 .../librecms/CmsAdminMessages_de.properties   |  6 +++
 .../libreccm/ui/login/LoginController.java    |  3 --
 9 files changed, 174 insertions(+), 12 deletions(-)
 create mode 100644 ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/list.xhtml
 create mode 100644 ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/pages.xhtml
 create mode 100644 ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/search.xhtml
 create mode 100644 ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties
 create mode 100644 ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties

diff --git a/ccm-cms/src/main/java/org/librecms/CmsConstants.java b/ccm-cms/src/main/java/org/librecms/CmsConstants.java
index 2446b7c15..1a3ff9ad1 100644
--- a/ccm-cms/src/main/java/org/librecms/CmsConstants.java
+++ b/ccm-cms/src/main/java/org/librecms/CmsConstants.java
@@ -29,6 +29,7 @@ public class CmsConstants {
     public static final String DB_SCHEMA = "CCM_CMS";
 
     public static final String CMS_BUNDLE = "org.librecms.CmsResources";
+    public static final String CMS_ADMIN_BUNDLE = "org.librecms.CmsAdminMessages";
     public static final String CMS_FOLDER_BUNDLE
                                    = "com.arsdigita.cms.ui.folder.CMSFolderResources";
 
diff --git a/ccm-cms/src/main/java/org/librecms/ui/ContentSectionsController.java b/ccm-cms/src/main/java/org/librecms/ui/ContentSectionsController.java
index 3a92862da..833138d28 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/ContentSectionsController.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/ContentSectionsController.java
@@ -6,13 +6,14 @@
 package org.librecms.ui;
 
 import org.libreccm.security.AuthorizationRequired;
-import org.libreccm.security.RequiresPrivilege;
-import org.librecms.CmsConstants;
 
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.mvc.Controller;
+import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
 
 /**
  *
@@ -22,12 +23,41 @@ import javax.ws.rs.Path;
 @Controller
 @Path("/")
 public class ContentSectionsController {
-    
+
+    @Inject
+    private HttpServletRequest request;
+
     @GET
     @Path("/")
     @AuthorizationRequired
-    public String getContentSections() {
-        return "org/librecms/ui/content-sections.xhtml";
+    public Response getRoot() {
+        return Response
+            .status(Response.Status.MOVED_PERMANENTLY)
+            .entity(
+                String.format("%s/@content-sections/list", request
+                              .getContextPath())
+            ).build();
     }
-    
+
+    @GET
+    @Path("/list")
+    @AuthorizationRequired
+    public String getContentSections() {
+        return "org/librecms/ui/content-sections/list.xhtml";
+    }
+
+    @GET
+    @Path("/pages")
+    @AuthorizationRequired
+    public String getPages() {
+        return "org/librecms/ui/content-sections/pages.xhtml";
+    }
+
+    @GET
+    @Path("/search")
+    @AuthorizationRequired
+    public String getSearch() {
+        return "org/librecms/ui/content-sections/pages.xhtml";
+    }
+
 }
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/content-sections.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/content-sections.xhtml
index 3162e3d01..7703dba93 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/content-sections.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/content-sections.xhtml
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
       >
     <head>
         <title>#{title} - LibreCMS Content Sections</title>
@@ -12,10 +12,52 @@
     </head>
     <body>
         <header>
-            
+            <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
+                <button
+                    class="navbar-toggler"
+                    type="button"
+                    data-toggle="collapse"
+                    data-target="#navbarSupportedContent"
+                    aria-controls="navbarSupportedContent"
+                    aria-expanded="false"
+                    aria-label="Toggle navigation"
+                    >
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+                <div class="collapse navbar-collapse" id="navbarSupportedContent">
+                    <ul class="navbar-nav mr-auto">
+                        <li class="nav-item">
+                            <a class="nav-link #{activePage == 'contentSections'} ? 'active' : ''}"
+                               href="#{mvc.uri('ContentSectionsController#getContentSections')}">
+                                <bootstrap:svgIcon icon="bookshelf" />
+                                <span>#{CmsAdminMessages['contentsections.list.nav.link.title']}</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link #{activePage == 'pages'} ? 'active' : ''}"
+                               href="#{mvc.uri('ContentSectionsController#getPages')}">
+                                <bootstrap:svgIcon icon="diagram-3" />
+                                <span>#{CmsAdminMessages['contentsections.pages.nav.link.title']}</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link #{activePage == 'search'} ? 'active' : ''}"
+                               href="#{mvc.uri('ContentSectionsController#getSearch')}">
+                                <bootstrap:svgIcon icon="search" />
+                                <span>#{CmsAdminMessages['contentsections.search.nav.link.title']}</span>
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+            </nav>
+            <nav aria-label="breadcrumb">
+                <ol class="breadcrumb">
+                    <ui:insert name="breadcrumb"></ui:insert>
+                </ol>
+            </nav>
         </header>
         <main>
-            <p><em>Content Sections Placeholder</em></p>
+            <ui:insert name="main"></ui:insert>
         </main>
         <script src="#{request.contextPath}/assets/@content-sections/cms-admin.js"></script>
     </body>
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/list.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/list.xhtml
new file mode 100644
index 000000000..c755e36dd
--- /dev/null
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/list.xhtml
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+    <ui:composition template="/WEB-INF/views/org/librecms/ui/content-sections/content-sections.xhtml">
+        
+        <ui:param name="activePage" value="contentSections" />
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                #{CmsAdminMessages['contentsections.list.label']}
+            </li>
+        </ui:define>
+        
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{CmsAdminMessages['contentsections.list.label']}</h1>
+                <p>
+                    Content Sections List Placeholder
+                </p>
+                
+            </div>
+        </ui:define>
+    </ui:composition>
+</html>
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/pages.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/pages.xhtml
new file mode 100644
index 000000000..2ec25f31f
--- /dev/null
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/pages.xhtml
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+    <ui:composition template="/WEB-INF/views/org/librecms/ui/content-sections/content-sections.xhtml">
+        
+        <ui:param name="activePage" value="contentSections" />
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                #{CmsAdminMessages['contentsections.pages.label']}
+            </li>
+        </ui:define>
+        
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{CmsAdminMessages['contentsections.pages.label']}</h1>
+                <p>
+                    Content Sections Pages Placeholder
+                </p>
+                
+            </div>
+        </ui:define>
+    </ui:composition>
+</html>
+
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/search.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/search.xhtml
new file mode 100644
index 000000000..1e8533986
--- /dev/null
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/search.xhtml
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+    <ui:composition template="/WEB-INF/views/org/librecms/ui/content-sections/content-sections.xhtml">
+        
+        <ui:param name="activePage" value="contentSections" />
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                #{CmsAdminMessages['contentsections.search.label']}
+            </li>
+        </ui:define>
+        
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{CmsAdminMessages['contentsections.search.label']}</h1>
+                <p>
+                    Content Sections Search Placeholder
+                </p>
+                
+            </div>
+        </ui:define>
+    </ui:composition>
+</html>
+
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties
new file mode 100644
index 000000000..3fdac5f4c
--- /dev/null
+++ b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties
@@ -0,0 +1,6 @@
+contentsections.list.nav.link.title=Content Sections
+contentsections.pages.nav.link.title=Pages
+contentsections.search.nav.link.title=Search
+contentsections.list.label=Content Sections
+contentsections.pages.label=Pages
+contentsections.search.label=Search
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties
new file mode 100644
index 000000000..79092122a
--- /dev/null
+++ b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties
@@ -0,0 +1,6 @@
+contentsections.list.nav.link.title=Content Sections
+contentsections.pages.nav.link.title=Seitenb\u00e4ume
+contentsections.search.nav.link.title=Suche
+contentsections.list.label=Content Sections
+contentsections.pages.label=Seitenb\u00e4ume
+contentsections.search.label=Suche
diff --git a/ccm-core/src/main/java/org/libreccm/ui/login/LoginController.java b/ccm-core/src/main/java/org/libreccm/ui/login/LoginController.java
index f006369e5..3d8955ee4 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/login/LoginController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/login/LoginController.java
@@ -38,7 +38,6 @@ import javax.inject.Inject;
 import javax.mail.MessagingException;
 import javax.mvc.Controller;
 import javax.mvc.Models;
-import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.FormParam;
@@ -46,11 +45,9 @@ import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.QueryParam;
-import javax.ws.rs.RedirectionException;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 
 /**